[cig-commits] r13442 - in short/3D/PyLith/trunk: libsrc/bc libsrc/faults libsrc/feassemble libsrc/meshio libsrc/topology libsrc/utils unittests/libtests/feassemble unittests/libtests/materials
brad at geodynamics.org
brad at geodynamics.org
Tue Dec 2 12:07:20 PST 2008
Author: brad
Date: 2008-12-02 12:07:20 -0800 (Tue, 02 Dec 2008)
New Revision: 13442
Modified:
short/3D/PyLith/trunk/libsrc/bc/AbsorbingDampers.cc
short/3D/PyLith/trunk/libsrc/bc/DirichletBoundary.cc
short/3D/PyLith/trunk/libsrc/bc/DirichletPoints.cc
short/3D/PyLith/trunk/libsrc/bc/Neumann.cc
short/3D/PyLith/trunk/libsrc/faults/BruneSlipFn.cc
short/3D/PyLith/trunk/libsrc/faults/CohesiveTopology.cc
short/3D/PyLith/trunk/libsrc/faults/ConstRateSlipFn.cc
short/3D/PyLith/trunk/libsrc/faults/EqKinSrc.cc
short/3D/PyLith/trunk/libsrc/faults/FaultCohesive.cc
short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveDyn.cc
short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.cc
short/3D/PyLith/trunk/libsrc/faults/LiuCosSlipFn.cc
short/3D/PyLith/trunk/libsrc/faults/StepSlipFn.cc
short/3D/PyLith/trunk/libsrc/feassemble/CellGeometry.cc
short/3D/PyLith/trunk/libsrc/feassemble/ElasticityExplicit.cc
short/3D/PyLith/trunk/libsrc/feassemble/ElasticityImplicit.cc
short/3D/PyLith/trunk/libsrc/feassemble/GeometryHex3D.cc
short/3D/PyLith/trunk/libsrc/feassemble/GeometryLine1D.cc
short/3D/PyLith/trunk/libsrc/feassemble/GeometryLine2D.cc
short/3D/PyLith/trunk/libsrc/feassemble/GeometryLine3D.cc
short/3D/PyLith/trunk/libsrc/feassemble/GeometryPoint1D.cc
short/3D/PyLith/trunk/libsrc/feassemble/GeometryPoint2D.cc
short/3D/PyLith/trunk/libsrc/feassemble/GeometryPoint3D.cc
short/3D/PyLith/trunk/libsrc/feassemble/GeometryQuad2D.cc
short/3D/PyLith/trunk/libsrc/feassemble/GeometryQuad3D.cc
short/3D/PyLith/trunk/libsrc/feassemble/GeometryTet3D.cc
short/3D/PyLith/trunk/libsrc/feassemble/GeometryTri2D.cc
short/3D/PyLith/trunk/libsrc/feassemble/GeometryTri3D.cc
short/3D/PyLith/trunk/libsrc/feassemble/Integrator.cc
short/3D/PyLith/trunk/libsrc/feassemble/IntegratorElasticity.cc
short/3D/PyLith/trunk/libsrc/feassemble/Quadrature.cc
short/3D/PyLith/trunk/libsrc/feassemble/Quadrature0D.cc
short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1D.cc
short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1Din2D.cc
short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1Din3D.cc
short/3D/PyLith/trunk/libsrc/feassemble/Quadrature2D.cc
short/3D/PyLith/trunk/libsrc/feassemble/Quadrature2Din3D.cc
short/3D/PyLith/trunk/libsrc/feassemble/Quadrature3D.cc
short/3D/PyLith/trunk/libsrc/meshio/BinaryIO.cc
short/3D/PyLith/trunk/libsrc/meshio/DataWriterVTK.cc
short/3D/PyLith/trunk/libsrc/meshio/GMVFile.cc
short/3D/PyLith/trunk/libsrc/meshio/GMVFileAscii.cc
short/3D/PyLith/trunk/libsrc/meshio/GMVFileBinary.cc
short/3D/PyLith/trunk/libsrc/meshio/HDF5.cc
short/3D/PyLith/trunk/libsrc/meshio/MeshIO.cc
short/3D/PyLith/trunk/libsrc/meshio/MeshIOAscii.cc
short/3D/PyLith/trunk/libsrc/meshio/MeshIOCubit.cc
short/3D/PyLith/trunk/libsrc/meshio/MeshIOHDF5.cc
short/3D/PyLith/trunk/libsrc/meshio/MeshIOLagrit.cc
short/3D/PyLith/trunk/libsrc/meshio/PsetFile.cc
short/3D/PyLith/trunk/libsrc/meshio/PsetFileAscii.cc
short/3D/PyLith/trunk/libsrc/meshio/PsetFileBinary.cc
short/3D/PyLith/trunk/libsrc/topology/Distributor.cc
short/3D/PyLith/trunk/libsrc/topology/FieldsManager.cc
short/3D/PyLith/trunk/libsrc/topology/MeshOps.cc
short/3D/PyLith/trunk/libsrc/topology/MeshRefiner.cc
short/3D/PyLith/trunk/libsrc/topology/RefineUniform.cc
short/3D/PyLith/trunk/libsrc/utils/EventLogger.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityExplicit.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityImplicit.cc
short/3D/PyLith/trunk/unittests/libtests/materials/TestMaterial.cc
Log:
Updated include directives to use C++ rather than C header files.
Modified: short/3D/PyLith/trunk/libsrc/bc/AbsorbingDampers.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/bc/AbsorbingDampers.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/bc/AbsorbingDampers.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -24,8 +24,8 @@
#include <Selection.hh> // USES submesh algorithms
-#include <string.h> // USES memcpy()
-#include <assert.h> // USES assert()
+#include <cstring> // USES memcpy()
+#include <cassert> // USES assert()
#include <stdexcept> // USES std::runtime_error
#include <sstream> // USES std::ostringstream
Modified: short/3D/PyLith/trunk/libsrc/bc/DirichletBoundary.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/bc/DirichletBoundary.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/bc/DirichletBoundary.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -20,9 +20,9 @@
#include <Selection.hh> // USES submesh algorithms
-#include <string.h> // USES strcpy()
+#include <cstring> // USES strcpy()
#include <strings.h> // USES strcasecmp()
-#include <assert.h> // USES assert()
+#include <cassert> // USES assert()
#include <stdexcept> // USES std::runtime_error
#include <sstream> // USES std::ostringstream
Modified: short/3D/PyLith/trunk/libsrc/bc/DirichletPoints.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/bc/DirichletPoints.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/bc/DirichletPoints.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -18,8 +18,8 @@
#include "spatialdata/geocoords/CoordSys.hh" // USES CoordSys
#include "spatialdata/units/Nondimensional.hh" // USES Nondimensional
-#include <string.h> // USES strcpy()
-#include <assert.h> // USES assert()
+#include <cstring> // USES strcpy()
+#include <cassert> // USES assert()
#include <stdexcept> // USES std::runtime_error
#include <sstream> // USES std::ostringstream
Modified: short/3D/PyLith/trunk/libsrc/bc/Neumann.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/bc/Neumann.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/bc/Neumann.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -24,9 +24,9 @@
#include <Selection.hh> // USES submesh algorithms
-#include <string.h> // USES memcpy()
+#include <cstring> // USES memcpy()
#include <strings.h> // USES strcasecmp()
-#include <assert.h> // USES assert()
+#include <cassert> // USES assert()
#include <stdexcept> // USES std::runtime_error
#include <sstream> // USES std::ostringstream
Modified: short/3D/PyLith/trunk/libsrc/faults/BruneSlipFn.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/faults/BruneSlipFn.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/faults/BruneSlipFn.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -21,7 +21,7 @@
#include "spatialdata/geocoords/CoordSys.hh" // USES CoordSys
#include "spatialdata/units/Nondimensional.hh" // USES Nondimensional
-#include <assert.h> // USES assert()
+#include <cassert> // USES assert()
#include <sstream> // USES std::ostringstream
#include <stdexcept> // USES std::runtime_error
Modified: short/3D/PyLith/trunk/libsrc/faults/CohesiveTopology.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/faults/CohesiveTopology.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/faults/CohesiveTopology.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -17,7 +17,7 @@
#include "pylith/utils/sievetypes.hh" // USES PETSc Mesh
-#include <assert.h> // USES assert()
+#include <cassert> // USES assert()
void
pylith::faults::CohesiveTopology::createFaultSieveFromVertices(const int dim,
Modified: short/3D/PyLith/trunk/libsrc/faults/ConstRateSlipFn.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/faults/ConstRateSlipFn.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/faults/ConstRateSlipFn.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -21,7 +21,7 @@
#include "spatialdata/geocoords/CoordSys.hh" // USES CoordSys
#include "spatialdata/units/Nondimensional.hh" // USES Nondimensional
-#include <assert.h> // USES assert()
+#include <cassert> // USES assert()
#include <sstream> // USES std::ostringstream
#include <stdexcept> // USES std::runtime_error
Modified: short/3D/PyLith/trunk/libsrc/faults/EqKinSrc.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/faults/EqKinSrc.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/faults/EqKinSrc.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -18,7 +18,7 @@
#include "spatialdata/units/Nondimensional.hh" // USES Nondimensional
-#include <assert.h> // USES assert()
+#include <cassert> // USES assert()
// ----------------------------------------------------------------------
// Default constructor.
Modified: short/3D/PyLith/trunk/libsrc/faults/FaultCohesive.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/faults/FaultCohesive.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/faults/FaultCohesive.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -21,7 +21,7 @@
#include "pylith/utils/sievetypes.hh" // USES PETSc Mesh
#include "pylith/utils/array.hh" // USES double_array
-#include <assert.h> // USES assert()
+#include <cassert> // USES assert()
#include <sstream> // USES std::ostringstream
#include <stdexcept> // USES std::runtime_error
Modified: short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveDyn.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveDyn.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveDyn.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -20,7 +20,7 @@
#include "spatialdata/geocoords/CoordSys.hh" // USES CoordSys
-#include <assert.h> // USES assert()
+#include <cassert> // USES assert()
#include <sstream> // USES std::ostringstream
#include <stdexcept> // USES std::runtime_error
Modified: short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -31,11 +31,11 @@
#include <Completion.hh> // USES completeSection
#include <Selection.hh> // Algorithms for submeshes
-#include <math.h> // USES pow(), sqrt()
+#include <cmath> // USES pow(), sqrt()
#include <strings.h> // USES strcasecmp()
-#include <string.h> // USES strlen()
-#include <stdlib.h> // USES atoi()
-#include <assert.h> // USES assert()
+#include <cstring> // USES strlen()
+#include <cstdlib> // USES atoi()
+#include <cassert> // USES assert()
#include <sstream> // USES std::ostringstream
#include <stdexcept> // USES std::runtime_error
Modified: short/3D/PyLith/trunk/libsrc/faults/LiuCosSlipFn.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/faults/LiuCosSlipFn.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/faults/LiuCosSlipFn.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -21,7 +21,7 @@
#include "spatialdata/geocoords/CoordSys.hh" // USES CoordSys
#include "spatialdata/units/Nondimensional.hh" // USES Nondimensional
-#include <assert.h> // USES assert()
+#include <cassert> // USES assert()
#include <sstream> // USES std::ostringstream
#include <stdexcept> // USES std::runtime_error
Modified: short/3D/PyLith/trunk/libsrc/faults/StepSlipFn.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/faults/StepSlipFn.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/faults/StepSlipFn.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -21,7 +21,7 @@
#include "spatialdata/geocoords/CoordSys.hh" // USES CoordSys
#include "spatialdata/units/Nondimensional.hh" // USES Nondimensional
-#include <assert.h> // USES assert()
+#include <cassert> // USES assert()
#include <sstream> // USES std::ostringstream
#include <stdexcept> // USES std::runtime_error
Modified: short/3D/PyLith/trunk/libsrc/feassemble/CellGeometry.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/CellGeometry.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/feassemble/CellGeometry.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -16,7 +16,7 @@
#include "petsc.h" // USES PetscLogFlops
-#include <string.h> // USES memcpy()
+#include <cstring> // USES memcpy()
#include <iostream> // USES std::cerr
Modified: short/3D/PyLith/trunk/libsrc/feassemble/ElasticityExplicit.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/ElasticityExplicit.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/feassemble/ElasticityExplicit.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -25,7 +25,7 @@
#include "petscmat.h" // USES PetscMat
#include "spatialdata/geocoords/CoordSys.hh" // USES CoordSys
-#include <assert.h> // USES assert()
+#include <cassert> // USES assert()
#include <stdexcept> // USES std::runtime_error
// ----------------------------------------------------------------------
Modified: short/3D/PyLith/trunk/libsrc/feassemble/ElasticityImplicit.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/ElasticityImplicit.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/feassemble/ElasticityImplicit.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -28,7 +28,7 @@
#include "spatialdata/units/Nondimensional.hh" // USES Nondimendional
#include "spatialdata/spatialdb/GravityField.hh" // USES GravityField
-#include <assert.h> // USES assert()
+#include <cassert> // USES assert()
#include <stdexcept> // USES std::runtime_error
// ----------------------------------------------------------------------
Modified: short/3D/PyLith/trunk/libsrc/feassemble/GeometryHex3D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/GeometryHex3D.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/feassemble/GeometryHex3D.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -20,7 +20,7 @@
#include "pylith/utils/array.hh" // USES double_array
-#include <assert.h> // USES assert()
+#include <cassert> // USES assert()
// ----------------------------------------------------------------------
// Default constructor.
Modified: short/3D/PyLith/trunk/libsrc/feassemble/GeometryLine1D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/GeometryLine1D.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/feassemble/GeometryLine1D.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -20,7 +20,7 @@
#include "petsc.h" // USES PetscLogFlops
-#include <assert.h> // USES assert()
+#include <cassert> // USES assert()
// ----------------------------------------------------------------------
// Default constructor.
Modified: short/3D/PyLith/trunk/libsrc/feassemble/GeometryLine2D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/GeometryLine2D.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/feassemble/GeometryLine2D.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -20,7 +20,7 @@
#include "petsc.h" // USES PetscLogFlops
-#include <assert.h> // USES assert()
+#include <cassert> // USES assert()
// ----------------------------------------------------------------------
// Default constructor.
Modified: short/3D/PyLith/trunk/libsrc/feassemble/GeometryLine3D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/GeometryLine3D.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/feassemble/GeometryLine3D.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -20,7 +20,7 @@
#include "pylith/utils/array.hh" // USES double_array
-#include <assert.h> // USES assert()
+#include <cassert> // USES assert()
// ----------------------------------------------------------------------
// Default constructor.
Modified: short/3D/PyLith/trunk/libsrc/feassemble/GeometryPoint1D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/GeometryPoint1D.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/feassemble/GeometryPoint1D.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -16,7 +16,7 @@
#include "pylith/utils/array.hh" // USES double_array
-#include <assert.h> // USES assert()
+#include <cassert> // USES assert()
// ----------------------------------------------------------------------
// Default constructor.
Modified: short/3D/PyLith/trunk/libsrc/feassemble/GeometryPoint2D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/GeometryPoint2D.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/feassemble/GeometryPoint2D.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -16,7 +16,7 @@
#include "pylith/utils/array.hh" // USES double_array
-#include <assert.h> // USES assert()
+#include <cassert> // USES assert()
// ----------------------------------------------------------------------
// Default constructor.
Modified: short/3D/PyLith/trunk/libsrc/feassemble/GeometryPoint3D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/GeometryPoint3D.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/feassemble/GeometryPoint3D.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -16,7 +16,7 @@
#include "pylith/utils/array.hh" // USES double_array
-#include <assert.h> // USES assert()
+#include <cassert> // USES assert()
// ----------------------------------------------------------------------
// Default constructor.
Modified: short/3D/PyLith/trunk/libsrc/feassemble/GeometryQuad2D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/GeometryQuad2D.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/feassemble/GeometryQuad2D.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -20,7 +20,7 @@
#include "pylith/utils/array.hh" // USES double_array
-#include <assert.h> // USES assert()
+#include <cassert> // USES assert()
// ----------------------------------------------------------------------
// Default constructor.
Modified: short/3D/PyLith/trunk/libsrc/feassemble/GeometryQuad3D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/GeometryQuad3D.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/feassemble/GeometryQuad3D.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -20,7 +20,7 @@
#include "pylith/utils/array.hh" // USES double_array
-#include <assert.h> // USES assert()
+#include <cassert> // USES assert()
// ----------------------------------------------------------------------
// Default constructor.
Modified: short/3D/PyLith/trunk/libsrc/feassemble/GeometryTet3D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/GeometryTet3D.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/feassemble/GeometryTet3D.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -20,7 +20,7 @@
#include "pylith/utils/array.hh" // USES double_array
-#include <assert.h> // USES assert()
+#include <cassert> // USES assert()
// ----------------------------------------------------------------------
// Default constructor.
Modified: short/3D/PyLith/trunk/libsrc/feassemble/GeometryTri2D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/GeometryTri2D.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/feassemble/GeometryTri2D.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -20,7 +20,7 @@
#include "pylith/utils/array.hh" // USES double_array
-#include <assert.h> // USES assert()
+#include <cassert> // USES assert()
// ----------------------------------------------------------------------
// Default constructor.
Modified: short/3D/PyLith/trunk/libsrc/feassemble/GeometryTri3D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/GeometryTri3D.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/feassemble/GeometryTri3D.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -20,7 +20,7 @@
#include "pylith/utils/array.hh" // USES double_array
-#include <assert.h> // USES assert()
+#include <cassert> // USES assert()
// ----------------------------------------------------------------------
// Default constructor.
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Integrator.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Integrator.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Integrator.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -20,7 +20,7 @@
#include "spatialdata/units/Nondimensional.hh" // USES Nondimensional
#include "spatialdata/spatialdb/GravityField.hh" // USES GravityField
-#include <assert.h> // USES assert()
+#include <cassert> // USES assert()
// ----------------------------------------------------------------------
// Constructor
Modified: short/3D/PyLith/trunk/libsrc/feassemble/IntegratorElasticity.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/IntegratorElasticity.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/feassemble/IntegratorElasticity.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -21,9 +21,9 @@
#include "pylith/topology/FieldsManager.hh" // USES FieldsManager
#include "pylith/utils/array.hh" // USES double_array
-#include <string.h> // USES memcpy()
+#include <cstring> // USES memcpy()
#include <strings.h> // USES strcasecmp()
-#include <assert.h> // USES assert()
+#include <cassert> // USES assert()
#include <stdexcept> // USES std::runtime_error
// ----------------------------------------------------------------------
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -16,8 +16,8 @@
#include "CellGeometry.hh" // USES CellGeometry
-#include <string.h> // USES memcpy()
-#include <assert.h> // USES assert()
+#include <cstring> // USES memcpy()
+#include <cassert> // USES assert()
#include <stdexcept> // USES std::runtime_error
#include <sstream> // USES std::ostringstream
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature0D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature0D.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature0D.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -18,7 +18,7 @@
#include "petsc.h" // USES PetscLogFlops()
-#include <assert.h> // USES assert()
+#include <cassert> // USES assert()
// ----------------------------------------------------------------------
// Constructor
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1D.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1D.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -19,7 +19,7 @@
#include "petsc.h" // USES PetscLogFlops
-#include <assert.h> // USES assert()
+#include <cassert> // USES assert()
#define ISOPARAMETRIC
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1Din2D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1Din2D.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1Din2D.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -18,7 +18,7 @@
#include "petsc.h" // USES PetscLogFlops
-#include <assert.h> // USES assert()
+#include <cassert> // USES assert()
#define ISOPARAMETRIC
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1Din3D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1Din3D.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1Din3D.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -18,7 +18,7 @@
#include "petsc.h" // USES PetscLogFlops
-#include <assert.h> // USES assert()
+#include <cassert> // USES assert()
#define ISOPARAMETRIC
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature2D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature2D.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature2D.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -18,7 +18,7 @@
#include "petsc.h" // USES PetscLogFlops
-#include <assert.h> // USES assert()
+#include <cassert> // USES assert()
#define ISOPARAMETRIC
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature2Din3D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature2Din3D.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature2Din3D.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -18,8 +18,8 @@
#include "petsc.h" // USES PetscLogFlops
-#include <math.h> // USES fabs()
-#include <assert.h> // USES assert()
+#include <cmath> // USES fabs()
+#include <cassert> // USES assert()
#include <stdexcept> // USES internal_error
#define ISOPARAMETRIC
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature3D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature3D.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature3D.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -18,7 +18,7 @@
#include "petsc.h" // USES PetscLogFlops
-#include <assert.h> // USES assert()
+#include <cassert> // USES assert()
#define ISOPARAMETRIC
Modified: short/3D/PyLith/trunk/libsrc/meshio/BinaryIO.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/BinaryIO.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/meshio/BinaryIO.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -15,7 +15,7 @@
#include "BinaryIO.hh" // implementation of class methods
#include <fstream> // USES std::ifstream
-#include <assert.h> // USES assert()
+#include <cassert> // USES assert()
// ----------------------------------------------------------------------
// Read fixed length string from file.
Modified: short/3D/PyLith/trunk/libsrc/meshio/DataWriterVTK.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/DataWriterVTK.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/meshio/DataWriterVTK.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -16,7 +16,7 @@
#include <petscmesh_viewers.hh> // USES VTKViewer
-#include <assert.h> // USES assert()
+#include <cassert> // USES assert()
#include <sstream> // USES std::ostringstream
#include <stdexcept> // USES std::runtime_error
Modified: short/3D/PyLith/trunk/libsrc/meshio/GMVFile.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/GMVFile.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/meshio/GMVFile.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -18,7 +18,7 @@
#include <fstream> // uses std::fstream
#include <sstream> // uses std::ostringstream
-#include <string.h> // uses strcmp()
+#include <cstring> // uses strcmp()
#include <stdexcept> // USES std::runtime_error
// ----------------------------------------------------------------
Modified: short/3D/PyLith/trunk/libsrc/meshio/GMVFileAscii.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/GMVFileAscii.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/meshio/GMVFileAscii.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -18,8 +18,8 @@
#include <fstream> // USES std::ifstream
#include <iomanip> // USES std::setw()
-#include <string.h> // USES strcmp()
-#include <assert.h> // USES assert()
+#include <cstring> // USES strcmp()
+#include <cassert> // USES assert()
#include <sstream> // USES std::ostringstream
#include <stdexcept> // USES std::exception
Modified: short/3D/PyLith/trunk/libsrc/meshio/GMVFileBinary.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/GMVFileBinary.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/meshio/GMVFileBinary.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -20,7 +20,7 @@
#include <fstream> // USES std::ifstream
#include <iomanip> // USES std::setw()
-#include <assert.h> // USES assert()
+#include <cassert> // USES assert()
#include <sstream> // USES std::ostringstream
#include <stdexcept> // USES std::exception
Modified: short/3D/PyLith/trunk/libsrc/meshio/HDF5.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/HDF5.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/meshio/HDF5.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -18,7 +18,7 @@
#include <stdexcept> // USES std::runtime_error
#include <sstream> // USES std::ostringstream
-#include <assert.h> // USES assert()
+#include <cassert> // USES assert()
// ----------------------------------------------------------------------
// Constructor
Modified: short/3D/PyLith/trunk/libsrc/meshio/MeshIO.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/MeshIO.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/meshio/MeshIO.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -20,7 +20,7 @@
#include "Selection.hh" // USES boundary()
-#include <assert.h> // USES assert()
+#include <cassert> // USES assert()
#include <sstream> // USES std::ostringstream
#include <stdexcept> // USES std::runtime_error
Modified: short/3D/PyLith/trunk/libsrc/meshio/MeshIOAscii.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/MeshIOAscii.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/meshio/MeshIOAscii.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -23,7 +23,7 @@
#include <iomanip> // USES setw(), setiosflags(), resetiosflags()
#include <strings.h> // USES strcasecmp()
-#include <assert.h> // USES assert()
+#include <cassert> // USES assert()
#include <fstream> // USES std::ifstream, std::ofstream
#include <stdexcept> // USES std::runtime_error
#include <sstream> // USES std::ostringstream
Modified: short/3D/PyLith/trunk/libsrc/meshio/MeshIOCubit.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/MeshIOCubit.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/meshio/MeshIOCubit.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -22,7 +22,7 @@
#include <netcdfcpp.h> // USES netcdf
-#include <assert.h> // USES assert()
+#include <cassert> // USES assert()
#include <stdexcept> // USES std::runtime_error
#include <sstream> // USES std::ostringstream
Modified: short/3D/PyLith/trunk/libsrc/meshio/MeshIOHDF5.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/MeshIOHDF5.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/meshio/MeshIOHDF5.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -20,7 +20,7 @@
#include <stdexcept> // USES std::runtime_error
#include <sstream> // USES std::ostringstream
-#include <assert.h> // USES assert()
+#include <cassert> // USES assert()
// ----------------------------------------------------------------------
// Constructor
Modified: short/3D/PyLith/trunk/libsrc/meshio/MeshIOLagrit.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/MeshIOLagrit.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/meshio/MeshIOLagrit.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -23,7 +23,7 @@
#include <petsc.h> // USES MPI_Comm
-#include <assert.h> // USES assert()
+#include <cassert> // USES assert()
#include <stdexcept> // TEMPORARY
// ----------------------------------------------------------------------
Modified: short/3D/PyLith/trunk/libsrc/meshio/PsetFile.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/PsetFile.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/meshio/PsetFile.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -18,7 +18,7 @@
#include <fstream> // uses std::fstream
#include <sstream> // uses std::ostringstream
-#include <string.h> // uses strcmp()
+#include <cstring> // uses strcmp()
#include <stdexcept> // USES std::runtime_error
// ----------------------------------------------------------------
Modified: short/3D/PyLith/trunk/libsrc/meshio/PsetFileAscii.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/PsetFileAscii.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/meshio/PsetFileAscii.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -18,8 +18,8 @@
#include <fstream> // USES std::ifstream
#include <iomanip> // USES std::setw()
-#include <string.h> // USES strcmp()
-#include <assert.h> // USES assert()
+#include <cstring> // USES strcmp()
+#include <cassert> // USES assert()
#include <sstream> // USES std::ostringstream
#include <stdexcept> // USES std::exception
Modified: short/3D/PyLith/trunk/libsrc/meshio/PsetFileBinary.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/PsetFileBinary.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/meshio/PsetFileBinary.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -22,7 +22,7 @@
#include <fstream> // USES std::ifstream
#include <iomanip> // USES std::setw()
-#include <assert.h> // USES assert()
+#include <cassert> // USES assert()
#include <sstream> // USES std::ostringstream
#include <stdexcept> // USES std::exception
#include <sys/types.h> // USES int32_t, int64_t
Modified: short/3D/PyLith/trunk/libsrc/topology/Distributor.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/topology/Distributor.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/topology/Distributor.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -18,11 +18,11 @@
#include "pylith/utils/vectorfields.hh" // USES SCALAR_FIELD
#include "pylith/meshio/DataWriter.hh" // USES DataWriter
-#include <string.h> // USES strlen()
+#include <cstring> // USES strlen()
#include <strings.h> // USES strcasecmp()
#include <stdexcept> // USES std::runtime_error
#include <sstream> // USES std::ostringstream
-#include <assert.h> // USES assert()
+#include <cassert> // USES assert()
// ----------------------------------------------------------------------
// Constructor
Modified: short/3D/PyLith/trunk/libsrc/topology/FieldsManager.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/topology/FieldsManager.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/topology/FieldsManager.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -17,7 +17,7 @@
#include <stdexcept> // USES std::runtime_error
#include <sstream> // USES std::ostringstream
#include <strings.h> // USES strcasecmp()
-#include <assert.h> // USES assert()
+#include <cassert> // USES assert()
// ----------------------------------------------------------------------
// Constructor
Modified: short/3D/PyLith/trunk/libsrc/topology/MeshOps.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/topology/MeshOps.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/topology/MeshOps.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -18,7 +18,7 @@
#include <stdexcept> // USES std::runtime_error
#include <sstream> // USES std::ostringstream
-#include <assert.h> // USES assert()
+#include <cassert> // USES assert()
#include <algorithm> // USES std::sort, std::find
#include <map> // USES std::map
Modified: short/3D/PyLith/trunk/libsrc/topology/MeshRefiner.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/topology/MeshRefiner.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/topology/MeshRefiner.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -17,11 +17,11 @@
#include "pylith/utils/sievetypes.hh" // USES PETSc Mesh
#include "pylith/meshio/DataWriter.hh" // USES DataWriter
-#include <string.h> // USES strlen()
+#include <cstring> // USES strlen()
#include <strings.h> // USES strcasecmp()
#include <stdexcept> // USES std::runtime_error
#include <sstream> // USES std::ostringstream
-#include <assert.h> // USES assert()
+#include <cassert> // USES assert()
// ----------------------------------------------------------------------
// Constructor
Modified: short/3D/PyLith/trunk/libsrc/topology/RefineUniform.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/topology/RefineUniform.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/topology/RefineUniform.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -18,7 +18,7 @@
#include <stdexcept> // USES std::runtime_error
#include <sstream> // USES std::ostringstream
-#include <assert.h> // USES assert()
+#include <cassert> // USES assert()
// ----------------------------------------------------------------------
// Constructor
Modified: short/3D/PyLith/trunk/libsrc/utils/EventLogger.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/utils/EventLogger.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/libsrc/utils/EventLogger.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -15,7 +15,7 @@
#include <stdexcept> // USES std::runtime_error
#include <sstream> // USES std::ostringstream
-#include <assert.h> // USES assert()
+#include <cassert> // USES assert()
// ----------------------------------------------------------------------
// Constructor
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityExplicit.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityExplicit.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityExplicit.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -331,7 +331,8 @@
_material->id(_data->matId);
_material->label(_data->matLabel);
_material->db(&db);
- _material->initialize(*mesh, &cs, _quadrature, normalizer);
+ _material->normalizer(normalizer);
+ _material->initialize(*mesh, &cs, _quadrature);
integrator->quadrature(_quadrature);
integrator->gravityField(_gravityField);
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityImplicit.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityImplicit.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityImplicit.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -332,7 +332,8 @@
_material->id(_data->matId);
_material->label(_data->matLabel);
_material->db(&db);
- _material->initialize(*mesh, &cs, _quadrature, normalizer);
+ _material->normalizer(normalizer);
+ _material->initialize(*mesh, &cs, _quadrature);
integrator->quadrature(_quadrature);
integrator->gravityField(_gravityField);
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/TestMaterial.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/TestMaterial.cc 2008-12-02 20:06:51 UTC (rev 13441)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/TestMaterial.cc 2008-12-02 20:07:20 UTC (rev 13442)
@@ -194,7 +194,8 @@
material.db(&db);
material.id(materialID);
material.label("my_material");
- material.initialize(mesh, &cs, &quadrature, normalizer);
+ material.normalizer(normalizer);
+ material.initialize(mesh, &cs, &quadrature);
const double densityA = 2000.0;
const double vsA = 100.0;
More information about the CIG-COMMITS
mailing list