[cig-commits] r14195 - in short/3D/PyLith/branches/pylith-swig: libsrc libsrc/bc libsrc/feassemble libsrc/topology unittests/libtests/bc unittests/libtests/topology
brad at geodynamics.org
brad at geodynamics.org
Mon Mar 2 18:01:51 PST 2009
Author: brad
Date: 2009-03-02 18:01:51 -0800 (Mon, 02 Mar 2009)
New Revision: 14195
Modified:
short/3D/PyLith/branches/pylith-swig/libsrc/Makefile.am
short/3D/PyLith/branches/pylith-swig/libsrc/bc/AbsorbingDampers.cc
short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/ElasticityImplicit.hh
short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/IntegratorElasticity.cc
short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/IntegratorElasticity.hh
short/3D/PyLith/branches/pylith-swig/libsrc/topology/Fields.hh
short/3D/PyLith/branches/pylith-swig/libsrc/topology/Fields.icc
short/3D/PyLith/branches/pylith-swig/libsrc/topology/SolutionFields.cc
short/3D/PyLith/branches/pylith-swig/libsrc/topology/SolutionFields.hh
short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestAbsorbingDampers.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestNeumann.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/topology/TestSolutionFields.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/topology/TestSolutionFields.hh
Log:
Slight tweaks to Fields and SolutionFields interfaces (better names for methods). More work on elasticity integrators.
Modified: short/3D/PyLith/branches/pylith-swig/libsrc/Makefile.am
===================================================================
--- short/3D/PyLith/branches/pylith-swig/libsrc/Makefile.am 2009-03-03 01:16:04 UTC (rev 14194)
+++ short/3D/PyLith/branches/pylith-swig/libsrc/Makefile.am 2009-03-03 02:01:51 UTC (rev 14195)
@@ -50,6 +50,7 @@
feassemble/Quadrature2D.cc \
feassemble/Quadrature2Din3D.cc \
feassemble/Quadrature3D.cc \
+ feassemble/IntegratorElasticity.cc \
materials/Metadata.cc \
materials/Material.cc \
materials/ElasticMaterial.cc \
@@ -91,7 +92,6 @@
# faults/StepSlipFn.cc \
# feassemble/ElasticityExplicit.cc \
# feassemble/ElasticityImplicit.cc \
-# feassemble/IntegratorElasticity.cc \
# materials/GenMaxwellIsotropic3D.cc \
# meshio/CellFilter.cc \
# meshio/CellFilterAvg.cc \
Modified: short/3D/PyLith/branches/pylith-swig/libsrc/bc/AbsorbingDampers.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/libsrc/bc/AbsorbingDampers.cc 2009-03-03 01:16:04 UTC (rev 14194)
+++ short/3D/PyLith/branches/pylith-swig/libsrc/bc/AbsorbingDampers.cc 2009-03-03 02:01:51 UTC (rev 14195)
@@ -384,7 +384,7 @@
const ALE::Obj<SubRealSection>& dampersSection = _dampingConsts->section();
assert(!dampersSection.isNull());
- const topology::Field<topology::Mesh>& solution = fields->getSolution();
+ const topology::Field<topology::Mesh>& solution = fields->solution();
const ALE::Obj<SieveMesh>& sieveMesh = solution.mesh().sieveMesh();
const ALE::Obj<RealSection>& solutionSection = solution.section();
assert(!solutionSection.isNull());
Modified: short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/ElasticityImplicit.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/ElasticityImplicit.hh 2009-03-03 01:16:04 UTC (rev 14194)
+++ short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/ElasticityImplicit.hh 2009-03-03 02:01:51 UTC (rev 14195)
@@ -47,25 +47,10 @@
#if !defined(pylith_feassemble_elasticityimplicit_hh)
#define pylith_feassemble_elasticityimplicit_hh
+// Include directives ---------------------------------------------------
#include "IntegratorElasticity.hh" // ISA IntegratorElasticity
-#include "pylith/utils/array.hh" // USES std::vector, double_array
-namespace pylith {
- namespace feassemble {
- class ElasticityImplicit;
- class TestElasticityImplicit;
- } // feassemble
-} // pylith
-
-namespace spatialdata {
- namespace spatialdb {
- class SpatialDB; // USES SpatialDB
- } // spatialdb
- namespace geocoords {
- class CoordSys; // USES CoordSys
- } // geocoords
-} // spatialdata
-
+// ElasticityImplicit ---------------------------------------------------
class pylith::feassemble::ElasticityImplicit : public IntegratorElasticity
{ // ElasticityImplicit
friend class TestElasticityImplicit; // unit testing
Modified: short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/IntegratorElasticity.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/IntegratorElasticity.cc 2009-03-03 01:16:04 UTC (rev 14194)
+++ short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/IntegratorElasticity.cc 2009-03-03 02:01:51 UTC (rev 14195)
@@ -76,7 +76,7 @@
void
pylith::feassemble::IntegratorElasticity::useSolnIncr(const bool flag)
{ // useSolnIncr
- Integrator::useSolnIncr(flag);
+ Integrator<Quadrature<topology::Mesh> >::useSolnIncr(flag);
assert(0 != _material);
_material->useElasticBehavior(!flag);
@@ -131,15 +131,14 @@
const SieveMesh::label_sequence::iterator cellsEnd = cells->end();
// Get fields
- const topology::Field<topology::Mesh>* solution = fields->solution();
- assert(0 != solution);
- const ALE::Obj<RealSection>& disp = solution->section();
+ const topology::Field<topology::Mesh>& solution = fields->solution();
+ const ALE::Obj<RealSection>& disp = solution.section();
assert(!disp.isNull());
topology::Mesh::RestrictVisitor dispVisitor(*disp,
dispCell.size(), &dispCell[0]);
// Loop over cells
- for (Mesh::label_sequence::iterator c_iter=cells->begin();
+ for (SieveMesh::label_sequence::iterator c_iter=cells->begin();
c_iter != cellsEnd;
++c_iter) {
// Retrieve geometry information for current cell
@@ -195,8 +194,8 @@
} // if
const int numCorners = _quadrature->refGeometry().numCorners();
- const ALE::ObjSieveMesh>& sieveMesh = mesh.sieveMesh();
- assert(!sievemesh.isNull());
+ const ALE::Obj<SieveMesh>& sieveMesh = mesh.sieveMesh();
+ assert(!sieveMesh.isNull());
const ALE::Obj<SieveMesh::label_sequence>& cells =
sieveMesh->getLabelStratum("material-id", _material->id());
assert(!cells.isNull());
@@ -236,19 +235,25 @@
0 == strcasecmp(name, "stress") )) {
assert(0 != fields);
_allocateTensorField(fields->mesh());
- _calcStrainStressField(&_bufferFieldTensor, name, fields);
- return _bufferFieldTensor;
+ _calcStrainStressField(_bufferFieldTensor, name, fields);
+ return *_bufferFieldTensor;
} else if (0 == strcasecmp(name, "stress")) {
assert(0 != fields);
_allocateTensorField(fields->mesh());
- _calcStressFromStrain(&_bufferFieldTensor, name);
- return _bufferFieldTensor;
+#if 0 // TEMPORARY
+ _material->propertyField(_bufferFieldTensor, "total_strain");
+#endif
+ _calcStressFromStrain(_bufferFieldTensor);
+ return *_bufferFieldTensor;
} else
- return _material->getField(name);
+#if 0 // TEMPORARY
+ return _material->field(name);
+#endif
+ assert(0);
// Return tensor section to satisfy member function definition. Code
// should never get here.
- return _bufferTensorField;
+ return *_bufferFieldTensor;
} // cellField
// ----------------------------------------------------------------------
@@ -272,12 +277,12 @@
const int spaceDim = _quadrature->spaceDim();
const int tensorSize = _material->tensorSize();
- if (0 == _bufferTensorField) {
- _bufferTensorField = new topology::Field<topology::Mesh>(mesh);
- assert(0 != _bufferTensorField);
- _bufferTensorField.vectorFieldType(topology::FieldBase::MULTI_TENSOR);
- _bufferTensorField.newSection(cells, numQuadPts*tensorSize);
- _bufferTensorField.allocate();
+ if (0 == _bufferFieldTensor) {
+ _bufferFieldTensor = new topology::Field<topology::Mesh>(mesh);
+ assert(0 != _bufferFieldTensor);
+ _bufferFieldTensor->vectorFieldType(topology::FieldBase::MULTI_TENSOR);
+ _bufferFieldTensor->newSection(cells, numQuadPts*tensorSize);
+ _bufferFieldTensor->allocate();
} // if
} // _allocateTensorField
@@ -334,9 +339,8 @@
const SieveMesh::label_sequence::iterator cellsEnd = cells->end();
// Get field
- const topology::Field<topology::Mesh>* solution = fields->solution();
- assert(0 != solution);
- const ALE::Obj<RealSection>& disp = solution->section();
+ const topology::Field<topology::Mesh>& solution = fields->solution();
+ const ALE::Obj<RealSection>& disp = solution.section();
assert(!disp.isNull());
topology::Mesh::RestrictVisitor dispVisitor(*disp,
dispCell.size(), &dispCell[0]);
@@ -359,7 +363,7 @@
const double_array& basisDeriv = _quadrature->basisDeriv();
// Compute strains
- calcTotalStrainFn(&totalStrain, basisDeriv, dispCell,
+ calcTotalStrainFn(&strainCell, basisDeriv, dispCell,
numBasis, numQuadPts);
if (!calcStress)
@@ -377,62 +381,51 @@
// ----------------------------------------------------------------------
void
pylith::feassemble::IntegratorElasticity::_calcStressFromStrain(
- ALE::Obj<real_section_type>* field,
- const ALE::Obj<Mesh>& mesh)
+ topology::Field<topology::Mesh>* field)
{ // _calcStressFromStrain
+ assert(0 != field);
assert(0 != _quadrature);
assert(0 != _material);
const int cellDim = _quadrature->cellDim();
- int tensorSize = 0;
- if (1 == cellDim) {
- tensorSize = 1;
- } else if (2 == cellDim) {
- tensorSize = 3;
- } else if (3 == cellDim) {
- tensorSize = 6;
- } else
- assert(0);
-
- // Get cell information
- const int materialId = _material->id();
- const ALE::Obj<Mesh::label_sequence>& cells =
- mesh->getLabelStratum("material-id", materialId);
- assert(!cells.isNull());
- const Mesh::label_sequence::iterator cellsEnd = cells->end();
-
- // Get cell geometry information that doesn't depend on cell
const int numQuadPts = _quadrature->numQuadPts();
+ const int numBasis = _quadrature->numBasis();
+ const int spaceDim = _quadrature->spaceDim();
+ const int tensorSize = _material->tensorSize();
- // Allocate vector for total strain
- const int totalFiberDim = numQuadPts*tensorSize;
- double_array totalStrain(totalFiberDim);
- totalStrain = 0.0;
- double_array stress(totalFiberDim);
-
+ // Allocate arrays for cell data.
+ double_array strainCell(numQuadPts*tensorSize);
+ strainCell = 0.0;
+ double_array stressCell(numQuadPts*tensorSize);
+ stressCell = 0.0;
+
+ // Get normalizer
assert(0 != _normalizer);
const double pressureScale = _normalizer->pressureScale();
- // Allocate buffer for tensor field.
- if (field->isNull()) {
- const int fiberDim = numQuadPts * tensorSize;
- *field = new real_section_type(mesh->comm(), mesh->debug());
- (*field)->setChart(real_section_type::chart_type(*std::min_element(cells->begin(), cells->end()),
- *std::max_element(cells->begin(), cells->end())+1));
- (*field)->setFiberDimension(cells, fiberDim);
- mesh->allocate(*field);
- } // if
-
+ // Get cell information
+ const ALE::Obj<SieveMesh>& sieveMesh = field->mesh().sieveMesh();
+ assert(!sieveMesh.isNull());
+ const int materialId = _material->id();
+ const ALE::Obj<SieveMesh::label_sequence>& cells =
+ sieveMesh->getLabelStratum("material-id", materialId);
+ assert(!cells.isNull());
+ const SieveMesh::label_sequence::iterator cellsEnd = cells->end();
+
+ // Get field
+ const ALE::Obj<RealSection>& fieldSection = field->section();
+ assert(!fieldSection.isNull());
+
// Loop over cells
- for (Mesh::label_sequence::iterator c_iter=cells->begin();
+ for (SieveMesh::label_sequence::iterator c_iter=cells->begin();
c_iter != cellsEnd;
++c_iter) {
- (*field)->restrictPoint(*c_iter, &totalStrain[0], totalStrain.size());
- _material->getPropertiesCell(*c_iter, numQuadPts);
- stress = _material->calcStress(totalStrain);
- _normalizer->dimensionalize(&stress[0], stress.size(),
+ fieldSection->restrictPoint(*c_iter, &strainCell[0], strainCell.size());
+ _material->retrievePropsAndVars(*c_iter);
+ stressCell = _material->calcStress(strainCell);
+ _normalizer->dimensionalize(&stressCell[0], stressCell.size(),
pressureScale);
- (*field)->updatePoint(*c_iter, &stress[0]);
+ fieldSection->updatePoint(*c_iter, &stressCell[0]);
} // for
} // _calcStressFromStrain
Modified: short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/IntegratorElasticity.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/IntegratorElasticity.hh 2009-03-03 01:16:04 UTC (rev 14194)
+++ short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/IntegratorElasticity.hh 2009-03-03 02:01:51 UTC (rev 14195)
@@ -33,7 +33,7 @@
// IntegratorElasticity -------------------------------------------------
class pylith::feassemble::IntegratorElasticity :
- public Integrator<topology::Mesh>
+ public Integrator<Quadrature<topology::Mesh> >
{ // IntegratorElasticity
friend class TestIntegratorElasticity; // unit testing
@@ -105,6 +105,12 @@
// PROTECTED METHODS ////////////////////////////////////////////////////
protected :
+ /** Allocate buffer for tensor field at quadrature points.
+ *
+ * @param mesh Finite-element mesh.
+ */
+ void _allocateTensorField(const topology::Mesh& mesh);
+
/** Calculate stress or strain field from solution field.
*
* @param field Field in which to store stress or strain.
@@ -211,18 +217,9 @@
/// Elastic material associated with integrator
materials::ElasticMaterial* _material;
- /// Buffer for storing scalar cell field.
- topology::Field<topology::Mesh>* _bufferCellScalar;
-
- /// Buffer for storing vector cell field.
- topology::Field<topology::Mesh>* _bufferCellVector;
-
/// Buffer for storing cell tensor field.
- topology::Field<topology::Mesh>* _bufferCellTensor;
+ topology::Field<topology::Mesh>* _bufferFieldTensor;
- /// Buffer for storing other cell fields.
- topology::Field<topology::Mesh>* _bufferCellOther;
-
// NOT IMPLEMENTED //////////////////////////////////////////////////////
private :
Modified: short/3D/PyLith/branches/pylith-swig/libsrc/topology/Fields.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/libsrc/topology/Fields.hh 2009-03-03 01:16:04 UTC (rev 14194)
+++ short/3D/PyLith/branches/pylith-swig/libsrc/topology/Fields.hh 2009-03-03 02:01:51 UTC (rev 14195)
@@ -83,6 +83,12 @@
*/
void copyLayout(const char* name);
+ /** Get mesh associated with fields.
+ *
+ * @returns Finite-element mesh.
+ */
+ const typename field_type::Mesh& mesh(void) const;
+
// PROTECTED TYPEDEFS ///////////////////////////////////////////////////
protected :
Modified: short/3D/PyLith/branches/pylith-swig/libsrc/topology/Fields.icc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/libsrc/topology/Fields.icc 2009-03-03 01:16:04 UTC (rev 14194)
+++ short/3D/PyLith/branches/pylith-swig/libsrc/topology/Fields.icc 2009-03-03 02:01:51 UTC (rev 14195)
@@ -140,5 +140,14 @@
iter->second->newSection(*src->second);
} // copyLayout
+// ----------------------------------------------------------------------
+// Get mesh associated with fields.
+template<typename field_type>
+const typename field_type::Mesh&
+pylith::topology::Fields<field_type>::mesh(void) const
+{ // mesh
+ return _mesh;
+} // mesh
+
// End of file
Modified: short/3D/PyLith/branches/pylith-swig/libsrc/topology/SolutionFields.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/libsrc/topology/SolutionFields.cc 2009-03-03 01:16:04 UTC (rev 14194)
+++ short/3D/PyLith/branches/pylith-swig/libsrc/topology/SolutionFields.cc 2009-03-03 02:01:51 UTC (rev 14195)
@@ -31,8 +31,8 @@
// ----------------------------------------------------------------------
// Set name of solution field.
void
-pylith::topology::SolutionFields::solutionField(const char* name)
-{ // solutionField
+pylith::topology::SolutionFields::solutionName(const char* name)
+{ // solutionName
map_type::const_iterator iter = _fields.find(name);
if (iter == _fields.end()) {
std::ostringstream msg;
@@ -41,29 +41,29 @@
throw std::runtime_error(msg.str());
} // if
_solutionName = name;
-} // solutionField
+} // solutionName
// ----------------------------------------------------------------------
// Get solution field.
const pylith::topology::Field<pylith::topology::Mesh>&
-pylith::topology::SolutionFields::getSolution(void) const
-{ // getSolution
+pylith::topology::SolutionFields::solution(void) const
+{ // solution
if (_solutionName == "")
throw std::runtime_error("Cannot retrieve solution. Name of solution " \
"field has not been specified.");
return get(_solutionName.c_str());
-} // getSolution
+} // solution
// ----------------------------------------------------------------------
// Get solution field.
pylith::topology::Field<pylith::topology::Mesh>&
-pylith::topology::SolutionFields::getSolution(void)
-{ // getSolution
+pylith::topology::SolutionFields::solution(void)
+{ // solution
if (_solutionName == "")
throw std::runtime_error("Cannot retrieve solution. Name of solution " \
"field has not been specified.");
return get(_solutionName.c_str());
-} // getSolution
+} // solution
// ----------------------------------------------------------------------
// Create history manager for a subset of the managed fields.
Modified: short/3D/PyLith/branches/pylith-swig/libsrc/topology/SolutionFields.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/libsrc/topology/SolutionFields.hh 2009-03-03 01:16:04 UTC (rev 14194)
+++ short/3D/PyLith/branches/pylith-swig/libsrc/topology/SolutionFields.hh 2009-03-03 02:01:51 UTC (rev 14195)
@@ -50,19 +50,19 @@
*
* @param name Name of field that is the solution.
*/
- void solutionField(const char* name);
+ void solutionName(const char* name);
/** Get solution field.
*
* @returns Solution field.
*/
- const Field<Mesh>& getSolution(void) const;
+ const Field<Mesh>& solution(void) const;
/** Get solution field.
*
* @returns Solution field.
*/
- Field<Mesh>& getSolution(void);
+ Field<Mesh>& solution(void);
/** Create history manager for a subset of the managed fields.
*
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestAbsorbingDampers.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestAbsorbingDampers.cc 2009-03-03 01:16:04 UTC (rev 14194)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestAbsorbingDampers.cc 2009-03-03 02:01:51 UTC (rev 14195)
@@ -200,7 +200,7 @@
const topology::SubMesh& boundaryMesh = *bc._boundaryMesh;
const ALE::Obj<SieveSubMesh>& submesh = boundaryMesh.sieveMesh();
- topology::Field<topology::Mesh>& solution = fields.getSolution();
+ topology::Field<topology::Mesh>& solution = fields.solution();
const ALE::Obj<RealSection>& solutionSection = solution.section();
CPPUNIT_ASSERT(!solutionSection.isNull());
@@ -318,7 +318,7 @@
fields->add("disp t+dt");
fields->add("disp t");
fields->add("disp t-dt");
- fields->solutionField("disp t+dt");
+ fields->solutionName("disp t+dt");
const char* history[] = { "disp t+dt", "disp t", "disp t-dt" };
const int historySize = 3;
fields->createHistory(history, historySize);
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestNeumann.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestNeumann.cc 2009-03-03 01:16:04 UTC (rev 14194)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestNeumann.cc 2009-03-03 02:01:51 UTC (rev 14195)
@@ -251,7 +251,7 @@
CPPUNIT_ASSERT(0 != fields);
fields->add("residual");
fields->add("dispTBctpdt");
- fields->solutionField("dispTBctpdt");
+ fields->solutionName("dispTBctpdt");
topology::Field<topology::Mesh>& residual = fields->get("residual");
const ALE::Obj<SieveMesh>& sieveMesh = mesh->sieveMesh();
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/topology/TestSolutionFields.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/topology/TestSolutionFields.cc 2009-03-03 01:16:04 UTC (rev 14194)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/topology/TestSolutionFields.cc 2009-03-03 02:01:51 UTC (rev 14195)
@@ -32,25 +32,25 @@
} // testConstructor
// ----------------------------------------------------------------------
-// Test solutionField().
+// Test solutionName().
void
-pylith::topology::TestSolutionFields::testSolutionField(void)
-{ // testSolutionField
+pylith::topology::TestSolutionFields::testSolutionName(void)
+{ // testSolutionName
Mesh mesh;
_initialize(&mesh);
SolutionFields manager(mesh);
const std::string& name = "my solution";
manager.add(name.c_str());
- manager.solutionField(name.c_str());
+ manager.solutionName(name.c_str());
CPPUNIT_ASSERT_EQUAL(name, manager._solutionName);
-} // testSolutionField
+} // testSolutionName
// ----------------------------------------------------------------------
-// Test getSolution().
+// Test solution().
void
-pylith::topology::TestSolutionFields::testGetSolution(void)
-{ // testGetSolution
+pylith::topology::TestSolutionFields::testSolution(void)
+{ // testSolution
Mesh mesh;
_initialize(&mesh);
SolutionFields manager(mesh);
@@ -77,12 +77,12 @@
fieldB.newSection(chart, fiberDimB);
fieldC.newSection(chart, fiberDimC);
- manager.solutionField(labels[1]);
- const Field<Mesh>& solution = manager.getSolution();
+ manager.solutionName(labels[1]);
+ const Field<Mesh>& solution = manager.solution();
const ALE::Obj<Mesh::RealSection>& sectionSoln = solution.section();
CPPUNIT_ASSERT_EQUAL(fiberDimB,
sectionSoln->getFiberDimension(*(vertices->begin())));
-} // testGetSolution
+} // testSolution
// ----------------------------------------------------------------------
// Test createHistory().
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/topology/TestSolutionFields.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/topology/TestSolutionFields.hh 2009-03-03 01:16:04 UTC (rev 14194)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/topology/TestSolutionFields.hh 2009-03-03 02:01:51 UTC (rev 14195)
@@ -40,8 +40,8 @@
CPPUNIT_TEST_SUITE( TestSolutionFields );
CPPUNIT_TEST( testConstructor );
- CPPUNIT_TEST( testSolutionField );
- CPPUNIT_TEST( testGetSolution );
+ CPPUNIT_TEST( testSolutionName );
+ CPPUNIT_TEST( testSolution );
CPPUNIT_TEST( testCreateHistory );
CPPUNIT_TEST( testShiftHistory );
@@ -53,11 +53,11 @@
/// Test constructor.
void testConstructor(void);
- /// Test solutionField().
- void testSolutionField(void);
+ /// Test solutionName().
+ void testSolutionName(void);
- /// Test getSolution().
- void testGetSolution(void);
+ /// Test solution().
+ void testSolution(void);
/// Test createHistory().
void testCreateHistory(void);
More information about the CIG-COMMITS
mailing list