[cig-commits] [commit] knepley/upgrade-petsc-interface: Updated Python fault unit tests for interpolated meshes. (7b13d2f)

[cig_noreply at geodynamics.org]

Repository : ssh://geoshell/pylith

On branch  : knepley/upgrade-petsc-interface
Link       : https://github.com/geodynamics/pylith/compare/02d6f9c2f3202b524bc8b2d8c32ec207f35f3893...44dc34616c3c0f702805372f2b51e8aa7a0ccbcc

>---------------------------------------------------------------

commit 7b13d2f3fab06ac977ccbf92ae0307aae127afc8
Author: Brad Aagaard <baagaard at usgs.gov>
Date:   Thu Nov 7 14:53:57 2013 -0800

    Updated Python fault unit tests for interpolated meshes.


>---------------------------------------------------------------

7b13d2f3fab06ac977ccbf92ae0307aae127afc8
 unittests/pytests/faults/TestFaultCohesiveDyn.py      |  9 ++++++++-
 unittests/pytests/faults/TestFaultCohesiveImpulses.py |  9 ++++++++-
 unittests/pytests/faults/TestFaultCohesiveKin.py      | 10 ++++++++--
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/unittests/pytests/faults/TestFaultCohesiveDyn.py b/unittests/pytests/faults/TestFaultCohesiveDyn.py
index 1dc2682..f093ee7 100644
--- a/unittests/pytests/faults/TestFaultCohesiveDyn.py
+++ b/unittests/pytests/faults/TestFaultCohesiveDyn.py
@@ -332,10 +332,17 @@ class TestFaultCohesiveDyn(unittest.TestCase):
     fields.add("disp(t)", "displacement")
     fields.add("velocity(t)", "velocity")
     fields.solutionName("dispIncr(t->t+dt)")
+
     residual = fields.get("residual")
-    residual.newSection(residual.VERTICES_FIELD, cs.spaceDim())
+    residual.subfieldAdd("displacement", cs.spaceDim())
+    residual.subfieldAdd("lagrange multiplier", cs.spaceDim())
+    residual.subfieldsSetup()
+    residual.setupSolnChart()
+    residual.setupSolnDof(cs.spaceDim())
+    fault.setupSolnDof(residual)
     residual.allocate()
     residual.zero()
+
     fields.copyLayout("residual")
     
     return (mesh, fault, fields)
diff --git a/unittests/pytests/faults/TestFaultCohesiveImpulses.py b/unittests/pytests/faults/TestFaultCohesiveImpulses.py
index a3dd4a0..b36af45 100644
--- a/unittests/pytests/faults/TestFaultCohesiveImpulses.py
+++ b/unittests/pytests/faults/TestFaultCohesiveImpulses.py
@@ -323,10 +323,17 @@ class TestFaultCohesiveImpulses(unittest.TestCase):
     fields.add("dispIncr(t->t+dt)", "displacement_increment")
     fields.add("disp(t)", "displacement")
     fields.solutionName("dispIncr(t->t+dt)")
+
     residual = fields.get("residual")
-    residual.newSection(residual.VERTICES_FIELD, cs.spaceDim())
+    residual.subfieldAdd("displacement", cs.spaceDim())
+    residual.subfieldAdd("lagrange multiplier", cs.spaceDim())
+    residual.subfieldsSetup()
+    residual.setupSolnChart()
+    residual.setupSolnDof(cs.spaceDim())
+    fault.setupSolnDof(residual)
     residual.allocate()
     residual.zero()
+
     fields.copyLayout("residual")
     
     return (mesh, fault, fields)
diff --git a/unittests/pytests/faults/TestFaultCohesiveKin.py b/unittests/pytests/faults/TestFaultCohesiveKin.py
index df09e0b..96d2ee5 100644
--- a/unittests/pytests/faults/TestFaultCohesiveKin.py
+++ b/unittests/pytests/faults/TestFaultCohesiveKin.py
@@ -315,7 +315,6 @@ class TestFaultCohesiveKin(unittest.TestCase):
     fault.inventory.output._configure()
     fault.inventory.matId = 10
     fault.inventory.faultLabel = "fault"
-    fault.inventory.faultEdge = "fault_edge"
     fault.inventory.upDir = [0, 0, 1]
     fault.inventory.faultQuadrature = quadrature
     fault._configure()
@@ -343,10 +342,17 @@ class TestFaultCohesiveKin(unittest.TestCase):
     fields.add("dispIncr(t->t+dt)", "displacement_increment")
     fields.add("disp(t)", "displacement")
     fields.solutionName("dispIncr(t->t+dt)")
+
     residual = fields.get("residual")
-    residual.newSection(residual.VERTICES_FIELD, cs.spaceDim())
+    residual.subfieldAdd("displacement", cs.spaceDim())
+    residual.subfieldAdd("lagrange multiplier", cs.spaceDim())
+    residual.subfieldsSetup()
+    residual.setupSolnChart()
+    residual.setupSolnDof(cs.spaceDim())
+    fault.setupSolnDof(residual)
     residual.allocate()
     residual.zero()
+
     fields.copyLayout("residual")
     
     return (mesh, fault, fields)