[cig-commits] r13455 - in short/3D/PyLith/trunk: pylith/bc unittests/pytests/bc unittests/pytests/faults unittests/pytests/feassemble unittests/pytests/materials unittests/pytests/meshio
brad at geodynamics.org
brad at geodynamics.org
Wed Dec 3 12:38:21 PST 2008
Author: brad
Date: 2008-12-03 12:38:21 -0800 (Wed, 03 Dec 2008)
New Revision: 13455
Modified:
short/3D/PyLith/trunk/pylith/bc/DirichletBoundary.py
short/3D/PyLith/trunk/pylith/bc/DirichletPoints.py
short/3D/PyLith/trunk/pylith/bc/Neumann.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
short/3D/PyLith/trunk/unittests/pytests/meshio/TestMeshIOAscii.py
short/3D/PyLith/trunk/unittests/pytests/meshio/TestMeshIOCubit.py
short/3D/PyLith/trunk/unittests/pytests/meshio/TestMeshIOLagrit.py
short/3D/PyLith/trunk/unittests/pytests/meshio/TestOutputManager.py
short/3D/PyLith/trunk/unittests/pytests/meshio/TestOutputSolnSubset.py
Log:
Updated unit tests for nondimensionalization.
Modified: short/3D/PyLith/trunk/pylith/bc/DirichletBoundary.py
===================================================================
--- short/3D/PyLith/trunk/pylith/bc/DirichletBoundary.py 2008-12-03 20:03:22 UTC (rev 13454)
+++ short/3D/PyLith/trunk/pylith/bc/DirichletBoundary.py 2008-12-03 20:38:21 UTC (rev 13455)
@@ -143,8 +143,11 @@
logEvent = "%sinit" % self._loggingPrefix
self._logger.eventBegin(logEvent)
+ timeScale = normalizer.timeScale()
+ self.tRef = normalizer.nondimensionalize(self.tRef, timeScale)
+
assert(None != self.cppHandle)
- self.cppHandle.referenceTime = self.tRef.value
+ self.cppHandle.referenceTime = self.tRef
self.dbRate.initialize()
self.cppHandle.dbRate = self.dbRate.cppHandle
self.cppHandle.normalizer = normalizer.cppHandle
@@ -156,7 +159,7 @@
self.boundaryMesh.initialize(self.mesh.coordsys)
self.cppHandle.boundaryMesh(self.boundaryMesh.cppHandle)
- self.output.initialize()
+ self.output.initialize(normalizer)
self.output.writeInfo()
self._logger.eventEnd(logEvent)
Modified: short/3D/PyLith/trunk/pylith/bc/DirichletPoints.py
===================================================================
--- short/3D/PyLith/trunk/pylith/bc/DirichletPoints.py 2008-12-03 20:03:22 UTC (rev 13454)
+++ short/3D/PyLith/trunk/pylith/bc/DirichletPoints.py 2008-12-03 20:38:21 UTC (rev 13455)
@@ -127,9 +127,12 @@
"""
logEvent = "%sinit" % self._loggingPrefix
self._logger.eventBegin(logEvent)
+
+ timeScale = normalizer.timeScale()
+ self.tRef = normalizer.nondimensionalize(self.tRef, timeScale)
assert(None != self.cppHandle)
- self.cppHandle.referenceTime = self.tRef.value
+ self.cppHandle.referenceTime = self.tRef
self.dbRate.initialize()
self.cppHandle.dbRate = self.dbRate.cppHandle
self.cppHandle.normalizer = normalizer.cppHandle
Modified: short/3D/PyLith/trunk/pylith/bc/Neumann.py
===================================================================
--- short/3D/PyLith/trunk/pylith/bc/Neumann.py 2008-12-03 20:03:22 UTC (rev 13454)
+++ short/3D/PyLith/trunk/pylith/bc/Neumann.py 2008-12-03 20:38:21 UTC (rev 13455)
@@ -126,7 +126,7 @@
self.cppHandle.boundaryMesh(self.boundaryMesh.cppHandle)
if None != self.output:
- self.output.initialize(self.quadrature)
+ self.output.initialize(normalizer, self.quadrature)
self.output.writeInfo()
self._logger.eventEnd(logEvent)
Modified: short/3D/PyLith/trunk/unittests/pytests/bc/TestAbsorbingDampers.py
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/bc/TestAbsorbingDampers.py 2008-12-03 20:03:22 UTC (rev 13454)
+++ short/3D/PyLith/trunk/unittests/pytests/bc/TestAbsorbingDampers.py 2008-12-03 20:38:21 UTC (rev 13455)
@@ -18,8 +18,6 @@
from pylith.bc.AbsorbingDampers import AbsorbingDampers
-from pyre.units.time import second
-
# ----------------------------------------------------------------------
class TestAbsorbingDampers(unittest.TestCase):
"""
@@ -68,7 +66,7 @@
"""
(mesh, bc, fields) = self._initialize()
- dt = 0.25*second
+ dt = 0.25
bc.timeStep(dt)
return
@@ -79,7 +77,7 @@
"""
(mesh, bc, fields) = self._initialize()
- self.assertEqual(1.0e+30*second, bc.stableTimeStep())
+ self.assertEqual(1.0e+30, bc.stableTimeStep())
return
@@ -111,7 +109,7 @@
(mesh, bc, fields) = self._initialize()
residual = fields.getReal("residual")
- t = 0.02*second
+ t = 0.02
bc.integrateResidual(residual, t, fields)
# We should really add something here to check to make sure things
@@ -132,7 +130,7 @@
jacobian = mesh.createMatrix(fields.getReal("residual"))
import pylith.utils.petsc as petsc
petsc.mat_setzero(jacobian)
- t = 0.24*second
+ t = 0.24
bc.integrateJacobian(jacobian, t, fields)
self.assertEqual(False, bc.needNewJacobian())
@@ -150,9 +148,9 @@
"""
(mesh, bc, fields) = self._initialize()
- t = 0.50*second
- dt = 0.1*second
- totalTime = 5*second
+ t = 0.50
+ dt = 0.1
+ totalTime = 5
bc.poststep(t, dt, totalTime, fields)
# We should really add something here to check to make sure things
@@ -210,18 +208,19 @@
cs = CSCart()
cs.spaceDim = 2
+ from spatialdata.units.Nondimensional import Nondimensional
+ normalizer = Nondimensional()
+ normalizer.initialize()
+
from pylith.meshio.MeshIOAscii import MeshIOAscii
importer = MeshIOAscii()
importer.filename = "data/tri3.mesh"
importer.coordsys = cs
- mesh = importer.read(debug=False, interpolate=False)
+ mesh = importer.read(normalizer, debug=False, interpolate=False)
- from spatialdata.units.Nondimensional import Nondimensional
- normalizer = Nondimensional()
-
bc.preinitialize(mesh)
- bc.initialize(totalTime=0.0*second, numTimeSteps=1, normalizer=normalizer)
- bc.timeStep(0.01*second)
+ bc.initialize(totalTime=0.0, numTimeSteps=1, normalizer=normalizer)
+ bc.timeStep(0.01)
# Setup fields
from pylith.topology.FieldsManager import FieldsManager
Modified: short/3D/PyLith/trunk/unittests/pytests/bc/TestDirichletBoundary.py
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/bc/TestDirichletBoundary.py 2008-12-03 20:03:22 UTC (rev 13454)
+++ short/3D/PyLith/trunk/unittests/pytests/bc/TestDirichletBoundary.py 2008-12-03 20:38:21 UTC (rev 13455)
@@ -118,8 +118,7 @@
bc.setConstraintSizes(field)
mesh.allocateRealSection(field)
bc.setConstraints(field)
- from pyre.units.time import second
- t = 1.0*second
+ t = 1.0
bc.setField(t, field)
# We should really add something here to check to make sure things
@@ -178,18 +177,18 @@
cs = CSCart()
cs.spaceDim = 2
+ from spatialdata.units.Nondimensional import Nondimensional
+ normalizer = Nondimensional()
+ normalizer.initialize()
+
from pylith.meshio.MeshIOAscii import MeshIOAscii
importer = MeshIOAscii()
importer.filename = "data/tri3.mesh"
importer.coordsys = cs
- mesh = importer.read(debug=False, interpolate=False)
+ mesh = importer.read(normalizer, 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, normalizer=normalizer)
+ bc.initialize(totalTime=0.0, 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-12-03 20:03:22 UTC (rev 13454)
+++ short/3D/PyLith/trunk/unittests/pytests/bc/TestDirichletPoints.py 2008-12-03 20:38:21 UTC (rev 13455)
@@ -118,8 +118,7 @@
bc.setConstraintSizes(field)
mesh.allocateRealSection(field)
bc.setConstraints(field)
- from pyre.units.time import second
- t = 1.0*second
+ t = 1.0
bc.setField(t, field)
# We should really add something here to check to make sure things
@@ -177,18 +176,18 @@
cs = CSCart()
cs.spaceDim = 2
+ from spatialdata.units.Nondimensional import Nondimensional
+ normalizer = Nondimensional()
+ normalizer.initialize()
+
from pylith.meshio.MeshIOAscii import MeshIOAscii
importer = MeshIOAscii()
importer.filename = "data/tri3.mesh"
importer.coordsys = cs
- mesh = importer.read(debug=False, interpolate=False)
+ mesh = importer.read(normalizer, 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, normalizer=normalizer)
+ bc.initialize(totalTime=0.0, 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-12-03 20:03:22 UTC (rev 13454)
+++ short/3D/PyLith/trunk/unittests/pytests/bc/TestNeumann.py 2008-12-03 20:38:21 UTC (rev 13455)
@@ -18,8 +18,6 @@
from pylith.bc.Neumann import Neumann
-from pyre.units.time import second
-
# ----------------------------------------------------------------------
class TestNeumann(unittest.TestCase):
"""
@@ -68,7 +66,7 @@
"""
(mesh, bc, fields) = self._initialize()
- dt = 0.25*second
+ dt = 0.25
bc.timeStep(dt)
return
@@ -79,7 +77,7 @@
"""
(mesh, bc, fields) = self._initialize()
- self.assertEqual(1.0e+30*second, bc.stableTimeStep())
+ self.assertEqual(1.0e+30, bc.stableTimeStep())
return
@@ -111,7 +109,7 @@
(mesh, bc, fields) = self._initialize()
residual = fields.getReal("residual")
- t = 0.02*second
+ t = 0.02
bc.integrateResidual(residual, t, fields)
# We should really add something here to check to make sure things
@@ -131,7 +129,7 @@
jacobian = mesh.createMatrix(fields.getReal("residual"))
import pylith.utils.petsc as petsc
petsc.mat_setzero(jacobian)
- t = 0.24*second
+ t = 0.24
bc.integrateJacobian(jacobian, t, fields)
return
@@ -146,9 +144,9 @@
"""
(mesh, bc, fields) = self._initialize()
- t = 0.50*second
- dt = 0.1*second
- totalTime = 5*second
+ t = 0.50
+ dt = 0.1
+ totalTime = 5
bc.poststep(t, dt, totalTime, fields)
# We should really add something here to check to make sure things
@@ -207,18 +205,19 @@
cs = CSCart()
cs.spaceDim = 2
+ from spatialdata.units.Nondimensional import Nondimensional
+ normalizer = Nondimensional()
+ normalizer.initialize()
+
from pylith.meshio.MeshIOAscii import MeshIOAscii
importer = MeshIOAscii()
importer.filename = "data/tri3.mesh"
importer.coordsys = cs
- mesh = importer.read(debug=False, interpolate=False)
+ mesh = importer.read(normalizer, debug=False, interpolate=False)
- from spatialdata.units.Nondimensional import Nondimensional
- normalizer = Nondimensional()
-
bc.preinitialize(mesh)
- bc.initialize(totalTime=0.0*second, numTimeSteps=1, normalizer=normalizer)
- bc.timeStep(0.01*second)
+ bc.initialize(totalTime=0.0, numTimeSteps=1, normalizer=normalizer)
+ bc.timeStep(0.01)
# Setup fields
from pylith.topology.FieldsManager import FieldsManager
Modified: short/3D/PyLith/trunk/unittests/pytests/faults/TestFaultCohesiveKin.py
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/faults/TestFaultCohesiveKin.py 2008-12-03 20:03:22 UTC (rev 13454)
+++ short/3D/PyLith/trunk/unittests/pytests/faults/TestFaultCohesiveKin.py 2008-12-03 20:38:21 UTC (rev 13455)
@@ -59,11 +59,15 @@
cs = CSCart()
cs.spaceDim = 2
+ from spatialdata.units.Nondimensional import Nondimensional
+ normalizer = Nondimensional()
+ normalizer.initialize()
+
from pylith.meshio.MeshIOAscii import MeshIOAscii
importer = MeshIOAscii()
importer.filename = "data/tri3.mesh"
importer.coordsys = cs
- mesh = importer.read(debug=False, interpolate=False)
+ mesh = importer.read(normalizer, debug=False, interpolate=False)
fault = FaultCohesiveKin()
fault._configure()
@@ -95,8 +99,7 @@
"""
Test timeStep().
"""
- from pyre.units.time import second
- dt = 2.4*second
+ dt = 2.4
(mesh, fault, fields) = self._initialize()
fault.timeStep = dt
self.assertEqual(dt, fault.timeStep)
@@ -109,8 +112,7 @@
"""
(mesh, fault, fields) = self._initialize()
- from pyre.units.time import second
- self.assertEqual(1.0e+30*second, fault.stableTimeStep())
+ self.assertEqual(1.0e+30, fault.stableTimeStep())
return
@@ -145,7 +147,7 @@
(mesh, fault, fields) = self._initialize()
residual = fields.getReal("residual")
- t = 1.0*second
+ t = 1.0
fault.integrateResidual(residual, t, fields)
# We should really add something here to check to make sure things
@@ -165,7 +167,7 @@
jacobian = mesh.createMatrix(fields.getReal("residual"))
import pylith.utils.petsc as petsc
petsc.mat_setzero(jacobian)
- t = 1.0*second
+ t = 1.0
fault.integrateJacobian(jacobian, t, fields)
self.assertEqual(False, fault.needNewJacobian())
@@ -183,12 +185,12 @@
"""
(mesh, fault, fields) = self._initialize()
- t = 0.50*second
+ t = 0.50
residual = fields.getReal("residual")
fault.integrateResidual(residual, t, fields)
- dt = 0.1*second
- totalTime = 5*second
+ dt = 0.1
+ totalTime = 5
fault.poststep(t, dt, totalTime, fields)
# We should really add something here to check to make sure things
@@ -218,9 +220,12 @@
"""
Initialize fault.
"""
- from pyre.units.time import second
- dt = 2.4*second
+ dt = 2.4
+ from spatialdata.units.Nondimensional import Nondimensional
+ normalizer = Nondimensional()
+ normalizer.initialize()
+
# Setup mesh
cs = CSCart()
cs.spaceDim = 2
@@ -228,7 +233,7 @@
importer = MeshIOAscii()
importer.filename = "data/tri3.mesh"
importer.coordsys = cs
- mesh = importer.read(debug=False, interpolate=False)
+ mesh = importer.read(normalizer, debug=False, interpolate=False)
# Setup quadrature
from pylith.feassemble.FIATSimplex import FIATSimplex
@@ -268,9 +273,6 @@
slipfn.slipTime = dbSlipTime
slipfn.slipRate = dbPeakRate
- from spatialdata.units.Nondimensional import Nondimensional
- normalizer = Nondimensional()
-
ioMatDB = SimpleIOAscii()
ioMatDB.filename = "data/bulkprops_2d.spatialdb"
dbMat = SimpleDB()
Modified: short/3D/PyLith/trunk/unittests/pytests/feassemble/TestElasticityExplicit.py
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/feassemble/TestElasticityExplicit.py 2008-12-03 20:03:22 UTC (rev 13454)
+++ short/3D/PyLith/trunk/unittests/pytests/feassemble/TestElasticityExplicit.py 2008-12-03 20:38:21 UTC (rev 13455)
@@ -18,7 +18,6 @@
from pylith.feassemble.ElasticityExplicit import ElasticityExplicit
from spatialdata.geocoords.CSCart import CSCart
-from pyre.units.time import second
# ----------------------------------------------------------------------
class TestElasticityExplicit(unittest.TestCase):
@@ -40,6 +39,10 @@
"""
Test preiniitlaize().
"""
+ from spatialdata.units.Nondimensional import Nondimensional
+ normalizer = Nondimensional()
+ normalizer.initialize()
+
# Setup mesh
cs = CSCart()
cs.spaceDim = 2
@@ -47,7 +50,7 @@
importer = MeshIOAscii()
importer.filename = "data/tri3.mesh"
importer.coordsys = cs
- mesh = importer.read(debug=False, interpolate=False)
+ mesh = importer.read(normalizer, debug=False, interpolate=False)
# Setup material
from pylith.feassemble.FIATSimplex import FIATSimplex
@@ -94,8 +97,7 @@
"""
Test timeStep().
"""
- from pyre.units.time import second
- dt = 2.3*second
+ dt = 2.3
(mesh, integrator, fields) = self._initialize()
integrator.timeStep(dt)
return
@@ -107,8 +109,7 @@
"""
(mesh, integrator, fields) = self._initialize()
- from pyre.units.time import second
- self.assertEqual(1.0e+30*second, integrator.stableTimeStep())
+ self.assertEqual(1.0e+30, integrator.stableTimeStep())
return
@@ -145,7 +146,7 @@
residual = fields.getReal("residual")
- t = 0.45*second
+ t = 0.45
integrator.integrateResidual(residual, t, fields)
# We should really add something here to check to make sure things
@@ -165,7 +166,7 @@
jacobian = mesh.createMatrix(fields.getReal("residual"))
import pylith.utils.petsc as petsc
petsc.mat_setzero(jacobian)
- t = 0.145*second
+ t = 0.145
integrator.integrateJacobian(jacobian, t, fields)
self.assertEqual(False, integrator.needNewJacobian())
@@ -183,13 +184,13 @@
"""
(mesh, integrator, fields) = self._initialize()
- t = 3.45*second
+ t = 3.45
residual = fields.getReal("residual")
integrator.integrateResidual(residual, t, fields)
- dt = 0.02*second
- totalTime = 5.0*second
+ dt = 0.02
+ totalTime = 5.0
integrator.poststep(t, dt, totalTime, fields)
# We should really add something here to check to make sure things
@@ -219,9 +220,12 @@
"""
Initialize integrator.
"""
- from pyre.units.time import second
- dt = 2.3*second
+ dt = 2.3
+ from spatialdata.units.Nondimensional import Nondimensional
+ normalizer = Nondimensional()
+ normalizer.initialize()
+
# Setup mesh
cs = CSCart()
cs.spaceDim = 2
@@ -229,7 +233,7 @@
importer = MeshIOAscii()
importer.filename = "data/tri3.mesh"
importer.coordsys = cs
- mesh = importer.read(debug=False, interpolate=False)
+ mesh = importer.read(normalizer, debug=False, interpolate=False)
# Setup material
from pylith.feassemble.FIATSimplex import FIATSimplex
@@ -263,10 +267,6 @@
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)
Modified: short/3D/PyLith/trunk/unittests/pytests/feassemble/TestElasticityImplicit.py
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/feassemble/TestElasticityImplicit.py 2008-12-03 20:03:22 UTC (rev 13454)
+++ short/3D/PyLith/trunk/unittests/pytests/feassemble/TestElasticityImplicit.py 2008-12-03 20:38:21 UTC (rev 13455)
@@ -18,7 +18,6 @@
from pylith.feassemble.ElasticityImplicit import ElasticityImplicit
from spatialdata.geocoords.CSCart import CSCart
-from pyre.units.time import year
# ----------------------------------------------------------------------
class TestElasticityImplicit(unittest.TestCase):
@@ -40,6 +39,10 @@
"""
Test preiniitlaize().
"""
+ from spatialdata.units.Nondimensional import Nondimensional
+ normalizer = Nondimensional()
+ normalizer.initialize()
+
# Setup mesh
cs = CSCart()
cs.spaceDim = 2
@@ -47,7 +50,7 @@
importer = MeshIOAscii()
importer.filename = "data/tri3.mesh"
importer.coordsys = cs
- mesh = importer.read(debug=False, interpolate=False)
+ mesh = importer.read(normalizer, debug=False, interpolate=False)
# Setup material
from pylith.feassemble.FIATSimplex import FIATSimplex
@@ -94,8 +97,7 @@
"""
Test timeStep().
"""
- from pyre.units.time import second
- dt = 2.3*second
+ dt = 2.3
(mesh, integrator, fields) = self._initialize()
integrator.timeStep(dt)
return
@@ -107,8 +109,7 @@
"""
(mesh, integrator, fields) = self._initialize()
- from pyre.units.time import second
- self.assertEqual(1.0e+30*second, integrator.stableTimeStep())
+ self.assertEqual(1.0e+30, integrator.stableTimeStep())
return
@@ -140,7 +141,7 @@
(mesh, integrator, fields) = self._initialize()
residual = fields.getReal("residual")
- t = 3.4*year
+ t = 3.4
integrator.integrateResidual(residual, t, fields)
# We should really add something here to check to make sure things
@@ -160,7 +161,7 @@
jacobian = mesh.createMatrix(fields.getReal("residual"))
import pylith.utils.petsc as petsc
petsc.mat_setzero(jacobian)
- t = 7.3*year
+ t = 7.3
integrator.integrateJacobian(jacobian, t, fields)
self.assertEqual(False, integrator.needNewJacobian())
@@ -178,13 +179,13 @@
"""
(mesh, integrator, fields) = self._initialize()
- t = 0.27*year
+ t = 0.27
residual = fields.getReal("residual")
integrator.integrateResidual(residual, t, fields)
- dt = 0.01*year
- totalTime = 10*year
+ dt = 0.01
+ totalTime = 10
integrator.poststep(t, dt, totalTime, fields)
# We should really add something here to check to make sure things
@@ -214,9 +215,12 @@
"""
Initialize integrator.
"""
- from pyre.units.time import second
- dt = 2.3*second
+ dt = 2.3
+ from spatialdata.units.Nondimensional import Nondimensional
+ normalizer = Nondimensional()
+ normalizer.initialize()
+
# Setup mesh
cs = CSCart()
cs.spaceDim = 2
@@ -224,7 +228,7 @@
importer = MeshIOAscii()
importer.filename = "data/tri3.mesh"
importer.coordsys = cs
- mesh = importer.read(debug=False, interpolate=False)
+ mesh = importer.read(normalizer, debug=False, interpolate=False)
# Setup material
from pylith.feassemble.FIATSimplex import FIATSimplex
@@ -258,10 +262,6 @@
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)
Modified: short/3D/PyLith/trunk/unittests/pytests/materials/TestMaterial.py
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/materials/TestMaterial.py 2008-12-03 20:03:22 UTC (rev 13454)
+++ short/3D/PyLith/trunk/unittests/pytests/materials/TestMaterial.py 2008-12-03 20:38:21 UTC (rev 13455)
@@ -62,16 +62,16 @@
cs = CSCart()
cs.spaceDim = 1
+ from spatialdata.units.Nondimensional import Nondimensional
+ normalizer = Nondimensional()
+ normalizer.initialize()
+
from pylith.meshio.MeshIOAscii import MeshIOAscii
importer = MeshIOAscii()
importer.filename = "data/twoelems.mesh"
importer.coordsys = cs
- mesh = importer.read(debug=False, interpolate=False)
+ mesh = importer.read(normalizer, 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
Modified: short/3D/PyLith/trunk/unittests/pytests/meshio/TestMeshIOAscii.py
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/meshio/TestMeshIOAscii.py 2008-12-03 20:03:22 UTC (rev 13454)
+++ short/3D/PyLith/trunk/unittests/pytests/meshio/TestMeshIOAscii.py 2008-12-03 20:38:21 UTC (rev 13455)
@@ -54,10 +54,14 @@
filenameIn = "data/mesh2Din3D.txt"
filenameOut = "data/mesh2Din3D_test.txt"
+ from spatialdata.units.Nondimensional import Nondimensional
+ normalizer = Nondimensional()
+ normalizer.initialize()
+
from spatialdata.geocoords.CSCart import CSCart
iohandler.filename = filenameIn
iohandler.coordsys = CSCart()
- mesh = iohandler.read(debug=False, interpolate=False)
+ mesh = iohandler.read(normalizer, debug=False, interpolate=False)
self.assertEqual(2, mesh.dimension())
Modified: short/3D/PyLith/trunk/unittests/pytests/meshio/TestMeshIOCubit.py
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/meshio/TestMeshIOCubit.py 2008-12-03 20:03:22 UTC (rev 13454)
+++ short/3D/PyLith/trunk/unittests/pytests/meshio/TestMeshIOCubit.py 2008-12-03 20:38:21 UTC (rev 13455)
@@ -60,9 +60,13 @@
filenameOut = "data/twohex8_test.txt"
filenameE = "data/twohex8.txt"
+ from spatialdata.units.Nondimensional import Nondimensional
+ normalizer = Nondimensional()
+ normalizer.initialize()
+
iohandler.filename = filenameIn
iohandler.coordsys = CSCart()
- mesh = iohandler.read(debug=False, interpolate=False)
+ mesh = iohandler.read(normalizer, debug=False, interpolate=False)
self.assertEqual(3, mesh.dimension())
testhandler = MeshIOAscii()
Modified: short/3D/PyLith/trunk/unittests/pytests/meshio/TestMeshIOLagrit.py
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/meshio/TestMeshIOLagrit.py 2008-12-03 20:03:22 UTC (rev 13454)
+++ short/3D/PyLith/trunk/unittests/pytests/meshio/TestMeshIOLagrit.py 2008-12-03 20:38:21 UTC (rev 13455)
@@ -67,10 +67,14 @@
filenameOut = "data/cube2_test.txt"
filenameE = "data/cube2.txt"
+ from spatialdata.units.Nondimensional import Nondimensional
+ normalizer = Nondimensional()
+ normalizer.initialize()
+
iohandler.filenameGmv = filenameGmvIn
iohandler.filenamePset = filenamePsetIn
iohandler.coordsys = CSCart()
- mesh = iohandler.read(debug=False, interpolate=False)
+ mesh = iohandler.read(normalizer, debug=False, interpolate=False)
self.assertEqual(3, mesh.dimension())
testhandler = MeshIOAscii()
Modified: short/3D/PyLith/trunk/unittests/pytests/meshio/TestOutputManager.py
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/meshio/TestOutputManager.py 2008-12-03 20:03:22 UTC (rev 13454)
+++ short/3D/PyLith/trunk/unittests/pytests/meshio/TestOutputManager.py 2008-12-03 20:38:21 UTC (rev 13455)
@@ -38,10 +38,14 @@
iohandler = MeshIOAscii()
filename = "data/twohex8.txt"
+ from spatialdata.units.Nondimensional import Nondimensional
+ normalizer = Nondimensional()
+ normalizer.initialize()
+
from spatialdata.geocoords.CSCart import CSCart
iohandler.filename = filename
iohandler.coordsys = CSCart()
- mesh = iohandler.read(debug=False, interpolate=False)
+ mesh = iohandler.read(normalizer, debug=False, interpolate=False)
from pylith.topology.FieldsManager import FieldsManager
fields = FieldsManager(mesh)
@@ -107,6 +111,13 @@
Unit testing of Python OutputManager object.
"""
+ def setUp(self):
+ from spatialdata.units.Nondimensional import Nondimensional
+ self.normalizer = Nondimensional()
+ self.normalizer.initialize()
+ return
+
+
def test_constructor(self):
"""
Test constructor.
@@ -124,7 +135,7 @@
output = OutputManager()
output._configure()
output.writer._configure()
- output.writer.initialize()
+ output.writer.initialize(self.normalizer)
output._sync()
self.assertNotEqual(None, output.cppHandle)
return
@@ -169,7 +180,7 @@
output.writer.filename = "test.vtk"
dataProvider = TestProvider()
output.preinitialize(dataProvider)
- output.initialize()
+ output.initialize(self.normalizer)
self.assertNotEqual(None, output.cppHandle)
# With quadrature
@@ -189,7 +200,7 @@
output.writer.filename = "test.vtk"
dataProvider = TestProvider()
output.preinitialize(dataProvider)
- output.initialize(quadrature)
+ output.initialize(self.normalizer, quadrature)
self.assertNotEqual(None, output.cppHandle)
return
@@ -204,10 +215,9 @@
output.writer.filename = "output.vtk"
dataProvider = TestProvider()
output.preinitialize(dataProvider)
- output.initialize()
+ output.initialize(self.normalizer)
- from pyre.units.time import s
- output.open(totalTime=5.0*s, numTimeSteps=2)
+ output.open(totalTime=5.0, numTimeSteps=2)
output.close()
return
@@ -225,10 +235,9 @@
dataProvider = TestProvider()
output.preinitialize(dataProvider)
- output.initialize()
+ output.initialize(self.normalizer)
- from pyre.units.time import s
- output.open(totalTime=5.0*s, numTimeSteps=2)
+ output.open(totalTime=5.0, numTimeSteps=2)
output.writeInfo()
output.close()
return
@@ -249,11 +258,10 @@
dataProvider = TestProvider()
output.preinitialize(dataProvider)
- output.initialize()
+ output.initialize(self.normalizer)
- from pyre.units.time import s
- output.open(totalTime=5.0*s, numTimeSteps=2)
- output.writeData(2.0*s, dataProvider.fields)
+ output.open(totalTime=5.0, numTimeSteps=2)
+ output.writeData(2.0, dataProvider.fields)
output.close()
return
@@ -262,19 +270,26 @@
"""
Test _checkWrite().
"""
- from pyre.units.time import s
+ dataProvider = TestProvider()
# Default values should be true
output = OutputManager()
output._configure()
- self.assertEqual(True, output._checkWrite(0.0*s))
- self.assertEqual(True, output._checkWrite(3.234e+8*s))
+ output.writer._configure()
+ output.preinitialize(dataProvider)
+ output.initialize(self.normalizer)
+ self.assertEqual(True, output._checkWrite(0.0))
+ self.assertEqual(True, output._checkWrite(3.234e+8))
# Check writing based on time
output = OutputManager()
output._configure()
+ output.writer._configure()
+ output.preinitialize(dataProvider)
+ output.initialize(self.normalizer)
+
output.outputFreq = "time_step"
- t = 0.0*s
+ t = 0.0
dt = output.dt
self.assertEqual(True, output._checkWrite(t))
self.assertEqual(False, output._checkWrite(t))
@@ -287,10 +302,13 @@
# Check writing based on number of steps
output = OutputManager()
output._configure()
+ output.writer._configure()
+ output.preinitialize(dataProvider)
+ output.initialize(self.normalizer)
output.outputFreq = "skip"
output.skip = 1
- t = 0.0*s
- dt = 1.0*s
+ t = 0.0
+ dt = 1.0
self.assertEqual(True, output._checkWrite(t))
t += dt
self.assertEqual(False, output._checkWrite(t))
Modified: short/3D/PyLith/trunk/unittests/pytests/meshio/TestOutputSolnSubset.py
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/meshio/TestOutputSolnSubset.py 2008-12-03 20:03:22 UTC (rev 13454)
+++ short/3D/PyLith/trunk/unittests/pytests/meshio/TestOutputSolnSubset.py 2008-12-03 20:38:21 UTC (rev 13455)
@@ -29,10 +29,14 @@
iohandler = MeshIOAscii()
filename = "data/twohex8.txt"
+ from spatialdata.units.Nondimensional import Nondimensional
+ normalizer = Nondimensional()
+ normalizer.initialize()
+
from spatialdata.geocoords.CSCart import CSCart
iohandler.filename = filename
iohandler.coordsys = CSCart()
- mesh = iohandler.read(debug=False, interpolate=False)
+ mesh = iohandler.read(normalizer, debug=False, interpolate=False)
from pylith.topology.FieldsManager import FieldsManager
fields = FieldsManager(mesh)
@@ -45,6 +49,7 @@
self.mesh = mesh
self.fields = fields
+ self.normalizer = normalizer
return
@@ -96,7 +101,7 @@
output.writer.filename = "test.vtk"
output.preinitialize()
- output.initialize(self.mesh)
+ output.initialize(self.mesh, self.normalizer)
self.assertNotEqual(None, output.cppHandle)
return
@@ -112,7 +117,7 @@
output.writer.filename = "test.vtk"
output.preinitialize()
- output.initialize(self.mesh)
+ output.initialize(self.mesh, self.normalizer)
from pyre.units.time import s
output.open(totalTime=5.0*s, numTimeSteps=2)
@@ -131,10 +136,9 @@
output.writer.filename = "output_sub.vtk"
output.preinitialize()
- output.initialize(self.mesh)
+ output.initialize(self.mesh, self.normalizer)
- from pyre.units.time import s
- output.open(totalTime=5.0*s, numTimeSteps=2)
+ output.open(totalTime=5.0, numTimeSteps=2)
output.writeInfo()
output.close()
return
@@ -153,11 +157,10 @@
output.vertexDataFields = ["displacements"]
output.preinitialize()
- output.initialize(self.mesh)
+ output.initialize(self.mesh, self.normalizer)
- from pyre.units.time import s
- output.open(totalTime=5.0*s, numTimeSteps=2)
- output.writeData(2.0*s, self.fields)
+ output.open(totalTime=5.0, numTimeSteps=2)
+ output.writeData(2.0, self.fields)
output.close()
return
More information about the CIG-COMMITS
mailing list