[cig-commits] r21699 - short/3D/PyLith/trunk/libsrc/pylith/faults

[brad at geodynamics.org]

Author: brad
Date: 2013-04-02 15:52:02 -0700 (Tue, 02 Apr 2013)
New Revision: 21699

Modified:
   short/3D/PyLith/trunk/libsrc/pylith/faults/FaultCohesiveLagrange.cc
Log:
Code cleanup.

Modified: short/3D/PyLith/trunk/libsrc/pylith/faults/FaultCohesiveLagrange.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/faults/FaultCohesiveLagrange.cc	2013-04-02 22:49:48 UTC (rev 21698)
+++ short/3D/PyLith/trunk/libsrc/pylith/faults/FaultCohesiveLagrange.cc	2013-04-02 22:52:02 UTC (rev 21699)
@@ -47,7 +47,6 @@
 #include <sstream> // USES std::ostringstream
 #include <stdexcept> // USES std::runtime_error
 
-//#define PRECOMPUTE_GEOMETRY
 //#define DETAILED_EVENT_LOGGING
 
 // ----------------------------------------------------------------------
@@ -109,19 +108,6 @@
 
   _quadrature->initializeGeometry();
 
-#if defined(PRECOMPUTE_GEOMETRY)
-#error("Code for PRECOMPUTE_GEOMETRY not implemented.");
-  const ALE::Obj<SieveSubMesh>& faultSieveMesh = _faultMesh->sieveMesh();
-  assert(!faultSieveMesh.isNull());
-  const ALE::Obj<SieveSubMesh::label_sequence>& cells =
-      faultSieveMesh->heightStratum(0);
-  assert(!cells.isNull());
-  const SieveSubMesh::label_sequence::iterator cellsBegin = cells->begin();
-  const SieveSubMesh::label_sequence::iterator cellsEnd = cells->end();
-  _quadrature->initializeGeometry();
-  _quadrature->computeGeometry(*_faultMesh, cells);
-#endif
-
   // Compute orientation at vertices in fault mesh.
   _calcOrientation(upDir);
 
@@ -1590,13 +1576,9 @@
     areaCell = 0.0;
 
     // Compute geometry information for current cell
-#if defined(PRECOMPUTE_GEOMETRY)
-    _quadrature->retrieveGeometry(c);
-#else
     coordsVisitor.getClosure(&coordsCell, &coordsSize, c);
     _quadrature->computeGeometry(coordsCell, coordsSize, c);
     coordsVisitor.restoreClosure(&coordsCell, &coordsSize, c);
-#endif
 
     // Get cell geometry information that depends on cell
     const scalar_array& basis = _quadrature->basis();