[cig-commits] r18944 - in short/3D/PyLith/trunk/unittests/libtests: feassemble/data materials/data
brad at geodynamics.org
brad at geodynamics.org
Mon Sep 19 15:53:19 PDT 2011
Author: brad
Date: 2011-09-19 15:53:19 -0700 (Mon, 19 Sep 2011)
New Revision: 18944
Modified:
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitApp.py
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/IntegratorApp.py
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureApp.py
short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticMaterialApp.py
Log:
Updated Python utility code to use PylithScalar.
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitApp.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitApp.py 2011-09-19 22:47:11 UTC (rev 18943)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitApp.py 2011-09-19 22:53:19 UTC (rev 18944)
@@ -85,10 +85,10 @@
ElasticityApp._initData(self)
# Calculated values
- self.data.addArray(vtype="double", name="_valsResidualLumped",
+ self.data.addArray(vtype="PylithScalar", name="_valsResidualLumped",
values=self.valsResidualLumped,
format="%16.8e", ncols=self.spaceDim)
- self.data.addArray(vtype="double", name="_valsJacobianLumped",
+ self.data.addArray(vtype="PylithScalar", name="_valsJacobianLumped",
values=self.valsJacobianLumped,
format="%16.8e", ncols=self.spaceDim)
return
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/IntegratorApp.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/IntegratorApp.py 2011-09-19 22:47:11 UTC (rev 18943)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/IntegratorApp.py 2011-09-19 22:53:19 UTC (rev 18944)
@@ -205,13 +205,13 @@
format="%d")
self.data.addScalar(vtype="int", name="_numCells", value=self.numCells,
format="%d")
- self.data.addArray(vtype="double", name="_gravityVec", values=self.gravityVec,
+ self.data.addArray(vtype="PylithScalar", name="_gravityVec", values=self.gravityVec,
format="%16.8e", ncols=self.spaceDim)
- self.data.addArray(vtype="double", name="_vertices", values=self.vertices,
+ self.data.addArray(vtype="PylithScalar", name="_vertices", values=self.vertices,
format="%16.8e", ncols=self.spaceDim)
self.data.addArray(vtype="int", name="_cells", values=self.cells,
format="%d", ncols=self.numBasis)
- self.data.addArray(vtype="double", name="_verticesRef", values=self.verticesRef,
+ self.data.addArray(vtype="PylithScalar", name="_verticesRef", values=self.verticesRef,
format="%16.8e", ncols=self.cellDim)
# Quadrature information
@@ -219,13 +219,13 @@
format="%d")
self.data.addScalar(vtype="int", name="_numQuadPts", value=self.numQuadPts,
format="%d")
- self.data.addArray(vtype="double", name="_quadPts", values=self.quadPts,
+ self.data.addArray(vtype="PylithScalar", name="_quadPts", values=self.quadPts,
format="%16.8e", ncols=self.cellDim)
- self.data.addArray(vtype="double", name="_quadWts", values=self.quadWts,
+ self.data.addArray(vtype="PylithScalar", name="_quadWts", values=self.quadWts,
format="%16.8e", ncols=self.numQuadPts)
- self.data.addArray(vtype="double", name="_basis", values=self.basis,
+ self.data.addArray(vtype="PylithScalar", name="_basis", values=self.basis,
format="%16.8e", ncols=self.cellDim)
- self.data.addArray(vtype="double", name="_basisDerivRef",
+ self.data.addArray(vtype="PylithScalar", name="_basisDerivRef",
values=self.basisDerivRef,
format="%16.8e", ncols=self.cellDim)
@@ -240,23 +240,23 @@
value=self.matLabel, format='"%s"')
# Input files
- self.data.addScalar(vtype="double", name="_dt", value=self.dt,
+ self.data.addScalar(vtype="PylithScalar", name="_dt", value=self.dt,
format="%16.8e")
- self.data.addArray(vtype="double", name="_fieldTIncr",
+ self.data.addArray(vtype="PylithScalar", name="_fieldTIncr",
values=self.fieldTIncr,
format="%16.8e", ncols=self.spaceDim)
- self.data.addArray(vtype="double", name="_fieldT",
+ self.data.addArray(vtype="PylithScalar", name="_fieldT",
values=self.fieldT,
format="%16.8e", ncols=self.spaceDim)
- self.data.addArray(vtype="double", name="_fieldTmdt",
+ self.data.addArray(vtype="PylithScalar", name="_fieldTmdt",
values=self.fieldTmdt,
format="%16.8e", ncols=self.spaceDim)
# Calculated values
- self.data.addArray(vtype="double", name="_valsResidual",
+ self.data.addArray(vtype="PylithScalar", name="_valsResidual",
values=self.valsResidual,
format="%16.8e", ncols=self.spaceDim)
- self.data.addArray(vtype="double", name="_valsJacobian",
+ self.data.addArray(vtype="PylithScalar", name="_valsJacobian",
values=self.valsJacobian,
format="%16.8e", ncols=self.spaceDim)
return
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureApp.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureApp.py 2011-09-19 22:47:11 UTC (rev 18943)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureApp.py 2011-09-19 22:53:19 UTC (rev 18944)
@@ -164,39 +164,39 @@
value=self.numQuadPts,
format="%d")
- self.data.addArray(vtype="double", name="_vertices", values=self.vertices,
+ self.data.addArray(vtype="PylithScalar", name="_vertices", values=self.vertices,
format="%16.8e", ncols=self.spaceDim)
self.data.addArray(vtype="int", name="_cells", values=self.cells,
format="%8d", ncols=self.numVertices)
- self.data.addArray(vtype="double", name="_verticesRef",
+ self.data.addArray(vtype="PylithScalar", name="_verticesRef",
values=self.verticesRef,
format="%16.8e", ncols=self.cellDim)
- self.data.addArray(vtype="double", name="_quadPtsRef",
+ self.data.addArray(vtype="PylithScalar", name="_quadPtsRef",
values=self.quadPtsRef,
format="%16.8e", ncols=self.cellDim)
- self.data.addArray(vtype="double", name="_quadWts", values=self.quadWts,
+ self.data.addArray(vtype="PylithScalar", name="_quadWts", values=self.quadWts,
format="%16.8e", ncols=self.numQuadPts)
- self.data.addArray(vtype="double", name="_quadPts",
+ self.data.addArray(vtype="PylithScalar", name="_quadPts",
values=self.quadPts,
format="%16.8e", ncols=self.spaceDim)
- self.data.addArray(vtype="double", name="_basis",
+ self.data.addArray(vtype="PylithScalar", name="_basis",
values=self.basis,
format="%16.8e", ncols=self.cellDim)
- self.data.addArray(vtype="double", name="_basisDerivRef",
+ self.data.addArray(vtype="PylithScalar", name="_basisDerivRef",
values=self.basisDerivRef,
format="%16.8e", ncols=self.cellDim)
- self.data.addArray(vtype="double", name="_basisDeriv",
+ self.data.addArray(vtype="PylithScalar", name="_basisDeriv",
values=self.basisDeriv,
format="%16.8e", ncols=self.spaceDim)
- self.data.addArray(vtype="double", name="_jacobian",
+ self.data.addArray(vtype="PylithScalar", name="_jacobian",
values=self.jacobian,
format="%16.8e", ncols=self.cellDim)
- self.data.addArray(vtype="double", name="_jacobianDet",
+ self.data.addArray(vtype="PylithScalar", name="_jacobianDet",
values=self.jacobianDet,
format="%16.8e", ncols=self.numQuadPts)
- self.data.addArray(vtype="double", name="_jacobianInv",
+ self.data.addArray(vtype="PylithScalar", name="_jacobianInv",
values=self.jacobianInv,
format="%16.8e", ncols=self.spaceDim)
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticMaterialApp.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticMaterialApp.py 2011-09-19 22:47:11 UTC (rev 18943)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticMaterialApp.py 2011-09-19 22:53:19 UTC (rev 18944)
@@ -166,59 +166,59 @@
self.data.addArray(vtype="char*", name="_dbStateVarValues",
values=self.dbStateVarValues,
format="\"%s\"", ncols=1)
- self.data.addArray(vtype="double", name="_dbProperties",
+ self.data.addArray(vtype="PylithScalar", name="_dbProperties",
values=self.dbProperties,
format="%16.8e", ncols=1)
- self.data.addArray(vtype="double", name="_dbStateVars",
+ self.data.addArray(vtype="PylithScalar", name="_dbStateVars",
values=self.dbStateVars,
format="%16.8e", ncols=1)
- self.data.addArray(vtype="double", name="_properties",
+ self.data.addArray(vtype="PylithScalar", name="_properties",
values=self.properties,
format="%16.8e", ncols=1)
- self.data.addArray(vtype="double", name="_stateVars",
+ self.data.addArray(vtype="PylithScalar", name="_stateVars",
values=self.stateVars,
format="%16.8e", ncols=1)
- self.data.addArray(vtype="double", name="_propertiesNondim",
+ self.data.addArray(vtype="PylithScalar", name="_propertiesNondim",
values=self.propertiesNondim,
format="%16.8e", ncols=1)
- self.data.addArray(vtype="double", name="_stateVarsNondim",
+ self.data.addArray(vtype="PylithScalar", name="_stateVarsNondim",
values=self.stateVarsNondim,
format="%16.8e", ncols=1)
- self.data.addScalar(vtype="double", name="_lengthScale",
+ self.data.addScalar(vtype="PylithScalar", name="_lengthScale",
value=self.lengthScale,
format="%16.8e")
- self.data.addScalar(vtype="double", name="_timeScale",
+ self.data.addScalar(vtype="PylithScalar", name="_timeScale",
value=self.timeScale,
format="%16.8e")
- self.data.addScalar(vtype="double", name="_pressureScale",
+ self.data.addScalar(vtype="PylithScalar", name="_pressureScale",
value=self.pressureScale,
format="%16.8e")
- self.data.addScalar(vtype="double", name="_densityScale",
+ self.data.addScalar(vtype="PylithScalar", name="_densityScale",
value=self.densityScale,
format="%16.8e")
- self.data.addScalar(vtype="double", name="_dtStableImplicit",
+ self.data.addScalar(vtype="PylithScalar", name="_dtStableImplicit",
value=self.dtStableImplicit,
format="%16.8e")
- self.data.addArray(vtype="double", name="_density",
+ self.data.addArray(vtype="PylithScalar", name="_density",
values=self.density,
format="%16.8e", ncols=1)
- self.data.addArray(vtype="double", name="_strain",
+ self.data.addArray(vtype="PylithScalar", name="_strain",
values=self.strain,
format="%16.8e", ncols=1)
- self.data.addArray(vtype="double", name="_stress",
+ self.data.addArray(vtype="PylithScalar", name="_stress",
values=self.stress,
format="%16.8e", ncols=1)
- self.data.addArray(vtype="double", name="_elasticConsts",
+ self.data.addArray(vtype="PylithScalar", name="_elasticConsts",
values=self.elasticConsts,
format="%16.8e", ncols=1)
- self.data.addArray(vtype="double", name="_initialStress",
+ self.data.addArray(vtype="PylithScalar", name="_initialStress",
values=self.initialStress,
format="%16.8e", ncols=1)
- self.data.addArray(vtype="double", name="_initialStrain",
+ self.data.addArray(vtype="PylithScalar", name="_initialStrain",
values=self.initialStrain,
format="%16.8e", ncols=1)
- self.data.addArray(vtype="double", name="_stateVarsUpdated",
+ self.data.addArray(vtype="PylithScalar", name="_stateVarsUpdated",
values=self.stateVarsUpdated,
format="%16.8e", ncols=1)
More information about the CIG-COMMITS
mailing list