[cig-commits] r19546 - in short/3D/PyLith/branches/v1.6-stable: libsrc/pylith/faults libsrc/pylith/friction pylith/perf unittests/libtests/friction
brad at geodynamics.org
brad at geodynamics.org
Tue Jan 31 18:05:30 PST 2012
Author: brad
Date: 2012-01-31 18:05:30 -0800 (Tue, 31 Jan 2012)
New Revision: 19546
Modified:
short/3D/PyLith/branches/v1.6-stable/libsrc/pylith/faults/CohesiveTopology.cc
short/3D/PyLith/branches/v1.6-stable/libsrc/pylith/faults/FaultCohesiveDyn.cc
short/3D/PyLith/branches/v1.6-stable/libsrc/pylith/friction/RateStateAgeing.cc
short/3D/PyLith/branches/v1.6-stable/pylith/perf/Fault.py
short/3D/PyLith/branches/v1.6-stable/unittests/libtests/friction/TestFrictionModel.cc
Log:
Turn off some debugging output. More work on memory model for fault.
Modified: short/3D/PyLith/branches/v1.6-stable/libsrc/pylith/faults/CohesiveTopology.cc
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/libsrc/pylith/faults/CohesiveTopology.cc 2012-02-01 01:38:55 UTC (rev 19545)
+++ short/3D/PyLith/branches/v1.6-stable/libsrc/pylith/faults/CohesiveTopology.cc 2012-02-01 02:05:30 UTC (rev 19546)
@@ -51,7 +51,7 @@
// Memory logging
ALE::MemoryLogger& logger = ALE::MemoryLogger::singleton();
- logger.stagePush("xxFaultCohesiveCellsCreation");
+ logger.stagePush("SerialFaultCreation");
faultMesh->coordsys(mesh);
@@ -98,10 +98,10 @@
fault->setSieve(faultSieve);
logger.stagePop();
- logger.stagePush("xxFaultCohesiveCellsStratification");
+ logger.stagePush("SerialFaultStratification");
fault->stratify();
logger.stagePop();
- logger.stagePush("xxFaultCohesiveCellsCreation");
+ logger.stagePush("SerialFaultCreation");
if (debug)
fault->view("Fault mesh");
@@ -143,7 +143,7 @@
// Memory logging
ALE::MemoryLogger& logger = ALE::MemoryLogger::singleton();
- logger.stagePush("FaultCohesiveCellsCreation");
+ logger.stagePush("SerialFaultCreation");
const ALE::Obj<SieveMesh>& sieveMesh = mesh->sieveMesh();
assert(!sieveMesh.isNull());
@@ -212,7 +212,7 @@
<< vertexRenumber[*v_iter] << std::endl;
logger.stagePop();
- logger.stagePush("FaultCohesiveCellsStratification");
+ logger.stagePush("SerialFaultStratification");
// Add shadow and constraint vertices (if they exist) to group
// associated with fault
groupField->addPoint(firstFaultVertex, 1);
@@ -232,7 +232,7 @@
++firstLagrangeVertex;
} // if
logger.stagePop();
- logger.stagePush("MeshIntSections");
+ logger.stagePush("SerialFaultCreation");
// Add shadow vertices to other groups, don't add constraint
// vertices (if they exist) because we don't want BC, etc to act
@@ -246,11 +246,9 @@
if (group->getFiberDimension(*v_iter))
group->addPoint(firstFaultVertex, 1);
} // for
- logger.stagePop();
- logger.stagePush("FaultCohesiveCellsCreation");
} // for
logger.stagePop();
- logger.stagePush("MeshIntSections");
+ logger.stagePush("SerialFaultCreation");
const std::set<std::string>::const_iterator namesEnd = groupNames->end();
for(std::set<std::string>::const_iterator name = groupNames->begin();
name != namesEnd;
@@ -258,7 +256,7 @@
sieveMesh->reallocate(sieveMesh->getIntSection(*name));
} // for
logger.stagePop();
- logger.stagePush("FaultCohesiveCellsCreation");
+ logger.stagePush("SerialFault");
// Split the mesh along the fault sieve and create cohesive elements
const ALE::Obj<SieveSubMesh::label_sequence>& faces =
@@ -416,14 +414,14 @@
// TODO: Need to reform the material label when sieve is reallocated
sieveMesh->setValue(material, firstFaultCell, materialId);
logger.stagePop();
- logger.stagePush("FaultCohesiveCellsStratification");
+ logger.stagePush("SerialFaultStratification");
#if defined(FAST_STRATIFY)
// OPTIMIZATION
sieveMesh->setHeight(firstFaultCell, 0);
sieveMesh->setDepth(firstFaultCell, 1);
#endif
logger.stagePop();
- logger.stagePush("FaultCohesiveCellsCreation");
+ logger.stagePush("SerialFaultCreation");
sV2.clear();
cV2.clear();
} // for
@@ -612,10 +610,10 @@
delete [] indices;
#if !defined(FAST_STRATIFY)
logger.stagePop();
- logger.stagePush("FaultCohesiveCellsStratification");
+ logger.stagePush("SerialFaultStratification");
sieveMesh->stratify();
logger.stagePop();
- logger.stagePush("FaultCohesiveCellsCreation");
+ logger.stagePush("SerialFaultCreation");
#endif
const std::string labelName("censored depth");
@@ -929,7 +927,7 @@
} // if
#endif
-#if 1 // DEBUGGING
+#if 0 // DEBUGGING
sendParallelMeshOverlap->view("Send parallel fault overlap");
recvParallelMeshOverlap->view("Recv parallel fault overlap");
#endif
Modified: short/3D/PyLith/branches/v1.6-stable/libsrc/pylith/faults/FaultCohesiveDyn.cc
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/libsrc/pylith/faults/FaultCohesiveDyn.cc 2012-02-01 01:38:55 UTC (rev 19545)
+++ short/3D/PyLith/branches/v1.6-stable/libsrc/pylith/faults/FaultCohesiveDyn.cc 2012-02-01 02:05:30 UTC (rev 19546)
@@ -1005,7 +1005,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)
@@ -2376,7 +2376,7 @@
assert(dTractionTpdt);
assert(dSlipTpdt);
-#if 1 // DEBUGGING
+#if 0 // DEBUGGING
std::cout << "BEFORE improvement"
<< ", dTractionTpdt:";
for (int i=0; i < 2; ++i)
@@ -2478,7 +2478,7 @@
#endif
} // if/else
-#if 1 // DEBUGGING
+#if 0 // DEBUGGING
std::cout << "AFTER improvement"
<< ", dTractionTpdt:";
for (int i=0; i < 2; ++i)
@@ -2514,7 +2514,7 @@
assert(dTractionTpdt);
assert(dSlipTpdt);
-#if 1 // DEBUGGING
+#if 0 // DEBUGGING
std::cout << "BEFORE improvement"
<< ", dTractionTpdt:";
for (int i=0; i < 2; ++i)
@@ -2639,7 +2639,7 @@
#endif
} // if
-#if 1 // DEBUGGING
+#if 0 // DEBUGGING
std::cout << "AFTER improvement"
<< ", dTractionTpdt:";
for (int i=0; i < 2; ++i)
Modified: short/3D/PyLith/branches/v1.6-stable/libsrc/pylith/friction/RateStateAgeing.cc
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/libsrc/pylith/friction/RateStateAgeing.cc 2012-02-01 01:38:55 UTC (rev 19545)
+++ short/3D/PyLith/branches/v1.6-stable/libsrc/pylith/friction/RateStateAgeing.cc 2012-02-01 02:05:30 UTC (rev 19546)
@@ -332,14 +332,6 @@
mu_f = a * asinh(sinhArg);
friction = -mu_f * normalTraction + properties[p_cohesion];
- std::cout << "slip: " << slip
- << ", slipRate: " << slipRate
- << ", stateVar: " << theta
- << ", bLnTermL: " << bLnTerm
- << ", expTerm: " << expTerm
- << ", sinhArg: " << sinhArg
- << ", mu_f: " << mu_f
- << std::endl;
#else
const double slipRateLinear = _minSlipRate;
@@ -360,11 +352,13 @@
friction = -mu_f * normalTraction + properties[p_cohesion];
+#if 0
std::cout << "slip: " << slip
<< ", slipRate: " << slipRate
<< ", stateVar: " << theta
<< ", mu_f: " << mu_f
<< std::endl;
+#endif
#endif
} // if
Modified: short/3D/PyLith/branches/v1.6-stable/pylith/perf/Fault.py
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/pylith/perf/Fault.py 2012-02-01 01:38:55 UTC (rev 19545)
+++ short/3D/PyLith/branches/v1.6-stable/pylith/perf/Fault.py 2012-02-01 02:05:30 UTC (rev 19546)
@@ -66,11 +66,5 @@
memDict['Stratification'] = 2 * self.sizeArrow * (nvertices + ncells)
memDict['Coordinates'] = (self.sizeDouble * dim * nvertices) + (2 * self.sizeInt * nvertices) + (2 * self.sizeInt * nvertices)
- # coneSize for cohesive cell is 3*coneSize for fault (surface) cell
- # :TODO: account for fault sieve
- memDict['CohesiveCells'] = {'Creation': 0,
- 'Stratification': 0}
- memDict['CohesiveCells']['Creation'] = self.sizeInt * (2 * (3*coneSize*ncells + 3*nvertices + ncells) + 3*coneSize*ncells)
- memDict['CohesiveCells']['Stratification'] = 2 * self.sizeArrow * (3*nvertices + ncells)
return
Modified: short/3D/PyLith/branches/v1.6-stable/unittests/libtests/friction/TestFrictionModel.cc
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/unittests/libtests/friction/TestFrictionModel.cc 2012-02-01 01:38:55 UTC (rev 19545)
+++ short/3D/PyLith/branches/v1.6-stable/unittests/libtests/friction/TestFrictionModel.cc 2012-02-01 02:05:30 UTC (rev 19546)
@@ -715,7 +715,7 @@
const double tolerance = 1.0e-06;
for (int i=0; i < numVarsVertex; ++i) {
-#if 1 // DEBUGGING
+#if 0 // DEBUGGING
std::cout << "valE: " << stateVarsE[i]
<< ", val: " << stateVars[i]
<< std::endl;
More information about the CIG-COMMITS
mailing list