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

[luis at geodynamics.org]

Author: luis
Date: 2008-12-09 18:14:34 -0800 (Tue, 09 Dec 2008)
New Revision: 13567

Modified:
   cs/cigma/trunk/src/cli_compare_cmd.cpp
   cs/cigma/trunk/src/core_compare_op.h
   cs/cigma/trunk/src/fn_one.h
Log:
Misc changes, and added -c option to compare

Modified: cs/cigma/trunk/src/cli_compare_cmd.cpp
===================================================================
--- cs/cigma/trunk/src/cli_compare_cmd.cpp	2008-12-10 02:14:31 UTC (rev 13566)
+++ cs/cigma/trunk/src/cli_compare_cmd.cpp	2008-12-10 02:14:34 UTC (rev 13567)
@@ -48,7 +48,7 @@
         ("second-mesh-coords", po::value<string>(&nc2), "...node coordinates for second mesh")
         ("second-mesh-connect", po::value<string>(&eb2), "...connectivity for second mesh")
         ("mesh,m", po::value<string>(&mesh), "Path to integration mesh")
-        ("mesh-cell", po::value<string>(&cell), "...cell type of integration mesh")
+        ("mesh-cell,c", po::value<string>(&cell), "...cell type of integration mesh")
         ("mesh-coords", po::value<string>(&nc), "...node coordinates of integration mesh")
         ("mesh-connect", po::value<string>(&eb), "...connectivity of integration mesh")
         ("rule,r", po::value<string>(&rule), "Integration rule (points and weights)")
@@ -76,7 +76,7 @@
         TRI_LOG_OFF();
     }
 
-    TRI_LOG_STR("CompareCmd::configure()");
+    TRI_LOG_STR("CompareCmd::configure");
 
     if (vm.count("verbose"))
     {

Modified: cs/cigma/trunk/src/core_compare_op.h
===================================================================
--- cs/cigma/trunk/src/core_compare_op.h	2008-12-10 02:14:31 UTC (rev 13566)
+++ cs/cigma/trunk/src/core_compare_op.h	2008-12-10 02:14:34 UTC (rev 13567)
@@ -24,6 +24,8 @@
     void configure();
     int run();
 
+    /* XXX: convenience setters for info structs */
+
 public:
 
     FunctionInfo first_info;

Modified: cs/cigma/trunk/src/fn_one.h
===================================================================
--- cs/cigma/trunk/src/fn_one.h	2008-12-10 02:14:31 UTC (rev 13566)
+++ cs/cigma/trunk/src/fn_one.h	2008-12-10 02:14:34 UTC (rev 13567)
@@ -1,5 +1,5 @@
-#ifndef __CIGMA_UNIT_SCALAR_FUNCTION_H__
-#define __CIGMA_UNIT_SCALAR_FUNCTION_H__
+#ifndef __CIGMA_UNIT_SCALAR_FN_H__
+#define __CIGMA_UNIT_SCALAR_FN_H__
 
 #include "Function.h"
 
@@ -28,4 +28,5 @@
 
 inline int cigma::UnitScalarFn::n_dim() const { return dim; }
 inline int cigma::UnitScalarFn::n_rank() const { return 1; }
+
 #endif