[cig-commits] [commit] knepley/upgrade-petsc-interface: Always create lagrange_multiplier subfield. (cc6d236)

[cig_noreply at geodynamics.org]

Repository : ssh://geoshell/pylith

On branch  : knepley/upgrade-petsc-interface
Link       : https://github.com/geodynamics/pylith/compare/38af70f852f88e09db031dc32da2bb69b8636846...cc6d236d1d32991191bebf4738dac67befb5fead

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

commit cc6d236d1d32991191bebf4738dac67befb5fead
Author: Brad Aagaard <baagaard at usgs.gov>
Date:   Wed Nov 13 17:54:06 2013 -0800

    Always create lagrange_multiplier subfield.
    
    Always create the Lagrange multiplier subfield even if not splitting
    fields in solver. Change name of subfield from "lagrange multiplier" to
    "lagrange_multiplier" for compatibility with output.


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

cc6d236d1d32991191bebf4738dac67befb5fead
 libsrc/pylith/faults/FaultCohesiveLagrange.cc          | 2 +-
 pylith/problems/Formulation.py                         | 3 +--
 unittests/libtests/faults/TestFaultCohesiveDyn.cc      | 2 +-
 unittests/libtests/faults/TestFaultCohesiveImpulses.cc | 2 +-
 unittests/libtests/faults/TestFaultCohesiveKin.cc      | 2 +-
 unittests/pytests/faults/TestFaultCohesiveDyn.py       | 2 +-
 unittests/pytests/faults/TestFaultCohesiveImpulses.py  | 2 +-
 unittests/pytests/faults/TestFaultCohesiveKin.py       | 2 +-
 8 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/libsrc/pylith/faults/FaultCohesiveLagrange.cc b/libsrc/pylith/faults/FaultCohesiveLagrange.cc
index 61e6ef4..11fcf03 100644
--- a/libsrc/pylith/faults/FaultCohesiveLagrange.cc
+++ b/libsrc/pylith/faults/FaultCohesiveLagrange.cc
@@ -136,7 +136,7 @@ pylith::faults::FaultCohesiveLagrange::setupSolnDof(topology::Field* field)
   assert(field);
 
   const int indexDisp = field->subfieldMetadata("displacement").index;
-  const int indexLagrange = field->subfieldMetadata("lagrange multiplier").index;
+  const int indexLagrange = field->subfieldMetadata("lagrange_multiplier").index;
 
   PetscDM dmMesh = field->dmMesh();assert(dmMesh);
   PetscSection fieldSection  = field->petscSection();assert(fieldSection);
diff --git a/pylith/problems/Formulation.py b/pylith/problems/Formulation.py
index 801af3e..d98faca 100644
--- a/pylith/problems/Formulation.py
+++ b/pylith/problems/Formulation.py
@@ -501,8 +501,7 @@ class Formulation(PetscComponent, ModuleFormulation):
     if 1:
       solution = self.fields.get("dispIncr(t->t+dt)")
       solution.subfieldAdd("displacement", dimension)
-      if self.splitFields():
-        solution.subfieldAdd("lagrange multiplier", dimension)
+      solution.subfieldAdd("lagrange_multiplier", dimension)
       solution.subfieldsSetup()
       solution.setupSolnChart()
       solution.setupSolnDof(dimension)
