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

[luis at geodynamics.org]

Author: luis
Date: 2008-04-02 11:01:43 -0700 (Wed, 02 Apr 2008)
New Revision: 11724

Modified:
   cs/benchmark/cigma/trunk/src/MeshPartReader.cpp
Log:
Updates to MeshPartReader
 * Prefix error messages with "Error: "
 * Clean up any allocated reader objects


Modified: cs/benchmark/cigma/trunk/src/MeshPartReader.cpp
===================================================================
--- cs/benchmark/cigma/trunk/src/MeshPartReader.cpp	2008-04-02 18:01:41 UTC (rev 11723)
+++ cs/benchmark/cigma/trunk/src/MeshPartReader.cpp	2008-04-02 18:01:43 UTC (rev 11724)
@@ -261,12 +261,12 @@
     }
     if (coordsReader == 0)
     {
-        cerr << "Could not make reader for mesh coordinates" << endl;
+        cerr << "Error: Could not make reader for mesh coordinates" << endl;
         exit(1);
     }
     if (connectReader == 0)
     {
-        cerr << "Could not make reader for mesh connectivity" << endl;
+        cerr << "Error: Could not make reader for mesh connectivity" << endl;
         exit(1);
     }
 
@@ -278,7 +278,7 @@
         ierr = meshReader->open(meshFile.c_str());
         if (ierr < 0)
         {
-            cerr << "Could not open mesh file " << meshFile << endl;
+            cerr << "Error: Could not open mesh file " << meshFile << endl;
             exit(1);
         }
     }
@@ -287,7 +287,7 @@
         ierr = coordsReader->open(coordsFile.c_str());
         if (ierr < 0)
         {
-            cerr << "Could not open mesh-coordinates file " << coordsFile << endl;
+            cerr << "Error: Could not open mesh-coordinates file " << coordsFile << endl;
             exit(1);
         }
     }
@@ -296,7 +296,7 @@
         ierr = connectReader->open(connectFile.c_str());
         if (ierr < 0)
         {
-            cerr << "Could not open mesh-connectivity file " << connectFile << endl;
+            cerr << "Error: Could not open mesh-connectivity file " << connectFile << endl;
             exit(1);
         }
     }
@@ -362,8 +362,37 @@
         meshPart->nel = nel;
         meshPart->ndofs = ndofs;
         meshPart->connect = connect;
+
+        // XXX: can we decide at this point which cell to assign?
+        meshPart->set_cell();
     }
 
+    //
+    // Clean up
+    //
+    if (meshReader != 0)
+    {
+        if (coordsReader == meshReader)
+        {
+            coordsReader = 0;
+        }
+        if (connectReader == meshReader)
+        {
+            connectReader = 0;
+        }
+        delete meshReader;
+        meshReader = 0;
+    }
+    if (coordsReader != 0)
+    {
+        delete coordsReader;
+        coordsReader = 0;
+    }
+    if (connectReader != 0)
+    {
+        delete connectReader;
+        connectReader = 0;
+    }
 }
 
 // ---------------------------------------------------------------------------