[cig-commits] r12771 - short/3D/PyLith/trunk/tests/2d/twofaults_quad4
brad at geodynamics.org
brad at geodynamics.org
Tue Sep 2 09:19:35 PDT 2008
Author: brad
Date: 2008-09-02 09:19:34 -0700 (Tue, 02 Sep 2008)
New Revision: 12771
Added:
short/3D/PyLith/trunk/tests/2d/twofaults_quad4/slipLL.spatialdb
short/3D/PyLith/trunk/tests/2d/twofaults_quad4/slipRL.spatialdb
short/3D/PyLith/trunk/tests/2d/twofaults_quad4/sliptime.spatialdb
Removed:
short/3D/PyLith/trunk/tests/2d/twofaults_quad4/dislocation_disp.spatialdb
short/3D/PyLith/trunk/tests/2d/twofaults_quad4/dislocation_slipA.spatialdb
short/3D/PyLith/trunk/tests/2d/twofaults_quad4/dislocation_slipB.spatialdb
short/3D/PyLith/trunk/tests/2d/twofaults_quad4/dislocation_sliprate.spatialdb
short/3D/PyLith/trunk/tests/2d/twofaults_quad4/dislocation_sliptime.spatialdb
short/3D/PyLith/trunk/tests/2d/twofaults_quad4/faults.odb
short/3D/PyLith/trunk/tests/2d/twofaults_quad4/materials.odb
Modified:
short/3D/PyLith/trunk/tests/2d/twofaults_quad4/dislocation_para.cfg
short/3D/PyLith/trunk/tests/2d/twofaults_quad4/quad4_para.mesh
Log:
Started updating two faults test.
Deleted: short/3D/PyLith/trunk/tests/2d/twofaults_quad4/dislocation_disp.spatialdb
===================================================================
--- short/3D/PyLith/trunk/tests/2d/twofaults_quad4/dislocation_disp.spatialdb 2008-09-02 05:07:20 UTC (rev 12770)
+++ short/3D/PyLith/trunk/tests/2d/twofaults_quad4/dislocation_disp.spatialdb 2008-09-02 16:19:34 UTC (rev 12771)
@@ -1,14 +0,0 @@
-#SPATIAL.ascii 1
-SimpleDB {
- num-values = 2
- value-names = dof-0 dof-1
- value-units = m m
- num-locs = 1
- data-dim = 0
- space-dim = 2
- cs-data = cartesian {
- to-meters = 1.0
- space-dim = 2
- }
-}
-0.0 0.0 0.0 0.0
Modified: short/3D/PyLith/trunk/tests/2d/twofaults_quad4/dislocation_para.cfg
===================================================================
--- short/3D/PyLith/trunk/tests/2d/twofaults_quad4/dislocation_para.cfg 2008-09-02 05:07:20 UTC (rev 12770)
+++ short/3D/PyLith/trunk/tests/2d/twofaults_quad4/dislocation_para.cfg 2008-09-02 16:19:34 UTC (rev 12771)
@@ -30,47 +30,26 @@
# problem
# ----------------------------------------------------------------------
[pylithapp.timedependent]
-total_time = 0.0*s
-default_dt = 1.0*s
dimension = 2
-formulation = pylith.problems.Implicit
-bc = pylith.bc.BCTwoSides
-interfaces = faults
-materials = materials
+bc = [pos,neg]
+interfaces = [faultL,faultR]
+materials = [elastic]
+[pylithapp.timedependent.formulation.time_step]
+total_time = 0.0*s
+dt = 1.0*s
+
# ----------------------------------------------------------------------
# materials
# ----------------------------------------------------------------------
-[pylithapp.timedependent.materials.one]
-label = elastic material A
+[pylithapp.timedependent.materials.elastic]
+label = Elastic material
id = 10
quadrature = pylith.feassemble.quadrature.Quadrature2D
quadrature.cell = pylith.feassemble.FIATLagrange
quadrature.cell.dimension = 2
-db = spatialdata.spatialdb.UniformDB
-db.values = [vp,vs,density]
-db.data = [5291.502622129181, 3000.0, 2500.0]
+db.iohandler.filename = matprops.spatialdb
-[pylithapp.timedependent.materials.two]
-label = elastic material B
-id = 11
-quadrature = pylith.feassemble.quadrature.Quadrature2D
-quadrature.cell = pylith.feassemble.FIATLagrange
-quadrature.cell.dimension = 2
-db = spatialdata.spatialdb.UniformDB
-db.values = [vp,vs,density]
-db.data = [5291.502622129181, 3000.0, 2500.0]
-
-[pylithapp.timedependent.materials.three]
-label = elastic material C
-id = 12
-quadrature = pylith.feassemble.quadrature.Quadrature2D
-quadrature.cell = pylith.feassemble.FIATLagrange
-quadrature.cell.dimension = 2
-db = spatialdata.spatialdb.UniformDB
-db.values = [vp,vs,density]
-db.data = [5291.502622129181, 3000.0, 2500.0]
-
# ----------------------------------------------------------------------
# boundary conditions
# ----------------------------------------------------------------------
@@ -87,57 +66,29 @@
# ----------------------------------------------------------------------
# faults
# ----------------------------------------------------------------------
-[pylithapp.timedependent.interfaces.one]
+[pylithapp.timedependent.interfaces.faultL]
id = 100
label = faultL
quadrature = pylith.feassemble.quadrature.Quadrature1Din2D
quadrature.cell.shape = line
-mat_db = spatialdata.spatialdb.UniformDB
-mat_db.values = [vp,vs,density]
-mat_db.data = [5291.502622129181, 3000.0, 2500.0]
+mat_db.iohandler.filename = matprops.spatialdb
-[pylithapp.timedependent.interfaces.one.eq_src.slip_function]
-slip = spatialdata.spatialdb.UniformDB
-slip.values = [left-lateral-slip,fault-opening]
-slip.data = [0.2, 0.0]
-slip.label = Final slip for faultL
+[pylithapp.timedependent.interfaces.faultL.eq_srcs.rupture.slip_function]
+slip.iohandler.filename = slipLL.spatialdb
+slip_time.iohandler.filename = sliptime.spatialdb
-slip_rate = spatialdata.spatialdb.UniformDB
-slip_rate.values = [slip-rate]
-slip_rate.data = [1.0e+6]
-slip_rate.label = Peak slip rate for faultL
-
-slip_time = spatialdata.spatialdb.UniformDB
-slip_time.values = [slip-time]
-slip_time.data = [-1.0]
-slip_time.label = Slip time for faultL
-
-[pylithapp.timedependent.interfaces.two]
+[pylithapp.timedependent.interfaces.faultR]
id = 101
label = faultR
quadrature = pylith.feassemble.quadrature.Quadrature1Din2D
quadrature.cell.shape = line
-mat_db = spatialdata.spatialdb.UniformDB
-mat_db.values = [vp,vs,density]
-mat_db.data = [5291.502622129181, 3000.0, 2500.0]
+mat_db.iohandler.filename = matprops.spatialdb
-[pylithapp.timedependent.interfaces.two.eq_src.slip_function]
-slip = spatialdata.spatialdb.UniformDB
-slip.values = [left-lateral-slip,fault-opening]
-slip.data = [-0.2, 0.0]
-slip.label = Final slip for faultL
+[pylithapp.timedependent.interfaces.faultR.eq_srcs.rupture.slip_function]
+slip.iohandler.filename = slipRL.spatialdb
+slip_time.iohandler.filename = sliptime.spatialdb
-slip_rate = spatialdata.spatialdb.UniformDB
-slip_rate.values = [slip-rate]
-slip_rate.data = [1.0e+6]
-slip_rate.label = Peak slip rate for faultL
-slip_time = spatialdata.spatialdb.UniformDB
-slip_time.values = [slip-time]
-slip_time.data = [-1.0]
-slip_time.label = Slip time for faultL
-
-
# ----------------------------------------------------------------------
# PETSc
# ----------------------------------------------------------------------
@@ -152,8 +103,12 @@
[pylithapp.problem.formulation.output.output.writer]
filename = dislocation-para.vtk
-[pylithapp.problem.interfaces.one.output.writer]
+[pylithapp.timedependent.materials.elastic.output]
+cell_filter = pylith.meshio.CellFilterAvg
+writer.filename = dislocation-para-statevars-elastic.vtk
+
+[pylithapp.problem.interfaces.faultL.output.writer]
filename = dislocation-para-faultL.vtk
-[pylithapp.problem.interfaces.two.output.writer]
+[pylithapp.problem.interfaces.faultR.output.writer]
filename = dislocation-para-faultR.vtk
Deleted: short/3D/PyLith/trunk/tests/2d/twofaults_quad4/dislocation_slipA.spatialdb
===================================================================
--- short/3D/PyLith/trunk/tests/2d/twofaults_quad4/dislocation_slipA.spatialdb 2008-09-02 05:07:20 UTC (rev 12770)
+++ short/3D/PyLith/trunk/tests/2d/twofaults_quad4/dislocation_slipA.spatialdb 2008-09-02 16:19:34 UTC (rev 12771)
@@ -1,16 +0,0 @@
-#SPATIAL.ascii 1
-SimpleDB {
- num-values = 2
- value-names = left-lateral-slip fault-opening
- value-units = m m
- num-locs = 3
- data-dim = 1
- space-dim = 2
- cs-data = cartesian {
- to-meters = 1.0
- space-dim = 2
- }
-}
-1.0 3.0 1.0 0.4
-1.0 1.0 0.5 0.2
-1.0 -1.0 0.0 0.0
Deleted: short/3D/PyLith/trunk/tests/2d/twofaults_quad4/dislocation_slipB.spatialdb
===================================================================
--- short/3D/PyLith/trunk/tests/2d/twofaults_quad4/dislocation_slipB.spatialdb 2008-09-02 05:07:20 UTC (rev 12770)
+++ short/3D/PyLith/trunk/tests/2d/twofaults_quad4/dislocation_slipB.spatialdb 2008-09-02 16:19:34 UTC (rev 12771)
@@ -1,14 +0,0 @@
-#SPATIAL.ascii 1
-SimpleDB {
- num-values = 2
- value-names = left-lateral-slip fault-opening
- value-units = m m
- num-locs = 1
- data-dim = 0
- space-dim = 2
- cs-data = cartesian {
- to-meters = 1.0
- space-dim = 2
- }
-}
-0.0 0.0 1.0 0.5
Deleted: short/3D/PyLith/trunk/tests/2d/twofaults_quad4/dislocation_sliprate.spatialdb
===================================================================
--- short/3D/PyLith/trunk/tests/2d/twofaults_quad4/dislocation_sliprate.spatialdb 2008-09-02 05:07:20 UTC (rev 12770)
+++ short/3D/PyLith/trunk/tests/2d/twofaults_quad4/dislocation_sliprate.spatialdb 2008-09-02 16:19:34 UTC (rev 12771)
@@ -1,14 +0,0 @@
-#SPATIAL.ascii 1
-SimpleDB {
- num-values = 1
- value-names = slip-rate
- value-units = m/s
- num-locs = 1
- data-dim = 0
- space-dim = 2
- cs-data = cartesian {
- to-meters = 1.0
- space-dim = 2
- }
-}
-0.0 0.0 1.0e+6
Deleted: short/3D/PyLith/trunk/tests/2d/twofaults_quad4/dislocation_sliptime.spatialdb
===================================================================
--- short/3D/PyLith/trunk/tests/2d/twofaults_quad4/dislocation_sliptime.spatialdb 2008-09-02 05:07:20 UTC (rev 12770)
+++ short/3D/PyLith/trunk/tests/2d/twofaults_quad4/dislocation_sliptime.spatialdb 2008-09-02 16:19:34 UTC (rev 12771)
@@ -1,14 +0,0 @@
-#SPATIAL.ascii 1
-SimpleDB {
- num-values = 1
- value-names = slip-time
- value-units = s
- num-locs = 1
- data-dim = 0
- space-dim = 2
- cs-data = cartesian {
- to-meters = 1.0
- space-dim = 2
- }
-}
-0.0 0.0 -1.0
Deleted: short/3D/PyLith/trunk/tests/2d/twofaults_quad4/faults.odb
===================================================================
--- short/3D/PyLith/trunk/tests/2d/twofaults_quad4/faults.odb 2008-09-02 05:07:20 UTC (rev 12770)
+++ short/3D/PyLith/trunk/tests/2d/twofaults_quad4/faults.odb 2008-09-02 16:19:34 UTC (rev 12771)
@@ -1,74 +0,0 @@
-#!/usr/bin/env python
-#
-# ----------------------------------------------------------------------
-#
-# Brad T. Aagaard
-# U.S. Geological Survey
-#
-# <LicenseText>
-#
-# ----------------------------------------------------------------------
-#
-
-from pylith.utils.ObjectBin import ObjectBin
-
-class MyFaults(ObjectBin):
- """
- User-defined boundary conditions container.
-
- Factory: object_bin
- """
-
- # INVENTORY //////////////////////////////////////////////////////////
-
- class Inventory(ObjectBin.Inventory):
- """
- Python object for managing MyBC facilities and properties.
- """
-
- import pyre.inventory
-
- from pylith.faults.FaultCohesiveKin import FaultCohesiveKin
-
- one = pyre.inventory.facility("one", family="fault",
- factory=FaultCohesiveKin)
- one.meta['tip'] = "Fault A."
-
- two = pyre.inventory.facility("two", family="fault",
- factory=FaultCohesiveKin)
- two.meta['tip'] = "Fault B."
-
-
- # PUBLIC METHODS /////////////////////////////////////////////////////
-
- def __init__(self, name="myfaults"):
- """
- Constructor.
- """
- ObjectBin.__init__(self, name)
- return
-
-
- # PRIVATE METHODS ////////////////////////////////////////////////////
-
- def _configure(self):
- """
- Set attributes from inventory.
- """
- ObjectBin._configure(self)
-
- self.bin = [self.inventory.one,
- self.inventory.two]
- return
-
-
-# FACTORIES ////////////////////////////////////////////////////////////
-
-def object_bin():
- """
- Factory associated with MyFaults.
- """
- return MyFaults()
-
-
-# End of file
Deleted: short/3D/PyLith/trunk/tests/2d/twofaults_quad4/materials.odb
===================================================================
--- short/3D/PyLith/trunk/tests/2d/twofaults_quad4/materials.odb 2008-09-02 05:07:20 UTC (rev 12770)
+++ short/3D/PyLith/trunk/tests/2d/twofaults_quad4/materials.odb 2008-09-02 16:19:34 UTC (rev 12771)
@@ -1,79 +0,0 @@
-#!/usr/bin/env python
-#
-# ----------------------------------------------------------------------
-#
-# Brad T. Aagaard
-# U.S. Geological Survey
-#
-# <LicenseText>
-#
-# ----------------------------------------------------------------------
-#
-
-from pylith.utils.ObjectBin import ObjectBin
-
-class MyMatBin(ObjectBin):
- """
- User-defined materials container.
-
- Factory: object_bin
- """
-
- # INVENTORY //////////////////////////////////////////////////////////
-
- class Inventory(ObjectBin.Inventory):
- """
- Python object for managing MyBC facilities and properties.
- """
-
- import pyre.inventory
-
- from pylith.materials.ElasticPlaneStrain import ElasticPlaneStrain
-
- one = pyre.inventory.facility("one", family="material",
- factory=ElasticPlaneStrain)
- one.meta['tip'] = "Material A."
-
- two = pyre.inventory.facility("two", family="material",
- factory=ElasticPlaneStrain)
- two.meta['tip'] = "Material B."
-
- three = pyre.inventory.facility("three", family="material",
- factory=ElasticPlaneStrain)
- three.meta['tip'] = "Material C."
-
-
- # PUBLIC METHODS /////////////////////////////////////////////////////
-
- def __init__(self, name="mymatbin"):
- """
- Constructor.
- """
- ObjectBin.__init__(self, name)
- return
-
-
- # PRIVATE METHODS ////////////////////////////////////////////////////
-
- def _configure(self):
- """
- Set attributes from inventory.
- """
- ObjectBin._configure(self)
-
- self.bin = [self.inventory.one,
- self.inventory.two,
- self.inventory.three]
- return
-
-
-# FACTORIES ////////////////////////////////////////////////////////////
-
-def object_bin():
- """
- Factory associated with MyMatBin.
- """
- return MyMatBin()
-
-
-# End of file
Modified: short/3D/PyLith/trunk/tests/2d/twofaults_quad4/quad4_para.mesh
===================================================================
--- short/3D/PyLith/trunk/tests/2d/twofaults_quad4/quad4_para.mesh 2008-09-02 05:07:20 UTC (rev 12770)
+++ short/3D/PyLith/trunk/tests/2d/twofaults_quad4/quad4_para.mesh 2008-09-02 16:19:34 UTC (rev 12771)
@@ -39,14 +39,14 @@
}
material-ids = {
0 10
- 1 11
- 2 12
+ 1 10
+ 2 10
3 10
- 4 11
- 5 12
+ 4 10
+ 5 10
6 10
- 7 11
- 8 12
+ 7 10
+ 8 10
}
}
group = {
Added: short/3D/PyLith/trunk/tests/2d/twofaults_quad4/slipLL.spatialdb
===================================================================
--- short/3D/PyLith/trunk/tests/2d/twofaults_quad4/slipLL.spatialdb (rev 0)
+++ short/3D/PyLith/trunk/tests/2d/twofaults_quad4/slipLL.spatialdb 2008-09-02 16:19:34 UTC (rev 12771)
@@ -0,0 +1,14 @@
+#SPATIAL.ascii 1
+SimpleDB {
+ num-values = 2
+ value-names = left-lateral-slip fault-opening
+ value-units = m m
+ num-locs = 1
+ data-dim = 0
+ space-dim = 2
+ cs-data = cartesian {
+ to-meters = 1.0
+ space-dim = 2
+ }
+}
+0.0 0.0 1.0 0.5
Added: short/3D/PyLith/trunk/tests/2d/twofaults_quad4/slipRL.spatialdb
===================================================================
--- short/3D/PyLith/trunk/tests/2d/twofaults_quad4/slipRL.spatialdb (rev 0)
+++ short/3D/PyLith/trunk/tests/2d/twofaults_quad4/slipRL.spatialdb 2008-09-02 16:19:34 UTC (rev 12771)
@@ -0,0 +1,16 @@
+#SPATIAL.ascii 1
+SimpleDB {
+ num-values = 2
+ value-names = left-lateral-slip fault-opening
+ value-units = m m
+ num-locs = 3
+ data-dim = 1
+ space-dim = 2
+ cs-data = cartesian {
+ to-meters = 1.0
+ space-dim = 2
+ }
+}
+1.0 3.0 1.0 0.4
+1.0 1.0 0.5 0.2
+1.0 -1.0 0.0 0.0
Copied: short/3D/PyLith/trunk/tests/2d/twofaults_quad4/sliptime.spatialdb (from rev 12770, short/3D/PyLith/trunk/tests/2d/twofaults_quad4/dislocation_sliptime.spatialdb)
===================================================================
--- short/3D/PyLith/trunk/tests/2d/twofaults_quad4/sliptime.spatialdb (rev 0)
+++ short/3D/PyLith/trunk/tests/2d/twofaults_quad4/sliptime.spatialdb 2008-09-02 16:19:34 UTC (rev 12771)
@@ -0,0 +1,14 @@
+#SPATIAL.ascii 1
+SimpleDB {
+ num-values = 1
+ value-names = slip-time
+ value-units = s
+ num-locs = 1
+ data-dim = 0
+ space-dim = 2
+ cs-data = cartesian {
+ to-meters = 1.0
+ space-dim = 2
+ }
+}
+0.0 0.0 -1.0
More information about the cig-commits
mailing list