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

[luis at geodynamics.org]

Author: luis
Date: 2008-01-29 12:24:50 -0800 (Tue, 29 Jan 2008)
New Revision: 9188

Modified:
   cs/benchmark/cigma/trunk/src/CompareCmd.cpp
Log:
Split arguments so that each component can come from a different source

Modified: cs/benchmark/cigma/trunk/src/CompareCmd.cpp
===================================================================
--- cs/benchmark/cigma/trunk/src/CompareCmd.cpp	2008-01-29 19:48:02 UTC (rev 9187)
+++ cs/benchmark/cigma/trunk/src/CompareCmd.cpp	2008-01-29 20:24:50 UTC (rev 9188)
@@ -70,24 +70,35 @@
     /* setup flags and options */
     opt->setFlag("help", 'h');
 
-    // options for first field, in the form /path/to/file:/path/to/dset
-    opt->setOption("first",'a');
+    // options for mesh
+    opt->setOption("mesh");
+    opt->setOption("mesh-coordinates");
+    opt->setOption("mesh-connectivity");
 
-    // option for second field, in the form /path/to/file:/path/to/dset
-    opt->setOption("second",'b');
-
     // options for quadrature
     opt->setOption("order");
     opt->setOption("rule");
     opt->setOption("rule-points");
     opt->setOption("rule-weights");
 
+    // options for first field, in the form /path/to/file:/path/to/dset
+    opt->setOption("first",'a');
+    opt->setOption("first-mesh");
+    opt->setOption("first-mesh-coordinates");
+    opt->setOption("first-mesh-connectivity");
+
+    // option for second field, in the form /path/to/file:/path/to/dset
+    opt->setOption("second",'b');
+    opt->setOption("second-mesh");
+    opt->setOption("second-mesh-coordinates");
+    opt->setOption("second-mesh-connectivity");
+
     // options for output
     opt->setOption("output");
+    opt->setOption("output-frequency",'f');
 
     // other options
     opt->setFlag("verbose");
-    opt->setOption("output-frequency",'f');
 }
 
 void cigma::CompareCmd::configure(AnyOption *opt)
@@ -162,6 +173,26 @@
     string_to_int(inputstr, output_frequency);
 
 
+    /*
+     * Initialization order:
+     *  Load Integration mesh
+     *  Load Quadrature rule
+     *  Load First field
+     *      If FE_Field
+     *          Load MeshA
+     *          Load DofsB
+     *      Else
+     *          Load Analytic Field
+     *  Load Second field
+     *      If FE_Field
+     *          Load MeshB
+     *          Load DofsB
+     *      Else
+     *          Load Analytic Field
+     */
+
+
+
     field_a = new FE_Field();
     load_field(inputfileA, locationA, readerA, field_a);
     std::cout << "first field location = " << locationA << std::endl;