[cig-commits] [commit] knepley/upgrade-petsc-interface: Minor cleanup of 3-D tet4 full-scale tests. (dae2d6e)

[cig_noreply at geodynamics.org]

Repository : ssh://geoshell/pylith

On branch  : knepley/upgrade-petsc-interface
Link       : https://github.com/geodynamics/pylith/compare/a2ce49cd3b5da0747bec4918248ea81c71e68d9e...dae2d6e3124761df3e02df9884274d99c2cc1c99

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

commit dae2d6e3124761df3e02df9884274d99c2cc1c99
Author: Brad Aagaard <baagaard at usgs.gov>
Date:   Wed Mar 12 14:49:58 2014 -0700

    Minor cleanup of 3-D tet4 full-scale tests.
    
    Update mesh information.
    Turn off output. Update Makefile.am.


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

dae2d6e3124761df3e02df9884274d99c2cc1c99
 tests_auto/3d/tet4/Makefile.am                  | 14 ++++++++--
 tests_auto/3d/tet4/TestShearDispNoSlip.py       | 34 ++++++++++++++++++++++++-
 tests_auto/3d/tet4/TestShearDispNoSlipRefine.py |  4 +--
 tests_auto/3d/tet4/sheardispnosliprefine.cfg    | 24 ++++++++---------
 4 files changed, 59 insertions(+), 17 deletions(-)

diff --git a/tests_auto/3d/tet4/Makefile.am b/tests_auto/3d/tet4/Makefile.am
index fddba2b..c66a935 100644
--- a/tests_auto/3d/tet4/Makefile.am
+++ b/tests_auto/3d/tet4/Makefile.am
@@ -27,6 +27,7 @@ dist_noinst_PYTHON = \
 	axialdisp_soln.py \
 	TestShearDisp.py \
 	TestShearDispNoSlip.py \
+	TestShearDispNoSlipRefine.py \
 	sheardisp_gendb.py \
 	sheardisp_soln.py \
 	testpylith.py
@@ -39,7 +40,16 @@ dist_noinst_DATA = \
 	matprops.spatialdb \
 	axialdisp.cfg \
 	sheardisp.cfg \
-	sheardispnoslip.cfg
+	sheardispnoslip.cfg \
+	sheardispnosliprefine.cfg
+
+noinst_TMP = \
+	axial_dispx.spatialdb \
+	axial_dispy.spatialdb \
+	axial_dispz.spatialdb \
+	shear_dispx.spatialdb \
+	shear_dispy.spatialdb \
+	shear_dispz.spatialdb
 
 TESTS_ENVIRONMENT = $(PYTHON)
 
@@ -58,7 +68,7 @@ BUILT_SOURCES = export-data
 clean-local: clean-local-tmp clean-data
 .PHONY: clean-local-tmp
 clean-local-tmp:
-	-rm *.h5 *.xmf *.pyc *.spatialdb
+	-rm *.h5 *.xmf *.pyc
 
 
 # End of file 
diff --git a/tests_auto/3d/tet4/TestShearDispNoSlip.py b/tests_auto/3d/tet4/TestShearDispNoSlip.py
index 795312f..5bafd21 100644
--- a/tests_auto/3d/tet4/TestShearDispNoSlip.py
+++ b/tests_auto/3d/tet4/TestShearDispNoSlip.py
@@ -65,7 +65,7 @@ class TestShearDispNoSlip(TestTet4):
     self.mesh['nvertices'] += 51
     self.faultMesh = {'nvertices': 51,
                       'spaceDim': 3,
-                      'ncells': 30,
+                      'ncells': 74,
                       'ncorners': 3}
     run_pylith()
     self.outputRoot = "sheardispnoslip"
@@ -74,6 +74,38 @@ class TestShearDispNoSlip(TestTet4):
     return
 
 
+  def test_fault_info(self):
+    """
+    Check fault information.
+    """
+    if not self.checkResults:
+      return
+
+    filename = "%s-fault_info.h5" % self.outputRoot
+    fields = ["normal_dir", "final_slip", "slip_time"]
+
+    from pylith.tests.Fault import check_vertex_fields
+    check_vertex_fields(self, filename, self.faultMesh, fields)
+
+    return
+
+
+  def test_fault_data(self):
+    """
+    Check fault information.
+    """
+    if not self.checkResults:
+      return
+
+    filename = "%s-fault.h5" % self.outputRoot
+    fields = ["slip"]
+
+    from pylith.tests.Fault import check_vertex_fields
+    check_vertex_fields(self, filename, self.faultMesh, fields)
+
+    return
+
+
   def calcDisplacements(self, vertices):
     """
     Calculate displacement field given coordinates of vertices.
diff --git a/tests_auto/3d/tet4/TestShearDispNoSlipRefine.py b/tests_auto/3d/tet4/TestShearDispNoSlipRefine.py
index f72fc5b..6e31fbc 100644
--- a/tests_auto/3d/tet4/TestShearDispNoSlipRefine.py
+++ b/tests_auto/3d/tet4/TestShearDispNoSlipRefine.py
@@ -64,11 +64,11 @@ class TestShearDispNoSlipRefine(TestTet4):
     self.mesh = {'ncells-elastic': 7068*8,
                  'ncells-viscoelastic': 11131*8,
                  'ncorners': 4,
-                 'nvertices': 3652,
+                 'nvertices': 26947,
                  'spaceDim': 3,
                  'tensorSize': 6}
     self.nverticesO = self.mesh['nvertices']
-    self.mesh['nvertices'] += 51
+    self.mesh['nvertices'] += 0
     self.faultMesh = {'nvertices': 51,
                       'spaceDim': 3,
                       'ncells': 30*4,
diff --git a/tests_auto/3d/tet4/sheardispnosliprefine.cfg b/tests_auto/3d/tet4/sheardispnosliprefine.cfg
index a3084cd..cf4e499 100644
--- a/tests_auto/3d/tet4/sheardispnosliprefine.cfg
+++ b/tests_auto/3d/tet4/sheardispnosliprefine.cfg
@@ -7,16 +7,16 @@ command = mpirun -np ${nodes}
 # journal
 # ----------------------------------------------------------------------
 [sheardispnosliprefine.journal.info]
-#timedependent = 1
-#implicit = 1
-#petsc = 1
-#solverlinear = 1
-#meshimporter = 1
-#meshiocubit = 1
-#implicitelasticity = 1
-#quadrature3d = 1
-#faultcohesivekin = 1
-#fiatsimplex = 1
+timedependent = 1
+implicit = 1
+petsc = 1
+solverlinear = 1
+meshimporter = 1
+meshiocubit = 1
+implicitelasticity = 1
+quadrature3d = 1
+faultcohesivekin = 1
+fiatsimplex = 1
 
 # ----------------------------------------------------------------------
 # mesh_generator
@@ -140,9 +140,9 @@ ksp_rtol = 1.0e-8
 ksp_max_it = 100
 ksp_gmres_restart = 50
 
-#ksp_monitor = true
+ksp_monitor = true
 #ksp_view = true
-#ksp_converged_reason = true
+ksp_converged_reason = true
 
 #log_summary = true
 # start_in_debugger = true