[cig-commits] r14468 - in short/3D/PyLith/branches/pylith-swig: libsrc/topology unittests/libtests/feassemble unittests/libtests/meshio unittests/libtests/topology

[brad at geodynamics.org]

Author: brad
Date: 2009-03-26 08:40:47 -0700 (Thu, 26 Mar 2009)
New Revision: 14468

Modified:
   short/3D/PyLith/branches/pylith-swig/libsrc/topology/Mesh.cc
   short/3D/PyLith/branches/pylith-swig/unittests/libtests/feassemble/TestElasticityExplicit.cc
   short/3D/PyLith/branches/pylith-swig/unittests/libtests/feassemble/TestElasticityImplicit.cc
   short/3D/PyLith/branches/pylith-swig/unittests/libtests/feassemble/TestQuadrature.cc
   short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/TestMeshIO.cc
   short/3D/PyLith/branches/pylith-swig/unittests/libtests/topology/TestFieldMesh.cc
   short/3D/PyLith/branches/pylith-swig/unittests/libtests/topology/TestFieldSubMesh.cc
   short/3D/PyLith/branches/pylith-swig/unittests/libtests/topology/TestSubMesh.cc
Log:
Cleaned up clearing global numbering (clear when creating Sieve mesh).

Modified: short/3D/PyLith/branches/pylith-swig/libsrc/topology/Mesh.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/libsrc/topology/Mesh.cc	2009-03-26 13:52:13 UTC (rev 14467)
+++ short/3D/PyLith/branches/pylith-swig/libsrc/topology/Mesh.cc	2009-03-26 15:40:47 UTC (rev 14468)
@@ -34,6 +34,8 @@
   _comm(comm),
   _debug(false)
 { // constructor
+  assert(!_mesh->getFactory().isNull());
+  _mesh->getFactory()->clear();
 } // constructor
 
 // ----------------------------------------------------------------------
@@ -51,6 +53,8 @@
   _mesh.destroy();
   _mesh = new SieveMesh(_comm, dim);
   _mesh->setDebug(_debug);
+  assert(!_mesh->getFactory().isNull());
+  _mesh->getFactory()->clear();
 } // createSieveMesh
 
 // ----------------------------------------------------------------------

Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/feassemble/TestElasticityExplicit.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/feassemble/TestElasticityExplicit.cc	2009-03-26 13:52:13 UTC (rev 14467)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/feassemble/TestElasticityExplicit.cc	2009-03-26 15:40:47 UTC (rev 14468)
@@ -329,7 +329,6 @@
       e_iter != cells->end();
       ++e_iter)
     sieveMesh->setValue(labelMaterials, *e_iter, _data->matId);
-  sieveMesh->getFactory()->clear(); // clear numberings
 
   // Setup quadrature
   _quadrature->initialize(_data->basis, _data->numQuadPts, _data->numBasis,

Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/feassemble/TestElasticityImplicit.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/feassemble/TestElasticityImplicit.cc	2009-03-26 13:52:13 UTC (rev 14467)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/feassemble/TestElasticityImplicit.cc	2009-03-26 15:40:47 UTC (rev 14468)
@@ -329,7 +329,6 @@
       e_iter != cells->end();
       ++e_iter)
     sieveMesh->setValue(labelMaterials, *e_iter, _data->matId);
-  sieveMesh->getFactory()->clear(); // clear numberings
 
   // Setup quadrature
   _quadrature->initialize(_data->basis, _data->numQuadPts, _data->numBasis,

Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/feassemble/TestQuadrature.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/feassemble/TestQuadrature.cc	2009-03-26 13:52:13 UTC (rev 14467)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/feassemble/TestQuadrature.cc	2009-03-26 15:40:47 UTC (rev 14468)
@@ -210,7 +210,6 @@
   sieveMesh->stratify();
   ALE::SieveBuilder<SieveMesh>::buildCoordinates(sieveMesh, spaceDim, 
 						 data.vertices);
-  sieveMesh->getFactory()->clear(); // clear numberings
 
   // Setup quadrature and compute geometry
   GeometryTri2D geometry;

Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/TestMeshIO.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/TestMeshIO.cc	2009-03-26 13:52:13 UTC (rev 14467)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/TestMeshIO.cc	2009-03-26 15:40:47 UTC (rev 14468)
@@ -104,7 +104,6 @@
       throw std::logic_error("Could not parse group type.");
     sieveMesh->allocate(groupField);
   } // for
-  sieveMesh->getFactory()->clear();
  
   return mesh;
 } // _createMesh

Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/topology/TestFieldMesh.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/topology/TestFieldMesh.cc	2009-03-26 13:52:13 UTC (rev 14467)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/topology/TestFieldMesh.cc	2009-03-26 15:40:47 UTC (rev 14468)
@@ -207,7 +207,6 @@
   _buildMesh(&mesh);
   const ALE::Obj<Mesh::SieveMesh>& sieveMesh = mesh.sieveMesh();
   CPPUNIT_ASSERT(!sieveMesh.isNull());
-  sieveMesh->view("Sieve");
 
   const ALE::Obj<Mesh::SieveMesh::label_sequence>& vertices = 
     sieveMesh->depthStratum(0);
@@ -896,7 +895,6 @@
   sieveMesh->stratify();
   ALE::SieveBuilder<Mesh::SieveMesh>::buildCoordinates(sieveMesh, spaceDim, 
 						       coordinates);
-  sieveMesh->getFactory()->clear(); // clear numberings
 
   spatialdata::geocoords::CSCart cs;
   cs.setSpaceDim(spaceDim);

Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/topology/TestFieldSubMesh.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/topology/TestFieldSubMesh.cc	2009-03-26 13:52:13 UTC (rev 14467)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/topology/TestFieldSubMesh.cc	2009-03-26 15:40:47 UTC (rev 14468)
@@ -922,7 +922,6 @@
   sieveMesh->stratify();
   ALE::SieveBuilder<SieveMesh>::buildCoordinates(sieveMesh, spaceDim, 
 						 coordinates);
-  sieveMesh->getFactory()->clear(); // clear numberings
 
   typedef Mesh::SieveMesh::int_section_type::chart_type chart_type;
   const ALE::Obj<SieveMesh::int_section_type>& groupField = 
@@ -943,8 +942,6 @@
   cs.initialize();
   mesh->coordsys(&cs);
 
-  sieveMesh->getFactory()->clear();
-
   submesh->createSubMesh(*mesh, _TestFieldSubMesh::label);
 } // _buildMesh
 

Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/topology/TestSubMesh.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/topology/TestSubMesh.cc	2009-03-26 13:52:13 UTC (rev 14467)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/topology/TestSubMesh.cc	2009-03-26 15:40:47 UTC (rev 14468)
@@ -231,7 +231,6 @@
   sieveMesh->stratify();
   ALE::SieveBuilder<Mesh::SieveMesh>::buildCoordinates(sieveMesh, spaceDim, 
 						       coordinates);
-  sieveMesh->getFactory()->clear(); // clear numberings
 
   spatialdata::geocoords::CSCart cs;
   cs.setSpaceDim(spaceDim);