[cig-commits] [commit] baagaard/fix-faults-intersect: Fixed test data for fault intersection full-scale tests. (6063f9b)

[cig_noreply at geodynamics.org]

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

On branch  : baagaard/fix-faults-intersect
Link       : https://github.com/geodynamics/pylith/compare/4455d452cbeb0b8335de63822420f97fe4260c0c...6063f9be24720cb6e6c830bf0ec46c151f839c6b

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

commit 6063f9be24720cb6e6c830bf0ec46c151f839c6b
Author: Brad Aagaard <baagaard at usgs.gov>
Date:   Mon Jun 30 10:06:13 2014 -0700

    Fixed test data for fault intersection full-scale tests.
    
    Tests completely implemented for tri3 and tet4.


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

6063f9be24720cb6e6c830bf0ec46c151f839c6b
 tests_auto/2d/tri3/TestFaultsIntersect.py |  2 +-
 tests_auto/2d/tri3/faultsintersect.cfg    | 20 ++++++++++----------
 tests_auto/2d/tri3/testpylith.py          |  3 +++
 tests_auto/3d/tet4/TestFaultsIntersect.py |  2 +-
 tests_auto/3d/tet4/faultsintersect.cfg    | 20 ++++++++++----------
 tests_auto/3d/tet4/testpylith.py          |  3 +++
 6 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/tests_auto/2d/tri3/TestFaultsIntersect.py b/tests_auto/2d/tri3/TestFaultsIntersect.py
index 4619b12..6043607 100644
--- a/tests_auto/2d/tri3/TestFaultsIntersect.py
+++ b/tests_auto/2d/tri3/TestFaultsIntersect.py
@@ -151,7 +151,7 @@ class TestFaultsIntersect(TestTri3):
       finalSlip = -2.0
       faultMesh = self.faultMeshX
     elif self.fault == "y":
-      normalDir = (+1.0, 0.0)
+      normalDir = (0.0, +1.0)
       finalSlip = 0.0
       faultMesh = self.faultMeshY
     slipTime = 0.0
diff --git a/tests_auto/2d/tri3/faultsintersect.cfg b/tests_auto/2d/tri3/faultsintersect.cfg
index ed0eef6..f9f1ac1 100644
--- a/tests_auto/2d/tri3/faultsintersect.cfg
+++ b/tests_auto/2d/tri3/faultsintersect.cfg
@@ -4,16 +4,16 @@
 # journal
 # ----------------------------------------------------------------------
 [faultsintersect.journal.info]
-faultsintersect = 1
-timedependent = 1
-implicit = 1
-petsc = 1
-solverlinear = 1
-meshimporter = 1
-meshiocubit = 1
-implicitelasticity = 1
-quadrature2d = 1
-fiatsimplex = 1
+#faultsintersect = 1
+#timedependent = 1
+#implicit = 1
+#petsc = 1
+#solverlinear = 1
+#meshimporter = 1
+#meshiocubit = 1
+#implicitelasticity = 1
+#quadrature2d = 1
+#fiatsimplex = 1
 
 # ----------------------------------------------------------------------
 # mesh_generator
diff --git a/tests_auto/2d/tri3/testpylith.py b/tests_auto/2d/tri3/testpylith.py
index a08bbc6..69a3b77 100644
--- a/tests_auto/2d/tri3/testpylith.py
+++ b/tests_auto/2d/tri3/testpylith.py
@@ -45,6 +45,9 @@ def suite():
   from TestSlipTwoFaults import TestSlipTwoFaults
   suite.addTest(unittest.makeSuite(TestSlipTwoFaults))
 
+  from TestFaultsIntersect import TestFaultsIntersect
+  suite.addTest(unittest.makeSuite(TestFaultsIntersect))
+
   return suite
 
 
diff --git a/tests_auto/3d/tet4/TestFaultsIntersect.py b/tests_auto/3d/tet4/TestFaultsIntersect.py
index 6e83cbb..b5c68e0 100644
--- a/tests_auto/3d/tet4/TestFaultsIntersect.py
+++ b/tests_auto/3d/tet4/TestFaultsIntersect.py
@@ -151,7 +151,7 @@ class TestFaultsIntersect(TestTet4):
       finalSlip = -2.0
       faultMesh = self.faultMeshX
     elif self.fault == "y":
-      normalDir = (0.0,+1.0, 0.0)
+      normalDir = (0.0,-1.0, 0.0)
       finalSlip = 0.0
       faultMesh = self.faultMeshY
 
diff --git a/tests_auto/3d/tet4/faultsintersect.cfg b/tests_auto/3d/tet4/faultsintersect.cfg
index a8c1a0d..72b4a21 100644
--- a/tests_auto/3d/tet4/faultsintersect.cfg
+++ b/tests_auto/3d/tet4/faultsintersect.cfg
@@ -4,16 +4,16 @@
 # journal
 # ----------------------------------------------------------------------
 [faultsintersect.journal.info]
-faultsintersect = 1
-timedependent = 1
-implicit = 1
-petsc = 1
-solverlinear = 1
-meshimporter = 1
-meshiocubit = 1
-implicitelasticity = 1
-quadrature2d = 1
-fiatsimplex = 1
+#faultsintersect = 1
+#timedependent = 1
+#implicit = 1
+#petsc = 1
+#solverlinear = 1
+#meshimporter = 1
+#meshiocubit = 1
+#implicitelasticity = 1
+#quadrature3d = 1
+#fiatsimplex = 1
 
 # ----------------------------------------------------------------------
 # mesh_generator
diff --git a/tests_auto/3d/tet4/testpylith.py b/tests_auto/3d/tet4/testpylith.py
index a488d7b..983ae9e 100644
--- a/tests_auto/3d/tet4/testpylith.py
+++ b/tests_auto/3d/tet4/testpylith.py
@@ -42,6 +42,9 @@ def suite():
   from TestSlipTwoFaults import TestSlipTwoFaults
   suite.addTest(unittest.makeSuite(TestSlipTwoFaults))
 
+  from TestFaultsIntersect import TestFaultsIntersect
+  suite.addTest(unittest.makeSuite(TestFaultsIntersect))
+
   return suite