[cig-commits] r19099 - in short/3D/PyLith/trunk: libsrc/pylith/meshio unittests/libtests/faults unittests/libtests/faults/data unittests/libtests/feassemble unittests/libtests/friction unittests/libtests/materials unittests/libtests/meshio
brad at geodynamics.org
brad at geodynamics.org
Wed Oct 19 16:03:26 PDT 2011
Author: brad
Date: 2011-10-19 16:03:26 -0700 (Wed, 19 Oct 2011)
New Revision: 19099
Modified:
short/3D/PyLith/trunk/libsrc/pylith/meshio/DataWriter.cc
short/3D/PyLith/trunk/libsrc/pylith/meshio/DataWriter.hh
short/3D/PyLith/trunk/libsrc/pylith/meshio/DataWriterHDF5.cc
short/3D/PyLith/trunk/libsrc/pylith/meshio/DataWriterHDF5Ext.cc
short/3D/PyLith/trunk/libsrc/pylith/meshio/Xdmf.cc
short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveDyn.cc
short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4e.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3d.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataQuad4.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTet4.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTri3.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityExplicit.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityExplicitLgDeform.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityImplicit.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityImplicitLgDeform.cc
short/3D/PyLith/trunk/unittests/libtests/friction/TestRateStateAgeing.cc
short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticMaterial.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterHDF5.cc
Log:
Single precision fixes.
Modified: short/3D/PyLith/trunk/libsrc/pylith/meshio/DataWriter.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/meshio/DataWriter.cc 2011-10-19 21:54:43 UTC (rev 19098)
+++ short/3D/PyLith/trunk/libsrc/pylith/meshio/DataWriter.cc 2011-10-19 23:03:26 UTC (rev 19099)
@@ -49,7 +49,7 @@
// Set time scale for simulation time.
template<typename mesh_type, typename field_type>
void
-pylith::meshio::DataWriter<mesh_type, field_type>::timeScale(const double value)
+pylith::meshio::DataWriter<mesh_type, field_type>::timeScale(const PylithScalar value)
{ // timeScale
if (value <= 0.0) {
std::ostringstream msg;
Modified: short/3D/PyLith/trunk/libsrc/pylith/meshio/DataWriter.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/meshio/DataWriter.hh 2011-10-19 21:54:43 UTC (rev 19098)
+++ short/3D/PyLith/trunk/libsrc/pylith/meshio/DataWriter.hh 2011-10-19 23:03:26 UTC (rev 19099)
@@ -62,7 +62,7 @@
*
* @param value Time scale
*/
- void timeScale(const double value);
+ void timeScale(const PylithScalar value);
/** Prepare for writing files.
*
@@ -142,7 +142,7 @@
// PROTECTED MEMBERS ////////////////////////////////////////////////////
protected :
- double _timeScale; ///< Time scale for dimensioning time in output.
+ PylithScalar _timeScale; ///< Time scale for dimensioning time in output.
int _numTimeSteps; ///< Expected number of time steps for fields.
std::string _context; ///< Context of scatters for DataWriter.
Modified: short/3D/PyLith/trunk/libsrc/pylith/meshio/DataWriterHDF5.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/meshio/DataWriterHDF5.cc 2011-10-19 21:54:43 UTC (rev 19098)
+++ short/3D/PyLith/trunk/libsrc/pylith/meshio/DataWriterHDF5.cc 2011-10-19 23:03:26 UTC (rev 19099)
@@ -471,7 +471,7 @@
PetscErrorCode err = 0;
if (0 == rank) {
- const double tDim = t * DataWriter<mesh_type, field_type>::_timeScale;
+ const PylithScalar tDim = t * DataWriter<mesh_type, field_type>::_timeScale;
err = VecSetValue(_tstamp, 0, tDim, INSERT_VALUES); CHECK_PETSC_ERROR(err);
} // if
err = VecAssemblyBegin(_tstamp); CHECK_PETSC_ERROR(err);
Modified: short/3D/PyLith/trunk/libsrc/pylith/meshio/DataWriterHDF5Ext.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/meshio/DataWriterHDF5Ext.cc 2011-10-19 21:54:43 UTC (rev 19098)
+++ short/3D/PyLith/trunk/libsrc/pylith/meshio/DataWriterHDF5Ext.cc 2011-10-19 23:03:26 UTC (rev 19099)
@@ -591,6 +591,8 @@
assert(_h5);
const int ndims = 3;
+ const hid_t scalartype = (sizeof(double) == sizeof(PylithScalar)) ?
+ H5T_NATIVE_DOUBLE : H5T_NATIVE_FLOAT;
// Each time stamp has a size of 1.
hsize_t dimsChunk[3]; // Use 3 dims for compatibility with PETSc viewer
@@ -606,7 +608,7 @@
dims[1] = 1;
dims[2] = 1;
_h5->createDataset("/", "time", dims, dimsChunk, ndims,
- H5T_NATIVE_DOUBLE);
+ scalartype);
} // if
// Write time stamp as chunk to HDF5 file.
@@ -615,9 +617,9 @@
dims[0] = _tstampIndex+1;
dims[1] = 1;
dims[2] = 1;
- const double tDim = t * DataWriter<mesh_type, field_type>::_timeScale;
+ const PylithScalar tDim = t * DataWriter<mesh_type, field_type>::_timeScale;
_h5->writeDatasetChunk("/", "time", &tDim, dims, dimsChunk, ndims,
- _tstampIndex, H5T_NATIVE_DOUBLE);
+ _tstampIndex, scalartype);
_tstampIndex++;
} // _writeTimeStamp
Modified: short/3D/PyLith/trunk/libsrc/pylith/meshio/Xdmf.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/meshio/Xdmf.cc 2011-10-19 21:54:43 UTC (rev 19098)
+++ short/3D/PyLith/trunk/libsrc/pylith/meshio/Xdmf.cc 2011-10-19 23:03:26 UTC (rev 19099)
@@ -211,6 +211,8 @@
hsize_t* dims = 0;
int ndims = 0;
PylithScalar* t = 0;
+ const hid_t scalartype = (sizeof(double) == sizeof(PylithScalar)) ?
+ H5T_NATIVE_DOUBLE : H5T_NATIVE_FLOAT;
if (h5.hasDataset("/time")) {
h5.getDatasetDims(&dims, &ndims, "/", "time");
@@ -223,7 +225,7 @@
timeStamps->resize(numTimeStamps);
for (int i=0; i < numTimeStamps; ++i) {
h5.readDatasetChunk("/", "time", (char**)&t,
- &dims, &ndims, i, H5T_NATIVE_DOUBLE);
+ &dims, &ndims, i, scalartype);
assert(3 == ndims);
assert(1 == dims[0]);
assert(1 == dims[1]);
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveDyn.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveDyn.cc 2011-10-19 21:54:43 UTC (rev 19098)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveDyn.cc 2011-10-19 23:03:26 UTC (rev 19099)
@@ -104,7 +104,7 @@
{ // testZeroTolerance
FaultCohesiveDyn fault;
- CPPUNIT_ASSERT_EQUAL(1.0e-10, fault._zeroTolerance); // default
+ CPPUNIT_ASSERT_EQUAL(PylithScalar(1.0e-10), fault._zeroTolerance); // default
const PylithScalar value = 1.0e-20;
fault.zeroTolerance(value);
@@ -345,7 +345,8 @@
const PylithScalar* valsE = _data->slipSlipE;
int iVertex = 0; // variable to use as index into valsE array
const int fiberDimE = spaceDim; // number of values per point
- const PylithScalar tolerance = 1.0e-06;
+ const PylithScalar tolerance =
+ (sizeof(double) == sizeof(PylithScalar)) ? 1.0e-06 : 1.0e-5;
for (SieveMesh::label_sequence::iterator v_iter = verticesBegin; v_iter
!= verticesEnd;
++v_iter, ++iVertex) { // loop over fault vertices
@@ -393,7 +394,7 @@
const PylithScalar* valsE = _data->fieldIncrSlipE; // Expected values for dispIncr
int iVertex = 0; // variable to use as index into valsE array
const int fiberDimE = spaceDim; // number of values per point
- const PylithScalar tolerance = (8 == sizeof(PylithScalar)) ? 1.0e-06 : 1.0e-05;
+ const PylithScalar tolerance = (sizeof(double) == sizeof(PylithScalar)) ? 1.0e-06 : 1.0e-05;
for (SieveMesh::label_sequence::iterator v_iter = verticesBegin;
v_iter != verticesEnd;
++v_iter, ++iVertex) { // loop over all vertices in mesh
@@ -466,7 +467,7 @@
const PylithScalar* valsE = _data->fieldIncrOpenE; // Expected values for dispIncr
int iVertex = 0; // variable to use as index into valsE array
const int fiberDimE = spaceDim; // number of values per point
- const PylithScalar tolerance = (8 == sizeof(PylithScalar)) ? 1.0e-06 : 1.0e-05;
+ const PylithScalar tolerance = (sizeof(double) == sizeof(PylithScalar)) ? 1.0e-06 : 1.0e-05;
for (SieveMesh::label_sequence::iterator v_iter = verticesBegin;
v_iter != verticesEnd;
++v_iter, ++iVertex) { // loop over all vertices in mesh
@@ -515,7 +516,7 @@
const PylithScalar* valsE = _data->slipOpenE;
int iVertex = 0; // variable to use as index into valsE array
const int fiberDimE = spaceDim; // number of values per point
- const PylithScalar tolerance = (8 == sizeof(PylithScalar)) ? 1.0e-06 : 1.0e-05;
+ const PylithScalar tolerance = (sizeof(double) == sizeof(PylithScalar)) ? 1.0e-06 : 1.0e-05;
for (SieveMesh::label_sequence::iterator v_iter = verticesBegin; v_iter
!= verticesEnd;
++v_iter, ++iVertex) { // loop over fault vertices
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc 2011-10-19 21:54:43 UTC (rev 19098)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc 2011-10-19 23:03:26 UTC (rev 19099)
@@ -294,7 +294,7 @@
const PylithScalar* valsE = _data->residual;
iVertex = 0;
const int fiberDimE = spaceDim;
- const PylithScalar tolerance = (8 == sizeof(PylithScalar)) ? 1.0e-06 : 1.0e-05;
+ const PylithScalar tolerance = (sizeof(double) == sizeof(PylithScalar)) ? 1.0e-06 : 1.0e-05;
for (SieveMesh::label_sequence::iterator v_iter=verticesBegin;
v_iter != verticesEnd;
++v_iter, ++iVertex) {
@@ -325,7 +325,7 @@
const PylithScalar* valsE = _data->residualIncr;
iVertex = 0;
const int fiberDimE = spaceDim;
- const PylithScalar tolerance = (8 == sizeof(PylithScalar)) ? 1.0e-06 : 1.0e-05;
+ const PylithScalar tolerance = (sizeof(double) == sizeof(PylithScalar)) ? 1.0e-06 : 1.0e-05;
for (SieveMesh::label_sequence::iterator v_iter=verticesBegin;
v_iter != verticesEnd;
++v_iter, ++iVertex) {
@@ -608,7 +608,7 @@
CPPUNIT_ASSERT(!solutionSection.isNull());
int i = 0;
- const PylithScalar tolerance = (8 == sizeof(PylithScalar)) ? 1.0e-06 : 1.0e-05;
+ const PylithScalar tolerance = (sizeof(double) == sizeof(PylithScalar)) ? 1.0e-06 : 1.0e-05;
const PylithScalar* solutionE = _data->fieldIncrAdjusted;
for (SieveMesh::label_sequence::iterator v_iter=verticesBegin;
v_iter != verticesEnd;
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4e.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4e.cc 2011-10-19 21:54:43 UTC (rev 19098)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4e.cc 2011-10-19 23:03:26 UTC (rev 19099)
@@ -110,7 +110,7 @@
4.4, 6.4, 8.4, // 17
};
-const double pylith::faults::CohesiveKinDataTet4e::_fieldIncr[] = {
+const PylithScalar pylith::faults::CohesiveKinDataTet4e::_fieldIncr[] = {
6.1, 7.1, 2.1,
6.2, 7.2, 2.2, // 5
6.3, 7.3, 2.3, // 6
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3d.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3d.cc 2011-10-19 21:54:43 UTC (rev 19098)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3d.cc 2011-10-19 23:03:26 UTC (rev 19099)
@@ -128,7 +128,7 @@
7.2, 9.2, // 15
};
-const double pylith::faults::CohesiveKinDataTri3d::_fieldIncr[] = {
+const PylithScalar pylith::faults::CohesiveKinDataTri3d::_fieldIncr[] = {
3.1, 7.1,
3.2, 7.2, // 5
3.3, 7.3, // 6
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataQuad4.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataQuad4.cc 2011-10-19 21:54:43 UTC (rev 19098)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataQuad4.cc 2011-10-19 23:03:26 UTC (rev 19099)
@@ -108,7 +108,7 @@
8.0, 9.0, // 11
};
-const double pylith::faults::CohesiveKinSrcsDataQuad4::_fieldIncr[] = {
+const PylithScalar pylith::faults::CohesiveKinSrcsDataQuad4::_fieldIncr[] = {
3.1, 4.1,
3.2, 4.2,
3.3, 4.3, // 4
@@ -121,7 +121,7 @@
3.0, 4.0, // 11
};
-const double pylith::faults::CohesiveKinSrcsDataQuad4::_jacobianLumped[] = {
+const PylithScalar pylith::faults::CohesiveKinSrcsDataQuad4::_jacobianLumped[] = {
1.1, 1.1,
1.2, 1.2,
1.3, 1.3, // 4
@@ -416,14 +416,14 @@
finalSlipFilename = const_cast<char*>(_finalSlipFilename);
slipTimeFilename = const_cast<char*>(_slipTimeFilename);
riseTimeFilename = const_cast<char*>(_riseTimeFilename);
- fieldT = const_cast<double*>(_fieldT);
- fieldIncr = const_cast<double*>(_fieldIncr);
- jacobianLumped = const_cast<double*>(_jacobianLumped);
- orientation = const_cast<double*>(_orientation);
- area = const_cast<double*>(_area);
- residual = const_cast<double*>(_residual);
- residualIncr = const_cast<double*>(_residualIncr);
- jacobian = const_cast<double*>(_jacobian);
+ fieldT = const_cast<PylithScalar*>(_fieldT);
+ fieldIncr = const_cast<PylithScalar*>(_fieldIncr);
+ jacobianLumped = const_cast<PylithScalar*>(_jacobianLumped);
+ orientation = const_cast<PylithScalar*>(_orientation);
+ area = const_cast<PylithScalar*>(_area);
+ residual = const_cast<PylithScalar*>(_residual);
+ residualIncr = const_cast<PylithScalar*>(_residualIncr);
+ jacobian = const_cast<PylithScalar*>(_jacobian);
verticesFault = const_cast<int*>(_verticesFault);
verticesLagrange = const_cast<int*>(_verticesLagrange);
verticesNegative = const_cast<int*>(_verticesNegative);
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTet4.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTet4.cc 2011-10-19 21:54:43 UTC (rev 19098)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTet4.cc 2011-10-19 23:03:26 UTC (rev 19099)
@@ -107,7 +107,7 @@
7.1, 8.1, 9.1, // 12
};
-const double pylith::faults::CohesiveKinSrcsDataTet4::_fieldIncr[] = {
+const PylithScalar pylith::faults::CohesiveKinSrcsDataTet4::_fieldIncr[] = {
3.1, 4.1, 5.1,
3.2, 4.2, 5.2, // 3
3.3, 4.3, 5.3, // 4
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTri3.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTri3.cc 2011-10-19 21:54:43 UTC (rev 19098)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTri3.cc 2011-10-19 23:03:26 UTC (rev 19099)
@@ -120,7 +120,7 @@
8.8, 9.8, // 9
};
-const double pylith::faults::CohesiveKinSrcsDataTri3::_fieldIncr[] = {
+const PylithScalar pylith::faults::CohesiveKinSrcsDataTri3::_fieldIncr[] = {
3.1, 4.1,
3.2, 4.2, // 3
3.3, 4.3, // 4
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityExplicit.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityExplicit.cc 2011-10-19 21:54:43 UTC (rev 19098)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityExplicit.cc 2011-10-19 23:03:26 UTC (rev 19099)
@@ -209,7 +209,7 @@
std::cout << " " << valsE[i] << std::endl;
#endif
- const PylithScalar tolerance = (8 == sizeof(PylithScalar)) ? 1.0e-06 : 1.0e-05;
+ const PylithScalar tolerance = (sizeof(double) == sizeof(PylithScalar)) ? 1.0e-06 : 1.0e-05;
for (int i=0; i < size; ++i)
if (fabs(valsE[i]) > 1.0)
CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, vals[i]/valsE[i], tolerance);
@@ -249,7 +249,7 @@
std::cout << " " << valsE[i] << std::endl;
#endif
- const PylithScalar tolerance = (8 == sizeof(PylithScalar)) ? 1.0e-06 : 1.0e-05;
+ const PylithScalar tolerance = (sizeof(double) == sizeof(PylithScalar)) ? 1.0e-06 : 1.0e-05;
for (int i=0; i < size; ++i)
if (fabs(valsE[i]) > 1.0)
CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, vals[i]/valsE[i], tolerance);
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityExplicitLgDeform.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityExplicitLgDeform.cc 2011-10-19 21:54:43 UTC (rev 19098)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityExplicitLgDeform.cc 2011-10-19 23:03:26 UTC (rev 19099)
@@ -121,7 +121,7 @@
const int size = residualSection->sizeWithBC();
CPPUNIT_ASSERT_EQUAL(sizeE, size);
- const PylithScalar tolerance = (8 == sizeof(PylithScalar)) ? 1.0e-06 : 1.0e-04;
+ const PylithScalar tolerance = (sizeof(double) == sizeof(PylithScalar)) ? 1.0e-06 : 1.0e-04;
for (int i=0; i < size; ++i)
if (fabs(valsE[i]) > 1.0)
CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, vals[i]/valsE[i], tolerance);
@@ -161,7 +161,7 @@
std::cout << " " << valsE[i] << std::endl;
#endif
- const PylithScalar tolerance = (8 == sizeof(PylithScalar)) ? 1.0e-06 : 1.0e-04;
+ const PylithScalar tolerance = (sizeof(double) == sizeof(PylithScalar)) ? 1.0e-06 : 1.0e-04;
for (int i=0; i < size; ++i)
if (fabs(valsE[i]) > 1.0)
CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, vals[i]/valsE[i], tolerance);
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityImplicit.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityImplicit.cc 2011-10-19 21:54:43 UTC (rev 19098)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityImplicit.cc 2011-10-19 23:03:26 UTC (rev 19099)
@@ -179,7 +179,7 @@
const int size = residualSection->sizeWithBC();
CPPUNIT_ASSERT_EQUAL(sizeE, size);
- const PylithScalar tolerance = (8 == sizeof(PylithScalar)) ? 1.0e-06 : 4.0e-05;
+ const PylithScalar tolerance = (sizeof(double) == sizeof(PylithScalar)) ? 1.0e-06 : 4.0e-05;
for (int i=0; i < size; ++i)
if (fabs(valsE[i]) > 1.0)
CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, vals[i]/valsE[i], tolerance);
@@ -234,7 +234,7 @@
for (int iCol=0; iCol < ncols; ++iCol)
cols[iCol] = iCol;
MatGetValues(jDense, nrows, &rows[0], ncols, &cols[0], &vals[0]);
- const PylithScalar tolerance = (8 == sizeof(PylithScalar)) ? 1.0e-06 : 1.0e-04;
+ const PylithScalar tolerance = (sizeof(double) == sizeof(PylithScalar)) ? 1.0e-06 : 1.0e-04;
for (int iRow=0; iRow < nrows; ++iRow)
for (int iCol=0; iCol < ncols; ++iCol) {
const int index = ncols*iRow+iCol;
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityImplicitLgDeform.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityImplicitLgDeform.cc 2011-10-19 21:54:43 UTC (rev 19098)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityImplicitLgDeform.cc 2011-10-19 23:03:26 UTC (rev 19099)
@@ -121,7 +121,7 @@
const int size = residualSection->sizeWithBC();
CPPUNIT_ASSERT_EQUAL(sizeE, size);
- const PylithScalar tolerance = (8 == sizeof(PylithScalar)) ? 1.0e-06 : 1.0e-04;
+ const PylithScalar tolerance = (sizeof(double) == sizeof(PylithScalar)) ? 1.0e-06 : 1.0e-04;
for (int i=0; i < size; ++i)
if (fabs(valsE[i]) > 1.0)
CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, vals[i]/valsE[i], tolerance);
@@ -174,7 +174,7 @@
for (int iCol=0; iCol < ncols; ++iCol)
cols[iCol] = iCol;
MatGetValues(jDense, nrows, &rows[0], ncols, &cols[0], &vals[0]);
- const PylithScalar tolerance = (8 == sizeof(PylithScalar)) ? 1.0e-06 : 2.0e-05;
+ const PylithScalar tolerance = (sizeof(double) == sizeof(PylithScalar)) ? 1.0e-06 : 2.0e-05;
for (int iRow=0; iRow < nrows; ++iRow)
for (int iCol=0; iCol < ncols; ++iCol) {
const int index = ncols*iRow+iCol;
Modified: short/3D/PyLith/trunk/unittests/libtests/friction/TestRateStateAgeing.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/friction/TestRateStateAgeing.cc 2011-10-19 21:54:43 UTC (rev 19098)
+++ short/3D/PyLith/trunk/unittests/libtests/friction/TestRateStateAgeing.cc 2011-10-19 23:03:26 UTC (rev 19099)
@@ -44,7 +44,7 @@
{ // testMinSlipRate
RateStateAgeing model;
- CPPUNIT_ASSERT_EQUAL(1.0e-12, model._minSlipRate); // default
+ CPPUNIT_ASSERT_EQUAL(PylithScalar(1.0e-12), model._minSlipRate); // default
const PylithScalar value = 1.0e-20;
model.minSlipRate(value);
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticMaterial.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticMaterial.cc 2011-10-19 21:54:43 UTC (rev 19098)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticMaterial.cc 2011-10-19 23:03:26 UTC (rev 19099)
@@ -562,7 +562,7 @@
const PylithScalar* elasticConstsE = &data->elasticConsts[iLoc*numConsts];
CPPUNIT_ASSERT(0 != elasticConstsE);
- const PylithScalar tolerance = (8 == sizeof(PylithScalar)) ? 1.0e-06 : 1.0e-05;
+ const PylithScalar tolerance = (sizeof(double) == sizeof(PylithScalar)) ? 1.0e-06 : 1.0e-05;
for (int i=0; i < numConsts; ++i)
if (fabs(elasticConstsE[i]) > tolerance)
CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, elasticConsts[i]/elasticConstsE[i],
@@ -618,7 +618,7 @@
CPPUNIT_ASSERT( (0 < numVarsQuadPt && 0 != stateVarsE) ||
(0 == numVarsQuadPt && 0 == stateVarsE) );
- const PylithScalar tolerance = (8 == sizeof(PylithScalar)) ? 1.0e-06 : 1.0e-05;
+ const PylithScalar tolerance = (sizeof(double) == sizeof(PylithScalar)) ? 1.0e-06 : 1.0e-05;
for (int i=0; i < numVarsQuadPt; ++i)
if (fabs(stateVarsE[i]) > tolerance)
CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, stateVars[i]/stateVarsE[i],
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterHDF5.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterHDF5.cc 2011-10-19 21:54:43 UTC (rev 19098)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterHDF5.cc 2011-10-19 23:03:26 UTC (rev 19099)
@@ -65,7 +65,7 @@
int sizeE = (ndimsE > 0 && dimsE[0] > 0) ? 1 : 0;
for (int i=0; i < ndimsE; ++i)
sizeE *= dimsE[i];
- PylithScalar* dataE = (sizeE > 0) ? new PylithScalar[sizeE] : 0;
+ double* dataE = (sizeE > 0) ? new double[sizeE] : 0;
CPPUNIT_ASSERT(sizeE > 0);
err = H5Dread(datasetE, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL,
H5P_DEFAULT, (void*) dataE);
@@ -90,8 +90,10 @@
int size = (ndims > 0 && dims[0] > 0) ? 1 : 0;
for (int i=0; i < ndims; ++i)
size *= dims[i];
- PylithScalar* data = (size > 0) ? new PylithScalar[size] : 0;
+ double* data = (size > 0) ? new double[size] : 0;
CPPUNIT_ASSERT(size > 0);
+ //const hid_t scalartype = (sizeof(double) == sizeof(PylithScalar)) ?
+ // H5T_NATIVE_DOUBLE : H5T_NATIVE_DOUBLE;
err = H5Dread(dataset, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL,
H5P_DEFAULT, (void*) data);
CPPUNIT_ASSERT(err >= 0);
@@ -107,13 +109,13 @@
CPPUNIT_ASSERT_EQUAL(dimsE[i], dims[i]);
// Compare data values.
- const PylithScalar tolerance = 1.0e-6;
+ const double tolerance = 1.0e-6;
CPPUNIT_ASSERT_EQUAL(sizeE, size);
for (int i=0; i < size; ++i)
if (dataE[i] != 0.0)
- CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, data[i]/dataE[i], tolerance);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, double(data[i])/dataE[i], tolerance);
else
- CPPUNIT_ASSERT_DOUBLES_EQUAL(dataE[i], data[i], tolerance);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(dataE[i], double(data[i]), tolerance);
delete[] dimsE; dimsE = 0;
delete[] dataE; dataE = 0;
More information about the CIG-COMMITS
mailing list