[cig-commits] r14853 - in short/3D/PyLith/branches/pylith-swig: . libsrc/faults pylith/bc pylith/feassemble pylith/problems

[brad at geodynamics.org]

Author: brad
Date: 2009-05-03 19:11:09 -0700 (Sun, 03 May 2009)
New Revision: 14853

Modified:
   short/3D/PyLith/branches/pylith-swig/TODO
   short/3D/PyLith/branches/pylith-swig/libsrc/faults/FaultCohesiveKin.cc
   short/3D/PyLith/branches/pylith-swig/pylith/bc/Neumann.py
   short/3D/PyLith/branches/pylith-swig/pylith/feassemble/Constraint.py
   short/3D/PyLith/branches/pylith-swig/pylith/problems/Implicit.py
Log:
Fixed bug associated with integrating Jacobian for faults (add -> insert). Fixed a minor bug associated with verifyConfiguration().

Modified: short/3D/PyLith/branches/pylith-swig/TODO
===================================================================
--- short/3D/PyLith/branches/pylith-swig/TODO	2009-05-04 00:15:08 UTC (rev 14852)
+++ short/3D/PyLith/branches/pylith-swig/TODO	2009-05-04 02:11:09 UTC (rev 14853)
@@ -6,6 +6,9 @@
 
 0. SWIG conversion [Brad]
 
+  (1) Bugs
+    time step values (adaptive)
+
   (3) Full-scale tests (few 1-D, 2-D, and 3-D)
 
     Analytical solutions, time stepping, multiple faults
@@ -19,6 +22,8 @@
 
   (6) Tidy up
 
+    Add simple stableTimeStep() for elastic materials.
+
     Check use of label_sequence.  label_sequence - iterators are
     cached, so use sequence or cache begin/end to maintain access
 

Modified: short/3D/PyLith/branches/pylith-swig/libsrc/faults/FaultCohesiveKin.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/libsrc/faults/FaultCohesiveKin.cc	2009-05-04 00:15:08 UTC (rev 14852)
+++ short/3D/PyLith/branches/pylith-swig/libsrc/faults/FaultCohesiveKin.cc	2009-05-04 02:11:09 UTC (rev 14853)
@@ -572,7 +572,7 @@
     // Insert cell contribution into PETSc Matrix
     jacobianVisitor.clear();
     err = updateOperator(jacobianMatrix, *sieveMesh->getSieve(),
-			 jacobianVisitor, *c_iter, &matrixCell[0], ADD_VALUES);
+			 jacobianVisitor, *c_iter, &matrixCell[0], INSERT_VALUES);
     CHECK_PETSC_ERROR_MSG(err, "Update to PETSc Mat failed.");
   } // for
   PetscLogFlops(cellsCohesiveSize*numConstraintVert*spaceDim*spaceDim*4);

Modified: short/3D/PyLith/branches/pylith-swig/pylith/bc/Neumann.py
===================================================================
--- short/3D/PyLith/branches/pylith-swig/pylith/bc/Neumann.py	2009-05-04 00:15:08 UTC (rev 14852)
+++ short/3D/PyLith/branches/pylith-swig/pylith/bc/Neumann.py	2009-05-04 02:11:09 UTC (rev 14853)
@@ -96,16 +96,17 @@
     logEvent = "%sverify" % self._loggingPrefix
     self._logger.eventBegin(logEvent)
 
-    BoundaryCondition.verifyConfiguration(self)
+    BoundaryCondition.verifyConfiguration(self, self.mesh)
     Integrator.verifyConfiguration(self)
-    if self.bcQuadrature.cellDim != self.mesh.dimension()-1:
+    if self.bcQuadrature.cellDim() != self.mesh.dimension()-1:
         raise ValueError, \
               "Quadrature scheme and mesh are incompatible.\n" \
               "Dimension for quadrature: %d\n" \
               "Dimension of mesh boundary '%s': %d" % \
-              (self.bcQuadrature.cellDim,
-               self.label, self.mesh.dimension()-1)    
+              (self.bcQuadrature.cellDim(),
+               self.label(), self.mesh.dimension()-1)    
     self.output.verifyConfiguration(self.mesh)
+    ModuleNeumann.verifyConfiguration(self, self.mesh)
 
     self._logger.eventEnd(logEvent)
     return

Modified: short/3D/PyLith/branches/pylith-swig/pylith/feassemble/Constraint.py
===================================================================
--- short/3D/PyLith/branches/pylith-swig/pylith/feassemble/Constraint.py	2009-05-04 00:15:08 UTC (rev 14852)
+++ short/3D/PyLith/branches/pylith-swig/pylith/feassemble/Constraint.py	2009-05-04 02:11:09 UTC (rev 14853)
@@ -32,7 +32,6 @@
               "finalize"]
   for attr in required:
     if not attr in available:
-      print "Missing method '%s'." % attr
       result = False
   return result
 

Modified: short/3D/PyLith/branches/pylith-swig/pylith/problems/Implicit.py
===================================================================
--- short/3D/PyLith/branches/pylith-swig/pylith/problems/Implicit.py	2009-05-04 00:15:08 UTC (rev 14852)
+++ short/3D/PyLith/branches/pylith-swig/pylith/problems/Implicit.py	2009-05-04 02:11:09 UTC (rev 14853)
@@ -190,8 +190,8 @@
     self._info.log("Solving equations.")
     residual = self.fields.get("residual")
     self._logger.stagePush("Solve")
-    residual.view("RESIDUAL BEFORE SOLVE")
-    self.jacobian.view()
+    #residual.view("RESIDUAL BEFORE SOLVE")
+    #self.jacobian.view()
     self.solver.solve(dispIncr, self.jacobian, residual)
     self._logger.stagePop()