[cig-commits] r14913 - in short/3D/PyLith/trunk: pylith/materials unittests/pytests/materials

[brad at geodynamics.org]

Author: brad
Date: 2009-05-06 19:44:34 -0700 (Wed, 06 May 2009)
New Revision: 14913

Modified:
   short/3D/PyLith/trunk/pylith/materials/ElasticMaterial.py
   short/3D/PyLith/trunk/pylith/materials/Material.py
   short/3D/PyLith/trunk/unittests/pytests/materials/TestElasticMaterial.py
Log:
Added missing initial stress and strain databases as facilities.

Modified: short/3D/PyLith/trunk/pylith/materials/ElasticMaterial.py
===================================================================
--- short/3D/PyLith/trunk/pylith/materials/ElasticMaterial.py	2009-05-07 01:55:26 UTC (rev 14912)
+++ short/3D/PyLith/trunk/pylith/materials/ElasticMaterial.py	2009-05-07 02:44:34 UTC (rev 14913)
@@ -39,19 +39,39 @@
     ## Python object for managing FaultCohesiveKin facilities and properties.
     ##
     ## \b Properties
-    ## @li None
+    ## @li \b use_initial_stress Use initial stress (true) or not (false).
+    ## @li \b use_initial_strain Use initial strain (true) or not (false).
     ##
     ## \b Facilities
     ## @li \b output Output manager associated with fault data.
+    ## @li \b initial_stress_db Database for initial stress.
+    ## @li \b initial_strain_db Database for initial strain.
 
     import pyre.inventory
 
+    useInitialStress = pyre.inventory.bool("use_initial_stress", default=False)
+    useInitialStress.meta['tip'] = "Use initial stress for material."
+
+    useInitialStrain = pyre.inventory.bool("use_initial_strain", default=False)
+    useInitialStrain.meta['tip'] = "Use initial strain for material."
+
     from pylith.meshio.OutputMatElastic import OutputMatElastic
     output = pyre.inventory.facility("output", family="output_manager",
                                      factory=OutputMatElastic)
     output.meta['tip'] = "Output manager for elastic material information."
 
+    from spatialdata.spatialdb.SimpleDB import SimpleDB
+    dbInitialStress = pyre.inventory.facility("initial_stress_db",
+                                              family="spatial_database",
+                                              factory=SimpleDB)
+    dbInitialStress.meta['tip'] = "Database for initial stress."
 
+    dbInitialStrain = pyre.inventory.facility("initial_strain_db",
+                                              family="spatial_database",
+                                              factory=SimpleDB)
+    dbInitialStrain.meta['tip'] = "Database for initial strain."
+
+
   # PUBLIC METHODS /////////////////////////////////////////////////////
 
   def __init__(self, name="elasticmaterial"):
@@ -70,6 +90,10 @@
     """
     Material._configure(self)
     self.output = self.inventory.output
+    if self.inventory.useInitialStress:
+      self.dbInitialStress(self.inventory.dbInitialStress)
+    if self.inventory.useInitialStrain:
+      self.dbInitialStrain(self.inventory.dbInitialStrain)
     return
 
   

Modified: short/3D/PyLith/trunk/pylith/materials/Material.py
===================================================================
--- short/3D/PyLith/trunk/pylith/materials/Material.py	2009-05-07 01:55:26 UTC (rev 14912)
+++ short/3D/PyLith/trunk/pylith/materials/Material.py	2009-05-07 02:44:34 UTC (rev 14913)
@@ -51,12 +51,12 @@
     ## \b Properties
     ## @li \b id Material identifier (from mesh generator)
     ## @li \b name Name of material
-    ## @li \b useInitialState Use initial state (true) or not (false).
+    ## @li \b use_initial_state Use initial state (true) or not (false).
     ##
     ## \b Facilities
     ## @li \b db Database of material property parameters
     ## @li \b quadrature Quadrature object for numerical integration
-    ## @li \b dbInitialState Database for initial state.
+    ## @li \b initial_state_db Database for initial state.
 
     import pyre.inventory
 

Modified: short/3D/PyLith/trunk/unittests/pytests/materials/TestElasticMaterial.py
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/materials/TestElasticMaterial.py	2009-05-07 01:55:26 UTC (rev 14912)
+++ short/3D/PyLith/trunk/unittests/pytests/materials/TestElasticMaterial.py	2009-05-07 02:44:34 UTC (rev 14913)
@@ -42,7 +42,10 @@
     db.inventory.iohandler = iohandler
     db._configure()
 
-    self.material.dbInitialStress(db)
+    material = self.material
+    material.inventory.dbInitialStress = db
+    material.inventory.useInitialStress = True
+    material._configure()
 
     # No test of result.
     return
@@ -59,7 +62,10 @@
     db.inventory.iohandler = iohandler
     db._configure()
 
-    self.material.dbInitialStrain(db)
+    material = self.material
+    material.inventory.dbInitialStrain = db
+    material.inventory.useInitialStrain = True
+    material._configure()
 
     # No test of result.
     return