[cig-commits] r15015 - in short/3D/PyLith/trunk: pylith/meshio pylith/problems tests/1d/line2 unittests/pytests/bc unittests/pytests/bc/data

[brad at geodynamics.org]

Author: brad
Date: 2009-05-18 17:04:48 -0700 (Mon, 18 May 2009)
New Revision: 15015

Modified:
   short/3D/PyLith/trunk/pylith/meshio/OutputSoln.py
   short/3D/PyLith/trunk/pylith/meshio/OutputSolnSubset.py
   short/3D/PyLith/trunk/pylith/problems/Implicit.py
   short/3D/PyLith/trunk/tests/1d/line2/TestDislocation.py
   short/3D/PyLith/trunk/unittests/pytests/bc/TestDirichletBC.py
   short/3D/PyLith/trunk/unittests/pytests/bc/data/elasticplanestrain.spatialdb
Log:
Fixed bugs associated with cleaning up SolutionFields. Need to update coordinates_dimensioned when creating cohesive cells.

Modified: short/3D/PyLith/trunk/pylith/meshio/OutputSoln.py
===================================================================
--- short/3D/PyLith/trunk/pylith/meshio/OutputSoln.py	2009-05-18 23:17:46 UTC (rev 15014)
+++ short/3D/PyLith/trunk/pylith/meshio/OutputSoln.py	2009-05-19 00:04:48 UTC (rev 15015)
@@ -101,7 +101,7 @@
     """
     field = None
     if name == "displacement":
-      field = fields.solution()
+      field = fields.get("disp(t)")
     else:
       raise ValueError, "Vertex field '%s' not available." % name
     return field

Modified: short/3D/PyLith/trunk/pylith/meshio/OutputSolnSubset.py
===================================================================
--- short/3D/PyLith/trunk/pylith/meshio/OutputSolnSubset.py	2009-05-18 23:17:46 UTC (rev 15014)
+++ short/3D/PyLith/trunk/pylith/meshio/OutputSolnSubset.py	2009-05-19 00:04:48 UTC (rev 15015)
@@ -118,7 +118,7 @@
     field = None
     fieldType = None
     if name == "displacement":
-      field = fields.solution()
+      field = fields.get("disp(t)")
     else:
       raise ValueError, "Vertex field '%s' not available." % name
     return field

Modified: short/3D/PyLith/trunk/pylith/problems/Implicit.py
===================================================================
--- short/3D/PyLith/trunk/pylith/problems/Implicit.py	2009-05-18 23:17:46 UTC (rev 15014)
+++ short/3D/PyLith/trunk/pylith/problems/Implicit.py	2009-05-19 00:04:48 UTC (rev 15015)
@@ -91,7 +91,7 @@
     Formulation.initialize(self, dimension, normalizer)
 
     self._info.log("Creating other fields.")
-    self.fields.add("dispIncr(t->t+dt)", "displacement increment")
+    self.fields.add("dispIncr(t->t+dt)", "displacement_increment")
     self.fields.add("residual", "residual")
     self.fields.copyLayout("disp(t)")
     self.fields.solutionName("dispIncr(t->t+dt)")
@@ -178,7 +178,7 @@
     """
     Advance to next time step.
     """
-    dispIncr = self.fields.solution()
+    dispIncr = self.fields.get("dispIncr(t->t+dt)")
     dispIncr.zero()
 
     ### NONLINEAR: This moves under SNES control as IntegrateResidual()
@@ -206,7 +206,7 @@
     """
     # Update displacement field from time t to time t+dt.
     dispIncr = self.fields.get("dispIncr(t->t+dt)")
-    disp = self.fields.solution()
+    disp = self.fields.get("disp(t)")
     disp += dispIncr
 
     Formulation.poststep(self, t, dt)

Modified: short/3D/PyLith/trunk/tests/1d/line2/TestDislocation.py
===================================================================
--- short/3D/PyLith/trunk/tests/1d/line2/TestDislocation.py	2009-05-18 23:17:46 UTC (rev 15014)
+++ short/3D/PyLith/trunk/tests/1d/line2/TestDislocation.py	2009-05-19 00:04:48 UTC (rev 15015)
@@ -111,6 +111,9 @@
         maskN*(-0.20 - 0.025*vertices[:,0]) + \
         maskP*(+0.30 - 0.025*vertices[:,0])
 
+    print "VERTICES",vertices
+    print "DISP",disp
+
     return disp
 
 

Modified: short/3D/PyLith/trunk/unittests/pytests/bc/TestDirichletBC.py
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/bc/TestDirichletBC.py	2009-05-18 23:17:46 UTC (rev 15014)
+++ short/3D/PyLith/trunk/unittests/pytests/bc/TestDirichletBC.py	2009-05-19 00:04:48 UTC (rev 15015)
@@ -39,7 +39,6 @@
     """
     bc = DirichletBC()
     from pylith.feassemble.Constraint import implementsConstraint
-    print dir(bc)
     self.failUnless(implementsConstraint(bc))
     return
     

Modified: short/3D/PyLith/trunk/unittests/pytests/bc/data/elasticplanestrain.spatialdb
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/bc/data/elasticplanestrain.spatialdb	2009-05-18 23:17:46 UTC (rev 15014)
+++ short/3D/PyLith/trunk/unittests/pytests/bc/data/elasticplanestrain.spatialdb	2009-05-19 00:04:48 UTC (rev 15015)
@@ -2,7 +2,7 @@
 SimpleDB {
   num-values = 3
   value-names =  density vs vp
-  value-units =  kg/m^3  m/s  m/s
+  value-units =  kg/m**3  m/s  m/s
   num-locs = 1
   data-dim = 0
   space-dim = 2