[cig-commits] r17061 - in short/3D/PyLith/trunk: . doc/releasenotes libsrc/friction pylith/faults

[brad at geodynamics.org]

Author: brad
Date: 2010-08-01 13:39:25 -0700 (Sun, 01 Aug 2010)
New Revision: 17061

Modified:
   short/3D/PyLith/trunk/TODO
   short/3D/PyLith/trunk/doc/releasenotes/announce_v1.5.1.txt
   short/3D/PyLith/trunk/libsrc/friction/TimeWeakening.cc
   short/3D/PyLith/trunk/pylith/faults/Fault.py
   short/3D/PyLith/trunk/pylith/faults/FaultCohesiveDyn.py
   short/3D/PyLith/trunk/pylith/faults/FaultCohesiveKin.py
Log:
Merge from stable.

Modified: short/3D/PyLith/trunk/TODO
===================================================================
--- short/3D/PyLith/trunk/TODO	2010-08-01 20:34:33 UTC (rev 17060)
+++ short/3D/PyLith/trunk/TODO	2010-08-01 20:39:25 UTC (rev 17061)
@@ -56,6 +56,8 @@
 
 * GenMaxwellPlaneStrain (plane strain Generalize Maxwell model) [Charles]
 
+* DruckerPragerPlaneStrain (Drucker-Prager plane strain ) [Charles]
+
 * Lumped solver [Brad]
   + Need to finish unit tests
 

Modified: short/3D/PyLith/trunk/doc/releasenotes/announce_v1.5.1.txt
===================================================================
--- short/3D/PyLith/trunk/doc/releasenotes/announce_v1.5.1.txt	2010-08-01 20:34:33 UTC (rev 17060)
+++ short/3D/PyLith/trunk/doc/releasenotes/announce_v1.5.1.txt	2010-08-01 20:39:25 UTC (rev 17061)
@@ -11,7 +11,7 @@
 
 You can download the source code and binaries from
 
-    http://geodynamics.org/cig/software/packages/short/pylith
+    http://geodynamics.org/cig/software/pylith
 
 Detailed installation instructions are in the User Manual with example
 installation procedures for a few platforms in the bundled doc/install

Modified: short/3D/PyLith/trunk/libsrc/friction/TimeWeakening.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/friction/TimeWeakening.cc	2010-08-01 20:34:33 UTC (rev 17060)
+++ short/3D/PyLith/trunk/libsrc/friction/TimeWeakening.cc	2010-08-01 20:39:25 UTC (rev 17061)
@@ -295,6 +295,13 @@
   } else {
     stateVars[s_time] = 0.0;
   } // else
+
+  std::cout << "UPDATESTATEVARS: "
+	    << "slip: " << slip 
+	    << ", slipRate: " << slipRate
+	    << ", slipTime: " << stateVars[s_time]
+	    << std::endl;
+
  
 } // _updateStateVars
 

Modified: short/3D/PyLith/trunk/pylith/faults/Fault.py
===================================================================
--- short/3D/PyLith/trunk/pylith/faults/Fault.py	2010-08-01 20:34:33 UTC (rev 17060)
+++ short/3D/PyLith/trunk/pylith/faults/Fault.py	2010-08-01 20:39:25 UTC (rev 17061)
@@ -159,19 +159,6 @@
     return
 
 
-  def poststep(self, t, dt, fields):
-    """
-    Hook for doing stuff after advancing time step.
-    """
-    logEvent = "%spoststep" % self._loggingPrefix
-    self._eventLogger.eventBegin(logEvent)
-
-    self.updateStateVars(t, fields)
-
-    self._eventLogger.eventEnd(logEvent)
-    return
-
-
   def writeData(self, t, fields):
     """
     Write data at time t.

Modified: short/3D/PyLith/trunk/pylith/faults/FaultCohesiveDyn.py
===================================================================
--- short/3D/PyLith/trunk/pylith/faults/FaultCohesiveDyn.py	2010-08-01 20:34:33 UTC (rev 17060)
+++ short/3D/PyLith/trunk/pylith/faults/FaultCohesiveDyn.py	2010-08-01 20:39:25 UTC (rev 17061)
@@ -143,20 +143,6 @@
     return
 
 
-  def poststep(self, t, dt, fields):
-    """
-    Hook for doing stuff after advancing time step.
-    """
-    logEvent = "%spoststep" % self._loggingPrefix
-    self._eventLogger.eventBegin(logEvent)
-
-    Integrator.poststep(self, t, dt, fields)
-    FaultCohesive.poststep(self, t, dt, fields)
-
-    self._eventLogger.eventEnd(logEvent)
-    return
-
-
   def getVertexField(self, name, fields=None):
     """
     Get vertex field.

Modified: short/3D/PyLith/trunk/pylith/faults/FaultCohesiveKin.py
===================================================================
--- short/3D/PyLith/trunk/pylith/faults/FaultCohesiveKin.py	2010-08-01 20:34:33 UTC (rev 17060)
+++ short/3D/PyLith/trunk/pylith/faults/FaultCohesiveKin.py	2010-08-01 20:39:25 UTC (rev 17061)
@@ -155,20 +155,6 @@
     return
 
 
-  def poststep(self, t, dt, fields):
-    """
-    Hook for doing stuff after advancing time step.
-    """
-    logEvent = "%spoststep" % self._loggingPrefix
-    self._eventLogger.eventBegin(logEvent)
-
-    Integrator.poststep(self, t, dt, fields)
-    FaultCohesive.poststep(self, t, dt, fields)
-
-    self._eventLogger.eventEnd(logEvent)
-    return
-
-
   def getVertexField(self, name, fields=None):
     """
     Get vertex field.