[cig-commits] r6848 - in short/3D/PyLith/trunk: . libsrc/faults unittests/libtests/faults

[brad at geodynamics.org]

Author: brad
Date: 2007-05-10 17:50:08 -0700 (Thu, 10 May 2007)
New Revision: 6848

Modified:
   short/3D/PyLith/trunk/TODO
   short/3D/PyLith/trunk/libsrc/faults/BruneSlipFn.icc
   short/3D/PyLith/trunk/libsrc/faults/SlipTimeFn.cc
   short/3D/PyLith/trunk/unittests/libtests/faults/Makefile.am
Log:
Fixed small bugs in BruneSlipFn. Worked on unit tests for BruneSlipFn (currently forcing 4 to fail because they aren't implemented).

Modified: short/3D/PyLith/trunk/TODO
===================================================================
--- short/3D/PyLith/trunk/TODO	2007-05-11 00:48:16 UTC (rev 6847)
+++ short/3D/PyLith/trunk/TODO	2007-05-11 00:50:08 UTC (rev 6848)
@@ -19,7 +19,25 @@
 
   Use MeshIOAscii to get mesh information into Python tests?
 
-0. Implement faults for kinematic source
+0. Implement MeshIOLagrit
+   b. unit tests at C++ level
+     Check unit tests on big endian machine.
+
+1. Implement VTK output
+   a. SolutionIO
+     i. Python
+     ii. C++
+   b. SolutionIOVTK
+     i. Python
+     ii. C++
+
+2. Implement Dirichlet boundary conditions
+   a. C++
+   b. Python
+   c. C++ unit tests
+   d. Python unit tests
+
+3. Implement faults for kinematic source
    a. Creation of cohesive cells
      i. Add tests for interpolated meshes.
         Double check consistency in ordering of vertices (positive/negative).
@@ -27,35 +45,25 @@
    b. Implement integrator for faults
 
      i. FaultCohesive
-       (1) C++ Unit tests
-         _orient1D()
-         _orient2D()
-         _orient3D()
        (2) Python unit tests
 	 constructor
          initialize()
 
-     ii. EqKinSrc
+     ii. BruneSlipFn
        (1) C++ unit tests
-         constructor
-         clone()
-         slipfn()
          initialize()
          slip()
        (2) Python unit tests
          constructor
          initialize()
 
-     iii. BruneSlipFn
+     iii. EqKinSrc
        (1) C++ unit tests
          constructor
          clone()
-         dbFinalSlip()
-         dbSlipTime()
-         dbPeakRate()
+         slipfn()
          initialize()
          slip()
-         _slip()
        (2) Python unit tests
          constructor
          initialize()
@@ -77,7 +85,7 @@
      v. Update Reference cell
        (1) Improve how we get Jacobian at vertices of cell
 
-1. Finish implementing ExplicitElasticity and Explicit
+4. Finish implementing ExplicitElasticity and Explicit
    a. Replace integrateConstant() with integrateResidual()
 
      {f}-[A]{u}, {u} is "guess" (zero for explicit)
@@ -87,17 +95,10 @@
 
    c. Add unit test for IntegratorElasticity::calcTotalStrain
 
-2. Implement MeshIOLagrit
-   b. unit tests at C++ level
-     BinaryIO
-     Check unit tests on big endian machine.
+5. Implement absorbing boundary conditions
 
-3. Implement HDF5 output
+6. Create suite of simple full test cases
 
-4. Implement absorbing boundary conditions
-
-5. Create suite of simple full test cases
-
 ======================================================================
 SECONDARY PRIORITIES
 ======================================================================
@@ -109,6 +110,10 @@
    d. bindings
    e. unit tests at Python level
 
+2. Implement HDF5 output
+
+
+
 ======================================================================
 UNRESOLVED ISSUES
 ======================================================================

Modified: short/3D/PyLith/trunk/libsrc/faults/BruneSlipFn.icc
===================================================================
--- short/3D/PyLith/trunk/libsrc/faults/BruneSlipFn.icc	2007-05-11 00:48:16 UTC (rev 6847)
+++ short/3D/PyLith/trunk/libsrc/faults/BruneSlipFn.icc	2007-05-11 00:50:08 UTC (rev 6848)
@@ -57,7 +57,7 @@
     const double tau = 
       // prevent 0 == tau when 0 == finalSlip 
       (finalSlip > 0.0) ? finalSlip / (exp(1.0) * peakRate) : 0.1;
-    slip = 1.0 - exp(-t/tau) * (1.0 + t/tau);
+    slip = finalSlip * (1.0 - exp(-t/tau) * (1.0 + t/tau));
   } // if
   return slip;
 } // _slip

Modified: short/3D/PyLith/trunk/libsrc/faults/SlipTimeFn.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/faults/SlipTimeFn.cc	2007-05-11 00:48:16 UTC (rev 6847)
+++ short/3D/PyLith/trunk/libsrc/faults/SlipTimeFn.cc	2007-05-11 00:50:08 UTC (rev 6848)
@@ -14,9 +14,12 @@
 
 #include "SlipTimeFn.hh" // implementation of object methods
 
+#include "pylith/feassemble/ParameterManager.hh" // USES ParameterManager
+
 // ----------------------------------------------------------------------
 // Default constructor.
-pylith::faults::SlipTimeFn::SlipTimeFn(void)
+pylith::faults::SlipTimeFn::SlipTimeFn(void) :
+  _parameters(0)
 { // constructor
 } // constructor
 
@@ -24,11 +27,13 @@
 // Destructor.
 pylith::faults::SlipTimeFn::~SlipTimeFn(void)
 { // destructor
+  delete _parameters; _parameters = 0;
 } // destructor
 
 // ----------------------------------------------------------------------
 // Copy constructor.
-pylith::faults::SlipTimeFn::SlipTimeFn(const SlipTimeFn& f)
+pylith::faults::SlipTimeFn::SlipTimeFn(const SlipTimeFn& f) :
+  _parameters(0)
 { // copy constructor
 } // copy constructor
 

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/Makefile.am	2007-05-11 00:48:16 UTC (rev 6847)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/Makefile.am	2007-05-11 00:50:08 UTC (rev 6848)
@@ -21,13 +21,17 @@
 
 # Primary source files
 testfaults_SOURCES = \
+	TestBruneSlipFn.cc \
 	TestFault.cc \
 	TestFaultCohesive.cc \
 	TestFaultCohesiveKin.cc \
 	test_faults.cc
 
 noinst_HEADERS = \
-	TestFault.hh
+	TestBruneSlipFn.hh \
+	TestFault.hh \
+	TestFaultCohesive.hh \
+	TestFaultCohesiveKin.hh
 
 # Source files associated with testing data
 testfaults_SOURCES += \