[cig-commits] r13533 - cs/cigma/trunk/src

[luis at geodynamics.org]

Author: luis
Date: 2008-12-09 18:13:30 -0800 (Tue, 09 Dec 2008)
New Revision: 13533

Modified:
   cs/cigma/trunk/src/Function.h
   cs/cigma/trunk/src/cli_extract_cmd.h
   cs/cigma/trunk/src/cli_info_cmd.cpp
   cs/cigma/trunk/src/core_extract_op.cpp
   cs/cigma/trunk/src/core_extract_op.h
Log:
Misc cleanup (old comments, headers, etc.)

Modified: cs/cigma/trunk/src/Function.h
===================================================================
--- cs/cigma/trunk/src/Function.h	2008-12-10 02:13:29 UTC (rev 13532)
+++ cs/cigma/trunk/src/Function.h	2008-12-10 02:13:30 UTC (rev 13533)
@@ -18,7 +18,6 @@
     virtual int n_rank() const = 0;
     virtual bool eval(double *point, double *value) = 0;
 
-    //static Function* New(const char *source); // XXX: use boost::shared_ptr<Function>
     static boost::shared_ptr<Function> New(const char* source);
 };
 

Modified: cs/cigma/trunk/src/cli_extract_cmd.h
===================================================================
--- cs/cigma/trunk/src/cli_extract_cmd.h	2008-12-10 02:13:29 UTC (rev 13532)
+++ cs/cigma/trunk/src/cli_extract_cmd.h	2008-12-10 02:13:30 UTC (rev 13533)
@@ -25,9 +25,9 @@
 
 public:
 
+    std::string mesh;
     std::string rule;
     unsigned int rule_order;
-    std::string mesh;
     std::string points;
 
     ExtractOp op;

Modified: cs/cigma/trunk/src/cli_info_cmd.cpp
===================================================================
--- cs/cigma/trunk/src/cli_info_cmd.cpp	2008-12-10 02:13:29 UTC (rev 13532)
+++ cs/cigma/trunk/src/cli_info_cmd.cpp	2008-12-10 02:13:30 UTC (rev 13533)
@@ -20,6 +20,7 @@
 
 void InfoCmd::defineOptions()
 {
+
 }
 
 void InfoCmd::configure()
@@ -30,13 +31,9 @@
 {
     cout << "Calling InfoCmd::run()" << endl;
     //
-    // What to do here?
-    //
     // 'cigma info functions' should list the available functions
-    // 'cigma info <MESH>' should give statistics about the mesh
+    // 'cigma info mesh <MESH>' should give statistics about the mesh
     //
-    // Any others?
-    //
 }
 
 // ----------------------------------------------------------------------------

Modified: cs/cigma/trunk/src/core_extract_op.cpp
===================================================================
--- cs/cigma/trunk/src/core_extract_op.cpp	2008-12-10 02:13:29 UTC (rev 13532)
+++ cs/cigma/trunk/src/core_extract_op.cpp	2008-12-10 02:13:30 UTC (rev 13533)
@@ -3,12 +3,13 @@
 #include <boost/shared_ptr.hpp>
 #include <iostream>
 #include <cassert>
+#include <sstream>
 
 using namespace std;
 using namespace cigma;
-
 using boost::shared_ptr;
 
+
 ExtractOp::ExtractOp()
 {
 }
@@ -25,7 +26,6 @@
     {
         mesh = ReadMeshPart(mesh_info);
     }
-
     assert(mesh);
     assert(mesh->coords);
     assert(mesh->connect);
@@ -34,9 +34,9 @@
     {
         quadrature = ReadQuadrature(quadrature_info);
     }
-
     assert(quadrature);
 
+    return;
 }
 
 int ExtractOp::run()

Modified: cs/cigma/trunk/src/core_extract_op.h
===================================================================
--- cs/cigma/trunk/src/core_extract_op.h	2008-12-10 02:13:29 UTC (rev 13532)
+++ cs/cigma/trunk/src/core_extract_op.h	2008-12-10 02:13:30 UTC (rev 13533)
@@ -5,9 +5,9 @@
 
 #include "core_base_op.h"
 #include "core_readers.h"
+#include "core_array.h"
 #include "MeshPart.h"
 #include "Quadrature.h"
-#include "core_array.h"
 
 namespace cigma
 {