[cig-commits] r13777 - cs/cigma/trunk/src

[luis at geodynamics.org]

Author: luis
Date: 2008-12-17 02:33:59 -0800 (Wed, 17 Dec 2008)
New Revision: 13777

Modified:
   cs/cigma/trunk/src/Field.cpp
   cs/cigma/trunk/src/io_vtk_reader.cpp
Log:
Fixed error (instantiation of DofHandler in VtkReader)

Modified: cs/cigma/trunk/src/Field.cpp
===================================================================
--- cs/cigma/trunk/src/Field.cpp	2008-12-17 10:33:56 UTC (rev 13776)
+++ cs/cigma/trunk/src/Field.cpp	2008-12-17 10:33:59 UTC (rev 13777)
@@ -38,16 +38,12 @@
 
             field->mesh = vtk->getMeshPart(0);
             field->fe   = vtk->getFE(0);
-
-            if (location != "")
-            {
-                field->dofs = vtk->getDofHandler(location.c_str());
-            }
+            field->dofs = vtk->getDofHandler(location.c_str());
         }
         else
         {
-            field->dofs = DofHandler::New(field_info.p_field);
             field->mesh = MeshPart::New(field_info.mesh_info);
+            field->dofs = DofHandler::New(field_info.p_field);
 
             if (field_info.fe_info)
             {

Modified: cs/cigma/trunk/src/io_vtk_reader.cpp
===================================================================
--- cs/cigma/trunk/src/io_vtk_reader.cpp	2008-12-17 10:33:56 UTC (rev 13776)
+++ cs/cigma/trunk/src/io_vtk_reader.cpp	2008-12-17 10:33:59 UTC (rev 13777)
@@ -318,7 +318,7 @@
     TRI_LOG_STR("VtkReader::getDofHandler()");
     TRI_LOG(loc);
 
-    shared_ptr<DofHandler> dh;
+    shared_ptr<DofHandler> dh(new DofHandler);
     int status = this->getDataset(loc, &(dh->dofs), &(dh->nno), &(dh->rank));
     if (status < 0)
     {
@@ -353,6 +353,7 @@
     if (false)
     {
         vtkIndent indent(0);
+        dataset->PrintSelf(cout, indent);
         pointData->PrintSelf(cout, indent);
         cellData->PrintSelf(cout, indent);
     }