[cig-commits] r18872 - in short/3D/PyLith/branches/v1.6-stable: libsrc/pylith/topology pylith/problems

[brad at geodynamics.org]

Author: brad
Date: 2011-09-05 09:16:48 -0700 (Mon, 05 Sep 2011)
New Revision: 18872

Modified:
   short/3D/PyLith/branches/v1.6-stable/libsrc/pylith/topology/Field.cc
   short/3D/PyLith/branches/v1.6-stable/pylith/problems/Formulation.py
Log:
Fixed small bugs related to split fields. Formulation.py had splitFields rather than splitFields() and Field::splitDefault() was missing nonzero fiber dimension guard.

Modified: short/3D/PyLith/branches/v1.6-stable/libsrc/pylith/topology/Field.cc
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/libsrc/pylith/topology/Field.cc	2011-09-01 13:56:06 UTC (rev 18871)
+++ short/3D/PyLith/branches/v1.6-stable/libsrc/pylith/topology/Field.cc	2011-09-05 16:16:48 UTC (rev 18872)
@@ -1158,8 +1158,10 @@
     for (typename chart_type::const_iterator c_iter = chart.begin();
         c_iter != chartEnd;
         ++c_iter) {
-      assert(spaceDim == _section->getFiberDimension(*c_iter));
-      _section->setFiberDimension(*c_iter, 1, fibration);
+      if (_section->getFiberDimension(*c_iter) > 0) {
+	assert(spaceDim == _section->getFiberDimension(*c_iter));
+	_section->setFiberDimension(*c_iter, 1, fibration);
+      } // if
     } // for
 } // splitDefault
 

Modified: short/3D/PyLith/branches/v1.6-stable/pylith/problems/Formulation.py
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/pylith/problems/Formulation.py	2011-09-01 13:56:06 UTC (rev 18871)
+++ short/3D/PyLith/branches/v1.6-stable/pylith/problems/Formulation.py	2011-09-05 16:16:48 UTC (rev 18872)
@@ -476,7 +476,7 @@
     solution.newSection(solution.VERTICES_FIELD, dimension)
     solution.vectorFieldType(solution.VECTOR)
     solution.scale(lengthScale.value)
-    if self.splitFields:
+    if self.splitFields():
       solution.splitDefault()
       for integrator in self.integratorsMesh + self.integratorsSubMesh:
         integrator.splitField(solution)