[cig-commits] r14810 - in short/3D/PyLith/branches/pylith-swig: libsrc/faults unittests/libtests/faults unittests/libtests/faults/data
brad at geodynamics.org
brad at geodynamics.org
Tue Apr 28 16:01:39 PDT 2009
Author: brad
Date: 2009-04-28 16:01:37 -0700 (Tue, 28 Apr 2009)
New Revision: 14810
Added:
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/hex8_risetime.spatialdb
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/quad4_risetime.spatialdb
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/quad4e_risetime.spatialdb
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/tet4e_risetime.spatialdb
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/tri3d_risetime.spatialdb
Removed:
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/hex8_peakrate.spatialdb
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/line2_peakrate.spatialdb
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/quad4_peakrate.spatialdb
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/quad4e_peakrate.spatialdb
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/tet4_peakrate.spatialdb
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/tet4e_peakrate.spatialdb
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/tri3_peakrate.spatialdb
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/tri3d_peakrate.spatialdb
Modified:
short/3D/PyLith/branches/pylith-swig/libsrc/faults/FaultCohesiveKin.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/Makefile.am
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKin.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinHex8.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinQuad4.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinQuad4e.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinSrcs.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinSrcsHex8.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinSrcsLine2.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinSrcsQuad4.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinSrcsTet4.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinSrcsTri3.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinTet4.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinTet4.hh
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinTet4e.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinTet4e.hh
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinTet4f.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinTet4f.hh
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinTri3d.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinTri3d.hh
short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/Makefile.am
Log:
More work on updating fault unit tests.
Modified: short/3D/PyLith/branches/pylith-swig/libsrc/faults/FaultCohesiveKin.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/libsrc/faults/FaultCohesiveKin.cc 2009-04-28 22:53:38 UTC (rev 14809)
+++ short/3D/PyLith/branches/pylith-swig/libsrc/faults/FaultCohesiveKin.cc 2009-04-28 23:01:37 UTC (rev 14810)
@@ -94,12 +94,6 @@
CohesiveTopology::createFaultParallel(_faultMesh, &_cohesiveToFault,
mesh, id(), _useLagrangeConstraints());
- { // TEMPORARY
- const ALE::Obj<SieveSubMesh>& faultSieveMesh = _faultMesh->sieveMesh();
- faultSieveMesh->getLabel("height")->view("Fault mesh height");
- faultSieveMesh->view("FAULT MESH");
- } // TEMPORARY
-
delete _fields;
_fields = new topology::Fields<topology::Field<topology::SubMesh> >(*_faultMesh);
@@ -228,7 +222,8 @@
_fields->get("area").section();
assert(!areaSection.isNull());
topology::Mesh::RestrictVisitor areaVisitor(*areaSection,
- areaCell.size(), &areaCell[0]);
+ areaAssembledCell.size(),
+ &areaAssembledCell[0]);
topology::Field<topology::Mesh>& solution = fields->solution();
const ALE::Obj<RealSection>& solutionSection = solution.section();
@@ -281,6 +276,7 @@
const int indexK = iConstraint + 2*numConstraintVert;
const double pseudoStiffness = stiffnessCell[iConstraint];
+ assert(areaAssembledCell[iConstraint] > 0);
const double wt = pseudoStiffness *
areaCell[iConstraint] / areaAssembledCell[iConstraint];
@@ -387,11 +383,14 @@
const ALE::Obj<RealSection>& residualSection = residual.section();
assert(!residualSection.isNull());
- const ALE::Obj<SieveMesh::label_sequence>& vertices = sieveMesh->depthStratum(0);
+ const ALE::Obj<SieveMesh::label_sequence>& vertices =
+ sieveMesh->depthStratum(0);
assert(!vertices.isNull());
- const SieveSubMesh::label_sequence::iterator verticesBegin = vertices->begin();
+ const SieveSubMesh::label_sequence::iterator verticesBegin =
+ vertices->begin();
const SieveSubMesh::label_sequence::iterator verticesEnd = vertices->end();
- SieveSubMesh::renumbering_type& renumbering = faultSieveMesh->getRenumbering();
+ SieveSubMesh::renumbering_type& renumbering =
+ faultSieveMesh->getRenumbering();
const SieveSubMesh::renumbering_type::const_iterator renumberingEnd =
renumbering.end();
for (SieveSubMesh::label_sequence::iterator v_iter=verticesBegin;
@@ -867,22 +866,6 @@
cellGeometry.jacobian(&jacobian, &jacobianDet, coordinatesCell,
refCoordsVertex);
- for (int ii=0; ii < numBasis; ++ii) {
- std::cout << " vertex " << ii << ": ";
- for (int jj=0; jj < spaceDim; ++jj)
- std::cout << " " << coordinatesCell[ii*spaceDim+jj];
- std::cout << std::endl;
- } // for
- std::cout << " location vertex: ";
- for (int jj=0; jj < cohesiveDim; ++jj)
- std::cout << " " << refCoordsVertex[jj];
- std::cout << std::endl;
- std::cout << " jacobian: ";
- for (int jj=0; jj < jacobianSize; ++jj)
- std::cout << " " << jacobian[jj];
- std::cout << std::endl;
-
-
// Compute orientation
cellGeometry.orientation(&orientationVertex, jacobian, jacobianDet,
upDirArray);
@@ -892,7 +875,7 @@
} // for
} // for
- orientation.view("ORIENTATION BEFORE COMPLETE");
+ //orientation.view("ORIENTATION BEFORE COMPLETE");
// Assemble orientation information
orientation.complete();
@@ -955,7 +938,7 @@
PetscLogFlops(5 + count * 3);
} // if
- orientation.view("ORIENTATION");
+ //orientation.view("ORIENTATION");
} // _calcOrientation
// ----------------------------------------------------------------------
@@ -1034,8 +1017,6 @@
PetscLogFlops(count * 2);
matDB->close();
-
- stiffness.view("PSEUDO STIFFNESS");
} // _calcConditioning
// ----------------------------------------------------------------------
@@ -1045,6 +1026,18 @@
assert(0 != _faultMesh);
assert(0 != _fields);
+ // Containers for area information
+ const int cellDim = _quadrature->cellDim();
+ const int numBasis = _quadrature->numBasis();
+ const int numQuadPts = _quadrature->numQuadPts();
+ const int spaceDim = _quadrature->spaceDim();
+ const feassemble::CellGeometry& cellGeometry = _quadrature->refGeometry();
+ const double_array& quadWts = _quadrature->quadWts();
+ assert(quadWts.size() == numQuadPts);
+ double jacobianDet = 0;
+ double_array areaCell(numBasis);
+ double_array verticesCell(numBasis*spaceDim);
+
// Get vertices in fault mesh.
const ALE::Obj<SieveSubMesh>& faultSieveMesh = _faultMesh->sieveMesh();
assert(!faultSieveMesh.isNull());
@@ -1061,19 +1054,8 @@
area.zero();
const ALE::Obj<RealSection>& areaSection = area.section();
assert(!areaSection.isNull());
+ topology::Mesh::UpdateAddVisitor areaVisitor(*areaSection, &areaCell[0]);
- // Containers for area information
- const int cellDim = _quadrature->cellDim();
- const int numBasis = _quadrature->numBasis();
- const int numQuadPts = _quadrature->numQuadPts();
- const int spaceDim = _quadrature->spaceDim();
- const feassemble::CellGeometry& cellGeometry = _quadrature->refGeometry();
- const double_array& quadWts = _quadrature->quadWts();
- assert(quadWts.size() == numQuadPts);
- double jacobianDet = 0;
- double_array areaCell(numBasis);
- double_array verticesCell(numBasis*spaceDim);
-
const ALE::Obj<SieveSubMesh::label_sequence>& cells =
faultSieveMesh->heightStratum(0);
assert(!cells.isNull());
@@ -1099,7 +1081,7 @@
areaCell[iBasis] += dArea;
} // for
} // for
- areaSection->updateAddPoint(*c_iter, &areaCell[0]);
+ faultSieveMesh->updateAdd(*c_iter, areaVisitor);
PetscLogFlops( numQuadPts*(1+numBasis*2) );
} // for
@@ -1107,10 +1089,10 @@
// Assemble area information
area.complete();
-#if 1 // DEBUGGING
+#if 0 // DEBUGGING
area.view("AREA");
- //_faultMesh->getSendOverlap()->view("Send fault overlap");
- //_faultMesh->getRecvOverlap()->view("Receive fault overlap");
+ _faultMesh->getSendOverlap()->view("Send fault overlap");
+ _faultMesh->getRecvOverlap()->view("Receive fault overlap");
#endif
} // _calcArea
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/Makefile.am
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/Makefile.am 2009-04-28 22:53:38 UTC (rev 14809)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/Makefile.am 2009-04-28 23:01:37 UTC (rev 14810)
@@ -31,24 +31,22 @@
TestFaultCohesiveKin.cc \
TestFaultCohesiveKinLine2.cc \
TestFaultCohesiveKinTri3.cc \
+ TestFaultCohesiveKinTri3d.cc \
+ TestFaultCohesiveKinQuad4.cc \
+ TestFaultCohesiveKinQuad4e.cc \
+ TestFaultCohesiveKinTet4.cc \
+ TestFaultCohesiveKinTet4e.cc \
+ TestFaultCohesiveKinTet4f.cc \
+ TestFaultCohesiveKinHex8.cc \
+ TestFaultCohesiveKinSrcs.cc \
+ TestFaultCohesiveKinSrcsLine2.cc \
+ TestFaultCohesiveKinSrcsTri3.cc \
+ TestFaultCohesiveKinSrcsQuad4.cc \
+ TestFaultCohesiveKinSrcsTet4.cc \
+ TestFaultCohesiveKinSrcsHex8.cc \
test_faults.cc
-# TestFaultCohesiveKinTri3d.cc \
-# TestFaultCohesiveKinQuad4.cc \
-# TestFaultCohesiveKinQuad4e.cc \
-# TestFaultCohesiveKinTet4.cc \
-# TestFaultCohesiveKinTet4e.cc \
-# TestFaultCohesiveKinTet4f.cc \
-# TestFaultCohesiveKinHex8.cc \
-# TestFaultCohesiveKinSrcs.cc \
-# TestFaultCohesiveKinSrcsLine2.cc \
-# TestFaultCohesiveKinSrcsTri3.cc \
-# TestFaultCohesiveKinSrcsQuad4.cc \
-# TestFaultCohesiveKinSrcsTet4.cc \
-# TestFaultCohesiveKinSrcsHex8.cc
-
-
noinst_HEADERS = \
TestBruneSlipFn.hh \
TestLiuCosSlipFn.hh \
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKin.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKin.cc 2009-04-28 22:53:38 UTC (rev 14809)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKin.cc 2009-04-28 23:01:37 UTC (rev 14810)
@@ -142,9 +142,6 @@
topology::SolutionFields fields(mesh);
_initialize(&mesh, &fault, &fields);
- mesh.view(_data->meshFilename);
- fault._faultMesh->view("FAULT MESH");
-
const ALE::Obj<SieveSubMesh>& faultSieveMesh = fault._faultMesh->sieveMesh();
CPPUNIT_ASSERT(!faultSieveMesh.isNull());
SieveSubMesh::renumbering_type& renumbering =
@@ -303,7 +300,7 @@
fault.useSolnIncr(true);
fault.integrateResidual(residual, t, &fields);
- //residual->view("RESIDUAL"); // DEBUGGING
+ residual.view("RESIDUAL"); // DEBUGGING
// Check values
const double* valsE = _data->valsResidualIncr;
@@ -729,19 +726,21 @@
const int spaceDim = _data->spaceDim;
const ALE::Obj<RealSection>& solutionSection = fields.get("solution").section();
CPPUNIT_ASSERT(!solutionSection.isNull());
- const ALE::Obj<SieveMesh>& sieveMesh = mesh.sieveMesh();
- CPPUNIT_ASSERT(!sieveMesh.isNull());
- const ALE::Obj<SieveMesh::label_sequence>& vertices =
- sieveMesh->depthStratum(0);
- CPPUNIT_ASSERT(!vertices.isNull());
- const SieveMesh::label_sequence::iterator verticesBegin = vertices->begin();
- const SieveMesh::label_sequence::iterator verticesEnd = vertices->end();
- int iVertex = 0;
- for (SieveMesh::label_sequence::iterator v_iter=verticesBegin;
- v_iter != verticesEnd;
- ++v_iter, ++iVertex) {
- solutionSection->updatePoint(*v_iter, &_data->fieldT[iVertex*spaceDim]);
- } // for
+ { // setup solution
+ const ALE::Obj<SieveMesh>& sieveMesh = mesh.sieveMesh();
+ CPPUNIT_ASSERT(!sieveMesh.isNull());
+ const ALE::Obj<SieveMesh::label_sequence>& vertices =
+ sieveMesh->depthStratum(0);
+ CPPUNIT_ASSERT(!vertices.isNull());
+ const SieveMesh::label_sequence::iterator verticesBegin = vertices->begin();
+ const SieveMesh::label_sequence::iterator verticesEnd = vertices->end();
+ int iVertex = 0;
+ for (SieveMesh::label_sequence::iterator v_iter=verticesBegin;
+ v_iter != verticesEnd;
+ ++v_iter, ++iVertex) {
+ solutionSection->updatePoint(*v_iter, &_data->fieldT[iVertex*spaceDim]);
+ } // for
+ } // setup solution
CPPUNIT_ASSERT(0 != fault._faultMesh);
topology::Field<topology::SubMesh> tractions(*fault._faultMesh);
@@ -755,20 +754,30 @@
fault.updateStateVars(t, &fields);
fault._calcTractionsChange(&tractions, fields.get("solution"));
- iVertex = 0;
+ int iVertex = 0;
const double tolerance = 1.0e-06;
const ALE::Obj<SieveSubMesh>& faultSieveMesh = fault._faultMesh->sieveMesh();
CPPUNIT_ASSERT(!faultSieveMesh.isNull());
- SieveSubMesh::renumbering_type& renumbering = faultSieveMesh->getRenumbering();
- const SieveMesh::renumbering_type::const_iterator rEnd = renumbering.end();
+ const ALE::Obj<SieveMesh::label_sequence>& vertices =
+ faultSieveMesh->depthStratum(0);
+ CPPUNIT_ASSERT(!vertices.isNull());
+ const SieveSubMesh::label_sequence::iterator verticesBegin =
+ vertices->begin();
+ const SieveSubMesh::label_sequence::iterator verticesEnd = vertices->end();
+ SieveSubMesh::renumbering_type& renumbering =
+ faultSieveMesh->getRenumbering();
+ const SieveMesh::renumbering_type::const_iterator renumberingBegin =
+ renumbering.begin();
+ const SieveMesh::renumbering_type::const_iterator renumberingEnd =
+ renumbering.end();
for (SieveMesh::label_sequence::iterator v_iter=verticesBegin;
v_iter != verticesEnd;
++v_iter, ++iVertex) {
SieveMesh::point_type meshVertex = -1;
bool found = false;
- for (SieveMesh::renumbering_type::const_iterator r_iter = renumbering.begin();
- r_iter != rEnd;
+ for (SieveMesh::renumbering_type::const_iterator r_iter = renumberingBegin;
+ r_iter != renumberingEnd;
++r_iter) {
if (r_iter->second == *v_iter) {
meshVertex = r_iter->first;
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinHex8.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinHex8.cc 2009-04-28 22:53:38 UTC (rev 14809)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinHex8.cc 2009-04-28 23:01:37 UTC (rev 14810)
@@ -16,7 +16,8 @@
#include "data/CohesiveKinDataHex8.hh" // USES CohesiveKinDataHex8
-#include "pylith/feassemble/Quadrature2Din3D.hh" // USES Quadrature2Din3D
+#include "pylith/topology/SubMesh.hh" // USES SubMesh
+#include "pylith/feassemble/Quadrature.hh" // USES Quadrature<SubMesh>
#include "pylith/feassemble/GeometryQuad3D.hh" // USES GeometryQuad3D
// ----------------------------------------------------------------------
@@ -29,7 +30,7 @@
{ // setUp
TestFaultCohesiveKin::setUp();
_data = new CohesiveKinDataHex8();
- _quadrature = new feassemble::Quadrature2Din3D();
+
CPPUNIT_ASSERT(0 != _quadrature);
feassemble::GeometryQuad3D geometry;
_quadrature->refGeometry(&geometry);
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinQuad4.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinQuad4.cc 2009-04-28 22:53:38 UTC (rev 14809)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinQuad4.cc 2009-04-28 23:01:37 UTC (rev 14810)
@@ -16,7 +16,8 @@
#include "data/CohesiveKinDataQuad4.hh" // USES CohesiveKinDataQuad4
-#include "pylith/feassemble/Quadrature1Din2D.hh" // USES Quadrature1Din2D
+#include "pylith/topology/SubMesh.hh" // USES SubMesh
+#include "pylith/feassemble/Quadrature.hh" // USES Quadrature<SubMesh>
#include "pylith/feassemble/GeometryLine2D.hh" // USES GeometryLine2D
// ----------------------------------------------------------------------
@@ -29,7 +30,7 @@
{ // setUp
TestFaultCohesiveKin::setUp();
_data = new CohesiveKinDataQuad4();
- _quadrature = new feassemble::Quadrature1Din2D();
+
CPPUNIT_ASSERT(0 != _quadrature);
feassemble::GeometryLine2D geometry;
_quadrature->refGeometry(&geometry);
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinQuad4e.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinQuad4e.cc 2009-04-28 22:53:38 UTC (rev 14809)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinQuad4e.cc 2009-04-28 23:01:37 UTC (rev 14810)
@@ -16,7 +16,8 @@
#include "data/CohesiveKinDataQuad4e.hh" // USES CohesiveKinDataQuad4e
-#include "pylith/feassemble/Quadrature1Din2D.hh" // USES Quadrature1Din2D
+#include "pylith/topology/SubMesh.hh" // USES SubMesh
+#include "pylith/feassemble/Quadrature.hh" // USES Quadrature<SubMesh>
#include "pylith/feassemble/GeometryLine2D.hh" // USES GeometryLine2D
// ----------------------------------------------------------------------
@@ -29,7 +30,7 @@
{ // setUp
TestFaultCohesiveKin::setUp();
_data = new CohesiveKinDataQuad4e();
- _quadrature = new feassemble::Quadrature1Din2D();
+
CPPUNIT_ASSERT(0 != _quadrature);
feassemble::GeometryLine2D geometry;
_quadrature->refGeometry(&geometry);
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinSrcs.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinSrcs.cc 2009-04-28 22:53:38 UTC (rev 14809)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinSrcs.cc 2009-04-28 23:01:37 UTC (rev 14810)
@@ -27,7 +27,6 @@
{ // setUp
TestFaultCohesiveKin::setUp();
_data = 0;
- _quadrature = 0;
// Cleanup previous allocation
int nsrcs = _eqsrcs.size();
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinSrcsHex8.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinSrcsHex8.cc 2009-04-28 22:53:38 UTC (rev 14809)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinSrcsHex8.cc 2009-04-28 23:01:37 UTC (rev 14810)
@@ -16,7 +16,8 @@
#include "data/CohesiveKinSrcsDataHex8.hh" // USES CohesiveKinDataHex8
-#include "pylith/feassemble/Quadrature2Din3D.hh" // USES Quadrature2Din3D
+#include "pylith/topology/SubMesh.hh" // USES SubMesh
+#include "pylith/feassemble/Quadrature.hh" // USES Quadrature<SubMesh>
#include "pylith/feassemble/GeometryQuad3D.hh" // USES GeometryQuad3D
// ----------------------------------------------------------------------
@@ -29,7 +30,7 @@
{ // setUp
TestFaultCohesiveKinSrcs::setUp();
_data = new CohesiveKinSrcsDataHex8();
- _quadrature = new feassemble::Quadrature2Din3D();
+
CPPUNIT_ASSERT(0 != _quadrature);
feassemble::GeometryQuad3D geometry;
_quadrature->refGeometry(&geometry);
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinSrcsLine2.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinSrcsLine2.cc 2009-04-28 22:53:38 UTC (rev 14809)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinSrcsLine2.cc 2009-04-28 23:01:37 UTC (rev 14810)
@@ -16,7 +16,8 @@
#include "data/CohesiveKinSrcsDataLine2.hh" // USES CohesiveKinDataSrcsLine2
-#include "pylith/feassemble/Quadrature0D.hh" // USES Quadrature0D
+#include "pylith/topology/SubMesh.hh" // USES SubMesh
+#include "pylith/feassemble/Quadrature.hh" // USES Quadrature<SubMesh>
#include "pylith/feassemble/GeometryPoint1D.hh" // USES GeometryPoint1D
// ----------------------------------------------------------------------
@@ -29,7 +30,7 @@
{ // setUp
TestFaultCohesiveKinSrcs::setUp();
_data = new CohesiveKinSrcsDataLine2();
- _quadrature = new feassemble::Quadrature0D();
+
CPPUNIT_ASSERT(0 != _quadrature);
feassemble::GeometryPoint1D geometry;
_quadrature->refGeometry(&geometry);
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinSrcsQuad4.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinSrcsQuad4.cc 2009-04-28 22:53:38 UTC (rev 14809)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinSrcsQuad4.cc 2009-04-28 23:01:37 UTC (rev 14810)
@@ -16,7 +16,8 @@
#include "data/CohesiveKinSrcsDataQuad4.hh" // USES CohesiveKinDataQuad4
-#include "pylith/feassemble/Quadrature1Din2D.hh" // USES Quadrature1Din2D
+#include "pylith/topology/SubMesh.hh" // USES SubMesh
+#include "pylith/feassemble/Quadrature.hh" // USES Quadrature<SubMesh>
#include "pylith/feassemble/GeometryLine2D.hh" // USES GeometryLine2D
// ----------------------------------------------------------------------
@@ -29,7 +30,7 @@
{ // setUp
TestFaultCohesiveKinSrcs::setUp();
_data = new CohesiveKinSrcsDataQuad4();
- _quadrature = new feassemble::Quadrature1Din2D();
+
CPPUNIT_ASSERT(0 != _quadrature);
feassemble::GeometryLine2D geometry;
_quadrature->refGeometry(&geometry);
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinSrcsTet4.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinSrcsTet4.cc 2009-04-28 22:53:38 UTC (rev 14809)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinSrcsTet4.cc 2009-04-28 23:01:37 UTC (rev 14810)
@@ -16,7 +16,8 @@
#include "data/CohesiveKinSrcsDataTet4.hh" // USES CohesiveKinDataTet4
-#include "pylith/feassemble/Quadrature2Din3D.hh" // USES Quadrature2Din3D
+#include "pylith/topology/SubMesh.hh" // USES SubMesh
+#include "pylith/feassemble/Quadrature.hh" // USES Quadrature<SubMesh>
#include "pylith/feassemble/GeometryTri3D.hh" // USES GeometryTri3D
// ----------------------------------------------------------------------
@@ -29,7 +30,7 @@
{ // setUp
TestFaultCohesiveKinSrcs::setUp();
_data = new CohesiveKinSrcsDataTet4();
- _quadrature = new feassemble::Quadrature2Din3D();
+
CPPUNIT_ASSERT(0 != _quadrature);
feassemble::GeometryTri3D geometry;
_quadrature->refGeometry(&geometry);
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinSrcsTri3.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinSrcsTri3.cc 2009-04-28 22:53:38 UTC (rev 14809)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinSrcsTri3.cc 2009-04-28 23:01:37 UTC (rev 14810)
@@ -16,7 +16,8 @@
#include "data/CohesiveKinSrcsDataTri3.hh" // USES CohesiveKinSrcsDataTri3
-#include "pylith/feassemble/Quadrature1Din2D.hh" // USES Quadrature1Din2D
+#include "pylith/topology/SubMesh.hh" // USES SubMesh
+#include "pylith/feassemble/Quadrature.hh" // USES Quadrature<SubMesh>
#include "pylith/feassemble/GeometryLine2D.hh" // USES GeometryLine2D
// ----------------------------------------------------------------------
@@ -29,7 +30,7 @@
{ // setUp
TestFaultCohesiveKinSrcs::setUp();
_data = new CohesiveKinSrcsDataTri3();
- _quadrature = new feassemble::Quadrature1Din2D();
+
CPPUNIT_ASSERT(0 != _quadrature);
feassemble::GeometryLine2D geometry;
_quadrature->refGeometry(&geometry);
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinTet4.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinTet4.cc 2009-04-28 22:53:38 UTC (rev 14809)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinTet4.cc 2009-04-28 23:01:37 UTC (rev 14810)
@@ -16,7 +16,8 @@
#include "data/CohesiveKinDataTet4.hh" // USES CohesiveKinDataTet4
-#include "pylith/feassemble/Quadrature2Din3D.hh" // USES Quadrature2Din3D
+#include "pylith/topology/SubMesh.hh" // USES SubMesh
+#include "pylith/feassemble/Quadrature.hh" // USES Quadrature<SubMesh>
#include "pylith/feassemble/GeometryTri3D.hh" // USES GeometryTri3D
// ----------------------------------------------------------------------
@@ -29,7 +30,7 @@
{ // setUp
TestFaultCohesiveKin::setUp();
_data = new CohesiveKinDataTet4();
- _quadrature = new feassemble::Quadrature2Din3D();
+
CPPUNIT_ASSERT(0 != _quadrature);
feassemble::GeometryTri3D geometry;
_quadrature->refGeometry(&geometry);
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinTet4.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinTet4.hh 2009-04-28 22:53:38 UTC (rev 14809)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinTet4.hh 2009-04-28 23:01:37 UTC (rev 14810)
@@ -40,7 +40,7 @@
CPPUNIT_TEST( testInitialize );
CPPUNIT_TEST( testIntegrateResidual );
CPPUNIT_TEST( testIntegrateJacobian );
- CPPUNIT_TEST( testUpdateState );
+ CPPUNIT_TEST( testUpdateStateVars );
CPPUNIT_TEST( testCalcTractionsChange );
CPPUNIT_TEST_SUITE_END();
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinTet4e.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinTet4e.cc 2009-04-28 22:53:38 UTC (rev 14809)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinTet4e.cc 2009-04-28 23:01:37 UTC (rev 14810)
@@ -16,7 +16,8 @@
#include "data/CohesiveKinDataTet4e.hh" // USES CohesiveKinDataTet4e
-#include "pylith/feassemble/Quadrature2Din3D.hh" // USES Quadrature2Din3D
+#include "pylith/topology/SubMesh.hh" // USES SubMesh
+#include "pylith/feassemble/Quadrature.hh" // USES Quadrature<SubMesh>
#include "pylith/feassemble/GeometryTri3D.hh" // USES GeometryTri3D
// ----------------------------------------------------------------------
@@ -29,7 +30,7 @@
{ // setUp
TestFaultCohesiveKin::setUp();
_data = new CohesiveKinDataTet4e();
- _quadrature = new feassemble::Quadrature2Din3D();
+
CPPUNIT_ASSERT(0 != _quadrature);
feassemble::GeometryTri3D geometry;
_quadrature->refGeometry(&geometry);
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinTet4e.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinTet4e.hh 2009-04-28 22:53:38 UTC (rev 14809)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinTet4e.hh 2009-04-28 23:01:37 UTC (rev 14810)
@@ -40,7 +40,7 @@
CPPUNIT_TEST( testInitialize );
CPPUNIT_TEST( testIntegrateResidual );
CPPUNIT_TEST( testIntegrateJacobian );
- CPPUNIT_TEST( testUpdateState );
+ CPPUNIT_TEST( testUpdateStateVars );
CPPUNIT_TEST( testCalcTractionsChange );
CPPUNIT_TEST_SUITE_END();
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinTet4f.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinTet4f.cc 2009-04-28 22:53:38 UTC (rev 14809)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinTet4f.cc 2009-04-28 23:01:37 UTC (rev 14810)
@@ -16,7 +16,8 @@
#include "data/CohesiveKinDataTet4f.hh" // USES CohesiveKinDataTet4f
-#include "pylith/feassemble/Quadrature2Din3D.hh" // USES Quadrature2Din3D
+#include "pylith/topology/SubMesh.hh" // USES SubMesh
+#include "pylith/feassemble/Quadrature.hh" // USES Quadrature<SubMesh>
#include "pylith/feassemble/GeometryTri3D.hh" // USES GeometryTri3D
// ----------------------------------------------------------------------
@@ -29,7 +30,7 @@
{ // setUp
TestFaultCohesiveKin::setUp();
_data = new CohesiveKinDataTet4f();
- _quadrature = new feassemble::Quadrature2Din3D();
+
CPPUNIT_ASSERT(0 != _quadrature);
feassemble::GeometryTri3D geometry;
_quadrature->refGeometry(&geometry);
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinTet4f.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinTet4f.hh 2009-04-28 22:53:38 UTC (rev 14809)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinTet4f.hh 2009-04-28 23:01:37 UTC (rev 14810)
@@ -40,7 +40,7 @@
CPPUNIT_TEST( testInitialize );
CPPUNIT_TEST( testIntegrateResidual );
CPPUNIT_TEST( testIntegrateJacobian );
- CPPUNIT_TEST( testUpdateState );
+ CPPUNIT_TEST( testUpdateStateVars );
CPPUNIT_TEST( testCalcTractionsChange );
CPPUNIT_TEST_SUITE_END();
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinTri3d.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinTri3d.cc 2009-04-28 22:53:38 UTC (rev 14809)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinTri3d.cc 2009-04-28 23:01:37 UTC (rev 14810)
@@ -16,7 +16,8 @@
#include "data/CohesiveKinDataTri3d.hh" // USES CohesiveKinDataTri3d
-#include "pylith/feassemble/Quadrature1Din2D.hh" // USES Quadrature1Din2D
+#include "pylith/topology/SubMesh.hh" // USES SubMesh
+#include "pylith/feassemble/Quadrature.hh" // USES Quadrature<SubMesh>
#include "pylith/feassemble/GeometryLine2D.hh" // USES GeometryLine2D
// ----------------------------------------------------------------------
@@ -29,7 +30,7 @@
{ // setUp
TestFaultCohesiveKin::setUp();
_data = new CohesiveKinDataTri3d();
- _quadrature = new feassemble::Quadrature1Din2D();
+
CPPUNIT_ASSERT(0 != _quadrature);
feassemble::GeometryLine2D geometry;
_quadrature->refGeometry(&geometry);
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinTri3d.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinTri3d.hh 2009-04-28 22:53:38 UTC (rev 14809)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKinTri3d.hh 2009-04-28 23:01:37 UTC (rev 14810)
@@ -40,7 +40,7 @@
CPPUNIT_TEST( testInitialize );
CPPUNIT_TEST( testIntegrateResidual );
CPPUNIT_TEST( testIntegrateJacobian );
- CPPUNIT_TEST( testUpdateState );
+ CPPUNIT_TEST( testUpdateStateVars );
CPPUNIT_TEST( testCalcTractionsChange );
CPPUNIT_TEST_SUITE_END();
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/Makefile.am
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/Makefile.am 2009-04-28 22:53:38 UTC (rev 14809)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/Makefile.am 2009-04-28 23:01:37 UTC (rev 14810)
@@ -17,7 +17,6 @@
line2.mesh \
line2_finalslip.spatialdb \
line2_sliptime.spatialdb \
- line2_peakrate.spatialdb \
line2_sliprate.spatialdb \
line2_risetime.spatialdb \
tri3.mesh \
@@ -29,12 +28,11 @@
tri3_finalslip.spatialdb \
tri3_finalslipB.spatialdb \
tri3_sliptime.spatialdb \
- tri3_peakrate.spatialdb \
tri3_sliprate.spatialdb \
tri3_risetime.spatialdb \
tri3d_finalslip.spatialdb \
tri3d_sliptime.spatialdb \
- tri3d_peakrate.spatialdb \
+ tri3d_risetime.spatialdb \
quad4.mesh \
quad4b.mesh \
quad4c.mesh \
@@ -45,10 +43,10 @@
quad4h.mesh \
quad4_finalslip.spatialdb \
quad4_sliptime.spatialdb \
- quad4_peakrate.spatialdb \
+ quad4_risetime.spatialdb \
quad4e_finalslip.spatialdb \
quad4e_sliptime.spatialdb \
- quad4e_peakrate.spatialdb \
+ quad4e_risetime.spatialdb \
tet4.mesh \
tet4b.mesh \
tet4c.mesh \
@@ -61,12 +59,11 @@
tet4j.mesh \
tet4_finalslip.spatialdb \
tet4_sliptime.spatialdb \
- tet4_peakrate.spatialdb \
- tet4_sliprate.spatialdb \
tet4_risetime.spatialdb \
+ tet4_sliprate.spatialdb \
tet4e_finalslip.spatialdb \
tet4e_sliptime.spatialdb \
- tet4e_peakrate.spatialdb \
+ tet4e_risetime.spatialdb \
hex8.mesh \
hex8b.mesh \
hex8c.mesh \
@@ -78,7 +75,7 @@
hex8i.mesh \
hex8_finalslip.spatialdb \
hex8_sliptime.spatialdb \
- hex8_peakrate.spatialdb \
+ hex8_risetime.spatialdb \
tri3traction.mesh \
quad4traction.mesh \
tet4traction.mesh \
Deleted: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/hex8_peakrate.spatialdb
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/hex8_peakrate.spatialdb 2009-04-28 22:53:38 UTC (rev 14809)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/hex8_peakrate.spatialdb 2009-04-28 23:01:37 UTC (rev 14810)
@@ -1,17 +0,0 @@
-#SPATIAL.ascii 1
-SimpleDB {
- num-values = 1
- value-names = slip-rate
- value-units = m/s
- num-locs = 4
- data-dim = 2
- space-dim = 3
- cs-data = cartesian {
- to-meters = 1.0
- space-dim = 3
- }
-}
-0.0 -1.0 -1.0 1.5
-0.0 1.0 -1.0 1.6
-0.0 -1.0 1.0 1.7
-0.0 1.0 1.0 1.8
Added: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/hex8_risetime.spatialdb
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/hex8_risetime.spatialdb (rev 0)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/hex8_risetime.spatialdb 2009-04-28 23:01:37 UTC (rev 14810)
@@ -0,0 +1,17 @@
+#SPATIAL.ascii 1
+SimpleDB {
+ num-values = 1
+ value-names = rise-time
+ value-units = s
+ num-locs = 4
+ data-dim = 2
+ space-dim = 3
+ cs-data = cartesian {
+ to-meters = 1.0
+ space-dim = 3
+ }
+}
+0.0 -1.0 -1.0 1.5
+0.0 1.0 -1.0 1.6
+0.0 -1.0 1.0 1.7
+0.0 1.0 1.0 1.8
Deleted: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/line2_peakrate.spatialdb
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/line2_peakrate.spatialdb 2009-04-28 22:53:38 UTC (rev 14809)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/line2_peakrate.spatialdb 2009-04-28 23:01:37 UTC (rev 14810)
@@ -1,14 +0,0 @@
-#SPATIAL.ascii 1
-SimpleDB {
- num-values = 1
- value-names = slip-rate
- value-units = m/s
- num-locs = 1
- data-dim = 0
- space-dim = 1
- cs-data = cartesian {
- to-meters = 1.0
- space-dim = 1
- }
-}
-0.0 1.4
Deleted: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/quad4_peakrate.spatialdb
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/quad4_peakrate.spatialdb 2009-04-28 22:53:38 UTC (rev 14809)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/quad4_peakrate.spatialdb 2009-04-28 23:01:37 UTC (rev 14810)
@@ -1,15 +0,0 @@
-#SPATIAL.ascii 1
-SimpleDB {
- num-values = 1
- value-names = slip-rate
- value-units = m/s
- num-locs = 2
- data-dim = 1
- space-dim = 2
- cs-data = cartesian {
- to-meters = 1.0
- space-dim = 2
- }
-}
-0.0 +1.0 1.4
-0.0 -1.0 1.5
Added: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/quad4_risetime.spatialdb
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/quad4_risetime.spatialdb (rev 0)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/quad4_risetime.spatialdb 2009-04-28 23:01:37 UTC (rev 14810)
@@ -0,0 +1,15 @@
+#SPATIAL.ascii 1
+SimpleDB {
+ num-values = 1
+ value-names = rise-time
+ value-units = s
+ num-locs = 2
+ data-dim = 1
+ space-dim = 2
+ cs-data = cartesian {
+ to-meters = 1.0
+ space-dim = 2
+ }
+}
+0.0 +1.0 1.4
+0.0 -1.0 1.5
Deleted: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/quad4e_peakrate.spatialdb
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/quad4e_peakrate.spatialdb 2009-04-28 22:53:38 UTC (rev 14809)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/quad4e_peakrate.spatialdb 2009-04-28 23:01:37 UTC (rev 14810)
@@ -1,16 +0,0 @@
-#SPATIAL.ascii 1
-SimpleDB {
- num-values = 1
- value-names = slip-rate
- value-units = m/s
- num-locs = 3
- data-dim = 1
- space-dim = 2
- cs-data = cartesian {
- to-meters = 1.0
- space-dim = 2
- }
-}
-0.0 +1.0 1.4
-0.0 -1.0 1.5
-0.0 +3.0 1.6
Added: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/quad4e_risetime.spatialdb
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/quad4e_risetime.spatialdb (rev 0)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/quad4e_risetime.spatialdb 2009-04-28 23:01:37 UTC (rev 14810)
@@ -0,0 +1,16 @@
+#SPATIAL.ascii 1
+SimpleDB {
+ num-values = 1
+ value-names = rise-time
+ value-units = s
+ num-locs = 3
+ data-dim = 1
+ space-dim = 2
+ cs-data = cartesian {
+ to-meters = 1.0
+ space-dim = 2
+ }
+}
+0.0 +1.0 1.4
+0.0 -1.0 1.5
+0.0 +3.0 1.6
Deleted: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/tet4_peakrate.spatialdb
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/tet4_peakrate.spatialdb 2009-04-28 22:53:38 UTC (rev 14809)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/tet4_peakrate.spatialdb 2009-04-28 23:01:37 UTC (rev 14810)
@@ -1,16 +0,0 @@
-#SPATIAL.ascii 1
-SimpleDB {
- num-values = 1
- value-names = slip-rate
- value-units = m/s
- num-locs = 3
- data-dim = 2
- space-dim = 3
- cs-data = cartesian {
- to-meters = 1.0
- space-dim = 3
- }
-}
-0.0 -1.0 0.0 1.5
-0.0 0.0 1.0 1.6
-0.0 1.0 0.0 1.7
Deleted: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/tet4e_peakrate.spatialdb
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/tet4e_peakrate.spatialdb 2009-04-28 22:53:38 UTC (rev 14809)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/tet4e_peakrate.spatialdb 2009-04-28 23:01:37 UTC (rev 14810)
@@ -1,17 +0,0 @@
-#SPATIAL.ascii 1
-SimpleDB {
- num-values = 1
- value-names = slip-rate
- value-units = m/s
- num-locs = 4
- data-dim = 2
- space-dim = 3
- cs-data = cartesian {
- to-meters = 1.0
- space-dim = 3
- }
-}
-0.0 -1.0 0.0 1.5
-0.0 0.0 1.0 1.6
-0.0 1.0 0.0 1.7
-0.0 0.0 -1.0 1.8
Added: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/tet4e_risetime.spatialdb
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/tet4e_risetime.spatialdb (rev 0)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/tet4e_risetime.spatialdb 2009-04-28 23:01:37 UTC (rev 14810)
@@ -0,0 +1,17 @@
+#SPATIAL.ascii 1
+SimpleDB {
+ num-values = 1
+ value-names = rise-time
+ value-units = s
+ num-locs = 4
+ data-dim = 2
+ space-dim = 3
+ cs-data = cartesian {
+ to-meters = 1.0
+ space-dim = 3
+ }
+}
+0.0 -1.0 0.0 1.5
+0.0 0.0 1.0 1.6
+0.0 1.0 0.0 1.7
+0.0 0.0 -1.0 1.8
Deleted: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/tri3_peakrate.spatialdb
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/tri3_peakrate.spatialdb 2009-04-28 22:53:38 UTC (rev 14809)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/tri3_peakrate.spatialdb 2009-04-28 23:01:37 UTC (rev 14810)
@@ -1,15 +0,0 @@
-#SPATIAL.ascii 1
-SimpleDB {
- num-values = 1
- value-names = slip-rate
- value-units = m/s
- num-locs = 2
- data-dim = 1
- space-dim = 2
- cs-data = cartesian {
- to-meters = 1.0
- space-dim = 2
- }
-}
-0.0 +1.0 1.4
-0.0 -1.0 1.5
Deleted: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/tri3d_peakrate.spatialdb
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/tri3d_peakrate.spatialdb 2009-04-28 22:53:38 UTC (rev 14809)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/tri3d_peakrate.spatialdb 2009-04-28 23:01:37 UTC (rev 14810)
@@ -1,16 +0,0 @@
-#SPATIAL.ascii 1
-SimpleDB {
- num-values = 1
- value-names = slip-rate
- value-units = m/s
- num-locs = 3
- data-dim = 2
- space-dim = 2
- cs-data = cartesian {
- to-meters = 1.0
- space-dim = 2
- }
-}
- 0.0 +1.0 1.4
- 0.0 -1.0 1.5
--2.0 +1.0 1.6
Added: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/tri3d_risetime.spatialdb
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/tri3d_risetime.spatialdb (rev 0)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/data/tri3d_risetime.spatialdb 2009-04-28 23:01:37 UTC (rev 14810)
@@ -0,0 +1,16 @@
+#SPATIAL.ascii 1
+SimpleDB {
+ num-values = 1
+ value-names = rise-time
+ value-units = s
+ num-locs = 3
+ data-dim = 1
+ space-dim = 2
+ cs-data = cartesian {
+ to-meters = 1.0
+ space-dim = 2
+ }
+}
+ 0.0 +1.0 1.4
+ 0.0 -1.0 1.5
+-2.0 +1.0 1.6
More information about the CIG-COMMITS
mailing list