[cig-commits] r11665 - in short/3D/PyLith/trunk: . libsrc/bc libsrc/faults libsrc/feassemble libsrc/materials libsrc/meshio
brad at geodynamics.org
brad at geodynamics.org
Mon Mar 31 09:16:01 PDT 2008
Author: brad
Date: 2008-03-31 09:16:00 -0700 (Mon, 31 Mar 2008)
New Revision: 11665
Modified:
short/3D/PyLith/trunk/TODO
short/3D/PyLith/trunk/libsrc/bc/AbsorbingDampers.cc
short/3D/PyLith/trunk/libsrc/bc/Neumann.cc
short/3D/PyLith/trunk/libsrc/faults/BruneSlipFn.cc
short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.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/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/IntegratorElasticity.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/materials/ElasticIsotropic3D.cc
short/3D/PyLith/trunk/libsrc/materials/ElasticPlaneStrain.cc
short/3D/PyLith/trunk/libsrc/materials/ElasticPlaneStress.cc
short/3D/PyLith/trunk/libsrc/materials/ElasticStrain1D.cc
short/3D/PyLith/trunk/libsrc/materials/ElasticStress1D.cc
short/3D/PyLith/trunk/libsrc/materials/GenMaxwellIsotropic3D.cc
short/3D/PyLith/trunk/libsrc/materials/MaxwellIsotropic3D.cc
short/3D/PyLith/trunk/libsrc/materials/ViscoelasticMaxwell.cc
short/3D/PyLith/trunk/libsrc/meshio/CellFilterAvg.cc
short/3D/PyLith/trunk/libsrc/meshio/VertexFilterVecNorm.cc
Log:
Updated to account for changes in PETSc. PetscFlopsNoCheck -> PetscFlops.
Modified: short/3D/PyLith/trunk/TODO
===================================================================
--- short/3D/PyLith/trunk/TODO 2008-03-31 16:13:07 UTC (rev 11664)
+++ short/3D/PyLith/trunk/TODO 2008-03-31 16:16:00 UTC (rev 11665)
@@ -4,33 +4,20 @@
Release 1.1
- 2. Fix calcTractionsChange.
-
Benchmarks
1. Strike-slip benchmark.
c. Rerun benchmarks.
d. Tabulate results.
- e. Test scaling (1,2,4,8,16 processors) for 500m cases
- Examples
-
- 2. Add some simple kinematic rupture examples. (Brad)
- a. 2-D bar (tri3, quad4)
- b. 3-D bar (tet4, hex8)
-
Binaries
Add setup.sh for linux.
Manual
- 1. Add list of output fields for elastic materials.
-
2. Add strike-slip benchmarks.
- 3. Update cover figure with current result. (Brad)
-
----------------------------------------------------------------------
Workshop
@@ -46,9 +33,6 @@
d. Generate analytic solutions.
e. Tabulate results.
- 3. CUBIT (Brad)
- Add GUI instructions in journal files for examples/3d/hex8.
-
----------------------------------------------------------------------
Release 1.2
Modified: short/3D/PyLith/trunk/libsrc/bc/AbsorbingDampers.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/bc/AbsorbingDampers.cc 2008-03-31 16:13:07 UTC (rev 11664)
+++ short/3D/PyLith/trunk/libsrc/bc/AbsorbingDampers.cc 2008-03-31 16:16:00 UTC (rev 11665)
@@ -293,7 +293,7 @@
} // for
} // for
- PetscLogFlopsNoCheck(numQuadPts*(3+numBasis*(1+numBasis*(5*spaceDim))));
+ PetscLogFlops(numQuadPts*(3+numBasis*(1+numBasis*(5*spaceDim))));
// Assemble cell contribution into field
_boundaryMesh->updateAdd(residual, *c_iter, _cellVector);
@@ -384,7 +384,7 @@
} // for
} // for
} // for
- PetscLogFlopsNoCheck(numQuadPts*(3+numBasis*(1+numBasis*(1+2*spaceDim))));
+ PetscLogFlops(numQuadPts*(3+numBasis*(1+numBasis*(1+2*spaceDim))));
// Assemble cell contribution into PETSc Matrix
const ALE::Obj<Mesh::order_type>& globalOrder =
Modified: short/3D/PyLith/trunk/libsrc/bc/Neumann.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/bc/Neumann.cc 2008-03-31 16:13:07 UTC (rev 11664)
+++ short/3D/PyLith/trunk/libsrc/bc/Neumann.cc 2008-03-31 16:16:00 UTC (rev 11665)
@@ -314,7 +314,7 @@
// Assemble cell contribution into field
_boundaryMesh->updateAdd(residual, *c_iter, _cellVector);
- PetscLogFlopsNoCheck(numQuadPts*(1+numBasis*(1+numBasis*(1+2*spaceDim))));
+ PetscLogFlops(numQuadPts*(1+numBasis*(1+numBasis*(1+2*spaceDim))));
} // for
} // integrateResidual
Modified: short/3D/PyLith/trunk/libsrc/faults/BruneSlipFn.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/faults/BruneSlipFn.cc 2008-03-31 16:13:07 UTC (rev 11664)
+++ short/3D/PyLith/trunk/libsrc/faults/BruneSlipFn.cc 2008-03-31 16:16:00 UTC (rev 11665)
@@ -230,7 +230,7 @@
_slip->updatePoint(*v_iter, &slipValues[0]);
} // for
- PetscLogFlopsNoCheck(numVertices * (2+8 + 3*spaceDim));
+ PetscLogFlops(numVertices * (2+8 + 3*spaceDim));
return _slip;
} // slip
@@ -285,7 +285,7 @@
_slip->updatePoint(*v_iter, &slipValues[0]);
} // for
- PetscLogFlopsNoCheck(count * (3+2*8 + 3*spaceDim));
+ PetscLogFlops(count * (3+2*8 + 3*spaceDim));
return _slip;
} // slipIncr
Modified: short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.cc 2008-03-31 16:13:07 UTC (rev 11664)
+++ short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.cc 2008-03-31 16:16:00 UTC (rev 11665)
@@ -239,7 +239,7 @@
// Assemble cell contribution into field
mesh->updateAdd(residual, *c_iter, &cellResidual[0]);
} // for
- PetscLogFlopsNoCheck(cellsCohesiveSize*numConstraintVert*spaceDim*spaceDim*7);
+ PetscLogFlops(cellsCohesiveSize*numConstraintVert*spaceDim*spaceDim*7);
} // integrateResidual
// ----------------------------------------------------------------------
@@ -359,7 +359,7 @@
if (err)
throw std::runtime_error("Update to PETSc Mat failed.");
} // for
- PetscLogFlopsNoCheck(cellsCohesiveSize*numConstraintVert*spaceDim*spaceDim*4);
+ PetscLogFlops(cellsCohesiveSize*numConstraintVert*spaceDim*spaceDim*4);
_needNewJacobian = false;
} // integrateJacobian
@@ -610,7 +610,7 @@
_orientation->updatePoint(*v_iter, &vertexDir[0]);
} // for
- PetscLogFlopsNoCheck(count * orientationSize * 4);
+ PetscLogFlops(count * orientationSize * 4);
if (2 == cohesiveDim) {
// Check orientation of first vertex, if dot product of fault
@@ -650,7 +650,7 @@
_orientation->updatePoint(*v_iter, &vertexDir[0]);
} // for
- PetscLogFlopsNoCheck(5 + count * 3);
+ PetscLogFlops(5 + count * 3);
} // if
//_orientation->view("ORIENTATION");
@@ -776,7 +776,7 @@
//const double mu = 1.0;
_pseudoStiffness->updatePoint(*v_iter, &mu);
} // for
- PetscLogFlopsNoCheck(count * 2);
+ PetscLogFlops(count * 2);
} // _calcConditioning
// ----------------------------------------------------------------------
@@ -843,7 +843,7 @@
} // for
_faultMesh->updateAdd(_area, *c_iter, &cellArea[0]);
- PetscLogFlopsNoCheck( numQuadPts*(1+numBasis*2) );
+ PetscLogFlops( numQuadPts*(1+numBasis*2) );
} // for
// Assemble area information
@@ -905,7 +905,7 @@
(*tractions)->updatePoint(*v_iter, &tractionValues[0]);
} // for
- PetscLogFlopsNoCheck(numVertices * (1 + fiberDim) );
+ PetscLogFlops(numVertices * (1 + fiberDim) );
//solution->view("SOLUTION");
//(*tractions)->view("TRACTIONS");
Modified: short/3D/PyLith/trunk/libsrc/feassemble/CellGeometry.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/CellGeometry.cc 2008-03-31 16:13:07 UTC (rev 11664)
+++ short/3D/PyLith/trunk/libsrc/feassemble/CellGeometry.cc 2008-03-31 16:16:00 UTC (rev 11665)
@@ -14,7 +14,7 @@
#include "CellGeometry.hh" // implementation of class methods
-#include "petsc.h" // USES PetscLogFlopsNoCheck
+#include "petsc.h" // USES PetscLogFlops
#include <iostream> // USES std::cerr
@@ -184,7 +184,7 @@
(*orientation)[1] = j2;
(*orientation)[2] = j2;
(*orientation)[3] = -j1;
- PetscLogFlopsNoCheck(1);
+ PetscLogFlops(1);
} // _orient1D
// ----------------------------------------------------------------------
@@ -251,7 +251,7 @@
(*orientation)[6] = r0*wt;
(*orientation)[7] = r1*wt;
(*orientation)[8] = r2*wt;
- PetscLogFlopsNoCheck(63);
+ PetscLogFlops(63);
} // _orient2D
Modified: short/3D/PyLith/trunk/libsrc/feassemble/ElasticityExplicit.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/ElasticityExplicit.cc 2008-03-31 16:13:07 UTC (rev 11664)
+++ short/3D/PyLith/trunk/libsrc/feassemble/ElasticityExplicit.cc 2008-03-31 16:16:00 UTC (rev 11665)
@@ -222,7 +222,7 @@
} // for
} // for
} // for
- PetscLogFlopsNoCheck(numQuadPts*(3+numBasis*(1+numBasis*(6*spaceDim))));
+ PetscLogFlops(numQuadPts*(3+numBasis*(1+numBasis*(6*spaceDim))));
// Compute B(transpose) * sigma, first computing strains
calcTotalStrainFn(&totalStrain, basisDeriv, dispTCell,
@@ -321,7 +321,7 @@
} // for
} // for
} // for
- PetscLogFlopsNoCheck(numQuadPts*(3+numBasis*(1+numBasis*(1+spaceDim))));
+ PetscLogFlops(numQuadPts*(3+numBasis*(1+numBasis*(1+spaceDim))));
// Assemble cell contribution into PETSc Matrix
const ALE::Obj<Mesh::order_type>& globalOrder =
Modified: short/3D/PyLith/trunk/libsrc/feassemble/ElasticityImplicit.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/ElasticityImplicit.cc 2008-03-31 16:13:07 UTC (rev 11664)
+++ short/3D/PyLith/trunk/libsrc/feassemble/ElasticityImplicit.cc 2008-03-31 16:16:00 UTC (rev 11665)
@@ -234,7 +234,7 @@
} // for
} // for
} // for
- PetscLogFlopsNoCheck(numQuadPts*(2+numBasis*(2+2*spaceDim)));
+ PetscLogFlops(numQuadPts*(2+numBasis*(2+2*spaceDim)));
} // if
#endif
Modified: short/3D/PyLith/trunk/libsrc/feassemble/GeometryHex3D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/GeometryHex3D.cc 2008-03-31 16:13:07 UTC (rev 11664)
+++ short/3D/PyLith/trunk/libsrc/feassemble/GeometryHex3D.cc 2008-03-31 16:16:00 UTC (rev 11665)
@@ -16,7 +16,7 @@
#include "GeometryQuad3D.hh" // USES GeometryQuad3D
-#include "petsc.h" // USES PetscLogFlopsNoCheck
+#include "petsc.h" // USES PetscLogFlops
#include "pylith/utils/array.hh" // USES double_array
@@ -152,7 +152,7 @@
+ h_01*p0*p1 + h_12*p1*p2 + h_02*p0*p2 + h_012*p0*p1*p2;
} // for
- PetscLogFlopsNoCheck(57 + npts*57);
+ PetscLogFlops(57 + npts*57);
} // ptsRefToGlobal
// ----------------------------------------------------------------------
@@ -245,7 +245,7 @@
(*jacobian)[2]*((*jacobian)[3]*(*jacobian)[7] -
(*jacobian)[4]*(*jacobian)[6]);
- PetscLogFlopsNoCheck(152);
+ PetscLogFlops(152);
} // jacobian
// ----------------------------------------------------------------------
@@ -356,7 +356,7 @@
det[i] = j0*(j4*j8 - j5*j7) - j1*(j3*j8 - j5*j6) + j2*(j3*j7 - j4*j6);
} // for
- PetscLogFlopsNoCheck(78 + npts*69);
+ PetscLogFlops(78 + npts*69);
} // jacobian
Modified: short/3D/PyLith/trunk/libsrc/feassemble/GeometryLine1D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/GeometryLine1D.cc 2008-03-31 16:13:07 UTC (rev 11664)
+++ short/3D/PyLith/trunk/libsrc/feassemble/GeometryLine1D.cc 2008-03-31 16:16:00 UTC (rev 11665)
@@ -18,7 +18,7 @@
#include "pylith/utils/array.hh" // USES double_array
-#include "petsc.h" // USES PetscLogFlopsNoCheck
+#include "petsc.h" // USES PetscLogFlops
#include <assert.h> // USES assert()
@@ -79,7 +79,7 @@
ptsGlobal[i] = x0 + (x1-x0) * p0;
} // for
- PetscLogFlopsNoCheck(5*npts);
+ PetscLogFlops(5*npts);
} // ptsRefToGlobal
// ----------------------------------------------------------------------
@@ -129,7 +129,7 @@
det[i] = j;
} // for
- PetscLogFlopsNoCheck(2);
+ PetscLogFlops(2);
} // jacobian
Modified: short/3D/PyLith/trunk/libsrc/feassemble/GeometryLine2D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/GeometryLine2D.cc 2008-03-31 16:13:07 UTC (rev 11664)
+++ short/3D/PyLith/trunk/libsrc/feassemble/GeometryLine2D.cc 2008-03-31 16:16:00 UTC (rev 11665)
@@ -18,7 +18,7 @@
#include "pylith/utils/array.hh" // USES double_array
-#include "petsc.h" // USES PetscLogFlopsNoCheck
+#include "petsc.h" // USES PetscLogFlops
#include <assert.h> // USES assert()
@@ -86,7 +86,7 @@
ptsGlobal[iG++] = y0 + g_1 * p0;
} // for
- PetscLogFlopsNoCheck(2 + npts*6);
+ PetscLogFlops(2 + npts*6);
} // ptsRefToGlobal
// ----------------------------------------------------------------------
@@ -114,7 +114,7 @@
*det = sqrt(pow((*jacobian)[0], 2) +
pow((*jacobian)[1], 2));
- PetscLogFlopsNoCheck(8);
+ PetscLogFlops(8);
} // jacobian
// ----------------------------------------------------------------------
@@ -150,7 +150,7 @@
det[i] = jdet;
} // for
- PetscLogFlopsNoCheck(8);
+ PetscLogFlops(8);
} // jacobian
Modified: short/3D/PyLith/trunk/libsrc/feassemble/GeometryLine3D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/GeometryLine3D.cc 2008-03-31 16:13:07 UTC (rev 11664)
+++ short/3D/PyLith/trunk/libsrc/feassemble/GeometryLine3D.cc 2008-03-31 16:16:00 UTC (rev 11665)
@@ -16,7 +16,7 @@
#include "GeometryPoint3D.hh" // USES GeometryPoint3D
-#include "petsc.h" // USES PetscLogFlopsNoCheck
+#include "petsc.h" // USES PetscLogFlops
#include "pylith/utils/array.hh" // USES double_array
@@ -90,7 +90,7 @@
ptsGlobal[iG++] = z0 + h_1 * p0;
} // for
- PetscLogFlopsNoCheck(3 + npts*8);
+ PetscLogFlops(3 + npts*8);
} // ptsRefToGlobal
// ----------------------------------------------------------------------
@@ -121,7 +121,7 @@
*det = sqrt(pow((*jacobian)[0], 2) +
pow((*jacobian)[1], 2) +
pow((*jacobian)[2], 2));
- PetscLogFlopsNoCheck(12);
+ PetscLogFlops(12);
} // jacobian
// ----------------------------------------------------------------------
@@ -161,7 +161,7 @@
det[i] = jdet;
} // for
- PetscLogFlopsNoCheck(12);
+ PetscLogFlops(12);
} // jacobian
Modified: short/3D/PyLith/trunk/libsrc/feassemble/GeometryQuad2D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/GeometryQuad2D.cc 2008-03-31 16:13:07 UTC (rev 11664)
+++ short/3D/PyLith/trunk/libsrc/feassemble/GeometryQuad2D.cc 2008-03-31 16:16:00 UTC (rev 11665)
@@ -16,7 +16,7 @@
#include "GeometryLine2D.hh" // USES GeometryLine2D
-#include "petsc.h" // USES PetscLogFlopsNoCheck
+#include "petsc.h" // USES PetscLogFlops
#include "pylith/utils/array.hh" // USES double_array
@@ -101,7 +101,7 @@
ptsGlobal[iG++] = y0 + g_1 * p0 + g_3 * p1 + g_01 * p0 * p1;
} // for
- PetscLogFlopsNoCheck(10 + npts*18);
+ PetscLogFlops(10 + npts*18);
} // ptsRefToGlobal
// ----------------------------------------------------------------------
@@ -148,7 +148,7 @@
(*jacobian)[0]*(*jacobian)[3] -
(*jacobian)[1]*(*jacobian)[2];
- PetscLogFlopsNoCheck(31);
+ PetscLogFlops(31);
} // jacobian
// ----------------------------------------------------------------------
@@ -206,7 +206,7 @@
det[i] = j0*j3 - j1*j2;
} // for
- PetscLogFlopsNoCheck(10 + npts*19);
+ PetscLogFlops(10 + npts*19);
} // jacobian
Modified: short/3D/PyLith/trunk/libsrc/feassemble/GeometryQuad3D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/GeometryQuad3D.cc 2008-03-31 16:13:07 UTC (rev 11664)
+++ short/3D/PyLith/trunk/libsrc/feassemble/GeometryQuad3D.cc 2008-03-31 16:16:00 UTC (rev 11665)
@@ -16,7 +16,7 @@
#include "GeometryLine3D.hh" // USES GeometryLine3D
-#include "petsc.h" // USES PetscLogFlopsNoCheck
+#include "petsc.h" // USES PetscLogFlops
#include "pylith/utils/array.hh" // USES double_array
@@ -111,7 +111,7 @@
ptsGlobal[iG++] = z0 + h_1 * p0 + h_3 * p1 + h_01 * p0 * p1;
} // for
- PetscLogFlopsNoCheck(15 + npts*25);
+ PetscLogFlops(15 + npts*25);
} // ptsRefToGlobal
// ----------------------------------------------------------------------
@@ -178,7 +178,7 @@
(*jacobian)[5]*(*jacobian)[5];
*det = sqrt(jj00*jj11 - jj01*jj10);
- PetscLogFlopsNoCheck(50);
+ PetscLogFlops(50);
} // jacobian
// ----------------------------------------------------------------------
@@ -251,7 +251,7 @@
det[i] = sqrt(jj00*jj11 - jj01*jj10);
} // for
- PetscLogFlopsNoCheck(28 + npts*32);
+ PetscLogFlops(28 + npts*32);
} // jacobian
Modified: short/3D/PyLith/trunk/libsrc/feassemble/GeometryTet3D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/GeometryTet3D.cc 2008-03-31 16:13:07 UTC (rev 11664)
+++ short/3D/PyLith/trunk/libsrc/feassemble/GeometryTet3D.cc 2008-03-31 16:16:00 UTC (rev 11665)
@@ -16,7 +16,7 @@
#include "GeometryTri3D.hh" // USES GeometryTri3D
-#include "petsc.h" // USES PetscLogFlopsNoCheck
+#include "petsc.h" // USES PetscLogFlops
#include "pylith/utils/array.hh" // USES double_array
@@ -114,7 +114,7 @@
ptsGlobal[iG++] = z0 + h_1 * p0 + h_2 * p1 + h_3 * p2;
} // for
- PetscLogFlopsNoCheck(9 + npts*24);
+ PetscLogFlops(9 + npts*24);
} // ptsRefToGlobal
// ----------------------------------------------------------------------
@@ -165,7 +165,7 @@
(*jacobian)[2]*((*jacobian)[3]*(*jacobian)[7] -
(*jacobian)[4]*(*jacobian)[6]);
- PetscLogFlopsNoCheck(32);
+ PetscLogFlops(32);
} // jacobian
// ----------------------------------------------------------------------
@@ -228,7 +228,7 @@
det[i] = jdet;
} // for
- PetscLogFlopsNoCheck(32);
+ PetscLogFlops(32);
} // jacobian
Modified: short/3D/PyLith/trunk/libsrc/feassemble/GeometryTri2D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/GeometryTri2D.cc 2008-03-31 16:13:07 UTC (rev 11664)
+++ short/3D/PyLith/trunk/libsrc/feassemble/GeometryTri2D.cc 2008-03-31 16:16:00 UTC (rev 11665)
@@ -16,7 +16,7 @@
#include "GeometryLine2D.hh" // USES GeometryLine2D
-#include "petsc.h" // USES PetscLogFlopsNoCheck
+#include "petsc.h" // USES PetscLogFlops
#include "pylith/utils/array.hh" // USES double_array
@@ -94,7 +94,7 @@
ptsGlobal[iG++] = y0 + g_1 * p0 + g_2 * p1;
} // for
- PetscLogFlopsNoCheck(4 + npts*12);
+ PetscLogFlops(4 + npts*12);
} // ptsRefToGlobal
// ----------------------------------------------------------------------
@@ -128,7 +128,7 @@
(*jacobian)[0]*(*jacobian)[3] -
(*jacobian)[1]*(*jacobian)[2];
- PetscLogFlopsNoCheck(11);
+ PetscLogFlops(11);
} // jacobian
// ----------------------------------------------------------------------
@@ -174,7 +174,7 @@
det[i] = jdet;
} // for
- PetscLogFlopsNoCheck(11);
+ PetscLogFlops(11);
} // jacobian
Modified: short/3D/PyLith/trunk/libsrc/feassemble/GeometryTri3D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/GeometryTri3D.cc 2008-03-31 16:13:07 UTC (rev 11664)
+++ short/3D/PyLith/trunk/libsrc/feassemble/GeometryTri3D.cc 2008-03-31 16:16:00 UTC (rev 11665)
@@ -16,7 +16,7 @@
#include "GeometryLine3D.hh" // USES GeometryLine3D
-#include "petsc.h" // USES PetscLogFlopsNoCheck
+#include "petsc.h" // USES PetscLogFlops
#include "pylith/utils/array.hh" // USES double_array
@@ -100,7 +100,7 @@
ptsGlobal[iG++] = z0 + h_1 * p0 + h_2 * p1;
} // for
- PetscLogFlopsNoCheck(22);
+ PetscLogFlops(22);
} // ptsRefToGlobal
// ----------------------------------------------------------------------
@@ -151,7 +151,7 @@
(*jacobian)[3]*(*jacobian)[3] +
(*jacobian)[5]*(*jacobian)[5];
*det = sqrt(jj00*jj11 - jj01*jj10);
- PetscLogFlopsNoCheck(25);
+ PetscLogFlops(25);
} // jacobian
// ----------------------------------------------------------------------
@@ -208,7 +208,7 @@
det[i] = jdet;
} // for
- PetscLogFlopsNoCheck(31);
+ PetscLogFlops(31);
} // jacobian
Modified: short/3D/PyLith/trunk/libsrc/feassemble/IntegratorElasticity.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/IntegratorElasticity.cc 2008-03-31 16:13:07 UTC (rev 11664)
+++ short/3D/PyLith/trunk/libsrc/feassemble/IntegratorElasticity.cc 2008-03-31 16:16:00 UTC (rev 11665)
@@ -441,7 +441,7 @@
_cellVector[iBasis*spaceDim ] -= N1*s11;
} // for
} // for
- PetscLogFlopsNoCheck(numQuadPts*(1+numBasis*5));
+ PetscLogFlops(numQuadPts*(1+numBasis*5));
} // _elasticityResidual1D
// ----------------------------------------------------------------------
@@ -476,7 +476,7 @@
_cellVector[iBasis*spaceDim+1] -= N1*s12 + N2*s22;
} // for
} // for
- PetscLogFlopsNoCheck(numQuadPts*(1+numBasis*(8+2+9)));
+ PetscLogFlops(numQuadPts*(1+numBasis*(8+2+9)));
} // _elasticityResidual2D
// ----------------------------------------------------------------------
@@ -519,7 +519,7 @@
_cellVector[iBlock+2] -= N1*s13 + N2*s23 + N3*s33;
} // for
} // for
- PetscLogFlopsNoCheck(numQuadPts*(1+numBasis*(3+12)));
+ PetscLogFlops(numQuadPts*(1+numBasis*(3+12)));
} // _elasticityResidual3D
// ----------------------------------------------------------------------
@@ -552,7 +552,7 @@
} // for
} // for
} // for
- PetscLogFlopsNoCheck(numQuadPts*(1+numBasis*(2+numBasis*3)));
+ PetscLogFlops(numQuadPts*(1+numBasis*(2+numBasis*3)));
} // _elasticityJacobian1D
// ----------------------------------------------------------------------
@@ -616,7 +616,7 @@
} // for
} // for
} // for
- PetscLogFlopsNoCheck(numQuadPts*(1+numBasis*(2+numBasis*(3*11+4))));
+ PetscLogFlops(numQuadPts*(1+numBasis*(2+numBasis*(3*11+4))));
} // _elasticityJacobian2D
// ----------------------------------------------------------------------
@@ -729,7 +729,7 @@
} // for
} // for
} // for
- PetscLogFlopsNoCheck(numQuadPts*(1+numBasis*(3+numBasis*(6*26+9))));
+ PetscLogFlops(numQuadPts*(1+numBasis*(3+numBasis*(6*26+9))));
} // _elasticityJacobian3D
// ----------------------------------------------------------------------
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature0D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature0D.cc 2008-03-31 16:13:07 UTC (rev 11664)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature0D.cc 2008-03-31 16:16:00 UTC (rev 11665)
@@ -16,7 +16,7 @@
#include "pylith/utils/array.hh" // USES double_array
-#include "petsc.h" // USES PetscLogFlopsNoCheck()
+#include "petsc.h" // USES PetscLogFlops()
#include <assert.h> // USES assert()
@@ -66,7 +66,7 @@
_jacobianInv[0] = 1.0;
_basisDeriv[0] = _basisDerivRef[0];
- PetscLogFlopsNoCheck(0);
+ PetscLogFlops(0);
} // computeGeometry
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1D.cc 2008-03-31 16:13:07 UTC (rev 11664)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1D.cc 2008-03-31 16:16:00 UTC (rev 11665)
@@ -17,7 +17,7 @@
#include "pylith/utils/array.hh" // USES double_array
#include "CellGeometry.hh" // USES CellGeometry
-#include "petsc.h" // USES PetscLogFlopsNoCheck
+#include "petsc.h" // USES PetscLogFlops
#include <assert.h> // USES assert()
@@ -112,7 +112,7 @@
_jacobianInv[iQuadPt];
} // for
- PetscLogFlopsNoCheck(_numQuadPts * (1 + _numBasis * 4));
+ PetscLogFlops(_numQuadPts * (1 + _numBasis * 4));
} // computeGeometry
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1Din2D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1Din2D.cc 2008-03-31 16:13:07 UTC (rev 11664)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1Din2D.cc 2008-03-31 16:16:00 UTC (rev 11665)
@@ -16,7 +16,7 @@
#include "CellGeometry.hh" // USES CellGeometry
-#include "petsc.h" // USES PetscLogFlopsNoCheck
+#include "petsc.h" // USES PetscLogFlops
#include <assert.h> // USES assert()
@@ -127,7 +127,7 @@
_jacobianInv[iQuadPt*_cellDim*_spaceDim+jDim*_spaceDim+iDim];
} // for
- PetscLogFlopsNoCheck(_numQuadPts * (1+_numBasis*_spaceDim*2+
+ PetscLogFlops(_numQuadPts * (1+_numBasis*_spaceDim*2+
_spaceDim*1 +
_numBasis*_spaceDim*_cellDim*2));
} // computeGeometry
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1Din3D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1Din3D.cc 2008-03-31 16:13:07 UTC (rev 11664)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1Din3D.cc 2008-03-31 16:16:00 UTC (rev 11665)
@@ -16,7 +16,7 @@
#include "CellGeometry.hh" // USES CellGeometry
-#include "petsc.h" // USES PetscLogFlopsNoCheck
+#include "petsc.h" // USES PetscLogFlops
#include <assert.h> // USES assert()
@@ -130,7 +130,7 @@
_jacobianInv[iQuadPt*_cellDim*_spaceDim+jDim*_spaceDim+iDim];
} // for
- PetscLogFlopsNoCheck(_numQuadPts * (1+_numBasis*_spaceDim*2 +
+ PetscLogFlops(_numQuadPts * (1+_numBasis*_spaceDim*2 +
_spaceDim*1 +
_numBasis*_spaceDim*_cellDim*2));
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature2D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature2D.cc 2008-03-31 16:13:07 UTC (rev 11664)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature2D.cc 2008-03-31 16:16:00 UTC (rev 11665)
@@ -16,7 +16,7 @@
#include "CellGeometry.hh" // USES CellGeometry
-#include "petsc.h" // USES PetscLogFlopsNoCheck
+#include "petsc.h" // USES PetscLogFlops
#include <assert.h> // USES assert()
@@ -143,7 +143,7 @@
_jacobianInv[iQuadPt*_cellDim*_spaceDim+jDim*_spaceDim+iDim];
} // for
- PetscLogFlopsNoCheck(_numQuadPts*(4 +
+ PetscLogFlops(_numQuadPts*(4 +
_numBasis*_spaceDim*2 +
_numBasis*_spaceDim*_cellDim*2));
} // computeGeometry
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature2Din3D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature2Din3D.cc 2008-03-31 16:13:07 UTC (rev 11664)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature2Din3D.cc 2008-03-31 16:16:00 UTC (rev 11665)
@@ -16,7 +16,7 @@
#include "CellGeometry.hh" // USES CellGeometry
-#include "petsc.h" // USES PetscLogFlopsNoCheck
+#include "petsc.h" // USES PetscLogFlops
#include <math.h> // USES fabs()
#include <assert.h> // USES assert()
@@ -222,7 +222,7 @@
_jacobianInv[iQuadPt*_cellDim*_spaceDim+jDim*_spaceDim+iDim];
} // for
- PetscLogFlopsNoCheck(_numQuadPts*(15 +
+ PetscLogFlops(_numQuadPts*(15 +
_numBasis*_spaceDim*2 +
_numBasis*_spaceDim*_cellDim*2));
} // computeGeometry
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature3D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature3D.cc 2008-03-31 16:13:07 UTC (rev 11664)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature3D.cc 2008-03-31 16:16:00 UTC (rev 11665)
@@ -16,7 +16,7 @@
#include "CellGeometry.hh" // USES CellGeometry
-#include "petsc.h" // USES PetscLogFlopsNoCheck
+#include "petsc.h" // USES PetscLogFlops
#include <assert.h> // USES assert()
@@ -178,7 +178,7 @@
_jacobianInv[iQuadPt*_cellDim*_spaceDim+jDim*_spaceDim+iDim];
} // for
- PetscLogFlopsNoCheck(_numQuadPts*(2+36 +
+ PetscLogFlops(_numQuadPts*(2+36 +
_numBasis*_spaceDim*_cellDim*4));
} // computeGeometry
Modified: short/3D/PyLith/trunk/libsrc/materials/ElasticIsotropic3D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/materials/ElasticIsotropic3D.cc 2008-03-31 16:13:07 UTC (rev 11664)
+++ short/3D/PyLith/trunk/libsrc/materials/ElasticIsotropic3D.cc 2008-03-31 16:16:00 UTC (rev 11665)
@@ -16,7 +16,7 @@
#include "pylith/utils/array.hh" // USES double_array
-#include "petsc.h" // USES PetscLogFlopsNoCheck
+#include "petsc.h" // USES PetscLogFlops
#include <assert.h> // USES assert()
#include <sstream> // USES std::ostringstream
@@ -111,7 +111,7 @@
propValues[_ElasticIsotropic3D::pidMu] = mu;
propValues[_ElasticIsotropic3D::pidLambda] = lambda;
- PetscLogFlopsNoCheck(6);
+ PetscLogFlops(6);
} // _dbToProperties
// ----------------------------------------------------------------------
@@ -170,7 +170,7 @@
stress[4] = mu2 * e23;
stress[5] = mu2 * e13;
- PetscLogFlopsNoCheck(13);
+ PetscLogFlops(13);
} // _calcStress
// ----------------------------------------------------------------------
@@ -220,7 +220,7 @@
elasticConsts[19] = 0; // C2313
elasticConsts[20] = mu2; // C1313
- PetscLogFlopsNoCheck(2);
+ PetscLogFlops(2);
} // _calcElasticConsts
Modified: short/3D/PyLith/trunk/libsrc/materials/ElasticPlaneStrain.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/materials/ElasticPlaneStrain.cc 2008-03-31 16:13:07 UTC (rev 11664)
+++ short/3D/PyLith/trunk/libsrc/materials/ElasticPlaneStrain.cc 2008-03-31 16:16:00 UTC (rev 11665)
@@ -14,7 +14,7 @@
#include "ElasticPlaneStrain.hh" // implementation of object methods
-#include "petsc.h" // USES PetscLogFlopsNoCheck
+#include "petsc.h" // USES PetscLogFlops
#include <assert.h> // USES assert()
#include <sstream> // USES std::ostringstream
@@ -109,7 +109,7 @@
propValues[_ElasticPlaneStrain::pidMu] = mu;
propValues[_ElasticPlaneStrain::pidLambda] = lambda;
- PetscLogFlopsNoCheck(6);
+ PetscLogFlops(6);
} // _dbToProperties
// ----------------------------------------------------------------------
@@ -162,7 +162,7 @@
stress[1] = s12 + mu2*e22;
stress[2] = mu2 * e12;
- PetscLogFlopsNoCheck(8);
+ PetscLogFlops(8);
} // _calcStress
// ----------------------------------------------------------------------
@@ -197,7 +197,7 @@
elasticConsts[4] = 0; // C2212
elasticConsts[5] = mu2; // C1212
- PetscLogFlopsNoCheck(2);
+ PetscLogFlops(2);
} // calcElasticConsts
Modified: short/3D/PyLith/trunk/libsrc/materials/ElasticPlaneStress.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/materials/ElasticPlaneStress.cc 2008-03-31 16:13:07 UTC (rev 11664)
+++ short/3D/PyLith/trunk/libsrc/materials/ElasticPlaneStress.cc 2008-03-31 16:16:00 UTC (rev 11665)
@@ -14,7 +14,7 @@
#include "ElasticPlaneStress.hh" // implementation of object methods
-#include "petsc.h" // USES PetscLogFlopsNoCheck
+#include "petsc.h" // USES PetscLogFlops
#include <assert.h> // USES assert()
#include <sstream> // USES std::ostringstream
@@ -108,7 +108,7 @@
propValues[_ElasticPlaneStress::pidMu] = mu;
propValues[_ElasticPlaneStress::pidLambda] = lambda;
- PetscLogFlopsNoCheck(6);
+ PetscLogFlops(6);
} // _dbToProperties
// ----------------------------------------------------------------------
@@ -159,7 +159,7 @@
stress[1] = (mu2*lambda * e11 + 2.0*mu2*lambdamu * e22) / lambda2mu;
stress[2] = mu2 * e12;
- PetscLogFlopsNoCheck(18);
+ PetscLogFlops(18);
} // _calcStress
// ----------------------------------------------------------------------
@@ -195,7 +195,7 @@
elasticConsts[4] = 0; // C2212
elasticConsts[5] = mu2; // C1212
- PetscLogFlopsNoCheck(8);
+ PetscLogFlops(8);
} // calcElasticConsts
Modified: short/3D/PyLith/trunk/libsrc/materials/ElasticStrain1D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/materials/ElasticStrain1D.cc 2008-03-31 16:13:07 UTC (rev 11664)
+++ short/3D/PyLith/trunk/libsrc/materials/ElasticStrain1D.cc 2008-03-31 16:16:00 UTC (rev 11665)
@@ -14,7 +14,7 @@
#include "ElasticStrain1D.hh" // implementation of object methods
-#include "petsc.h" // USES PetscLogFlopsNoCheck
+#include "petsc.h" // USES PetscLogFlops
#include <assert.h> // USES assert()
@@ -107,7 +107,7 @@
propValues[_ElasticStrain1D::pidMu] = mu;
propValues[_ElasticStrain1D::pidLambda] = lambda;
- PetscLogFlopsNoCheck(6);
+ PetscLogFlops(6);
} // _dbToProperties
// ----------------------------------------------------------------------
@@ -150,7 +150,7 @@
const double e11 = totalStrain[0];
stress[0] = (lambda + 2.0*mu) * e11;
- PetscLogFlopsNoCheck(3);
+ PetscLogFlops(3);
} // _calcStress
// ----------------------------------------------------------------------
@@ -177,7 +177,7 @@
elasticConsts[0] = lambda + 2.0*mu;
- PetscLogFlopsNoCheck(2);
+ PetscLogFlops(2);
} // _calcElasticConsts
Modified: short/3D/PyLith/trunk/libsrc/materials/ElasticStress1D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/materials/ElasticStress1D.cc 2008-03-31 16:13:07 UTC (rev 11664)
+++ short/3D/PyLith/trunk/libsrc/materials/ElasticStress1D.cc 2008-03-31 16:16:00 UTC (rev 11665)
@@ -14,7 +14,7 @@
#include "ElasticStress1D.hh" // implementation of object methods
-#include "petsc.h" // USES PetscLogFlopsNoCheck
+#include "petsc.h" // USES PetscLogFlops
#include <assert.h> // USES assert()
@@ -105,7 +105,7 @@
propValues[_ElasticStress1D::pidMu] = mu;
propValues[_ElasticStress1D::pidLambda] = lambda;
- PetscLogFlopsNoCheck(6);
+ PetscLogFlops(6);
} // _dbToProperties
// ----------------------------------------------------------------------
@@ -147,7 +147,7 @@
const double e11 = totalStrain[0];
stress[0] = mu * (3.0*lambda+2.0*mu) / (lambda + mu) * e11;
- PetscLogFlopsNoCheck(7);
+ PetscLogFlops(7);
} // _calcStress
// ----------------------------------------------------------------------
@@ -174,7 +174,7 @@
elasticConsts[0] = mu * (3.0*lambda+2.0*mu) / (lambda + mu);
- PetscLogFlopsNoCheck(6);
+ PetscLogFlops(6);
} // _calcElasticConsts
Modified: short/3D/PyLith/trunk/libsrc/materials/GenMaxwellIsotropic3D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/materials/GenMaxwellIsotropic3D.cc 2008-03-31 16:13:07 UTC (rev 11664)
+++ short/3D/PyLith/trunk/libsrc/materials/GenMaxwellIsotropic3D.cc 2008-03-31 16:16:00 UTC (rev 11665)
@@ -18,7 +18,7 @@
#include "pylith/utils/array.hh" // USES double_array
-#include "petsc.h" // USES PetscLogFlopsNoCheck
+#include "petsc.h" // USES PetscLogFlops
#include <assert.h> // USES assert()
#include <string.h> // USES memcpy()
@@ -159,7 +159,7 @@
propValues[_GenMaxwellIsotropic3D::pidMaxwellTime + model] = maxwellTime;
} // for
- PetscLogFlopsNoCheck(6+2*numMaxwellModels);
+ PetscLogFlops(6+2*numMaxwellModels);
} // _dbToProperties
// ----------------------------------------------------------------------
@@ -219,7 +219,7 @@
properties[_GenMaxwellIsotropic3D::pidStrainT+1] +
properties[_GenMaxwellIsotropic3D::pidStrainT+2])/3.0;
- PetscLogFlopsNoCheck(6);
+ PetscLogFlops(6);
// Compute Prony series terms
double dq[] = { 0.0, 0.0, 0.0};
@@ -239,14 +239,14 @@
devStrainT = properties[_GenMaxwellIsotropic3D::pidStrainT+iComp] -
diag[iComp]*meanStrainT;
deltaStrain = devStrainTpdt - devStrainT;
- PetscLogFlopsNoCheck(5);
+ PetscLogFlops(5);
for (int model=0; model < numMaxwellModels; ++model) {
if (muRatio[model] != 0.0) {
int pindex = iComp + model * tensorSize;
_visStrain[pindex] = exp(-_dt/maxwellTime[model])*
properties[_GenMaxwellIsotropic3D::pidVisStrain + pindex] +
dq[model] * deltaStrain;
- PetscLogFlopsNoCheck(6);
+ PetscLogFlops(6);
} // if
} // for
} // for
@@ -301,7 +301,7 @@
// std::cout << " " << (*stress)[iComp];
// std::cout << std::endl;
- PetscLogFlopsNoCheck(13);
+ PetscLogFlops(13);
} // _calcStressElastic
@@ -367,7 +367,7 @@
} // if
double elasFrac = 1.0 - visFrac;
- PetscLogFlopsNoCheck(8 + numMaxwellModels);
+ PetscLogFlops(8 + numMaxwellModels);
// Get viscous strains
if (computeStateVars) {
@@ -405,7 +405,7 @@
// std::cout << " " << stress[iComp] << " " << totalStrain[iComp] << " " << _visStrain << std:: endl;
} // for
- PetscLogFlopsNoCheck((3 + 2*numMaxwellModels) * tensorSize);
+ PetscLogFlops((3 + 2*numMaxwellModels) * tensorSize);
} // _calcStressViscoelastic
// ----------------------------------------------------------------------
@@ -454,7 +454,7 @@
elasticConsts[19] = 0; // C2313
elasticConsts[20] = mu2; // C1313
- PetscLogFlopsNoCheck(4);
+ PetscLogFlops(4);
} // _calcElasticConstsElastic
// ----------------------------------------------------------------------
@@ -532,7 +532,7 @@
std::cout << elasticConsts[20] << std::endl;
#endif
- PetscLogFlopsNoCheck(8 + 2 * numMaxwellModels);
+ PetscLogFlops(8 + 2 * numMaxwellModels);
} // _calcElasticConstsViscoelastic
// ----------------------------------------------------------------------
@@ -574,7 +574,7 @@
devStrain;
} // for
} // for
- PetscLogFlopsNoCheck(3 + 2 * _GenMaxwellIsotropic3D::tensorSize);
+ PetscLogFlops(3 + 2 * _GenMaxwellIsotropic3D::tensorSize);
_needNewJacobian = true;
} // _updatePropertiesElastic
Modified: short/3D/PyLith/trunk/libsrc/materials/MaxwellIsotropic3D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/materials/MaxwellIsotropic3D.cc 2008-03-31 16:13:07 UTC (rev 11664)
+++ short/3D/PyLith/trunk/libsrc/materials/MaxwellIsotropic3D.cc 2008-03-31 16:16:00 UTC (rev 11665)
@@ -18,7 +18,7 @@
#include "pylith/utils/array.hh" // USES double_array
-#include "petsc.h" // USES PetscLogFlopsNoCheck
+#include "petsc.h" // USES PetscLogFlops
#include <assert.h> // USES assert()
#include <string.h> // USES memcpy()
@@ -130,7 +130,7 @@
propValues[_MaxwellIsotropic3D::pidLambda] = lambda;
propValues[_MaxwellIsotropic3D::pidMaxwellTime] = maxwelltime;
- PetscLogFlopsNoCheck(7);
+ PetscLogFlops(7);
} // _dbToProperties
// ----------------------------------------------------------------------
@@ -197,7 +197,7 @@
dq * (devStrainTpdt - devStrainT);
} // for
- PetscLogFlopsNoCheck(8 + 7 * tensorSize);
+ PetscLogFlops(8 + 7 * tensorSize);
} // _computeStateVars
// ----------------------------------------------------------------------
@@ -241,7 +241,7 @@
stress[4] = mu2 * e23;
stress[5] = mu2 * e13;
- PetscLogFlopsNoCheck(13);
+ PetscLogFlops(13);
} // _calcStressElastic
// ----------------------------------------------------------------------
@@ -304,7 +304,7 @@
stress[iComp] = diag[iComp] * meanStressTpdt + devStressTpdt;
} // for
- PetscLogFlopsNoCheck(7 + 3 * tensorSize);
+ PetscLogFlops(7 + 3 * tensorSize);
} // _calcStressViscoelastic
// ----------------------------------------------------------------------
@@ -353,7 +353,7 @@
elasticConsts[19] = 0; // C2313
elasticConsts[20] = mu2; // C1313
- PetscLogFlopsNoCheck(4);
+ PetscLogFlops(4);
} // _calcElasticConstsElastic
// ----------------------------------------------------------------------
@@ -407,7 +407,7 @@
elasticConsts[19] = 0; // C2313
elasticConsts[20] = elasticConsts[15]; // C1313
- PetscLogFlopsNoCheck(10);
+ PetscLogFlops(10);
} // _calcElasticConstsViscoelastic
// ----------------------------------------------------------------------
@@ -440,7 +440,7 @@
properties[_MaxwellIsotropic3D::pidVisStrain+iComp] =
totalStrain[iComp] - diag[iComp] * meanStrainTpdt;
} // for
- PetscLogFlopsNoCheck(3 + 2 * _MaxwellIsotropic3D::tensorSize);
+ PetscLogFlops(3 + 2 * _MaxwellIsotropic3D::tensorSize);
_needNewJacobian = true;
} // _updatePropertiesElastic
Modified: short/3D/PyLith/trunk/libsrc/materials/ViscoelasticMaxwell.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/materials/ViscoelasticMaxwell.cc 2008-03-31 16:13:07 UTC (rev 11664)
+++ short/3D/PyLith/trunk/libsrc/materials/ViscoelasticMaxwell.cc 2008-03-31 16:16:00 UTC (rev 11665)
@@ -14,7 +14,7 @@
#include "ViscoelasticMaxwell.hh" // implementation of object methods
-#include "petsc.h" // USES PetscLogFlopsNoCheck
+#include "petsc.h" // USES PetscLogFlops
#include <stdexcept> // USES std::runtime_error
@@ -47,15 +47,15 @@
fraction *= dt/maxwelltime;
dq += fSign*fraction/factorial;
} // for
- PetscLogFlopsNoCheck(8*(numTerms-1));
+ PetscLogFlops(8*(numTerms-1));
// Throw away exponential term if maxwelltime is very small.
} else if (maxwelltime < timeFrac*dt) {
dq = maxwelltime/dt;
- PetscLogFlopsNoCheck(1);
+ PetscLogFlops(1);
// Default solution.
} else{
dq = maxwelltime*(1.0-exp(-dt/maxwelltime))/dt;
- PetscLogFlopsNoCheck(6);
+ PetscLogFlops(6);
} // else
return dq;
Modified: short/3D/PyLith/trunk/libsrc/meshio/CellFilterAvg.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/CellFilterAvg.cc 2008-03-31 16:13:07 UTC (rev 11664)
+++ short/3D/PyLith/trunk/libsrc/meshio/CellFilterAvg.cc 2008-03-31 16:16:00 UTC (rev 11665)
@@ -98,7 +98,7 @@
fieldAvgCell[i] += wts[iQuad] / scalar * values[iQuad*fiberDim+i];
_fieldAvg->updatePoint(*c_iter, &fieldAvgCell[0]);
- PetscLogFlopsNoCheck( numQuadPts*fiberDim*3 );
+ PetscLogFlops( numQuadPts*fiberDim*3 );
} // for
return _fieldAvg;
Modified: short/3D/PyLith/trunk/libsrc/meshio/VertexFilterVecNorm.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/VertexFilterVecNorm.cc 2008-03-31 16:13:07 UTC (rev 11664)
+++ short/3D/PyLith/trunk/libsrc/meshio/VertexFilterVecNorm.cc 2008-03-31 16:16:00 UTC (rev 11665)
@@ -81,7 +81,7 @@
norm = sqrt(norm);
_fieldVecNorm->updatePoint(*v_iter, &norm);
- PetscLogFlopsNoCheck( 1 + fiberDim*2 );
+ PetscLogFlops( 1 + fiberDim*2 );
} // for
return _fieldVecNorm;
More information about the cig-commits
mailing list