[cig-commits] r19534 - in short/3D/PyLith/branches/pylith-scecdynrup: libsrc/pylith/faults libsrc/pylith/friction unittests/libtests/friction unittests/libtests/friction/data
brad at geodynamics.org
brad at geodynamics.org
Tue Jan 31 14:57:43 PST 2012
Author: brad
Date: 2012-01-31 14:57:42 -0800 (Tue, 31 Jan 2012)
New Revision: 19534
Modified:
short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/faults/FaultCohesiveDyn.cc
short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/friction/SlipWeakening.cc
short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/friction/SlipWeakeningTime.cc
short/3D/PyLith/branches/pylith-scecdynrup/unittests/libtests/friction/TestFrictionModel.cc
short/3D/PyLith/branches/pylith-scecdynrup/unittests/libtests/friction/data/SlipWeakeningData.cc
short/3D/PyLith/branches/pylith-scecdynrup/unittests/libtests/friction/data/SlipWeakeningTimeData.cc
Log:
Merge from trunk.
Modified: short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/faults/FaultCohesiveDyn.cc
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/faults/FaultCohesiveDyn.cc 2012-01-31 22:55:07 UTC (rev 19533)
+++ short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/faults/FaultCohesiveDyn.cc 2012-01-31 22:57:42 UTC (rev 19534)
@@ -983,7 +983,7 @@
dDispTIncrVertexP[iDim] = +0.5*dDispRelVertex[iDim];
} // for
-#if 1 // debugging
+#if 0 // debugging
std::cout << "v_fault: " << v_fault;
std::cout << ", tractionTpdtVertex: ";
for (int iDim=0; iDim < spaceDim; ++iDim)
Modified: short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/friction/SlipWeakening.cc
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/friction/SlipWeakening.cc 2012-01-31 22:55:07 UTC (rev 19533)
+++ short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/friction/SlipWeakening.cc 2012-01-31 22:57:42 UTC (rev 19534)
@@ -322,7 +322,7 @@
// Don't reset state variables when sliding stops
// (SCEC dynamic rupture branch only).
const double slipPrev = stateVars[s_slipPrev];
- stateVars[s_slipPrev] = stateVars[s_slipCum];
+ stateVars[s_slipPrev] = slip;
stateVars[s_slipCum] += fabs(slip - slipPrev);
} // _updateStateVars
Modified: short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/friction/SlipWeakeningTime.cc
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/friction/SlipWeakeningTime.cc 2012-01-31 22:55:07 UTC (rev 19533)
+++ short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/friction/SlipWeakeningTime.cc 2012-01-31 22:57:42 UTC (rev 19534)
@@ -330,7 +330,7 @@
// Don't reset state variables when sliding stops
// (SCEC dynamic rupture branch only).
- const double slipPrev = stateVars[s_slipPrev];
+ const double slipPrev = slip;
stateVars[s_slipPrev] = stateVars[s_slipCum];
stateVars[s_slipCum] += fabs(slip - slipPrev);
} // _updateStateVars
Modified: short/3D/PyLith/branches/pylith-scecdynrup/unittests/libtests/friction/TestFrictionModel.cc
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/unittests/libtests/friction/TestFrictionModel.cc 2012-01-31 22:55:07 UTC (rev 19533)
+++ short/3D/PyLith/branches/pylith-scecdynrup/unittests/libtests/friction/TestFrictionModel.cc 2012-01-31 22:57:42 UTC (rev 19534)
@@ -361,7 +361,7 @@
const int numStateVars = 2;
const PylithScalar stateVars[2] = { 0.5, 0.1 };
- const PylithScalar stateVarsUpdatedE[2] = { 0.65, 0.5 };
+ const PylithScalar stateVarsUpdatedE[2] = { 0.65, 0.25 };
// Set state variables to given values
Modified: short/3D/PyLith/branches/pylith-scecdynrup/unittests/libtests/friction/data/SlipWeakeningData.cc
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/unittests/libtests/friction/data/SlipWeakeningData.cc 2012-01-31 22:55:07 UTC (rev 19533)
+++ short/3D/PyLith/branches/pylith-scecdynrup/unittests/libtests/friction/data/SlipWeakeningData.cc 2012-01-31 22:57:42 UTC (rev 19534)
@@ -142,9 +142,9 @@
const PylithScalar pylith::friction::SlipWeakeningData::_stateVarsUpdated[] = {
0.48,
- 0.4,
+ 0.12,
0.65,
- 0.5,
+ 0.25,
};
pylith::friction::SlipWeakeningData::SlipWeakeningData(void)
Modified: short/3D/PyLith/branches/pylith-scecdynrup/unittests/libtests/friction/data/SlipWeakeningTimeData.cc
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/unittests/libtests/friction/data/SlipWeakeningTimeData.cc 2012-01-31 22:55:07 UTC (rev 19533)
+++ short/3D/PyLith/branches/pylith-scecdynrup/unittests/libtests/friction/data/SlipWeakeningTimeData.cc 2012-01-31 22:57:42 UTC (rev 19534)
@@ -150,9 +150,9 @@
const PylithScalar pylith::friction::SlipWeakeningTimeData::_stateVarsUpdated[] = {
0.48,
- 0.4,
+ 0.12,
0.65,
- 0.5,
+ 0.25,
};
pylith::friction::SlipWeakeningTimeData::SlipWeakeningTimeData(void)
More information about the CIG-COMMITS
mailing list