[cig-commits] [commit] knepley/upgrade-petsc-interface: Faults: Better consistency testing (4563c9e)

[cig_noreply at geodynamics.org]

Repository : ssh://geoshell/pylith

On branch  : knepley/upgrade-petsc-interface
Link       : https://github.com/geodynamics/pylith/compare/086b7b94b37b71e66c6947911ac1b4bf11480589...4563c9e7cd0256b4959f19a292519af56758929f

>---------------------------------------------------------------

commit 4563c9e7cd0256b4959f19a292519af56758929f
Author: Matthew G. Knepley <knepley at gmail.com>
Date:   Fri Nov 1 14:01:04 2013 -0500

    Faults: Better consistency testing


>---------------------------------------------------------------

4563c9e7cd0256b4959f19a292519af56758929f
 unittests/libtests/faults/TestFaultCohesive.cc | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/unittests/libtests/faults/TestFaultCohesive.cc b/unittests/libtests/faults/TestFaultCohesive.cc
index b3d3a94..443e063 100644
--- a/unittests/libtests/faults/TestFaultCohesive.cc
+++ b/unittests/libtests/faults/TestFaultCohesive.cc
@@ -819,11 +819,21 @@ pylith::faults::TestFaultCohesive::_testAdjustTopology(Fault* faultA,
   if (dynamic_cast<FaultCohesive*>(faultB)->useLagrangeConstraints()) {
     firstFaultCell += sizeB;
   } // if
+  PetscBool isSimplexMesh = PETSC_TRUE;
+  if ((data.cellDim == 2 && data.numCorners[0] == 4) ||
+      (data.cellDim == 3 && data.numCorners[0] == 8)) {
+    isSimplexMesh = PETSC_FALSE;
+  } // if
 
   faultA->id(1);
   faultA->label("faultA");
   faultA->adjustTopology(&mesh, &firstFaultVertex, &firstLagrangeVertex, &firstFaultCell);
 
+  // Check consistency
+  dmMesh = mesh.dmMesh();CPPUNIT_ASSERT(dmMesh);
+  err = DMPlexCheckSymmetry(dmMesh);CPPUNIT_ASSERT(!err);
+  err = DMPlexCheckSkeleton(dmMesh, isSimplexMesh);CPPUNIT_ASSERT(!err);
+
   faultB->id(2);
   faultB->label("faultB");
   faultB->adjustTopology(&mesh, &firstFaultVertex, &firstLagrangeVertex, &firstFaultCell);
@@ -833,15 +843,9 @@ pylith::faults::TestFaultCohesive::_testAdjustTopology(Fault* faultA,
   PetscViewerPopFormat(PETSC_VIEWER_STDOUT_WORLD);
 #endif
 
+  // Check consistency
   CPPUNIT_ASSERT_EQUAL(data.cellDim, mesh.dimension());
   dmMesh = mesh.dmMesh();CPPUNIT_ASSERT(dmMesh);
-
-  // Check consistency
-  PetscBool isSimplexMesh = PETSC_TRUE;
-  if ((data.cellDim == 2 && data.numCorners[0] == 4) ||
-      (data.cellDim == 3 && data.numCorners[0] == 8)) {
-    isSimplexMesh = PETSC_FALSE;
-  } // if
   err = DMPlexCheckSymmetry(dmMesh);CPPUNIT_ASSERT(!err);
   err = DMPlexCheckSkeleton(dmMesh, isSimplexMesh);CPPUNIT_ASSERT(!err);