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

[luis at geodynamics.org]

Author: luis
Date: 2008-02-06 15:40:02 -0800 (Wed, 06 Feb 2008)
New Revision: 9262

Modified:
   cs/benchmark/cigma/trunk/src/Misc.cpp
   cs/benchmark/cigma/trunk/src/VtkReader.cpp
Log:
Avoid VtkReader::close() for now


Modified: cs/benchmark/cigma/trunk/src/Misc.cpp
===================================================================
--- cs/benchmark/cigma/trunk/src/Misc.cpp	2008-02-06 23:40:00 UTC (rev 9261)
+++ cs/benchmark/cigma/trunk/src/Misc.cpp	2008-02-06 23:40:02 UTC (rev 9262)
@@ -209,7 +209,7 @@
         new_reader(&coords_reader, coords_ext);
         coords_reader->open(coords_file);
         coords_reader->get_coordinates(coords_loc.c_str(), &coords, &nno, &nsd);
-        coords_reader->close();
+        //coords_reader->close();
     }
 
     if (connect_path != "")
@@ -219,7 +219,7 @@
         new_reader(&connect_reader, connect_ext);
         connect_reader->open(connect_file);
         connect_reader->get_connectivity(connect_loc.c_str(), &connect, &nel, &ndofs);
-        connect_reader->close();
+        //connect_reader->close();
     }
 
     if ((mesh_path != "") && ((coords == 0) || (connect == 0)))
@@ -244,7 +244,7 @@
             }
             mesh_reader->get_connectivity(connect_loc.c_str(), &connect, &nel, &ndofs);
         }
-        mesh_reader->close();
+        //mesh_reader->close();
     }
 
     if ((coords != 0) && (connect != 0))
@@ -478,7 +478,7 @@
         new_reader(&reader, dofs_ext);
         reader->open(dofs_file);
         reader->get_dataset(dofs_loc.c_str(), &dofs, &dofs_nno, &dofs_valdim);
-        reader->close();
+        //reader->close();
 
 
         if (meshIO.mesh_path == "")

Modified: cs/benchmark/cigma/trunk/src/VtkReader.cpp
===================================================================
--- cs/benchmark/cigma/trunk/src/VtkReader.cpp	2008-02-06 23:40:00 UTC (rev 9261)
+++ cs/benchmark/cigma/trunk/src/VtkReader.cpp	2008-02-06 23:40:02 UTC (rev 9262)
@@ -20,7 +20,8 @@
 
 cigma::VtkReader::~VtkReader()
 {
-    close();
+    //XXX: avoid calling close() for now
+    //close();
 }
 
 
@@ -64,6 +65,7 @@
 
 void cigma::VtkReader::close()
 {
+    /* XXX: fix this!
     if (grid != 0)
     {
         grid->Delete();
@@ -74,6 +76,7 @@
         reader->Delete();
         reader = 0;
     }
+    // */
 }