[cig-commits] r13422 - in short/3D/PyLith/trunk: pylith/bc unittests/pytests/bc unittests/pytests/faults unittests/pytests/feassemble unittests/pytests/materials
brad at geodynamics.org
brad at geodynamics.org
Sat Nov 29 16:29:41 PST 2008
Author: brad
Date: 2008-11-29 16:29:41 -0800 (Sat, 29 Nov 2008)
New Revision: 13422
Modified:
short/3D/PyLith/trunk/pylith/bc/DirichletBoundary.py
short/3D/PyLith/trunk/unittests/pytests/bc/TestAbsorbingDampers.py
short/3D/PyLith/trunk/unittests/pytests/bc/TestDirichletBoundary.py
short/3D/PyLith/trunk/unittests/pytests/bc/TestDirichletPoints.py
short/3D/PyLith/trunk/unittests/pytests/bc/TestNeumann.py
short/3D/PyLith/trunk/unittests/pytests/faults/TestFaultCohesiveKin.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 Python unit tests for changes to interfaces associated with nondimensionalization.
Modified: short/3D/PyLith/trunk/pylith/bc/DirichletBoundary.py
===================================================================
--- short/3D/PyLith/trunk/pylith/bc/DirichletBoundary.py 2008-11-29 23:58:23 UTC (rev 13421)
+++ short/3D/PyLith/trunk/pylith/bc/DirichletBoundary.py 2008-11-30 00:29:41 UTC (rev 13422)
@@ -136,7 +136,7 @@
return
- def initialize(self, totalTime, numTimeSteps):
+ def initialize(self, totalTime, numTimeSteps, normalizer):
"""
Initialize DirichletBoundary boundary condition.
"""
@@ -148,7 +148,7 @@
self.dbRate.initialize()
self.cppHandle.dbRate = self.dbRate.cppHandle
- BoundaryCondition.initialize(self, totalTime, numTimeSteps)
+ BoundaryCondition.initialize(self, totalTime, numTimeSteps, normalizer)
from pylith.topology.Mesh import Mesh
self.boundaryMesh = Mesh()
Modified: short/3D/PyLith/trunk/unittests/pytests/bc/TestAbsorbingDampers.py
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/bc/TestAbsorbingDampers.py 2008-11-29 23:58:23 UTC (rev 13421)
+++ short/3D/PyLith/trunk/unittests/pytests/bc/TestAbsorbingDampers.py 2008-11-30 00:29:41 UTC (rev 13422)
@@ -216,8 +216,11 @@
importer.coordsys = cs
mesh = importer.read(debug=False, interpolate=False)
+ from spatialdata.units.Nondimensional import Nondimensional
+ normalizer = Nondimensional()
+
bc.preinitialize(mesh)
- bc.initialize(totalTime=0.0*second, numTimeSteps=1)
+ bc.initialize(totalTime=0.0*second, numTimeSteps=1, normalizer=normalizer)
bc.timeStep(0.01*second)
# Setup fields
Modified: short/3D/PyLith/trunk/unittests/pytests/bc/TestDirichletBoundary.py
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/bc/TestDirichletBoundary.py 2008-11-29 23:58:23 UTC (rev 13421)
+++ short/3D/PyLith/trunk/unittests/pytests/bc/TestDirichletBoundary.py 2008-11-30 00:29:41 UTC (rev 13422)
@@ -184,9 +184,12 @@
importer.coordsys = cs
mesh = importer.read(debug=False, interpolate=False)
+ from spatialdata.units.Nondimensional import Nondimensional
+ normalizer = Nondimensional()
+
bc.preinitialize(mesh)
from pyre.units.time import second
- bc.initialize(totalTime=0.0*second, numTimeSteps=1)
+ bc.initialize(totalTime=0.0*second, numTimeSteps=1, normalizer=normalizer)
# Setup fields
from pylith.topology.FieldsManager import FieldsManager
Modified: short/3D/PyLith/trunk/unittests/pytests/bc/TestDirichletPoints.py
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/bc/TestDirichletPoints.py 2008-11-29 23:58:23 UTC (rev 13421)
+++ short/3D/PyLith/trunk/unittests/pytests/bc/TestDirichletPoints.py 2008-11-30 00:29:41 UTC (rev 13422)
@@ -183,9 +183,12 @@
importer.coordsys = cs
mesh = importer.read(debug=False, interpolate=False)
+ from spatialdata.units.Nondimensional import Nondimensional
+ normalizer = Nondimensional()
+
bc.preinitialize(mesh)
from pyre.units.time import second
- bc.initialize(totalTime=0.0*second, numTimeSteps=1)
+ bc.initialize(totalTime=0.0*second, numTimeSteps=1, normalizer=normalizer)
# Setup fields
from pylith.topology.FieldsManager import FieldsManager
Modified: short/3D/PyLith/trunk/unittests/pytests/bc/TestNeumann.py
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/bc/TestNeumann.py 2008-11-29 23:58:23 UTC (rev 13421)
+++ short/3D/PyLith/trunk/unittests/pytests/bc/TestNeumann.py 2008-11-30 00:29:41 UTC (rev 13422)
@@ -213,8 +213,11 @@
importer.coordsys = cs
mesh = importer.read(debug=False, interpolate=False)
+ from spatialdata.units.Nondimensional import Nondimensional
+ normalizer = Nondimensional()
+
bc.preinitialize(mesh)
- bc.initialize(totalTime=0.0*second, numTimeSteps=1)
+ bc.initialize(totalTime=0.0*second, numTimeSteps=1, normalizer=normalizer)
bc.timeStep(0.01*second)
# Setup fields
Modified: short/3D/PyLith/trunk/unittests/pytests/faults/TestFaultCohesiveKin.py
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/faults/TestFaultCohesiveKin.py 2008-11-29 23:58:23 UTC (rev 13421)
+++ short/3D/PyLith/trunk/unittests/pytests/faults/TestFaultCohesiveKin.py 2008-11-30 00:29:41 UTC (rev 13422)
@@ -268,6 +268,9 @@
slipfn.slipTime = dbSlipTime
slipfn.slipRate = dbPeakRate
+ from spatialdata.units.Nondimensional import Nondimensional
+ normalizer = Nondimensional()
+
ioMatDB = SimpleIOAscii()
ioMatDB.filename = "data/bulkprops_2d.spatialdb"
dbMat = SimpleDB()
@@ -293,7 +296,7 @@
fault.timeStep(dt)
fault.verifyConfiguration()
from pyre.units.time import s
- fault.initialize(totalTime=0.0*s, numTimeSteps=1)
+ fault.initialize(totalTime=0.0*s, numTimeSteps=1, normalizer=normalizer)
# Setup fields
from pylith.topology.FieldsManager import FieldsManager
Modified: short/3D/PyLith/trunk/unittests/pytests/feassemble/TestElasticityExplicit.py
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/feassemble/TestElasticityExplicit.py 2008-11-29 23:58:23 UTC (rev 13421)
+++ short/3D/PyLith/trunk/unittests/pytests/feassemble/TestElasticityExplicit.py 2008-11-30 00:29:41 UTC (rev 13422)
@@ -263,11 +263,15 @@
material.output._configure()
material.output.writer._configure()
+ from spatialdata.units.Nondimensional import Nondimensional
+ normalizer = Nondimensional()
+ normalizer.initialize()
+
# Setup integrator
integrator = ElasticityExplicit()
integrator.preinitialize(mesh, material)
from pyre.units.time import s
- integrator.initialize(totalTime=0.0*s, numTimeSteps=1)
+ integrator.initialize(totalTime=0.0*s, numTimeSteps=1, normalizer=normalizer)
integrator.timeStep(dt)
# Setup fields
Modified: short/3D/PyLith/trunk/unittests/pytests/feassemble/TestElasticityImplicit.py
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/feassemble/TestElasticityImplicit.py 2008-11-29 23:58:23 UTC (rev 13421)
+++ short/3D/PyLith/trunk/unittests/pytests/feassemble/TestElasticityImplicit.py 2008-11-30 00:29:41 UTC (rev 13422)
@@ -258,11 +258,15 @@
material.output._configure()
material.output.writer._configure()
+ from spatialdata.units.Nondimensional import Nondimensional
+ normalizer = Nondimensional()
+ normalizer.initialize()
+
# Setup integrator
integrator = ElasticityImplicit()
integrator.preinitialize(mesh, material)
from pyre.units.time import s
- integrator.initialize(totalTime=0.0*s, numTimeSteps=1)
+ integrator.initialize(totalTime=0.0*s, numTimeSteps=1, normalizer=normalizer)
integrator.timeStep(dt)
# Setup fields
Modified: short/3D/PyLith/trunk/unittests/pytests/materials/TestMaterial.py
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/materials/TestMaterial.py 2008-11-29 23:58:23 UTC (rev 13421)
+++ short/3D/PyLith/trunk/unittests/pytests/materials/TestMaterial.py 2008-11-30 00:29:41 UTC (rev 13422)
@@ -68,11 +68,15 @@
importer.coordsys = cs
mesh = importer.read(debug=False, interpolate=False)
+ from spatialdata.units.Nondimensional import Nondimensional
+ normalizer = Nondimensional()
+ normalizer.initialize()
+
material.preinitialize()
from pyre.units.time import second
totalTime = 0.0*second
numTimeSteps = 1
- material.initialize(mesh, totalTime, numTimeSteps)
+ material.initialize(mesh, totalTime, numTimeSteps, normalizer)
# We should really add something here to check to make sure things
# actually initialized correctly
More information about the CIG-COMMITS
mailing list