[cig-commits] r17918 - in short/3D/PyLith/trunk: libsrc/topology tests/topology

[brad at geodynamics.org]

Author: brad
Date: 2011-02-20 08:49:21 -0800 (Sun, 20 Feb 2011)
New Revision: 17918

Modified:
   short/3D/PyLith/trunk/libsrc/topology/Distributor.cc
   short/3D/PyLith/trunk/libsrc/topology/MeshRefiner.cc
   short/3D/PyLith/trunk/libsrc/topology/RefineUniform.cc
   short/3D/PyLith/trunk/tests/topology/test_meshmem.py
Log:
Separate mesh from refinement and distribution in logging.

Modified: short/3D/PyLith/trunk/libsrc/topology/Distributor.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/topology/Distributor.cc	2011-02-20 06:38:23 UTC (rev 17917)
+++ short/3D/PyLith/trunk/libsrc/topology/Distributor.cc	2011-02-20 16:49:21 UTC (rev 17918)
@@ -147,8 +147,8 @@
 
   ALE::MemoryLogger& logger = ALE::MemoryLogger::singleton();
   //logger.setDebug(1);
-  logger.stagePush("Mesh");
-  logger.stagePush("MeshCreation");
+  logger.stagePush("DistributedMesh");
+  logger.stagePush("DistributedMeshCreation");
 
   journal::info_t info("distributor");
     
@@ -222,7 +222,7 @@
   } // if
 
   logger.stagePop();
-  logger.stagePush("MeshCoordinates");
+  logger.stagePush("DistributedMeshCoordinates");
 
   // Distribute the coordinates
   info << journal::at(__HERE__)
@@ -241,7 +241,7 @@
 				      parallelCoordinates);
 
   logger.stagePop();
-  logger.stagePush("MeshRealSections");
+  logger.stagePush("DistributedMeshRealSections");
 
   // Distribute other sections
   info << journal::at(__HERE__)
@@ -268,7 +268,7 @@
   }
 
   logger.stagePop();
-  logger.stagePush("MeshIntSections");
+  logger.stagePush("DistributedMeshIntSections");
 
   if (origSieveMesh->getIntSections()->size() > 0) {
     ALE::Obj<std::set<std::string> > names = origSieveMesh->getIntSections();
@@ -305,7 +305,7 @@
     throw std::logic_error("Need to distribute more arrow sections");
   
   logger.stagePop();
-  logger.stagePush("MeshLabels");
+  logger.stagePush("DistributedMeshLabels");
 
   // Distribute labels
   info << journal::at(__HERE__)
@@ -351,7 +351,7 @@
   } // for
 
   logger.stagePop();
-  logger.stagePush("MeshOverlap");
+  logger.stagePush("DistributedMeshOverlap");
 
   // Create the parallel overlap
   info << journal::at(__HERE__)

Modified: short/3D/PyLith/trunk/libsrc/topology/MeshRefiner.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/topology/MeshRefiner.cc	2011-02-20 06:38:23 UTC (rev 17917)
+++ short/3D/PyLith/trunk/libsrc/topology/MeshRefiner.cc	2011-02-20 16:49:21 UTC (rev 17918)
@@ -73,8 +73,8 @@
 
   ALE::MemoryLogger& logger = ALE::MemoryLogger::singleton();
   //logger.setDebug(1);
-  logger.stagePush("Mesh");
-  logger.stagePush("MeshCreation");
+  logger.stagePush("RefinedMesh");
+  logger.stagePush("RefinedMeshCreation");
 
   // Calculate order in old mesh.
   _orderOldMesh->initialize(mesh);
@@ -166,7 +166,7 @@
 
   logger.stagePop();
   //logger.setDebug(0);
-  logger.stagePush("MeshCoordinates");
+  logger.stagePush("RefinedMeshCoordinates");
 
   // Set coordinates in refined mesh.
   const Obj<mesh_type::real_section_type>& coordinates = mesh->getRealSection("coordinates");
@@ -195,22 +195,22 @@
   refiner.setCoordsNewVertices(newCoordinates, coordinates);
 
   logger.stagePop();
-  logger.stagePush("MeshStratification");
+  logger.stagePush("RefinedMeshStratification");
 
   _stratify(newMesh);
 
   logger.stagePop();
-  logger.stagePush("MeshOverlap");
+  logger.stagePush("RefinedMeshOverlap");
 
   _calcNewOverlap(newMesh, mesh, refiner);
 
   logger.stagePop();
-  logger.stagePush("MeshIntSections");
+  logger.stagePush("RefinedMeshIntSections");
 
   _createIntSections(newMesh, mesh, refiner);
 
   logger.stagePop();
-  logger.stagePush("MeshLabels");
+  logger.stagePush("RefinedMeshLabels");
 
   _createLabels(newMesh, mesh, refiner);
 

Modified: short/3D/PyLith/trunk/libsrc/topology/RefineUniform.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/topology/RefineUniform.cc	2011-02-20 06:38:23 UTC (rev 17917)
+++ short/3D/PyLith/trunk/libsrc/topology/RefineUniform.cc	2011-02-20 16:49:21 UTC (rev 17918)
@@ -56,10 +56,6 @@
 { // refine
   assert(0 != newMesh);
 
-  ALE::MemoryLogger& logger = ALE::MemoryLogger::singleton();
-  //logger.setDebug(2);
-  logger.stagePush("Refinement");
-
   typedef SieveMesh::point_type point_type;
 
   const ALE::Obj<SieveMesh>& sieveMesh = mesh.sieveMesh();
@@ -127,9 +123,6 @@
   } // switch
 
   // newMesh->view("REFINED MESH");
-
-  logger.stagePop();
-  //logger.setDebug(0);
 } // refine
     
 

Modified: short/3D/PyLith/trunk/tests/topology/test_meshmem.py
===================================================================
--- short/3D/PyLith/trunk/tests/topology/test_meshmem.py	2011-02-20 06:38:23 UTC (rev 17917)
+++ short/3D/PyLith/trunk/tests/topology/test_meshmem.py	2011-02-20 16:49:21 UTC (rev 17918)
@@ -120,9 +120,9 @@
       dmesh = distributor.distribute(mesh, normalizer)
       del distributor
       
-      self.logger.logMesh("Mesh", dmesh)
+      self.logger.logMesh("DistributedMesh", dmesh)
       material.ncells = MeshOps_numMaterialCells(dmesh, material.id())
-      self.logger.logMaterial("Mesh", material)
+      self.logger.logMaterial("DistributedMesh", material)
 
       self._showStatus("After distributing mesh")
 
@@ -136,9 +136,9 @@
     rmesh = refiner.refine(mesh)
     del refiner
     
-    self.logger.logMesh("Mesh", rmesh)
+    self.logger.logMesh("RefinedMesh", rmesh)
     material.ncells = MeshOps_numMaterialCells(rmesh, material.id())
-    self.logger.logMaterial("Mesh", material)
+    self.logger.logMaterial("RefinedMesh", material)
 
     self._showStatus("After refining mesh")