[cig-commits] r20061 - in short/3D/PyLith/branches/v1.7-trunk: examples/bar_shearwave/quad4 libsrc/pylith/faults pylith/faults unittests/libtests/faults
brad at geodynamics.org
brad at geodynamics.org
Wed May 9 16:48:49 PDT 2012
Author: brad
Date: 2012-05-09 16:48:48 -0700 (Wed, 09 May 2012)
New Revision: 20061
Modified:
short/3D/PyLith/branches/v1.7-trunk/examples/bar_shearwave/quad4/dynamic.cfg
short/3D/PyLith/branches/v1.7-trunk/examples/bar_shearwave/quad4/dynamic_slipweakening.cfg
short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/faults/TractPerturbation.cc
short/3D/PyLith/branches/v1.7-trunk/pylith/faults/FaultCohesiveDyn.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:
Added traction prefix to traction perturbation output fields. Update barshearwave examples.
Modified: short/3D/PyLith/branches/v1.7-trunk/examples/bar_shearwave/quad4/dynamic.cfg
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/examples/bar_shearwave/quad4/dynamic.cfg 2012-05-09 23:34:44 UTC (rev 20060)
+++ short/3D/PyLith/branches/v1.7-trunk/examples/bar_shearwave/quad4/dynamic.cfg 2012-05-09 23:48:48 UTC (rev 20061)
@@ -34,16 +34,19 @@
# Specify the initial tractions on the fault using a uniform DB.
# shear: 6.1 MPa (right-lateral)
# normal 10 MPa (compressive)
-db_initial_tractions = spatialdata.spatialdb.UniformDB
-db_initial_tractions.label = Initial fault tractions
-db_initial_tractions.values = [traction-shear,traction-normal]
-db_initial_tractions.data = [-6.1*MPa, -10.0*MPa]
+traction_perturbation = pylith.faults.TractPerturbation
+[pylithapp.timedependent.interfaces.fault.traction_perturbation]
+db_initial = spatialdata.spatialdb.UniformDB
+db_initial.label = Initial fault tractions
+db_initial.values = [traction-shear,traction-normal]
+db_initial.data = [-6.1*MPa, -10.0*MPa]
+
# ----------------------------------------------------------------------
# output
# ----------------------------------------------------------------------
[pylithapp.timedependent.interfaces.fault.output]
-vertex_info_fields=[initial_traction]
+vertex_info_fields=[traction_initial_value]
vertex_data_fields=[slip,slip_rate,traction]
skip = 1
writer.time_format = %05.2f
Modified: short/3D/PyLith/branches/v1.7-trunk/examples/bar_shearwave/quad4/dynamic_slipweakening.cfg
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/examples/bar_shearwave/quad4/dynamic_slipweakening.cfg 2012-05-09 23:34:44 UTC (rev 20060)
+++ short/3D/PyLith/branches/v1.7-trunk/examples/bar_shearwave/quad4/dynamic_slipweakening.cfg 2012-05-09 23:48:48 UTC (rev 20061)
@@ -55,7 +55,7 @@
# Add friction model parameters to fault info file in addition to
# default values.
-vertex_info_fields = [strike_dir,normal_dir,initial_traction,static_coefficient,dynamic_coefficient,slip_weakening_parameter,cohesion]
+vertex_info_fields = [strike_dir,normal_dir,traction_initial_value,static_coefficient,dynamic_coefficient,slip_weakening_parameter,cohesion]
# Add output of state variables cumulative slip and previous slip to default
# values.
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 23:34:44 UTC (rev 20060)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/faults/TractPerturbation.cc 2012-05-09 23:48:48 UTC (rev 20061)
@@ -339,15 +339,15 @@
bool
pylith::faults::TractPerturbation::hasParameter(const char* name) const
{ // hasParameter
- if (0 == strcasecmp(name, "initial_value"))
+ if (0 == strcasecmp(name, "traction_initial_value"))
return (0 != _dbInitial);
- else if (0 == strcasecmp(name, "rate_of_change"))
+ else if (0 == strcasecmp(name, "traction_rate_of_change"))
return (0 != _dbRate);
- else if (0 == strcasecmp(name, "change_in_value"))
+ else if (0 == strcasecmp(name, "traction_change_in_value"))
return (0 != _dbChange);
- else if (0 == strcasecmp(name, "rate_start_time"))
+ else if (0 == strcasecmp(name, "traction_rate_start_time"))
return (0 != _dbRate);
- else if (0 == strcasecmp(name, "change_start_time"))
+ else if (0 == strcasecmp(name, "traction_change_start_time"))
return (0 != _dbChange);
else
return false;
@@ -362,19 +362,19 @@
assert(_parameters);
assert(name);
- if (0 == strcasecmp(name, "initial_value"))
+ if (0 == strcasecmp(name, "traction_initial_value"))
return _parameters->get("initial");
- else if (0 == strcasecmp(name, "rate_of_change"))
+ else if (0 == strcasecmp(name, "traction_rate_of_change"))
return _parameters->get("rate");
- else if (0 == strcasecmp(name, "change_in_value"))
+ else if (0 == strcasecmp(name, "traction_change_in_value"))
return _parameters->get("change");
- else if (0 == strcasecmp(name, "rate_start_time"))
+ else if (0 == strcasecmp(name, "traction_rate_start_time"))
return _parameters->get("rate time");
- else if (0 == strcasecmp(name, "change_start_time"))
+ else if (0 == strcasecmp(name, "traction_change_start_time"))
return _parameters->get("change time");
else {
Modified: short/3D/PyLith/branches/v1.7-trunk/pylith/faults/FaultCohesiveDyn.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/pylith/faults/FaultCohesiveDyn.py 2012-05-09 23:34:44 UTC (rev 20060)
+++ short/3D/PyLith/branches/v1.7-trunk/pylith/faults/FaultCohesiveDyn.py 2012-05-09 23:48:48 UTC (rev 20061)
@@ -126,6 +126,7 @@
"dip_dir"]
if not isinstance(self.tract, NullComponent):
+ print "HERE",self.tract.availableFields
self.availableFields['vertex']['info'] += self.tract.availableFields['vertex']['info']
self.availableFields['vertex']['info'] += \
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 23:34:44 UTC (rev 20060)
+++ short/3D/PyLith/branches/v1.7-trunk/pylith/faults/TractPerturbation.py 2012-05-09 23:48:48 UTC (rev 20061)
@@ -58,11 +58,11 @@
"""
fields = []
if not isinstance(self.inventory.dbInitial, NullComponent):
- fields += ["initial_value"]
+ fields += ["traction_initial_value"]
if not isinstance(self.inventory.dbRate, NullComponent):
- fields += ["rate_of_change", "rate_start_time"]
+ fields += ["traction_rate_of_change", "traction_rate_start_time"]
if not isinstance(self.inventory.dbChange, NullComponent):
- fields += ["change_in_value", "change_start_time"]
+ fields += ["traction_change_in_value", "traction_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 23:34:44 UTC (rev 20060)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/faults/TestFaultCohesiveDyn.cc 2012-05-09 23:48:48 UTC (rev 20061)
@@ -185,7 +185,7 @@
if (fault._tractPerturbation) {
// :KLUDGE: Only check initial value
const ALE::Obj<RealSection>& initialTractionsSection =
- fault.vertexField("initial_value").section();
+ fault.vertexField("traction_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 23:34:44 UTC (rev 20060)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/faults/TestTractPerturbation.cc 2012-05-09 23:48:48 UTC (rev 20061)
@@ -73,36 +73,36 @@
TractPerturbation tract;
// no values
- 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"));
+ CPPUNIT_ASSERT_EQUAL(false, tract.hasParameter("traction_initial_value"));
+ CPPUNIT_ASSERT_EQUAL(false, tract.hasParameter("traction_rate_of_change"));
+ CPPUNIT_ASSERT_EQUAL(false, tract.hasParameter("traction_change_in_value"));
+ CPPUNIT_ASSERT_EQUAL(false, tract.hasParameter("traction_rate_start_time"));
+ CPPUNIT_ASSERT_EQUAL(false, tract.hasParameter("traction_change_start_time"));
// initial value
tract.dbInitial(&db);
- 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"));
+ CPPUNIT_ASSERT_EQUAL(true, tract.hasParameter("traction_initial_value"));
+ CPPUNIT_ASSERT_EQUAL(false, tract.hasParameter("traction_rate_of_change"));
+ CPPUNIT_ASSERT_EQUAL(false, tract.hasParameter("traction_change_in_value"));
+ CPPUNIT_ASSERT_EQUAL(false, tract.hasParameter("traction_rate_start_time"));
+ CPPUNIT_ASSERT_EQUAL(false, tract.hasParameter("traction_change_start_time"));
// change value
tract.dbChange(&db);
- 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"));
+ CPPUNIT_ASSERT_EQUAL(true, tract.hasParameter("traction_initial_value"));
+ CPPUNIT_ASSERT_EQUAL(false, tract.hasParameter("traction_rate_of_change"));
+ CPPUNIT_ASSERT_EQUAL(true, tract.hasParameter("traction_change_in_value"));
+ CPPUNIT_ASSERT_EQUAL(false, tract.hasParameter("traction_rate_start_time"));
+ CPPUNIT_ASSERT_EQUAL(true, tract.hasParameter("traction_change_start_time"));
// rate value, remove change
tract.dbRate(&db);
tract.dbChange(0);
- 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"));
+ CPPUNIT_ASSERT_EQUAL(true, tract.hasParameter("traction_initial_value"));
+ CPPUNIT_ASSERT_EQUAL(true, tract.hasParameter("traction_rate_of_change"));
+ CPPUNIT_ASSERT_EQUAL(false, tract.hasParameter("traction_change_in_value"));
+ CPPUNIT_ASSERT_EQUAL(true, tract.hasParameter("traction_rate_start_time"));
+ CPPUNIT_ASSERT_EQUAL(false, tract.hasParameter("traction_change_start_time"));
} // testHasParameter
// ----------------------------------------------------------------------
@@ -222,7 +222,7 @@
1.5,
2.5,
};
- const char* label = "change_start_time";
+ const char* label = "traction_change_start_time";
topology::Mesh mesh;
topology::SubMesh faultMesh;
More information about the CIG-COMMITS
mailing list