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

[luis at geodynamics.org]

Author: luis
Date: 2008-03-26 08:59:12 -0700 (Wed, 26 Mar 2008)
New Revision: 11587

Modified:
   cs/benchmark/cigma/trunk/src/FieldReader.cpp
   cs/benchmark/cigma/trunk/src/FieldReader.h
Log:
Added fieldReader->verbose


Modified: cs/benchmark/cigma/trunk/src/FieldReader.cpp
===================================================================
--- cs/benchmark/cigma/trunk/src/FieldReader.cpp	2008-03-26 15:59:11 UTC (rev 11586)
+++ cs/benchmark/cigma/trunk/src/FieldReader.cpp	2008-03-26 15:59:12 UTC (rev 11587)
@@ -19,6 +19,7 @@
 FieldReader::FieldReader()
 {
     field = 0;
+    verbose = false;
 }
 
 FieldReader::~FieldReader()
@@ -36,8 +37,7 @@
     assert(opt != 0);
 
     // remember the original option name
-    this->fieldOption = "--";
-    this->fieldOption += opt_prefix;
+    this->fieldOption = opt_prefix;
 
     // deduce all implied command line options
     char *in;
@@ -82,7 +82,7 @@
         {
             cerr << cmd_name << ": "
                  << "Please specify the option "
-                 << fieldOption
+                 << "--" << fieldOption
                  << endl;
             exit(1);
         }
@@ -92,7 +92,8 @@
             string o2 = fieldOption + "-values";
             cerr << cmd_name << ": "
                  << "Please provide the options "
-                 << o1 << " and " << o2
+                 << "--" << o1 << " and "
+                 << "--" << o2
                  << endl;
             exit(1);
         }
@@ -103,16 +104,20 @@
         {
             string optstr = fieldOption + "-points";
             cerr << cmd_name << ": "
-                 << "Can't specify both " << fieldOption
-                 << " and " << optstr << endl;
+                 << "Can't specify both "
+                 << "--" << fieldOption
+                 << " and "
+                 << "--" << optstr << endl;
             exit(1);
         }
         if (valuesReader.pointsPath != "")
         {
             string optstr = fieldOption + "-values";
             cerr << cmd_name << ": "
-                 << "Can't specify both " << fieldOption
-                 << " and " << optstr << endl;
+                 << "Can't specify both "
+                 << "--" << fieldOption
+                 << " and "
+                 << "--" << optstr << endl;
             exit(1);
         }
     }
@@ -188,6 +193,21 @@
 
         fe_field->dofHandler = new DofHandler();
         fe_field->dofHandler->set_data(dofs, dofs_nno, dofs_valdim);
+
+
+        if (verbose)
+        {
+            cout << fieldOption << " field path = "
+                 << fieldPath
+                 << endl;
+
+            cout << fieldOption << " field dimensions = "
+                 << "rank " << fe_field->n_rank() << ", "
+                 << fe_field->meshPart->nel << " cells, "
+                 << fe_field->meshPart->nno << " nodes, "
+                 << fe_field->meshPart->cell->n_nodes() << " dofs/cell"
+                 << endl;
+        }
     }
     else if (field->getType() == Field::POINT_FIELD)
     {

Modified: cs/benchmark/cigma/trunk/src/FieldReader.h
===================================================================
--- cs/benchmark/cigma/trunk/src/FieldReader.h	2008-03-26 15:59:11 UTC (rev 11586)
+++ cs/benchmark/cigma/trunk/src/FieldReader.h	2008-03-26 15:59:12 UTC (rev 11587)
@@ -24,6 +24,7 @@
 public:
     std::string fieldOption;
     std::string fieldPath;
+    bool verbose;
 
 public:
     MeshPartReader meshPartReader;