[cig-commits] r9308 - cs/benchmark/cigma/trunk/src

[luis at geodynamics.org]

Author: luis
Date: 2008-02-13 10:28:32 -0800 (Wed, 13 Feb 2008)
New Revision: 9308

Modified:
   cs/benchmark/cigma/trunk/src/CompareCmd.cpp
   cs/benchmark/cigma/trunk/src/FieldIO.cpp
   cs/benchmark/cigma/trunk/src/FieldIO.h
   cs/benchmark/cigma/trunk/src/MeshIO.cpp
   cs/benchmark/cigma/trunk/src/MeshIO.h
   cs/benchmark/cigma/trunk/src/QuadratureIO.cpp
   cs/benchmark/cigma/trunk/src/QuadratureIO.h
Log:
Using function polymorphism in the load_args() family of functions


Modified: cs/benchmark/cigma/trunk/src/CompareCmd.cpp
===================================================================
--- cs/benchmark/cigma/trunk/src/CompareCmd.cpp	2008-02-13 18:28:30 UTC (rev 9307)
+++ cs/benchmark/cigma/trunk/src/CompareCmd.cpp	2008-02-13 18:28:32 UTC (rev 9308)
@@ -128,16 +128,13 @@
 
     /* Gather up the expected command line arguments */
 
-    //XXX: add "rule" to last arg
-    //XXX: rename configure_quadrature to configure_rule
+    load_args(opt, &meshIO, "mesh");
+    load_args(opt, &quadratureIO, "rule");
+    load_args(opt, &firstIO, "first");
+    load_args(opt, &secondIO, "second");
+    load_args(opt, &residualsIO, "output");
 
-    configure_mesh(opt, &meshIO, "mesh");
-    configure_quadrature(opt, &quadratureIO, "rule");
-    configure_field(opt, &firstIO, "first");
-    configure_field(opt, &secondIO, "second");
-    configure_field(opt, &residualsIO, "output");
 
-
     /* Validate these arguments and complain about missing ones */
 
     if (opt->getFlag("debug"))

Modified: cs/benchmark/cigma/trunk/src/FieldIO.cpp
===================================================================
--- cs/benchmark/cigma/trunk/src/FieldIO.cpp	2008-02-13 18:28:30 UTC (rev 9307)
+++ cs/benchmark/cigma/trunk/src/FieldIO.cpp	2008-02-13 18:28:32 UTC (rev 9308)
@@ -11,7 +11,7 @@
 // ---------------------------------------------------------------------------
 
 
-void configure_field(AnyOption *opt, FieldIO *fieldIO, const char *opt_prefix)
+void load_args(AnyOption *opt, FieldIO *fieldIO, const char *opt_prefix)
 {
     assert(opt != 0);
     assert(fieldIO != 0);
@@ -26,7 +26,7 @@
         fieldIO->field_path = in;
     }
 
-    configure_mesh(opt, &(fieldIO->meshIO), mesh_name.c_str());
+    load_args(opt, &(fieldIO->meshIO), mesh_name.c_str());
 
 }
 

Modified: cs/benchmark/cigma/trunk/src/FieldIO.h
===================================================================
--- cs/benchmark/cigma/trunk/src/FieldIO.h	2008-02-13 18:28:30 UTC (rev 9307)
+++ cs/benchmark/cigma/trunk/src/FieldIO.h	2008-02-13 18:28:32 UTC (rev 9308)
@@ -26,7 +26,7 @@
 };
 
 
-void configure_field(AnyOption *opt, FieldIO *fieldIO, const char *opt_prefix);
+void load_args(AnyOption *opt, FieldIO *fieldIO, const char *opt_prefix);
 
 
 #endif

Modified: cs/benchmark/cigma/trunk/src/MeshIO.cpp
===================================================================
--- cs/benchmark/cigma/trunk/src/MeshIO.cpp	2008-02-13 18:28:30 UTC (rev 9307)
+++ cs/benchmark/cigma/trunk/src/MeshIO.cpp	2008-02-13 18:28:32 UTC (rev 9308)
@@ -8,7 +8,7 @@
 
 // ---------------------------------------------------------------------------
 
-void configure_mesh(AnyOption *opt, MeshIO *meshIO, const char *opt_prefix)
+void load_args(AnyOption *opt, MeshIO *meshIO, const char *opt_prefix)
 {
     assert(opt != 0);
     assert(meshIO != 0);

Modified: cs/benchmark/cigma/trunk/src/MeshIO.h
===================================================================
--- cs/benchmark/cigma/trunk/src/MeshIO.h	2008-02-13 18:28:30 UTC (rev 9307)
+++ cs/benchmark/cigma/trunk/src/MeshIO.h	2008-02-13 18:28:32 UTC (rev 9308)
@@ -42,7 +42,7 @@
 
 
 
-void configure_mesh(AnyOption *opt, MeshIO *meshIO, const char *opt_prefix);
+void load_args(AnyOption *opt, MeshIO *meshIO, const char *opt_prefix);
 void validate_args(MeshIO *meshIO, const char *cmd_name);
 
 

Modified: cs/benchmark/cigma/trunk/src/QuadratureIO.cpp
===================================================================
--- cs/benchmark/cigma/trunk/src/QuadratureIO.cpp	2008-02-13 18:28:30 UTC (rev 9307)
+++ cs/benchmark/cigma/trunk/src/QuadratureIO.cpp	2008-02-13 18:28:32 UTC (rev 9308)
@@ -7,7 +7,7 @@
 
 // ---------------------------------------------------------------------------
 
-void configure_quadrature(AnyOption *opt, QuadratureIO *quadratureIO, const char *opt_prefix)
+void load_args(AnyOption *opt, QuadratureIO *quadratureIO, const char *opt_prefix)
 {
     assert(opt != 0);
     assert(quadratureIO != 0);

Modified: cs/benchmark/cigma/trunk/src/QuadratureIO.h
===================================================================
--- cs/benchmark/cigma/trunk/src/QuadratureIO.h	2008-02-13 18:28:30 UTC (rev 9307)
+++ cs/benchmark/cigma/trunk/src/QuadratureIO.h	2008-02-13 18:28:32 UTC (rev 9308)
@@ -29,7 +29,7 @@
 };
 
 
-void configure_quadrature(AnyOption *opt, QuadratureIO *quadratureIO, const char *opt_prefix);
+void load_args(AnyOption *opt, QuadratureIO *quadratureIO, const char *opt_prefix);
 
 
 #endif