[cig-commits] [commit] knepley/fix-faults-parallel: Updated 2-D tri3 refinement w/embedded fault case. (da0e53b)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/pylith

On branch  : knepley/fix-faults-parallel
Link       : https://github.com/geodynamics/pylith/compare/df865220b80a43ba208f3cef3f0f16004191dad3...b9115fef9bddb6603ac8577e88470665f74d470c

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

commit da0e53bdedd874e5de83870e645e0abe3533d32f
Author: Brad Aagaard <baagaard at usgs.gov>
Date:   Tue May 6 12:42:41 2014 -0700

    Updated 2-D tri3 refinement w/embedded fault case.
    
    Also run embedded fault tests in parallel.


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

da0e53bdedd874e5de83870e645e0abe3533d32f
 tests_auto/2d/tri3/TestShearDispNoSlipRefine.py | 8 ++++----
 tests_auto/2d/tri3/sheardispnoslip.cfg          | 1 +
 tests_auto/2d/tri3/sheardispnosliprefine.cfg    | 4 +++-
 tests_auto/2d/tri3/testpylith.py                | 6 ++----
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/tests_auto/2d/tri3/TestShearDispNoSlipRefine.py b/tests_auto/2d/tri3/TestShearDispNoSlipRefine.py
index 3092974..c79e86b 100644
--- a/tests_auto/2d/tri3/TestShearDispNoSlipRefine.py
+++ b/tests_auto/2d/tri3/TestShearDispNoSlipRefine.py
@@ -63,14 +63,14 @@ class TestShearDispNoSlipRefine(TestTri3):
     TestTri3.setUp(self)
     self.mesh = {'ncells': 142*4,
                  'ncorners': 3,
-                 'nvertices': 319,
+                 'nvertices': 317,
                  'spaceDim': 2,
                  'tensorSize': 3}
     self.nverticesO = self.mesh['nvertices']
-    self.mesh['nvertices'] += 5
-    self.faultMesh = {'nvertices': 9,
+    self.mesh['nvertices'] += 3
+    self.faultMesh = {'nvertices': 5,
                       'spaceDim': 2,
-                      'ncells': 4*2,
+                      'ncells': 2*2,
                       'ncorners': 2}
     run_pylith()
     self.outputRoot = "sheardispnosliprefine"
diff --git a/tests_auto/2d/tri3/sheardispnoslip.cfg b/tests_auto/2d/tri3/sheardispnoslip.cfg
index a8350b9..b5f96f6 100644
--- a/tests_auto/2d/tri3/sheardispnoslip.cfg
+++ b/tests_auto/2d/tri3/sheardispnoslip.cfg
@@ -1,4 +1,5 @@
 [sheardispnoslip]
+nodes = 2
 
 [sheardispnoslip.launcher] # WARNING: THIS IS NOT PORTABLE
 command = mpirun -np ${nodes}
diff --git a/tests_auto/2d/tri3/sheardispnosliprefine.cfg b/tests_auto/2d/tri3/sheardispnosliprefine.cfg
index 783cd47..8477cfa 100644
--- a/tests_auto/2d/tri3/sheardispnosliprefine.cfg
+++ b/tests_auto/2d/tri3/sheardispnosliprefine.cfg
@@ -1,4 +1,5 @@
 [sheardispnosliprefine]
+nodes = 3
 
 [sheardispnosliprefine.launcher] # WARNING: THIS IS NOT PORTABLE
 command = mpirun -np ${nodes}
@@ -7,7 +8,7 @@ command = mpirun -np ${nodes}
 # journal
 # ----------------------------------------------------------------------
 [sheardispnosliprefine.journal.info]
-sheardispnosliprefine = 1
+#sheardispnosliprefine = 1
 #timedependent = 1
 #implicit = 1
 #petsc = 1
@@ -99,6 +100,7 @@ interfaces = [fault]
 [sheardispnosliprefine.timedependent.interfaces.fault]
 id = 100
 label = fault_y
+edge = fault_y_edge
 quadrature.cell = pylith.feassemble.FIATSimplex
 quadrature.cell.dimension = 1
 
diff --git a/tests_auto/2d/tri3/testpylith.py b/tests_auto/2d/tri3/testpylith.py
index 044a949..a488d7b 100644
--- a/tests_auto/2d/tri3/testpylith.py
+++ b/tests_auto/2d/tri3/testpylith.py
@@ -33,10 +33,8 @@ def suite():
   from TestShearDispNoSlip import TestShearDispNoSlip
   suite.addTest(unittest.makeSuite(TestShearDispNoSlip))
 
-  # Disabled. Incorrect solution due to refinement of fault halo not
-  # tied together.
-  #from TestShearDispNoSlipRefine import TestShearDispNoSlipRefine
-  #suite.addTest(unittest.makeSuite(TestShearDispNoSlipRefine))
+  from TestShearDispNoSlipRefine import TestShearDispNoSlipRefine
+  suite.addTest(unittest.makeSuite(TestShearDispNoSlipRefine))
 
   from TestSlipOneFault import TestSlipOneFault
   suite.addTest(unittest.makeSuite(TestSlipOneFault))