diff --git a/unittests/libtests/faults/TestFaultCohesiveDyn.cc b/unittests/libtests/faults/TestFaultCohesiveDyn.cc
index 80f8c1a..f7bae9f 100644
--- a/unittests/libtests/faults/TestFaultCohesiveDyn.cc
+++ b/unittests/libtests/faults/TestFaultCohesiveDyn.cc
@@ -685,7 +685,7 @@ pylith::faults::TestFaultCohesiveDyn::_initialize(topology::Mesh* const mesh,
   const int spaceDim = _data->spaceDim;
   topology::Field& residual = fields->get("residual");
   residual.subfieldAdd("displacement", spaceDim);
-  residual.subfieldAdd("lagrange multiplier", spaceDim);
+  residual.subfieldAdd("lagrange_multiplier", spaceDim);
   residual.subfieldsSetup();
   residual.setupSolnChart();
   residual.setupSolnDof(spaceDim);
diff --git a/unittests/libtests/faults/TestFaultCohesiveImpulses.cc b/unittests/libtests/faults/TestFaultCohesiveImpulses.cc
index 1522bce..e1dccd2 100644
--- a/unittests/libtests/faults/TestFaultCohesiveImpulses.cc
+++ b/unittests/libtests/faults/TestFaultCohesiveImpulses.cc
@@ -387,7 +387,7 @@ pylith::faults::TestFaultCohesiveImpulses::_initialize(topology::Mesh* const mes
   const int spaceDim = _data->spaceDim;
   topology::Field& residual = fields->get("residual");
   residual.subfieldAdd("displacement", spaceDim);
-  residual.subfieldAdd("lagrange multiplier", spaceDim);
+  residual.subfieldAdd("lagrange_multiplier", spaceDim);
   residual.subfieldsSetup();
   residual.setupSolnChart();
   residual.setupSolnDof(spaceDim);
diff --git a/unittests/libtests/faults/TestFaultCohesiveKin.cc b/unittests/libtests/faults/TestFaultCohesiveKin.cc
index f021e68..6092c80 100644
--- a/unittests/libtests/faults/TestFaultCohesiveKin.cc
+++ b/unittests/libtests/faults/TestFaultCohesiveKin.cc
@@ -723,7 +723,7 @@ pylith::faults::TestFaultCohesiveKin::_initialize(topology::Mesh* const mesh,
   const int spaceDim = _data->spaceDim;
   topology::Field& residual = fields->get("residual");
   residual.subfieldAdd("displacement", spaceDim);
-  residual.subfieldAdd("lagrange multiplier", spaceDim);
+  residual.subfieldAdd("lagrange_multiplier", spaceDim);
   residual.subfieldsSetup();
   residual.setupSolnChart();
   residual.setupSolnDof(spaceDim);
diff --git a/unittests/pytests/faults/TestFaultCohesiveDyn.py b/unittests/pytests/faults/TestFaultCohesiveDyn.py
index f093ee7..5fc50a8 100644
--- a/unittests/pytests/faults/TestFaultCohesiveDyn.py
+++ b/unittests/pytests/faults/TestFaultCohesiveDyn.py
@@ -335,7 +335,7 @@ class TestFaultCohesiveDyn(unittest.TestCase):
 
     residual = fields.get("residual")
     residual.subfieldAdd("displacement", cs.spaceDim())
-    residual.subfieldAdd("lagrange multiplier", cs.spaceDim())
+    residual.subfieldAdd("lagrange_multiplier", cs.spaceDim())
     residual.subfieldsSetup()
     residual.setupSolnChart()
     residual.setupSolnDof(cs.spaceDim())
diff --git a/unittests/pytests/faults/TestFaultCohesiveImpulses.py b/unittests/pytests/faults/TestFaultCohesiveImpulses.py
index b36af45..e9378d8 100644
--- a/unittests/pytests/faults/TestFaultCohesiveImpulses.py
+++ b/unittests/pytests/faults/TestFaultCohesiveImpulses.py
@@ -326,7 +326,7 @@ class TestFaultCohesiveImpulses(unittest.TestCase):
 
     residual = fields.get("residual")
     residual.subfieldAdd("displacement", cs.spaceDim())
-    residual.subfieldAdd("lagrange multiplier", cs.spaceDim())
+    residual.subfieldAdd("lagrange_multiplier", cs.spaceDim())
     residual.subfieldsSetup()
     residual.setupSolnChart()
     residual.setupSolnDof(cs.spaceDim())
diff --git a/unittests/pytests/faults/TestFaultCohesiveKin.py b/unittests/pytests/faults/TestFaultCohesiveKin.py
index 96d2ee5..4009635 100644
--- a/unittests/pytests/faults/TestFaultCohesiveKin.py
+++ b/unittests/pytests/faults/TestFaultCohesiveKin.py
@@ -345,7 +345,7 @@ class TestFaultCohesiveKin(unittest.TestCase):
 
     residual = fields.get("residual")
     residual.subfieldAdd("displacement", cs.spaceDim())
-    residual.subfieldAdd("lagrange multiplier", cs.spaceDim())
+    residual.subfieldAdd("lagrange_multiplier", cs.spaceDim())
     residual.subfieldsSetup()
     residual.setupSolnChart()
     residual.setupSolnDof(cs.spaceDim())