[cig-commits] r8276 - short/3D/PyLith/trunk/tests/1d/line2

[brad at geodynamics.org]

Author: brad
Date: 2007-11-12 10:20:49 -0800 (Mon, 12 Nov 2007)
New Revision: 8276

Modified:
   short/3D/PyLith/trunk/tests/1d/line2/Makefile.am
   short/3D/PyLith/trunk/tests/1d/line2/TestAxial.py
   short/3D/PyLith/trunk/tests/1d/line2/axialextension.cfg
Log:
Added trivial local app object to permit use of .cfg file for axial extension. This will allow automated full run test suites.

Modified: short/3D/PyLith/trunk/tests/1d/line2/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/tests/1d/line2/Makefile.am	2007-11-11 20:37:22 UTC (rev 8275)
+++ short/3D/PyLith/trunk/tests/1d/line2/Makefile.am	2007-11-12 18:20:49 UTC (rev 8276)
@@ -22,7 +22,7 @@
 	bar.mesh \
 	axialextension.cfg \
 	axialextension_disp.spatialdb \
-	dislocation.cfg \
+	dislocation_static.cfg \
 	dislocation_disp.spatialdb \
 	dislocation_slip.spatialdb \
 	dislocation_sliprate.spatialdb \
@@ -41,12 +41,13 @@
 
 # 'export' the input files by performing a mock install
 export_datadir = $(top_builddir)/tests/1d/line2
-export-data: $(noinst_DATA)
-	for f in $(noinst_DATA); do $(install_sh_DATA) $(srcdir)/$$f $(export_datadir); done
+export-data: $(noinst_PYTHON) $(noinst_DATA)
+	for f in $(noinst_PYTHON) $(noinst_DATA); do $(install_sh_DATA) $(srcdir)/$$f $(export_datadir); done
 
 BUILT_SOURCES = export-data
 
 CLEANFILES = \
+	$(export_datadir)/$(noinst_PYTHON) \
 	$(export_datadir)/$(noinst_DATA) \
 	$(export_datadir)/$(noinst_TMP)
 

Modified: short/3D/PyLith/trunk/tests/1d/line2/TestAxial.py
===================================================================
--- short/3D/PyLith/trunk/tests/1d/line2/TestAxial.py	2007-11-11 20:37:22 UTC (rev 8275)
+++ short/3D/PyLith/trunk/tests/1d/line2/TestAxial.py	2007-11-12 18:20:49 UTC (rev 8276)
@@ -15,16 +15,24 @@
 ## @brief Test suite for testing pylith with 1-D axial extension.
 
 import unittest
-import numpy
-import tables
+#import numpy
+#import tables
 
+
+from pylith.PyLithApp import PyLithApp
+class AxialExtension(PyLithApp):
+
+  def __init__(self):
+    PyLithApp.__init__(self, "axialextension")
+    return
+
+
 def run_pylith():
   """
   Run pylith.
   """
   if not "done" in dir(run_pylith):
-    from pylith.PyLithApp import PyLithApp
-    app = PyLithApp("axialextension")
+    app = AxialExtension()
     app.run()
     run_pylith.done = True
   return

Modified: short/3D/PyLith/trunk/tests/1d/line2/axialextension.cfg
===================================================================
--- short/3D/PyLith/trunk/tests/1d/line2/axialextension.cfg	2007-11-11 20:37:22 UTC (rev 8275)
+++ short/3D/PyLith/trunk/tests/1d/line2/axialextension.cfg	2007-11-12 18:20:49 UTC (rev 8276)
@@ -1,10 +1,10 @@
 # -*- Python -*-
-[pylithapp]
+[axialextension]
 
 # ----------------------------------------------------------------------
 # journal
 # ----------------------------------------------------------------------
-[pylithapp.journal.info]
+[axialextension.journal.info]
 timedependent = 1
 explicit = 1
 implicit = 1
@@ -19,17 +19,17 @@
 # ----------------------------------------------------------------------
 # mesh_generator
 # ----------------------------------------------------------------------
-[pylithapp.mesh_generator]
+[axialextension.mesh_generator]
 debug = 1
 
-[pylithapp.mesh_generator.importer]
+[axialextension.mesh_generator.importer]
 filename = bar.mesh
 coordsys.space_dim = 1
 
 # ----------------------------------------------------------------------
 # problem
 # ----------------------------------------------------------------------
-[pylithapp.timedependent]
+[axialextension.timedependent]
 total_time = 0.0*s
 default_dt = 1.0*s
 dimension = 1
@@ -39,10 +39,10 @@
 # ----------------------------------------------------------------------
 # materials
 # ----------------------------------------------------------------------
-[pylithapp.timedependent.materials]
+[axialextension.timedependent.materials]
 material = pylith.materials.ElasticStrain1D
 
-[pylithapp.timedependent.materials.material]
+[axialextension.timedependent.materials.material]
 label = elastic material
 id = 1
 db.iohandler.filename = matprops.spatialdb
@@ -52,7 +52,7 @@
 # ----------------------------------------------------------------------
 # boundary conditions
 # ----------------------------------------------------------------------
-[pylithapp.timedependent.bc.bc]
+[axialextension.timedependent.bc.bc]
 fixed_dof = [0]
 id = 10
 label = end points
@@ -62,11 +62,11 @@
 # ----------------------------------------------------------------------
 # PETSc
 # ----------------------------------------------------------------------
-[pylithapp.petsc]
+[axialextension.petsc]
 pc_type = jacobi
 
 # ----------------------------------------------------------------------
 # output
 # ----------------------------------------------------------------------
-[pylithapp.problem.formulation.output.output]
+[axialextension.problem.formulation.output.output]
 filename = axialextension.vtk