[cig-commits] r14466 - in short/3D/PyLith/branches/pylith-swig: modulesrc/faults unittests/libtests/topology

[knepley at geodynamics.org]

Author: knepley
Date: 2009-03-26 04:47:11 -0700 (Thu, 26 Mar 2009)
New Revision: 14466

Modified:
   short/3D/PyLith/branches/pylith-swig/modulesrc/faults/faults.pyxe.src
   short/3D/PyLith/branches/pylith-swig/unittests/libtests/topology/TestFieldMesh.cc
Log:
Merged with Brad, turned off some of faults module


Modified: short/3D/PyLith/branches/pylith-swig/modulesrc/faults/faults.pyxe.src
===================================================================
--- short/3D/PyLith/branches/pylith-swig/modulesrc/faults/faults.pyxe.src	2009-03-26 11:22:47 UTC (rev 14465)
+++ short/3D/PyLith/branches/pylith-swig/modulesrc/faults/faults.pyxe.src	2009-03-26 11:47:11 UTC (rev 14466)
@@ -533,7 +533,7 @@
       PetscMat* mat = (PetscMat*) matVptr;
       pylith::topology::FieldsManager* fields =
         (pylith::topology::FieldsManager*) fieldsVptr;
-      ((pylith::faults::FaultCohesiveKin*) objVptr)->integrateJacobian(
+      ((pylith::faults::FaultCohesiveKin*) objVptr)->integrateJacobianAssembled(
                                                         mat, t, fields, *mesh);
     } catch (const std::exception& err) {
       PyErr_SetString(PyExc_RuntimeError,
@@ -776,9 +776,11 @@
       #embed{ void FaultCohesiveKin_quadrature_set(void* objVptr, void* qVptr)
       try {
         assert(0 != objVptr);
+#if TODO
         pylith::feassemble::Quadrature* quadrature =
           (pylith::feassemble::Quadrature*) qVptr;
         ((pylith::faults::FaultCohesiveKin*) objVptr)->quadrature(quadrature);
+#endif
       } catch (const std::exception& err) {
         PyErr_SetString(PyExc_RuntimeError,
                         const_cast<char*>(err.what()));
@@ -808,7 +810,9 @@
         assert(0 != dimVptr);
         spatialdata::units::Nondimensional* dim =
           (spatialdata::units::Nondimensional*) dimVptr;
+#ifdef TODO
         ((pylith::faults::FaultCohesiveKin*) objVptr)->normalizer(*dim);
+#endif
       } catch (const std::exception& err) {
         PyErr_SetString(PyExc_RuntimeError,
                         const_cast<char*>(err.what()));
@@ -836,7 +840,9 @@
       #embed{ void FaultCohesiveKin_timeStep_set(void* objVptr, double dt)
       try {
         assert(0 != objVptr);
+#ifdef TODO
         ((pylith::faults::FaultCohesiveKin*) objVptr)->timeStep(dt);
+#endif
       } catch (const std::exception& err) {
         PyErr_SetString(PyExc_RuntimeError,
                         const_cast<char*>(err.what()));
@@ -861,8 +867,10 @@
       double result = 0.0;
       try {
         assert(0 != objVptr);
+#ifdef TODO
         result =
           ((pylith::faults::FaultCohesiveKin*) objVptr)->stableTimeStep();
+#endif
       } catch (const std::exception& err) {
         PyErr_SetString(PyExc_RuntimeError,
                         const_cast<char*>(err.what()));
@@ -888,8 +896,10 @@
       int result = 0;
       try {
         assert(0 != objVptr);
+#ifdef TODO
         result =
           ((pylith::faults::FaultCohesiveKin*) objVptr)->needNewJacobian();
+#endif
       } catch (const std::exception& err) {
         PyErr_SetString(PyExc_RuntimeError,
                         const_cast<char*>(err.what()));
@@ -914,7 +924,9 @@
       #embed{ void FaultCohesiveKin_useSolnIncr_set(void* objVptr, int flag)
       try {
         assert(0 != objVptr);
+#ifdef TODO
         ((pylith::faults::FaultCohesiveKin*) objVptr)->useSolnIncr(flag);
+#endif
       } catch (const std::exception& err) {
         PyErr_SetString(PyExc_RuntimeError,
                         const_cast<char*>(err.what()));

Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/topology/TestFieldMesh.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/topology/TestFieldMesh.cc	2009-03-26 11:22:47 UTC (rev 14465)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/topology/TestFieldMesh.cc	2009-03-26 11:47:11 UTC (rev 14466)
@@ -207,6 +207,7 @@
   _buildMesh(&mesh);
   const ALE::Obj<Mesh::SieveMesh>& sieveMesh = mesh.sieveMesh();
   CPPUNIT_ASSERT(!sieveMesh.isNull());
+  sieveMesh->view("Sieve");
 
   const ALE::Obj<Mesh::SieveMesh::label_sequence>& vertices = 
     sieveMesh->depthStratum(0);
@@ -787,10 +788,10 @@
     section->updatePoint(*v_iter, &values[0]);
   } // for
 
+  field.createScatter();
+  CPPUNIT_ASSERT(0 != field._scatter);
   field.createVector();
-  field.createScatter();
   field.scatterSectionToVector();
-  CPPUNIT_ASSERT(0 != field._scatter);
   const PetscVec vec = field.vector();
   CPPUNIT_ASSERT(0 != vec);
   int size = 0;
@@ -829,6 +830,8 @@
   const ALE::Obj<Mesh::SieveMesh::label_sequence>& vertices = 
     sieveMesh->depthStratum(0);
 
+  field.createScatter();
+  CPPUNIT_ASSERT(0 != field._scatter);
   field.createVector();
   const PetscVec vec = field.vector();
   CPPUNIT_ASSERT(0 != vec);