[cig-commits] [commit] baagaard/fix-fullscale-3d-tests, knepley/fix-parallel-mult-faults, master, next: Reduced size of problem (coarser mesh). Updated mesh info. (169bd63)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Apr 9 03:04:00 PDT 2014
Repository : ssh://geoshell/pylith
On branches: baagaard/fix-fullscale-3d-tests,knepley/fix-parallel-mult-faults,master,next
Link : https://github.com/geodynamics/pylith/compare/a213c3005450d915f40c7137ff7d8dbbb439d334...1b3d6d3bc246edc4235d0051142d675d91e9be41
>---------------------------------------------------------------
commit 169bd63996367135ed6c8983acd7c93570941660
Author: Brad Aagaard <baagaard at usgs.gov>
Date: Wed Mar 26 17:20:52 2014 -0700
Reduced size of problem (coarser mesh). Updated mesh info.
Corrected mesh info for refined mesh.
>---------------------------------------------------------------
169bd63996367135ed6c8983acd7c93570941660
tests_auto/3d/hex8/TestHex8.py | 6 +++---
tests_auto/3d/hex8/TestShearDispNoSlip.py | 6 +++---
tests_auto/3d/hex8/TestShearDispNoSlipRefine.py | 12 ++++++------
tests_auto/3d/hex8/TestSlipOneFault.py | 6 +++---
tests_auto/3d/hex8/TestSlipTwoFaults.py | 6 +++---
tests_auto/3d/hex8/geometry.jou | 6 +++---
tests_auto/3d/hex8/mesh.exo | Bin 181100 -> 42004 bytes
tests_auto/3d/hex8/mesh.jou | 5 ++---
8 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/tests_auto/3d/hex8/TestHex8.py b/tests_auto/3d/hex8/TestHex8.py
index 54f8e91..f714783 100644
--- a/tests_auto/3d/hex8/TestHex8.py
+++ b/tests_auto/3d/hex8/TestHex8.py
@@ -34,10 +34,10 @@ class TestHex8(unittest.TestCase):
"""
Setup for tests.
"""
- self.mesh = {'ncells-elastic': 768,
- 'ncells-viscoelastic': 1280,
+ self.mesh = {'ncells-elastic': 180,
+ 'ncells-viscoelastic': 180,
'ncorners': 8,
- 'nvertices': 2601,
+ 'nvertices': 550,
'spaceDim': 3,
'tensorSize': 6}
diff --git a/tests_auto/3d/hex8/TestShearDispNoSlip.py b/tests_auto/3d/hex8/TestShearDispNoSlip.py
index 9159974..d52eb9f 100644
--- a/tests_auto/3d/hex8/TestShearDispNoSlip.py
+++ b/tests_auto/3d/hex8/TestShearDispNoSlip.py
@@ -62,10 +62,10 @@ class TestShearDispNoSlip(TestHex8):
"""
TestHex8.setUp(self)
self.nverticesO = self.mesh['nvertices']
- self.mesh['nvertices'] += 44
- self.faultMesh = {'nvertices': 44,
+ self.mesh['nvertices'] += 21
+ self.faultMesh = {'nvertices': 21,
'spaceDim': 3,
- 'ncells': 30,
+ 'ncells': 12,
'ncorners': 4}
run_pylith()
diff --git a/tests_auto/3d/hex8/TestShearDispNoSlipRefine.py b/tests_auto/3d/hex8/TestShearDispNoSlipRefine.py
index 90e3115..80ab559 100644
--- a/tests_auto/3d/hex8/TestShearDispNoSlipRefine.py
+++ b/tests_auto/3d/hex8/TestShearDispNoSlipRefine.py
@@ -61,17 +61,17 @@ class TestShearDispNoSlipRefine(TestHex8):
Setup for test.
"""
TestHex8.setUp(self)
- self.mesh = {'ncells-elastic': 768*8,
- 'ncells-viscoelastic': 1280*8,
+ self.mesh = {'ncells-elastic': 180*8,
+ 'ncells-viscoelastic': 180*8,
'ncorners': 8,
- 'nvertices': 2601,
+ 'nvertices': 3614,
'spaceDim': 3,
'tensorSize': 6}
self.nverticesO = self.mesh['nvertices']
- self.mesh['nvertices'] += 44
- self.faultMesh = {'nvertices': 44,
+ self.mesh['nvertices'] += 65
+ self.faultMesh = {'nvertices': 65,
'spaceDim': 3,
- 'ncells': 30*4,
+ 'ncells': 48,
'ncorners': 4}
run_pylith()
diff --git a/tests_auto/3d/hex8/TestSlipOneFault.py b/tests_auto/3d/hex8/TestSlipOneFault.py
index d0c794c..42bc2d9 100644
--- a/tests_auto/3d/hex8/TestSlipOneFault.py
+++ b/tests_auto/3d/hex8/TestSlipOneFault.py
@@ -55,10 +55,10 @@ class TestSlipOneFault(TestHex8):
"""
TestHex8.setUp(self)
self.nverticesO = self.mesh['nvertices']
- self.mesh['nvertices'] += 153
- self.faultMesh = {'nvertices': 153,
+ self.mesh['nvertices'] += 55
+ self.faultMesh = {'nvertices': 55,
'spaceDim': 3,
- 'ncells': 128,
+ 'ncells': 40,
'ncorners': 4}
run_pylith()
self.outputRoot = "sliponefault"
diff --git a/tests_auto/3d/hex8/TestSlipTwoFaults.py b/tests_auto/3d/hex8/TestSlipTwoFaults.py
index 6910999..8998c77 100644
--- a/tests_auto/3d/hex8/TestSlipTwoFaults.py
+++ b/tests_auto/3d/hex8/TestSlipTwoFaults.py
@@ -55,10 +55,10 @@ class TestSlipTwoFaults(TestHex8):
"""
TestHex8.setUp(self)
self.nverticesO = self.mesh['nvertices']
- self.mesh['nvertices'] += 2*153
- self.faultMesh = {'nvertices': 153,
+ self.mesh['nvertices'] += 2*55
+ self.faultMesh = {'nvertices': 55,
'spaceDim': 3,
- 'ncells': 128,
+ 'ncells': 40,
'ncorners': 4}
run_pylith()
self.outputRoot = "sliptwofaults"
diff --git a/tests_auto/3d/hex8/geometry.jou b/tests_auto/3d/hex8/geometry.jou
index 482bb70..6a378e0 100644
--- a/tests_auto/3d/hex8/geometry.jou
+++ b/tests_auto/3d/hex8/geometry.jou
@@ -21,7 +21,7 @@ create planar surface with plane xplane offset +20000
surface 8 name "fault_surface_x2"
create planar surface with plane yplane offset 0
surface 9 name "fault_surface_y"
-create planar surface with plane zplane offset -15000
+create planar surface with plane zplane offset -20000
surface 10 name "material_interface"
# ----------------------------------------------------------------------
@@ -44,11 +44,11 @@ volume 12 name "visco_xnegyneg"
# Chop x and y faults into pieces
# ----------------------------------------------------------------------
# fault_surface_x
-brick x 2000 y 50000 z 30000
+brick x 2000 y 50000 z 40000
chop volume 2 with volume 13
# fault_surface_y
-brick x 25000 y 2000 z 30000
+brick x 25000 y 2000 z 40000
volume 16 move x -12500 y 0 z 0
chop volume 4 with volume 16
diff --git a/tests_auto/3d/hex8/mesh.exo b/tests_auto/3d/hex8/mesh.exo
index dda24db..64c2304 100644
Binary files a/tests_auto/3d/hex8/mesh.exo and b/tests_auto/3d/hex8/mesh.exo differ
diff --git a/tests_auto/3d/hex8/mesh.jou b/tests_auto/3d/hex8/mesh.jou
index 8f30c8c..2c58ea5 100644
--- a/tests_auto/3d/hex8/mesh.jou
+++ b/tests_auto/3d/hex8/mesh.jou
@@ -6,7 +6,7 @@ playback 'geometry.jou'
# ----------------------------------------------------------------------
# Set discretization size
# ----------------------------------------------------------------------
-volume all size 5000
+volume all size 10000
# ----------------------------------------------------------------------
# Generate the mesh
@@ -14,8 +14,6 @@ volume all size 5000
volume all scheme map
mesh volume all
-smooth volume all
-
# ----------------------------------------------------------------------
# Create blocks for materials
# ----------------------------------------------------------------------
@@ -151,3 +149,4 @@ nodeset 26 name "face_zneg_nofault"
# Export exodus file
# ----------------------------------------------------------------------
export mesh "mesh.exo" dimension 3 overwrite
+
More information about the CIG-COMMITS
mailing list