[cig-commits] r20060 - in short/3D/PyLith/branches/v1.7-trunk: libsrc/pylith/bc libsrc/pylith/faults pylith/bc pylith/faults unittests/libtests/faults
brad at geodynamics.org
brad at geodynamics.org
Wed May 9 16:34:44 PDT 2012
Author: brad
Date: 2012-05-09 16:34:44 -0700 (Wed, 09 May 2012)
New Revision: 20060
Modified:
short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/bc/DirichletBoundary.cc
short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/bc/Neumann.cc
short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/faults/TractPerturbation.cc
short/3D/PyLith/branches/v1.7-trunk/pylith/bc/DirichletBoundary.py
short/3D/PyLith/branches/v1.7-trunk/pylith/bc/Neumann.py
short/3D/PyLith/branches/v1.7-trunk/pylith/faults/TractPerturbation.py
short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/faults/TestFaultCohesiveDyn.cc
short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/faults/TestTractPerturbation.cc
Log:
Cleanup of name of output fields for time dependent stuff.
Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/bc/DirichletBoundary.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/bc/DirichletBoundary.cc 2012-05-09 22:48:01 UTC (rev 20059)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/bc/DirichletBoundary.cc 2012-05-09 23:34:44 UTC (rev 20060)
@@ -104,15 +104,15 @@
logger.stagePop();
- if (0 == strcasecmp(name, "initial-value"))
+ if (0 == strcasecmp(name, "initial_value"))
return _bufferVector("initial", "initial_displacement", lengthScale);
- else if (0 == strcasecmp(name, "rate-of-change"))
+ else if (0 == strcasecmp(name, "rate_of_change"))
return _bufferVector("rate", "velocity", rateScale);
- else if (0 == strcasecmp(name, "change-in-value"))
+ else if (0 == strcasecmp(name, "change_in_value"))
return _bufferVector("change", "displacement_change", lengthScale);
- else if (0 == strcasecmp(name, "rate-start-time"))
+ else if (0 == strcasecmp(name, "rate_start_time"))
return _bufferScalar("rate time", "velocity_start_time", timeScale);
- else if (0 == strcasecmp(name, "change-start-time"))
+ else if (0 == strcasecmp(name, "change_start_time"))
return _bufferScalar("change time", "change_start_time", timeScale);
else {
std::ostringstream msg;
Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/bc/Neumann.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/bc/Neumann.cc 2012-05-09 22:48:01 UTC (rev 20059)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/bc/Neumann.cc 2012-05-09 23:34:44 UTC (rev 20060)
@@ -203,19 +203,19 @@
assert(_parameters);
assert(name);
- if (0 == strcasecmp(name, "initial-value"))
+ if (0 == strcasecmp(name, "initial_value"))
return _parameters->get("initial");
- else if (0 == strcasecmp(name, "rate-of-change"))
+ else if (0 == strcasecmp(name, "rate_of_change"))
return _parameters->get("rate");
- else if (0 == strcasecmp(name, "change-in-value"))
+ else if (0 == strcasecmp(name, "change_in_value"))
return _parameters->get("change");
- else if (0 == strcasecmp(name, "rate-start-time"))
+ else if (0 == strcasecmp(name, "rate_start_time"))
return _parameters->get("rate time");
- else if (0 == strcasecmp(name, "change-start-time"))
+ else if (0 == strcasecmp(name, "change_start_time"))
return _parameters->get("change time");
else {
Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/faults/TractPerturbation.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/faults/TractPerturbation.cc 2012-05-09 22:48:01 UTC (rev 20059)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/faults/TractPerturbation.cc 2012-05-09 23:34:44 UTC (rev 20060)
@@ -107,14 +107,14 @@
// Create section to hold time dependent values
_parameters->add("value", "traction", spaceDim, topology::FieldBase::VECTOR, pressureScale);
if (_dbInitial)
- _parameters->add("initial", "initial_traction", spaceDim, topology::FieldBase::VECTOR, pressureScale);
+ _parameters->add("initial", "traction_initial", spaceDim, topology::FieldBase::VECTOR, pressureScale);
if (_dbRate) {
_parameters->add("rate", "traction_rate", spaceDim, topology::FieldBase::VECTOR, rateScale);
- _parameters->add("rate time", "traction_rate_time", 1, topology::FieldBase::SCALAR, timeScale);
+ _parameters->add("rate time", "rate_start_time", 1, topology::FieldBase::SCALAR, timeScale);
} // if
if (_dbChange) {
- _parameters->add("change", "change_traction", spaceDim, topology::FieldBase::VECTOR, pressureScale);
- _parameters->add("change time", "change_traction_time", 1, topology::FieldBase::SCALAR, timeScale);
+ _parameters->add("change", "traction_change", spaceDim, topology::FieldBase::VECTOR, pressureScale);
+ _parameters->add("change time", "change_start_time", 1, topology::FieldBase::SCALAR, timeScale);
} // if
_parameters->allocate(topology::FieldBase::VERTICES_FIELD, 0);
const ALE::Obj<SubRealUniformSection>& parametersSection = _parameters->section();
@@ -339,15 +339,15 @@
bool
pylith::faults::TractPerturbation::hasParameter(const char* name) const
{ // hasParameter
- if (0 == strcasecmp(name, "initial_traction"))
+ if (0 == strcasecmp(name, "initial_value"))
return (0 != _dbInitial);
- else if (0 == strcasecmp(name, "rate_traction"))
+ else if (0 == strcasecmp(name, "rate_of_change"))
return (0 != _dbRate);
- else if (0 == strcasecmp(name, "change_traction"))
+ else if (0 == strcasecmp(name, "change_in_value"))
return (0 != _dbChange);
- else if (0 == strcasecmp(name, "rate_time_traction"))
+ else if (0 == strcasecmp(name, "rate_start_time"))
return (0 != _dbRate);
- else if (0 == strcasecmp(name, "change_time_traction"))
+ else if (0 == strcasecmp(name, "change_start_time"))
return (0 != _dbChange);
else
return false;
@@ -362,19 +362,19 @@
assert(_parameters);
assert(name);
- if (0 == strcasecmp(name, "initial_traction"))
+ if (0 == strcasecmp(name, "initial_value"))
return _parameters->get("initial");
- else if (0 == strcasecmp(name, "rate_traction"))
+ else if (0 == strcasecmp(name, "rate_of_change"))
return _parameters->get("rate");
- else if (0 == strcasecmp(name, "change_traction"))
+ else if (0 == strcasecmp(name, "change_in_value"))
return _parameters->get("change");
- else if (0 == strcasecmp(name, "rate_time_traction"))
+ else if (0 == strcasecmp(name, "rate_start_time"))
return _parameters->get("rate time");
- else if (0 == strcasecmp(name, "change_time_traction"))
+ else if (0 == strcasecmp(name, "change_start_time"))
return _parameters->get("change time");
else {
Modified: short/3D/PyLith/branches/v1.7-trunk/pylith/bc/DirichletBoundary.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/pylith/bc/DirichletBoundary.py 2012-05-09 22:48:01 UTC (rev 20059)
+++ short/3D/PyLith/branches/v1.7-trunk/pylith/bc/DirichletBoundary.py 2012-05-09 23:34:44 UTC (rev 20060)
@@ -88,11 +88,11 @@
fields = []
if not isinstance(self.inventory.dbInitial, NullComponent):
- fields += ["initial_displacement"]
+ fields += ["initial_value"]
if not isinstance(self.inventory.dbRate, NullComponent):
- fields += ["rate_displacement", "rate_time_displacement"]
+ fields += ["rate_of_change", "rate_start_time"]
if not isinstance(self.inventory.dbChange, NullComponent):
- fields += ["change_displacement", "change_time_displacement"]
+ fields += ["change_in_value", "change_start_time"]
self.availableFields['vertex']['info'] += fields
return
Modified: short/3D/PyLith/branches/v1.7-trunk/pylith/bc/Neumann.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/pylith/bc/Neumann.py 2012-05-09 22:48:01 UTC (rev 20059)
+++ short/3D/PyLith/branches/v1.7-trunk/pylith/bc/Neumann.py 2012-05-09 23:34:44 UTC (rev 20060)
@@ -88,11 +88,11 @@
fields = []
if not isinstance(self.inventory.dbInitial, NullComponent):
- fields += ["initial_traction"]
+ fields += ["initial_value"]
if not isinstance(self.inventory.dbRate, NullComponent):
- fields += ["rate_traction", "rate_time_traction"]
+ fields += ["rate_of_change", "rate_start_time"]
if not isinstance(self.inventory.dbChange, NullComponent):
- fields += ["change_traction", "change_time_traction"]
+ fields += ["change_in_value", "change_start_time"]
self.availableFields['cell']['info'] += fields
return
Modified: short/3D/PyLith/branches/v1.7-trunk/pylith/faults/TractPerturbation.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/pylith/faults/TractPerturbation.py 2012-05-09 22:48:01 UTC (rev 20059)
+++ short/3D/PyLith/branches/v1.7-trunk/pylith/faults/TractPerturbation.py 2012-05-09 23:34:44 UTC (rev 20060)
@@ -58,11 +58,11 @@
"""
fields = []
if not isinstance(self.inventory.dbInitial, NullComponent):
- fields += ["initial_traction"]
+ fields += ["initial_value"]
if not isinstance(self.inventory.dbRate, NullComponent):
- fields += ["rate_traction", "rate_time_traction"]
+ fields += ["rate_of_change", "rate_start_time"]
if not isinstance(self.inventory.dbChange, NullComponent):
- fields += ["change_traction", "change_time_traction"]
+ fields += ["change_in_value", "change_start_time"]
self.availableFields = \
{'vertex': {'info': fields,
Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/faults/TestFaultCohesiveDyn.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/faults/TestFaultCohesiveDyn.cc 2012-05-09 22:48:01 UTC (rev 20059)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/faults/TestFaultCohesiveDyn.cc 2012-05-09 23:34:44 UTC (rev 20060)
@@ -185,7 +185,7 @@
if (fault._tractPerturbation) {
// :KLUDGE: Only check initial value
const ALE::Obj<RealSection>& initialTractionsSection =
- fault.vertexField("initial_traction").section();
+ fault.vertexField("initial_value").section();
CPPUNIT_ASSERT(!initialTractionsSection.isNull());
//initialTractionsSection->view("INITIAL TRACTIONS"); // DEBUGGING
Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/faults/TestTractPerturbation.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/faults/TestTractPerturbation.cc 2012-05-09 22:48:01 UTC (rev 20059)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/faults/TestTractPerturbation.cc 2012-05-09 23:34:44 UTC (rev 20060)
@@ -73,36 +73,36 @@
TractPerturbation tract;
// no values
- CPPUNIT_ASSERT_EQUAL(false, tract.hasParameter("initial_traction"));
- CPPUNIT_ASSERT_EQUAL(false, tract.hasParameter("rate_traction"));
- CPPUNIT_ASSERT_EQUAL(false, tract.hasParameter("change_traction"));
- CPPUNIT_ASSERT_EQUAL(false, tract.hasParameter("rate_time_traction"));
- CPPUNIT_ASSERT_EQUAL(false, tract.hasParameter("change_time_traction"));
+ CPPUNIT_ASSERT_EQUAL(false, tract.hasParameter("initial_value"));
+ CPPUNIT_ASSERT_EQUAL(false, tract.hasParameter("rate_of_change"));
+ CPPUNIT_ASSERT_EQUAL(false, tract.hasParameter("change_in_value"));
+ CPPUNIT_ASSERT_EQUAL(false, tract.hasParameter("rate_start_time"));
+ CPPUNIT_ASSERT_EQUAL(false, tract.hasParameter("change_start_time"));
// initial value
tract.dbInitial(&db);
- CPPUNIT_ASSERT_EQUAL(true, tract.hasParameter("initial_traction"));
- CPPUNIT_ASSERT_EQUAL(false, tract.hasParameter("rate_traction"));
- CPPUNIT_ASSERT_EQUAL(false, tract.hasParameter("change_traction"));
- CPPUNIT_ASSERT_EQUAL(false, tract.hasParameter("rate_time_traction"));
- CPPUNIT_ASSERT_EQUAL(false, tract.hasParameter("change_time_traction"));
+ CPPUNIT_ASSERT_EQUAL(true, tract.hasParameter("initial_value"));
+ CPPUNIT_ASSERT_EQUAL(false, tract.hasParameter("rate_of_change"));
+ CPPUNIT_ASSERT_EQUAL(false, tract.hasParameter("change_in_value"));
+ CPPUNIT_ASSERT_EQUAL(false, tract.hasParameter("rate_start_time"));
+ CPPUNIT_ASSERT_EQUAL(false, tract.hasParameter("change_start_time"));
// change value
tract.dbChange(&db);
- CPPUNIT_ASSERT_EQUAL(true, tract.hasParameter("initial_traction"));
- CPPUNIT_ASSERT_EQUAL(false, tract.hasParameter("rate_traction"));
- CPPUNIT_ASSERT_EQUAL(true, tract.hasParameter("change_traction"));
- CPPUNIT_ASSERT_EQUAL(false, tract.hasParameter("rate_time_traction"));
- CPPUNIT_ASSERT_EQUAL(true, tract.hasParameter("change_time_traction"));
+ CPPUNIT_ASSERT_EQUAL(true, tract.hasParameter("initial_value"));
+ CPPUNIT_ASSERT_EQUAL(false, tract.hasParameter("rate_of_change"));
+ CPPUNIT_ASSERT_EQUAL(true, tract.hasParameter("change_in_value"));
+ CPPUNIT_ASSERT_EQUAL(false, tract.hasParameter("rate_start_time"));
+ CPPUNIT_ASSERT_EQUAL(true, tract.hasParameter("change_start_time"));
// rate value, remove change
tract.dbRate(&db);
tract.dbChange(0);
- CPPUNIT_ASSERT_EQUAL(true, tract.hasParameter("initial_traction"));
- CPPUNIT_ASSERT_EQUAL(true, tract.hasParameter("rate_traction"));
- CPPUNIT_ASSERT_EQUAL(false, tract.hasParameter("change_traction"));
- CPPUNIT_ASSERT_EQUAL(true, tract.hasParameter("rate_time_traction"));
- CPPUNIT_ASSERT_EQUAL(false, tract.hasParameter("change_time_traction"));
+ CPPUNIT_ASSERT_EQUAL(true, tract.hasParameter("initial_value"));
+ CPPUNIT_ASSERT_EQUAL(true, tract.hasParameter("rate_of_change"));
+ CPPUNIT_ASSERT_EQUAL(false, tract.hasParameter("change_in_value"));
+ CPPUNIT_ASSERT_EQUAL(true, tract.hasParameter("rate_start_time"));
+ CPPUNIT_ASSERT_EQUAL(false, tract.hasParameter("change_start_time"));
} // testHasParameter
// ----------------------------------------------------------------------
@@ -222,7 +222,7 @@
1.5,
2.5,
};
- const char* label = "change_time_traction";
+ const char* label = "change_start_time";
topology::Mesh mesh;
topology::SubMesh faultMesh;
More information about the CIG-COMMITS
mailing list