[cig-commits] r16075 - in short/3D/PyLith/branches/pylith-friction: . tests tests/3dnew tests/3dnew/hex8 tests/petsc
brad at geodynamics.org
brad at geodynamics.org
Fri Dec 4 17:19:46 PST 2009
Author: brad
Date: 2009-12-04 17:19:46 -0800 (Fri, 04 Dec 2009)
New Revision: 16075
Added:
short/3D/PyLith/branches/pylith-friction/tests/3dnew/
short/3D/PyLith/branches/pylith-friction/tests/3dnew/hex8/
short/3D/PyLith/branches/pylith-friction/tests/3dnew/hex8/geometry.jou
short/3D/PyLith/branches/pylith-friction/tests/3dnew/hex8/mesh.jou
Modified:
short/3D/PyLith/branches/pylith-friction/configure.ac
short/3D/PyLith/branches/pylith-friction/tests/Makefile.am
short/3D/PyLith/branches/pylith-friction/tests/README
short/3D/PyLith/branches/pylith-friction/tests/petsc/Makefile.am
Log:
Some work on full-scale unit tests.
Modified: short/3D/PyLith/branches/pylith-friction/configure.ac
===================================================================
--- short/3D/PyLith/branches/pylith-friction/configure.ac 2009-12-04 23:42:21 UTC (rev 16074)
+++ short/3D/PyLith/branches/pylith-friction/configure.ac 2009-12-05 01:19:46 UTC (rev 16075)
@@ -284,6 +284,7 @@
tests/2d/Makefile
tests/2d/tri3/Makefile
tests/2d/quad4/Makefile
+ tests/petsc/Makefile
doc/Makefile
doc/developer/Makefile
doc/install/Makefile
Added: short/3D/PyLith/branches/pylith-friction/tests/3dnew/hex8/geometry.jou
===================================================================
--- short/3D/PyLith/branches/pylith-friction/tests/3dnew/hex8/geometry.jou (rev 0)
+++ short/3D/PyLith/branches/pylith-friction/tests/3dnew/hex8/geometry.jou 2009-12-05 01:19:46 UTC (rev 16075)
@@ -0,0 +1,42 @@
+# ----------------------------------------------------------------------
+# Create block
+# ----------------------------------------------------------------------
+
+# Block is 8 km x 8 km x 6 km
+# -4 km <= x <= 4 km
+# -4 km <= y <= 4 km
+# -6 km <= z <= 0 km
+reset
+brick x 8000 y 8000 z 6000
+
+# Translate block so the top is at z=0
+volume 1 move x 0 y 0 z -3000
+
+# ----------------------------------------------------------------------
+# Create interface surfaces
+# ----------------------------------------------------------------------
+create planar surface with plane xplane offset 0
+surface 7 name "fault_surface"
+create planar surface with plane xplane offset +2000
+surface 8 name "fault_surface_b"
+create planar surface with plane zplane offset -2000
+surface 9 name "material_interface"
+
+# ----------------------------------------------------------------------
+# Divide volumes using interface surfaces
+# ----------------------------------------------------------------------
+webcut volume 1 with plane surface fault_surface
+webcut volume 1 with plane surface fault_surface_b
+webcut volume 1 with plane surface material_interface
+webcut volume 4 with plane surface material_interface
+volume 1 name "elastic_xpos"
+volume 1 name "elastic_xpos"
+volume 4 name "elastic_xneg"
+volume 5 name "visco_xpos"
+volume 6 name "visco_xneg"
+
+# ----------------------------------------------------------------------
+# Imprint all volumes, merging surfaces
+# ----------------------------------------------------------------------
+imprint all with volume all
+merge all
Added: short/3D/PyLith/branches/pylith-friction/tests/3dnew/hex8/mesh.jou
===================================================================
--- short/3D/PyLith/branches/pylith-friction/tests/3dnew/hex8/mesh.jou (rev 0)
+++ short/3D/PyLith/branches/pylith-friction/tests/3dnew/hex8/mesh.jou 2009-12-05 01:19:46 UTC (rev 16075)
@@ -0,0 +1,69 @@
+# ----------------------------------------------------------------------
+# Generate geometry
+# ----------------------------------------------------------------------
+playback 'geometry.jou'
+
+# ----------------------------------------------------------------------
+# Set discretization size
+# ----------------------------------------------------------------------
+surface all size 1000
+
+# ----------------------------------------------------------------------
+# Generate the mesh
+# ----------------------------------------------------------------------
+surface all scheme submap
+mesh surface all
+
+# ----------------------------------------------------------------------
+# Create blocks for materials
+# ----------------------------------------------------------------------
+block 1 surface 3 4 5
+block 1 name "elastic"
+
+# ----------------------------------------------------------------------
+# Create nodeset for faults
+# ----------------------------------------------------------------------
+group "fault_x" add node in curve 5
+nodeset 10 group fault_x
+nodeset 10 name "fault_x"
+
+group "fault_x2" add node in curve 10
+nodeset 11 group fault_x2
+nodeset 11 name "fault_x2"
+
+# ----------------------------------------------------------------------
+# Create nodeset for +x edge
+# ----------------------------------------------------------------------
+group "edge_xpos" add node in curve 3
+nodeset 20 group edge_xpos
+nodeset 20 name "edge xpos"
+
+# ----------------------------------------------------------------------
+# Create nodeset for -x edge
+# ----------------------------------------------------------------------
+group "edge_xneg" add node in curve 1
+nodeset 21 group edge_xneg
+nodeset 21 name "edge xneg"
+
+# ----------------------------------------------------------------------
+# Create nodeset for +y edge
+# ----------------------------------------------------------------------
+group "edge_ypos" add node in curve 8
+group "edge_ypos" add node in curve 11
+group "edge_ypos" add node in curve 14
+nodeset 22 group edge_ypos
+nodeset 22 name "edge ypos"
+
+# ----------------------------------------------------------------------
+# Create nodeset for -y edge
+# ----------------------------------------------------------------------
+group "edge_yneg" add node in curve 9
+group "edge_yneg" add node in curve 12
+group "edge_yneg" add node in curve 13
+nodeset 23 group edge_yneg
+nodeset 23 name "edge yneg"
+
+# ----------------------------------------------------------------------
+# Export exodus file
+# ----------------------------------------------------------------------
+export mesh "mesh.exo" dimension 2 overwrite
Modified: short/3D/PyLith/branches/pylith-friction/tests/Makefile.am
===================================================================
--- short/3D/PyLith/branches/pylith-friction/tests/Makefile.am 2009-12-04 23:42:21 UTC (rev 16074)
+++ short/3D/PyLith/branches/pylith-friction/tests/Makefile.am 2009-12-05 01:19:46 UTC (rev 16075)
@@ -12,7 +12,8 @@
SUBDIRS = \
1d \
- 2d
+ 2d \
+ petsc
# End of file
Modified: short/3D/PyLith/branches/pylith-friction/tests/README
===================================================================
--- short/3D/PyLith/branches/pylith-friction/tests/README 2009-12-04 23:42:21 UTC (rev 16074)
+++ short/3D/PyLith/branches/pylith-friction/tests/README 2009-12-05 01:19:46 UTC (rev 16075)
@@ -9,10 +9,13 @@
Point force
Neumann
Absorbing dampers
+ Body forces (2-D, 3-D)
Faults
+ Kinematic
+ Dynamic
+ Large deformations
-
----------------------------------------------------------------------
1-D tests
----------------------------------------------------------------------
@@ -69,6 +72,18 @@
* dislocationdyn --TODO--
[single fault, dynamic]
+ * lgdeformrigidbody --TODO--
+
+ - Dirichlet BC w/initial displacement, UniformDB
+ (rigid body translation and rotation)
+ - Large deformation
+
+ * lgdeformtraction --TODO--
+
+ - Dirichlet BC w/initial displacement, UniformDB
+ - Neuman BC w/initial value, UniformDB
+ - Large deformation
+
tri3 (linear cells, plane stress)
* axialdisp
Modified: short/3D/PyLith/branches/pylith-friction/tests/petsc/Makefile.am
===================================================================
--- short/3D/PyLith/branches/pylith-friction/tests/petsc/Makefile.am 2009-12-04 23:42:21 UTC (rev 16074)
+++ short/3D/PyLith/branches/pylith-friction/tests/petsc/Makefile.am 2009-12-05 01:19:46 UTC (rev 16075)
@@ -14,7 +14,7 @@
check_SCRIPTS = testpetsc.py
-noinst_PYTHON = \
+dist_noinst_PYTHON = \
TestPetscApp.py
noinst_DATA =
@@ -26,15 +26,15 @@
# 'export' the input files by performing a mock install
export_datadir = $(top_builddir)/tests/petsc
-export-data: $(noinst_PYTHON) $(noinst_DATA)
- for f in $(noinst_PYTHON) $(noinst_DATA); do $(install_sh_DATA) $(srcdir)/$$f $(export_datadir); done
+export-data: $(dist_noinst_PYTHON) $(dist_noinst_DATA)
+ for f in $(dist_noinst_PYTHON) $(dist_noinst_DATA); do $(install_sh_DATA) $(srcdir)/$$f $(export_datadir); done
-BUILT_SOURCES = export-data
+clean-data:
+ if [ "X$(top_srcdir)" != "X$(top_builddir)" ]; then for f in $(dist_noinst_PYTHON) $(dist_noinst_DATA) $(noinst_TMP); do $(RM) $(RM_FLAGS) $(export_datadir)/$$f; done; fi
-CLEANFILES = \
- $(export_datadir)/$(noinst_PYTHON) \
- $(export_datadir)/$(noinst_DATA) \
- $(export_datadir)/$(noinst_TMP)
+BUILT_SOURCES = export-data
+clean-local: clean-data
+CLEANFILES = *.pyc
# End of file
More information about the CIG-COMMITS
mailing list