[cig-commits] r13229 - short/3D/PyLith/trunk/tests/2d/tri3

[brad at geodynamics.org]

Author: brad
Date: 2008-11-02 15:44:49 -0800 (Sun, 02 Nov 2008)
New Revision: 13229

Modified:
   short/3D/PyLith/trunk/tests/2d/tri3/TestAxialPlaneStrain.py
   short/3D/PyLith/trunk/tests/2d/tri3/TestShearPlaneStrain.py
   short/3D/PyLith/trunk/tests/2d/tri3/testpylith.py
Log:
More work on automating full-scale tests.

Modified: short/3D/PyLith/trunk/tests/2d/tri3/TestAxialPlaneStrain.py
===================================================================
--- short/3D/PyLith/trunk/tests/2d/tri3/TestAxialPlaneStrain.py	2008-11-02 23:44:10 UTC (rev 13228)
+++ short/3D/PyLith/trunk/tests/2d/tri3/TestAxialPlaneStrain.py	2008-11-02 23:44:49 UTC (rev 13229)
@@ -16,6 +16,8 @@
 ## y-direction for 2-D box.
 
 import unittest
+from pylith.utils.VTKDataReader import has_vtk
+from pylith.utils.VTKDataReader import VTKDataReader
 
 # Local version of PyLithApp
 from pylith.PyLithApp import PyLithApp
@@ -48,14 +50,36 @@
     Setup for test.
     """
     run_pylith()
+    if has_vtk():
+      self.reader = VTKDataReader()
+    else:
+      self.reader = None
     return
 
+  
+  def test_elastic_info(self):
+    """
+    Check elastic info.
+    """
+    if self.reader is None:
+      return
 
-  def test_disp(self):
+    data = self.reader.read("axialplanestrain-statevars-elastic_info.vtk")
+    return
+
+
+  def test_soln(self):
     """
-    Check displacement field.
+    Check solution (displacement) field.
     """
     return
 
 
+  def test_elastic_statevars(self):
+    """
+    Check elastic state variables.
+    """
+    return
+
+
 # End of file 

Modified: short/3D/PyLith/trunk/tests/2d/tri3/TestShearPlaneStrain.py
===================================================================
--- short/3D/PyLith/trunk/tests/2d/tri3/TestShearPlaneStrain.py	2008-11-02 23:44:10 UTC (rev 13228)
+++ short/3D/PyLith/trunk/tests/2d/tri3/TestShearPlaneStrain.py	2008-11-02 23:44:49 UTC (rev 13229)
@@ -16,6 +16,8 @@
 ## 2-D box.
 
 import unittest
+from pylith.utils.VTKDataReader import has_vtk
+from pylith.utils.VTKDataReader import VTKDataReader
 
 # Local version of PyLithApp
 from pylith.PyLithApp import PyLithApp
@@ -47,14 +49,36 @@
     Setup for test.
     """
     run_pylith()
+    if has_vtk():
+      self.reader = VTKDataReader()
+    else:
+      self.reader = None
     return
 
 
-  def test_disp(self):
+  def test_elastic_info(self):
     """
-    Check displacement field.
+    Check elastic info.
     """
+    if self.reader is None:
+      return
+
+    data = self.reader.read("axialplanestrain-statevars-elastic_info.vtk")
     return
 
 
+  def test_soln(self):
+    """
+    Check solution (displacement) field.
+    """
+    return
+
+
+  def test_elastic_statevars(self):
+    """
+    Check elastic state variables.
+    """
+    return
+
+
 # End of file 

Modified: short/3D/PyLith/trunk/tests/2d/tri3/testpylith.py
===================================================================
--- short/3D/PyLith/trunk/tests/2d/tri3/testpylith.py	2008-11-02 23:44:10 UTC (rev 13228)
+++ short/3D/PyLith/trunk/tests/2d/tri3/testpylith.py	2008-11-02 23:44:49 UTC (rev 13229)
@@ -26,8 +26,8 @@
   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))
 
   return suite