[cig-commits] [commit] knepley/upgrade-petsc-interface: Updated test data for C++ refinement test for quad4 w/fault. (8c284b9)

[cig_noreply at geodynamics.org]

Repository : ssh://geoshell/pylith

On branch  : knepley/upgrade-petsc-interface
Link       : https://github.com/geodynamics/pylith/compare/993cc758b9802c2ebed37731d68618691f9d2baa...8c284b970cccd41f17793a977d618698f6ad2974

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

commit 8c284b970cccd41f17793a977d618698f6ad2974
Author: Brad Aagaard <baagaard at usgs.gov>
Date:   Thu Jan 9 16:36:11 2014 -0800

    Updated test data for C++ refinement test for quad4 w/fault.


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

8c284b970cccd41f17793a977d618698f6ad2974
 unittests/libtests/topology/TestRefineUniform.cc                  | 7 -------
 .../libtests/topology/data/MeshDataCohesiveQuad4Level1Fault1.cc   | 8 +++++---
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/unittests/libtests/topology/TestRefineUniform.cc b/unittests/libtests/topology/TestRefineUniform.cc
index 9a92db9..b5fc2cc 100644
--- a/unittests/libtests/topology/TestRefineUniform.cc
+++ b/unittests/libtests/topology/TestRefineUniform.cc
@@ -42,8 +42,6 @@
 #include <strings.h> // USES strcasecmp()
 #include <stdexcept> // USES std::logic_error
 
-#define DISABLE_FAULT_TEST
-
 // ----------------------------------------------------------------------
 CPPUNIT_TEST_SUITE_REGISTRATION( pylith::topology::TestRefineUniform );
 
@@ -105,13 +103,8 @@ pylith::topology::TestRefineUniform::testRefineQuad4Level1Fault1(void)
 { // testRefineQuad4Level1Fault1
   PYLITH_METHOD_BEGIN;
 
-#if !defined(DISABLE_FAULT_TEST)
   MeshDataCohesiveQuad4Level1Fault1 data;
   _testRefine(data, false);
-#else
-  std::cout << "****TEST IS DISABLED. FORCING FAILURE.****" << std::endl;
-  CPPUNIT_ASSERT(false);
-#endif
 
   PYLITH_METHOD_END;
 } // testRefineQuad4Level1Fault1
diff --git a/unittests/libtests/topology/data/MeshDataCohesiveQuad4Level1Fault1.cc b/unittests/libtests/topology/data/MeshDataCohesiveQuad4Level1Fault1.cc
index 2a46d12..d749222 100644
--- a/unittests/libtests/topology/data/MeshDataCohesiveQuad4Level1Fault1.cc
+++ b/unittests/libtests/topology/data/MeshDataCohesiveQuad4Level1Fault1.cc
@@ -25,7 +25,7 @@ const int pylith::topology::MeshDataCohesiveQuad4Level1Fault1::_refineLevel = 1;
 const char* pylith::topology::MeshDataCohesiveQuad4Level1Fault1::_faultA = "fault";
 const char* pylith::topology::MeshDataCohesiveQuad4Level1Fault1::_faultB = 0;
 
-const int pylith::topology::MeshDataCohesiveQuad4Level1Fault1::_numVertices = 35;
+const int pylith::topology::MeshDataCohesiveQuad4Level1Fault1::_numVertices = 30;
 
 const int pylith::topology::MeshDataCohesiveQuad4Level1Fault1::_spaceDim = 2;
 
@@ -37,7 +37,7 @@ const int pylith::topology::MeshDataCohesiveQuad4Level1Fault1::_cellDim = 2;
 
 const int pylith::topology::MeshDataCohesiveQuad4Level1Fault1::_numCorners = 4;
 
-const int pylith::topology::MeshDataCohesiveQuad4Level1Fault1::_numCornersCohesive = 6;
+const int pylith::topology::MeshDataCohesiveQuad4Level1Fault1::_numCornersCohesive = 4;
 
 const int pylith::topology::MeshDataCohesiveQuad4Level1Fault1::_matIdSum = 
   8*1 + 8*2 + 4*100;
@@ -45,7 +45,9 @@ const int pylith::topology::MeshDataCohesiveQuad4Level1Fault1::_matIdSum =
 const int pylith::topology::MeshDataCohesiveQuad4Level1Fault1::_numGroups = 3;
 
 const int pylith::topology::MeshDataCohesiveQuad4Level1Fault1::_groupSizes[3] = {
-  6, 5, 15,
+  6+4, // vertices+edges
+  5+4, 
+  10+8,
 };
 
 const char* pylith::topology::MeshDataCohesiveQuad4Level1Fault1::_groupNames[3] = {