[cig-commits] r16326 - short/3D/PyLith/trunk/libsrc/feassemble

[brad at geodynamics.org]

Author: brad
Date: 2010-02-23 12:12:41 -0800 (Tue, 23 Feb 2010)
New Revision: 16326

Modified:
   short/3D/PyLith/trunk/libsrc/feassemble/ElasticityExplicitTet4.cc
Log:
Added temporary code to test of optimization (currently disabled).

Modified: short/3D/PyLith/trunk/libsrc/feassemble/ElasticityExplicitTet4.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/ElasticityExplicitTet4.cc	2010-02-23 18:48:45 UTC (rev 16325)
+++ short/3D/PyLith/trunk/libsrc/feassemble/ElasticityExplicitTet4.cc	2010-02-23 20:12:41 UTC (rev 16326)
@@ -33,7 +33,7 @@
 #include <cassert> // USES assert()
 #include <stdexcept> // USES std::runtime_error
 
-#define DETAILED_EVENT_LOGGING
+//#define DETAILED_EVENT_LOGGING
 
 // ----------------------------------------------------------------------
 typedef pylith::topology::Mesh::SieveMesh SieveMesh;
@@ -448,6 +448,9 @@
   const SieveMesh::label_sequence::iterator cellsBegin = cells->begin();
   const SieveMesh::label_sequence::iterator cellsEnd = cells->end();
 
+  const ALE::Obj<SieveMesh::sieve_type>& sieve = sieveMesh->getSieve();
+  assert(!sieve.isNull());
+
   // Get sections
   const ALE::Obj<RealSection>& dispTSection = fields->get("disp(t)").section();
   assert(!dispTSection.isNull());
@@ -498,6 +501,7 @@
 #endif
 
     // Restrict input fields to cell
+#if 1
     coordsVisitor.clear();
     sieveMesh->restrictClosure(*c_iter, coordsVisitor);
 
@@ -506,7 +510,17 @@
 
     dispTmdtVisitor.clear();
     sieveMesh->restrictClosure(*c_iter, dispTmdtVisitor);
+#else
+    coordsVisitor.clear();
+    sieve->orientedConeOpt(*c_iter, coordsVisitor, numBasis, spaceDim);
 
+    dispTVisitor.clear();
+    sieve->orientedConeOpt(*c_iter, dispTVisitor, numBasis, spaceDim);
+
+    dispTmdtVisitor.clear();
+    sieve->orientedConeOpt(*c_iter, dispTmdtVisitor, numBasis, spaceDim);
+#endif
+
 #if defined(DETAILED_EVENT_LOGGING)
     _logger->eventEnd(restrictEvent);
     _logger->eventBegin(geometryEvent);