[cig-commits] r12466 - in short/3D/PyLith/trunk: pylith/materials unittests/pytests/feassemble unittests/pytests/materials
willic3 at geodynamics.org
willic3 at geodynamics.org
Tue Jul 22 10:43:44 PDT 2008
Author: willic3
Date: 2008-07-22 10:43:44 -0700 (Tue, 22 Jul 2008)
New Revision: 12466
Modified:
short/3D/PyLith/trunk/pylith/materials/Material.py
short/3D/PyLith/trunk/unittests/pytests/feassemble/TestElasticityExplicit.py
short/3D/PyLith/trunk/unittests/pytests/feassemble/TestElasticityImplicit.py
short/3D/PyLith/trunk/unittests/pytests/materials/TestMaterial.py
Log:
Updated initialStress to initialState in Material.py, and updated Python
tests so they now pass with initialState.
Modified: short/3D/PyLith/trunk/pylith/materials/Material.py
===================================================================
--- short/3D/PyLith/trunk/pylith/materials/Material.py 2008-07-22 16:56:12 UTC (rev 12465)
+++ short/3D/PyLith/trunk/pylith/materials/Material.py 2008-07-22 17:43:44 UTC (rev 12466)
@@ -51,17 +51,17 @@
## \b Properties
## @li \b id Material identifier (from mesh generator)
## @li \b name Name of material
- ## @li \b useInitialStress Use initial stresses (true) or not (false).
+ ## @li \b useInitialState 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 initialStressDB Database for initial stresses.
+ ## @li \b initialStateDB Database for initial state.
import pyre.inventory
- useInitialStress = pyre.inventory.bool("use_initial_stress", default=False)
- useInitialStress.meta['tip'] = "Use initial stresses for material."
+ useInitialState = pyre.inventory.bool("use_initial_state", default=False)
+ useInitialState.meta['tip'] = "Use initial state for material."
id = pyre.inventory.int("id", default=0)
id.meta['tip'] = "Material identifier (from mesh generator)."
@@ -74,10 +74,10 @@
factory=SimpleDB)
db.meta['tip'] = "Database of material property parameters."
- initialStressDB = pyre.inventory.facility("initial_stress_db",
+ initialStateDB = pyre.inventory.facility("initial_state_db",
family="spatial_database",
factory=SimpleDB)
- initialStressDB.meta['tip'] = "Database used for initial stresses."
+ initialStateDB.meta['tip'] = "Database used for initial state."
from pylith.feassemble.quadrature.Quadrature import Quadrature
quadrature = pyre.inventory.facility("quadrature", factory=Quadrature)
@@ -143,10 +143,10 @@
assert(None != self.cppHandle)
self.db.initialize()
self.cppHandle.db = self.db.cppHandle
- if self.initialStressDB != None:
- self._info.log("Initializing initial stress database.")
- self.initialStressDB.initialize()
- self.cppHandle.initialStressDB = self.initialStressDB.cppHandle
+ if self.initialStateDB != None:
+ self._info.log("Initializing initial state database.")
+ self.initialStateDB.initialize()
+ self.cppHandle.initialStateDB = self.initialStateDB.cppHandle
self.cppHandle.initialize(mesh.cppHandle, mesh.coordsys.cppHandle,
self.quadrature.cppHandle)
@@ -172,10 +172,10 @@
self.label = self.inventory.label
self.db = self.inventory.db
self.quadrature = self.inventory.quadrature
- if self.inventory.useInitialStress:
- self.initialStressDB = self.inventory.initialStressDB
+ if self.inventory.useInitialState:
+ self.initialStateDB = self.inventory.initialStateDB
else:
- self.initialStressDB = None
+ self.initialStateDB = None
return
Modified: short/3D/PyLith/trunk/unittests/pytests/feassemble/TestElasticityExplicit.py
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/feassemble/TestElasticityExplicit.py 2008-07-22 16:56:12 UTC (rev 12465)
+++ short/3D/PyLith/trunk/unittests/pytests/feassemble/TestElasticityExplicit.py 2008-07-22 17:43:44 UTC (rev 12466)
@@ -68,6 +68,7 @@
db = SimpleDB()
db.label = "elastic plane strain"
db.iohandler = iohandler
+ initialStateDB = None
from pylith.materials.ElasticPlaneStrain import ElasticPlaneStrain
material = ElasticPlaneStrain()
@@ -75,6 +76,7 @@
material.label = "elastic plane strain"
material.db = db
material.quadrature = quadrature
+ material.initialStateDB = initialStateDB
from pylith.meshio.OutputMatElastic import OutputMatElastic
material.output = OutputMatElastic()
material.output._configure()
@@ -245,12 +247,14 @@
db = SimpleDB()
db.label = "elastic plane strain"
db.iohandler = iohandler
+ initialStateDB = None
from pylith.materials.ElasticPlaneStrain import ElasticPlaneStrain
material = ElasticPlaneStrain()
material.id = 0
material.label = "elastic plane strain"
material.db = db
+ material.initialStateDB = initialStateDB
material.quadrature = quadrature
from pylith.meshio.OutputMatElastic import OutputMatElastic
material.output = OutputMatElastic()
Modified: short/3D/PyLith/trunk/unittests/pytests/feassemble/TestElasticityImplicit.py
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/feassemble/TestElasticityImplicit.py 2008-07-22 16:56:12 UTC (rev 12465)
+++ short/3D/PyLith/trunk/unittests/pytests/feassemble/TestElasticityImplicit.py 2008-07-22 17:43:44 UTC (rev 12466)
@@ -68,12 +68,14 @@
db = SimpleDB()
db.label = "elastic plane strain"
db.iohandler = iohandler
+ initialStateDB = None
from pylith.materials.ElasticPlaneStrain import ElasticPlaneStrain
material = ElasticPlaneStrain()
material.id = 0
material.label = "elastic plane strain"
material.db = db
+ material.initialStateDB = initialStateDB
material.quadrature = quadrature
from pylith.meshio.OutputMatElastic import OutputMatElastic
material.output = OutputMatElastic()
@@ -240,12 +242,14 @@
db = SimpleDB()
db.label = "elastic plane strain"
db.iohandler = iohandler
+ initialStateDB = None
from pylith.materials.ElasticPlaneStrain import ElasticPlaneStrain
material = ElasticPlaneStrain()
material.id = 0
material.label = "elastic plane strain"
material.db = db
+ material.initialStateDB = initialStateDB
material.quadrature = quadrature
from pylith.meshio.OutputMatElastic import OutputMatElastic
material.output = OutputMatElastic()
Modified: short/3D/PyLith/trunk/unittests/pytests/materials/TestMaterial.py
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/materials/TestMaterial.py 2008-07-22 16:56:12 UTC (rev 12465)
+++ short/3D/PyLith/trunk/unittests/pytests/materials/TestMaterial.py 2008-07-22 17:43:44 UTC (rev 12466)
@@ -51,9 +51,11 @@
db = SimpleDB()
db.label = "material properties"
db.iohandler = iohandler
+ initialStateDB = None
material.db = db
material.label = "my material"
material.id = 54
+ material.initialStateDB = initialStateDB
from spatialdata.geocoords.CSCart import CSCart
cs = CSCart()
More information about the cig-commits
mailing list