[cig-commits] r14461 - in short/3D/PyLith/branches/pylith-swig/tests: 1d 2d/tri3
brad at geodynamics.org
brad at geodynamics.org
Wed Mar 25 17:05:26 PDT 2009
Author: brad
Date: 2009-03-25 17:05:25 -0700 (Wed, 25 Mar 2009)
New Revision: 14461
Modified:
short/3D/PyLith/branches/pylith-swig/tests/1d/Makefile.am
short/3D/PyLith/branches/pylith-swig/tests/2d/tri3/TestAxialPlaneStrain.py
short/3D/PyLith/branches/pylith-swig/tests/2d/tri3/TestDislocation.py
short/3D/PyLith/branches/pylith-swig/tests/2d/tri3/TestDislocation2.py
short/3D/PyLith/branches/pylith-swig/tests/2d/tri3/TestShearPlaneStrain.py
short/3D/PyLith/branches/pylith-swig/tests/2d/tri3/axialplanestrain.cfg
short/3D/PyLith/branches/pylith-swig/tests/2d/tri3/dislocation.cfg
short/3D/PyLith/branches/pylith-swig/tests/2d/tri3/dislocation2.cfg
short/3D/PyLith/branches/pylith-swig/tests/2d/tri3/shearplanestrain.cfg
short/3D/PyLith/branches/pylith-swig/tests/2d/tri3/testpylith.py
Log:
Updated settings for full-scale tests.
Modified: short/3D/PyLith/branches/pylith-swig/tests/1d/Makefile.am
===================================================================
--- short/3D/PyLith/branches/pylith-swig/tests/1d/Makefile.am 2009-03-26 00:03:30 UTC (rev 14460)
+++ short/3D/PyLith/branches/pylith-swig/tests/1d/Makefile.am 2009-03-26 00:05:25 UTC (rev 14461)
@@ -11,8 +11,7 @@
#
SUBDIRS = \
- line2 \
- line3
+ line2
# End of file
Modified: short/3D/PyLith/branches/pylith-swig/tests/2d/tri3/TestAxialPlaneStrain.py
===================================================================
--- short/3D/PyLith/branches/pylith-swig/tests/2d/tri3/TestAxialPlaneStrain.py 2009-03-26 00:03:30 UTC (rev 14460)
+++ short/3D/PyLith/branches/pylith-swig/tests/2d/tri3/TestAxialPlaneStrain.py 2009-03-26 00:05:25 UTC (rev 14461)
@@ -21,7 +21,7 @@
from pylith.utils.VTKDataReader import VTKDataReader
# Local version of PyLithApp
-from pylith.PyLithApp import PyLithApp
+from pylith.apps.PyLithApp import PyLithApp
class AxialPlaneStrainApp(PyLithApp):
def __init__(self):
PyLithApp.__init__(self, name="axialplanestrain")
Modified: short/3D/PyLith/branches/pylith-swig/tests/2d/tri3/TestDislocation.py
===================================================================
--- short/3D/PyLith/branches/pylith-swig/tests/2d/tri3/TestDislocation.py 2009-03-26 00:03:30 UTC (rev 14460)
+++ short/3D/PyLith/branches/pylith-swig/tests/2d/tri3/TestDislocation.py 2009-03-26 00:05:25 UTC (rev 14461)
@@ -18,7 +18,7 @@
import unittest
# Local application
-from pylith.PyLithApp import PyLithApp
+from pylith.apps.PyLithApp import PyLithApp
class DislocationApp(PyLithApp):
def __init__(self):
PyLithApp.__init__(self, name="dislocation")
Modified: short/3D/PyLith/branches/pylith-swig/tests/2d/tri3/TestDislocation2.py
===================================================================
--- short/3D/PyLith/branches/pylith-swig/tests/2d/tri3/TestDislocation2.py 2009-03-26 00:03:30 UTC (rev 14460)
+++ short/3D/PyLith/branches/pylith-swig/tests/2d/tri3/TestDislocation2.py 2009-03-26 00:05:25 UTC (rev 14461)
@@ -18,7 +18,7 @@
import unittest
# Local application
-from pylith.PyLithApp import PyLithApp
+from pylith.apps.PyLithApp import PyLithApp
class DislocationApp(PyLithApp):
def __init__(self):
PyLithApp.__init__(self, name="dislocation2")
Modified: short/3D/PyLith/branches/pylith-swig/tests/2d/tri3/TestShearPlaneStrain.py
===================================================================
--- short/3D/PyLith/branches/pylith-swig/tests/2d/tri3/TestShearPlaneStrain.py 2009-03-26 00:03:30 UTC (rev 14460)
+++ short/3D/PyLith/branches/pylith-swig/tests/2d/tri3/TestShearPlaneStrain.py 2009-03-26 00:05:25 UTC (rev 14461)
@@ -20,7 +20,7 @@
from pylith.utils.VTKDataReader import VTKDataReader
# Local version of PyLithApp
-from pylith.PyLithApp import PyLithApp
+from pylith.apps.PyLithApp import PyLithApp
class ShearPlaneStrainApp(PyLithApp):
def __init__(self):
PyLithApp.__init__(self, name="shearplanestrain")
Modified: short/3D/PyLith/branches/pylith-swig/tests/2d/tri3/axialplanestrain.cfg
===================================================================
--- short/3D/PyLith/branches/pylith-swig/tests/2d/tri3/axialplanestrain.cfg 2009-03-26 00:03:30 UTC (rev 14460)
+++ short/3D/PyLith/branches/pylith-swig/tests/2d/tri3/axialplanestrain.cfg 2009-03-26 00:05:25 UTC (rev 14461)
@@ -19,9 +19,9 @@
# ----------------------------------------------------------------------
[axialplanestrain.mesh_generator]
#debug = 1
-importer = pylith.meshio.MeshIOCubit
+reader = pylith.meshio.MeshIOCubit
-[axialplanestrain.mesh_generator.importer]
+[axialplanestrain.mesh_generator.reader]
filename = box_tri3_100m.exo
coordsys.space_dim = 2
@@ -45,8 +45,7 @@
[axialplanestrain.timedependent.materials.elastic]
label = Elastic material
id = 1
-db.iohandler.filename = matprops.spatialdb
-quadrature = pylith.feassemble.quadrature.Quadrature2D
+properties_db.iohandler.filename = matprops.spatialdb
quadrature.cell.shape = triangle
# ----------------------------------------------------------------------
Modified: short/3D/PyLith/branches/pylith-swig/tests/2d/tri3/dislocation.cfg
===================================================================
--- short/3D/PyLith/branches/pylith-swig/tests/2d/tri3/dislocation.cfg 2009-03-26 00:03:30 UTC (rev 14460)
+++ short/3D/PyLith/branches/pylith-swig/tests/2d/tri3/dislocation.cfg 2009-03-26 00:05:25 UTC (rev 14461)
@@ -11,7 +11,7 @@
#solverlinear = 1
#meshiocubit = 1
#implicitelasticity = 1
-#quadrature2d = 1
+#quadrature = 1
#fiatsimplex = 1
# ----------------------------------------------------------------------
@@ -19,9 +19,9 @@
# ----------------------------------------------------------------------
[dislocation.mesh_generator]
#debug = 1
-importer = pylith.meshio.MeshIOCubit
+reader = pylith.meshio.MeshIOCubit
-[dislocation.mesh_generator.importer]
+[dislocation.mesh_generator.reader]
filename = box_tri3_100m.exo
coordsys.space_dim = 2
@@ -46,8 +46,7 @@
[dislocation.timedependent.materials.elastic]
label = Elastic material
id = 1
-db.iohandler.filename = matprops.spatialdb
-quadrature = pylith.feassemble.quadrature.Quadrature2D
+properties_db.iohandler.filename = matprops.spatialdb
quadrature.cell.shape = triangle
# ----------------------------------------------------------------------
@@ -78,7 +77,6 @@
[dislocation.timedependent.interfaces.fault]
id = 2
label = 10
-quadrature = pylith.feassemble.quadrature.Quadrature1Din2D
quadrature.cell.shape = line
mat_db.iohandler.filename = matprops.spatialdb
Modified: short/3D/PyLith/branches/pylith-swig/tests/2d/tri3/dislocation2.cfg
===================================================================
--- short/3D/PyLith/branches/pylith-swig/tests/2d/tri3/dislocation2.cfg 2009-03-26 00:03:30 UTC (rev 14460)
+++ short/3D/PyLith/branches/pylith-swig/tests/2d/tri3/dislocation2.cfg 2009-03-26 00:05:25 UTC (rev 14461)
@@ -11,7 +11,7 @@
#solverlinear = 1
#meshiocubit = 1
#implicitelasticity = 1
-#quadrature2d = 1
+#quadrature = 1
#fiatsimplex = 1
# ----------------------------------------------------------------------
@@ -19,9 +19,9 @@
# ----------------------------------------------------------------------
[dislocation2.mesh_generator]
#debug = 1
-importer = pylith.meshio.MeshIOCubit
+reader = pylith.meshio.MeshIOCubit
-[dislocation2.mesh_generator.importer]
+[dislocation2.mesh_generator.reader]
filename = box_tri3_100m.exo
coordsys.space_dim = 2
@@ -46,8 +46,7 @@
[dislocation2.timedependent.materials.elastic]
label = Elastic material
id = 1
-db.iohandler.filename = matprops.spatialdb
-quadrature = pylith.feassemble.quadrature.Quadrature2D
+properties_db.iohandler.filename = matprops.spatialdb
quadrature.cell.shape = triangle
# ----------------------------------------------------------------------
@@ -71,7 +70,6 @@
[dislocation2.timedependent.interfaces.fault_pos]
id = 2
label = 11
-quadrature = pylith.feassemble.quadrature.Quadrature1Din2D
quadrature.cell.shape = line
mat_db.iohandler.filename = matprops.spatialdb
@@ -83,7 +81,6 @@
[dislocation2.timedependent.interfaces.fault_neg]
id = 3
label = 12
-quadrature = pylith.feassemble.quadrature.Quadrature1Din2D
quadrature.cell.shape = line
mat_db.iohandler.filename = matprops.spatialdb
Modified: short/3D/PyLith/branches/pylith-swig/tests/2d/tri3/shearplanestrain.cfg
===================================================================
--- short/3D/PyLith/branches/pylith-swig/tests/2d/tri3/shearplanestrain.cfg 2009-03-26 00:03:30 UTC (rev 14460)
+++ short/3D/PyLith/branches/pylith-swig/tests/2d/tri3/shearplanestrain.cfg 2009-03-26 00:05:25 UTC (rev 14461)
@@ -19,9 +19,9 @@
# ----------------------------------------------------------------------
[shearplanestrain.mesh_generator]
#debug = 1
-importer = pylith.meshio.MeshIOCubit
+reader = pylith.meshio.MeshIOCubit
-[shearplanestrain.mesh_generator.importer]
+[shearplanestrain.mesh_generator.reader]
filename = box_tri3_100m.exo
coordsys.space_dim = 2
@@ -45,8 +45,7 @@
[shearplanestrain.timedependent.materials.elastic]
label = Elastic material
id = 1
-db.iohandler.filename = matprops.spatialdb
-quadrature = pylith.feassemble.quadrature.Quadrature2D
+properties_db.iohandler.filename = matprops.spatialdb
quadrature.cell.shape = triangle
# ----------------------------------------------------------------------
Modified: short/3D/PyLith/branches/pylith-swig/tests/2d/tri3/testpylith.py
===================================================================
--- short/3D/PyLith/branches/pylith-swig/tests/2d/tri3/testpylith.py 2009-03-26 00:03:30 UTC (rev 14460)
+++ short/3D/PyLith/branches/pylith-swig/tests/2d/tri3/testpylith.py 2009-03-26 00:05:25 UTC (rev 14461)
@@ -26,11 +26,11 @@
from TestShearPlaneStrain import TestShearPlaneStrain
suite.addTest(unittest.makeSuite(TestShearPlaneStrain))
- from TestDislocation import TestDislocation
- suite.addTest(unittest.makeSuite(TestDislocation))
+ #from TestDislocation import TestDislocation
+ #suite.addTest(unittest.makeSuite(TestDislocation))
- from TestDislocation2 import TestDislocation2
- suite.addTest(unittest.makeSuite(TestDislocation2))
+ #from TestDislocation2 import TestDislocation2
+ #suite.addTest(unittest.makeSuite(TestDislocation2))
return suite
More information about the CIG-COMMITS
mailing list