[cig-commits] r21559 - in short/3D/PyLith/trunk/libsrc/pylith: friction materials

[brad at geodynamics.org]

Author: brad
Date: 2013-03-18 13:28:03 -0700 (Mon, 18 Mar 2013)
New Revision: 21559

Modified:
   short/3D/PyLith/trunk/libsrc/pylith/friction/FrictionModel.cc
   short/3D/PyLith/trunk/libsrc/pylith/materials/ElasticMaterial.cc
   short/3D/PyLith/trunk/libsrc/pylith/materials/Material.cc
Log:
Started cleanup of Friction and Material.

Modified: short/3D/PyLith/trunk/libsrc/pylith/friction/FrictionModel.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/friction/FrictionModel.cc	2013-03-18 18:46:25 UTC (rev 21558)
+++ short/3D/PyLith/trunk/libsrc/pylith/friction/FrictionModel.cc	2013-03-18 20:28:03 UTC (rev 21559)
@@ -93,8 +93,6 @@
 					    feassemble::Quadrature<topology::SubMesh>* quadrature)
 { // initialize
   assert(_dbProperties);
-  ALE::MemoryLogger& logger = ALE::MemoryLogger::singleton();
-  //logger.stagePush("Friction");
 
   // Get vertices associated with friction interface
   PetscDM faultDMMesh = faultMesh.dmMesh();assert(faultDMMesh);
@@ -233,8 +231,6 @@
 
   // Setup buffers for restrict/update of properties and state variables.
   _propsStateVarsVertex.resize(_propsFiberDim+_varsFiberDim);
-
-  //logger.stagePop();
 } // initialize
 
 // ----------------------------------------------------------------------

Modified: short/3D/PyLith/trunk/libsrc/pylith/materials/ElasticMaterial.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/materials/ElasticMaterial.cc	2013-03-18 18:46:25 UTC (rev 21558)
+++ short/3D/PyLith/trunk/libsrc/pylith/materials/ElasticMaterial.cc	2013-03-18 20:28:03 UTC (rev 21559)
@@ -41,9 +41,6 @@
 //#define PRECOMPUTE_GEOMETRY
 
 // ----------------------------------------------------------------------
-typedef pylith::topology::Mesh::SieveMesh SieveMesh;
-
-// ----------------------------------------------------------------------
 // Default constructor.
 pylith::materials::ElasticMaterial::ElasticMaterial(const int dimension,
 						    const int tensorSize,
@@ -294,12 +291,9 @@
       useCurrentField = fiberDim == fiberDimCurrent;
     } // if
     if (!useCurrentField) {
-      ALE::MemoryLogger& logger = ALE::MemoryLogger::singleton();
-      logger.stagePush("OutputFields");
       int_array cellsTmp(cells, numCells);
       field->newSection(cellsTmp, fiberDim);
       field->allocate();
-      logger.stagePop();
     } // if
     field->label("stable_dt_implicit");
     assert(_normalizer);
@@ -382,11 +376,8 @@
       useCurrentField = fiberDim == fiberDimCurrent;
     } // if
     if (!useCurrentField) {
-      ALE::MemoryLogger& logger = ALE::MemoryLogger::singleton();
-      logger.stagePush("OutputFields");
       field->newSection(cells, numCells, fiberDim);
       field->allocate();
-      logger.stagePop();
     } // if
     field->label("stable_dt_explicit");
     assert(_normalizer);
@@ -481,13 +472,10 @@
       useCurrentField = fiberDim == fiberDimCurrent;
     } // if
     if (!useCurrentField) {
-      ALE::MemoryLogger& logger = ALE::MemoryLogger::singleton();
-      logger.stagePush("OutputFields");
       field->newSection(cells, numCells, fiberDim);
       field->allocate();
       fieldSection = field->petscSection();
       fieldVec     = field->localVector();
-      logger.stagePop();
     } // if
     assert(fieldSection);
     field->label("stable_dt_implicit");
@@ -547,9 +535,6 @@
   if (!_dbInitialStress)
     return;
 
-  ALE::MemoryLogger& logger = ALE::MemoryLogger::singleton();
-  logger.stagePush("MaterialsFields");
-
   assert(_initialFields);
   _initialFields->add("initial stress", "initial_stress");
   topology::Field<topology::Mesh>& initialStress = _initialFields->get("initial stress");
@@ -673,8 +658,6 @@
 
   // Close databases
   _dbInitialStress->close();
-
-  logger.stagePop();
 } // _initializeInitialStress
 
 // ----------------------------------------------------------------------
@@ -686,9 +669,6 @@
   if (!_dbInitialStrain)
     return;
 
-  ALE::MemoryLogger& logger = ALE::MemoryLogger::singleton();
-  logger.stagePush("MaterialsFields");
-
   assert(_initialFields);
   _initialFields->add("initial strain", "initial_strain");
   topology::Field<topology::Mesh>& initialStrain = _initialFields->get("initial strain");
@@ -807,8 +787,6 @@
 
   // Close databases
   _dbInitialStrain->close();
-
-  logger.stagePop();
 } // _initializeInitialStrain
 
 // ----------------------------------------------------------------------

Modified: short/3D/PyLith/trunk/libsrc/pylith/materials/Material.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/materials/Material.cc	2013-03-18 18:46:25 UTC (rev 21558)
+++ short/3D/PyLith/trunk/libsrc/pylith/materials/Material.cc	2013-03-18 20:28:03 UTC (rev 21559)
@@ -37,9 +37,6 @@
 //#define PRECOMPUTE_GEOMETRY
 
 // ----------------------------------------------------------------------
-typedef pylith::topology::Mesh::SieveMesh SieveMesh;
-
-// ----------------------------------------------------------------------
 // Default constructor.
 pylith::materials::Material::Material(const int dimension,
 				      const int tensorSize,
@@ -111,9 +108,6 @@
   assert(0 != _dbProperties);
   assert(0 != quadrature);
 
-  ALE::MemoryLogger& logger = ALE::MemoryLogger::singleton();
-  logger.stagePush("MaterialsFields");
-
   // Get quadrature information
   const int numQuadPts = quadrature->numQuadPts();
   const int numBasis = quadrature->numBasis();
@@ -296,8 +290,6 @@
   _dbProperties->close();
   if (0 != _dbInitialState)
     _dbInitialState->close();
-
-  logger.stagePop();
 } // initialize
 
 // ----------------------------------------------------------------------
@@ -419,13 +411,9 @@
       useCurrentField = totalFiberDim == totalFiberDimCurrent;
     } // if
     if (!useCurrentField) {
-      ALE::MemoryLogger& logger = ALE::MemoryLogger::singleton();
-      logger.stagePush("OutputFields");
       int_array cellsTmp(cells, numCells);
-
       field->newSection(cellsTmp, totalFiberDim);
       field->allocate();
-      logger.stagePop();
     } // if
     assert(fieldSection);
     field->label(name);
@@ -498,13 +486,9 @@
       useCurrentField = totalFiberDim == totalFiberDimCurrent;
     } // if
     if (!useCurrentField) {
-      ALE::MemoryLogger& logger = ALE::MemoryLogger::singleton();
-      logger.stagePush("OutputFields");
       int_array cellsTmp(cells, numCells);
-
       field->newSection(cellsTmp, totalFiberDim);
       field->allocate();
-      logger.stagePop();
     } // if
     assert(fieldSection);
     fieldType = _metadata.getStateVar(stateVarIndex).fieldType;