[cig-commits] [commit] baagaard/fix-cubit-cellsize, baagaard/fix-fullscale-3d-tests, baagaard/fix-packaging, knepley/fix-parallel-mult-faults, master, next: Fixed solution so that it matches mesh. (aa1c4e1)

cig_noreply at geodynamics.org cig_noreply at geodynamics.org
Wed Apr 9 03:03:11 PDT 2014


Repository : ssh://geoshell/pylith

On branches: baagaard/fix-cubit-cellsize,baagaard/fix-fullscale-3d-tests,baagaard/fix-packaging,knepley/fix-parallel-mult-faults,master,next
Link       : https://github.com/geodynamics/pylith/compare/a213c3005450d915f40c7137ff7d8dbbb439d334...1b3d6d3bc246edc4235d0051142d675d91e9be41

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

commit aa1c4e1f48e554a5f9274421c58a657dc2d1b62b
Author: Brad Aagaard <baagaard at usgs.gov>
Date:   Mon Mar 17 10:14:28 2014 -0700

    Fixed solution so that it matches mesh.
    
    Needed to get the sides of the fault correct in displacement field.


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

aa1c4e1f48e554a5f9274421c58a657dc2d1b62b
 tests_auto/3d/tet4/sliptwofaults.cfg     | 22 +++++++++++-----------
 tests_auto/3d/tet4/sliptwofaults_soln.py |  4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/tests_auto/3d/tet4/sliptwofaults.cfg b/tests_auto/3d/tet4/sliptwofaults.cfg
index 59d9ae8..f416daa 100644
--- a/tests_auto/3d/tet4/sliptwofaults.cfg
+++ b/tests_auto/3d/tet4/sliptwofaults.cfg
@@ -4,15 +4,15 @@
 # journal
 # ----------------------------------------------------------------------
 [sliptwofaults.journal.info]
-timedependent = 1
-implicit = 1
-petsc = 1
-solverlinear = 1
-meshimporter = 1
-meshiocubit = 1
-implicitelasticity = 1
-quadrature2d = 1
-fiatsimplex = 1
+#timedependent = 1
+#implicit = 1
+#petsc = 1
+#solverlinear = 1
+#meshimporter = 1
+#meshiocubit = 1
+#implicitelasticity = 1
+#quadrature2d = 1
+#fiatsimplex = 1
 
 # ----------------------------------------------------------------------
 # mesh_generator
@@ -131,9 +131,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
diff --git a/tests_auto/3d/tet4/sliptwofaults_soln.py b/tests_auto/3d/tet4/sliptwofaults_soln.py
index be99ec7..9c29448 100644
--- a/tests_auto/3d/tet4/sliptwofaults_soln.py
+++ b/tests_auto/3d/tet4/sliptwofaults_soln.py
@@ -66,9 +66,9 @@ class AnalyticalSoln(object):
     (nlocs, dim) = locs.shape
 
     disp = numpy.zeros( (1, nlocs, 3), dtype=numpy.float64)
-    maskP = numpy.bitwise_or(locs[:,0] <= 0.0, locs[:,0] >= -20.0e+3)
+    maskP = numpy.bitwise_or(locs[:,0] <= 0.0, locs[:,0] >= +20.0e+3)
     maskP[nlocsO:nlocs] = False
-    maskN = numpy.bitwise_and(locs[:,0] <= 0.0, ~maskP)
+    maskN = ~maskP
     disp[0,:,1] = maskN*(-1.0) + maskP*(+1.0)
     return disp
 



More information about the CIG-COMMITS mailing list