[cig-commits] r16504 - in short/3D/PyLith/trunk: libsrc/faults tests/2d/quad4

[brad at geodynamics.org]

Author: brad
Date: 2010-04-07 17:26:36 -0700 (Wed, 07 Apr 2010)
New Revision: 16504

Modified:
   short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveLagrange.cc
   short/3D/PyLith/trunk/tests/2d/quad4/geometry.jou
   short/3D/PyLith/trunk/tests/2d/quad4/mesh.exo
   short/3D/PyLith/trunk/tests/2d/quad4/mesh.jou
Log:
Fixed bug in check to make sure fault vertices are not constrained.

Modified: short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveLagrange.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveLagrange.cc	2010-04-08 00:08:09 UTC (rev 16503)
+++ short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveLagrange.cc	2010-04-08 00:26:36 UTC (rev 16504)
@@ -774,7 +774,7 @@
     const int fiberDimN = section->getFiberDimension(v_negative);
     assert(spaceDim == fiberDimN);
     const int numConstraintsN = section->getConstraintDimension(v_negative);
-    if (fiberDimN > numConstraintsN) {
+    if (numConstraintsN > 0) {
       std::ostringstream msg;
       msg << "Vertex with label '" << v_negative << "' on negative side "
 	  << "of fault '" << label() << "' is constrained.\n"
@@ -786,7 +786,7 @@
     const int fiberDimP = section->getFiberDimension(v_positive);
     assert(spaceDim == fiberDimP);
     const int numConstraintsP = section->getConstraintDimension(v_positive);
-    if (fiberDimP > numConstraintsP) {
+    if (numConstraintsP > 0) {
       std::ostringstream msg;
       msg << "Vertex with label '" << v_positive << "' on positive side "
 	  << "of fault '" << label() << "' is constrained.\n"

Modified: short/3D/PyLith/trunk/tests/2d/quad4/geometry.jou
===================================================================
--- short/3D/PyLith/trunk/tests/2d/quad4/geometry.jou	2010-04-08 00:08:09 UTC (rev 16503)
+++ short/3D/PyLith/trunk/tests/2d/quad4/geometry.jou	2010-04-08 00:26:36 UTC (rev 16504)
@@ -20,12 +20,14 @@
 # Fault at x=0
 create vertex 0.0 -4000.0 0.0
 create vertex 0.0 +4000.0 0.0
-split surface 1 across location vertex 9 location vertex 10
+split surface 1 across location vertex 5 location vertex 6
 
 # Fault at x=-2000.0
 create vertex -2000.0 +4000.0 0.0
 create vertex -2000.0 -4000.0 0.0
-split surface 2 across location vertex 13 location vertex 14
-split surface 3 across location vertex 13 location vertex 14
+split surface 2 across location vertex 9 location vertex 10
+split surface 3 across location vertex 9 location vertex 10
 
 delete vertex all
+
+

Modified: short/3D/PyLith/trunk/tests/2d/quad4/mesh.exo
===================================================================
(Binary files differ)

Modified: short/3D/PyLith/trunk/tests/2d/quad4/mesh.jou
===================================================================
--- short/3D/PyLith/trunk/tests/2d/quad4/mesh.jou	2010-04-08 00:08:09 UTC (rev 16503)
+++ short/3D/PyLith/trunk/tests/2d/quad4/mesh.jou	2010-04-08 00:26:36 UTC (rev 16504)
@@ -64,6 +64,14 @@
 nodeset 23 name "edge yneg"
 
 # ----------------------------------------------------------------------
+# Create nodeset for -y edge w/o overlap with fault
+# ----------------------------------------------------------------------
+group "edge_yneg_nofault" add node in edge_yneg
+group "edge_yneg_nofault" remove node in fault_x
+nodeset 24 group edge_yneg_nofault
+nodeset 24 name "edge yneg nofault"
+
+# ----------------------------------------------------------------------
 # Export exodus file
 # ----------------------------------------------------------------------
 export mesh "mesh.exo" dimension 2 overwrite