[cig-commits] r16410 - short/3D/PyLith/trunk/libsrc/faults

[brad at geodynamics.org]

Author: brad
Date: 2010-03-12 17:14:18 -0800 (Fri, 12 Mar 2010)
New Revision: 16410

Modified:
   short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveLagrange.hh
Log:
Refactor adjustSolnLumped(). Move spatial dimension specific code to protected member functions.

Modified: short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveLagrange.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveLagrange.hh	2010-03-13 01:14:11 UTC (rev 16409)
+++ short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveLagrange.hh	2010-03-13 01:14:18 UTC (rev 16410)
@@ -207,6 +207,84 @@
   /// Allocate buffer for scalar field.
   void _allocateBufferScalarField(void);
 
+  /** Adjust solution in lumped formulation to match slip for 1-D.
+   *
+   * @param lagrangeIncr Increment in Lagrange multiplier.
+   * @param dispTIncrN Disp increment assoc. w/vertex on - side of fault.
+   * @param dispTIncrP Disp increment assoc. w/vertex on + side of fault.
+   * @param slip Slip associated with Lagrange multipler vertex.
+   * @param orientation Orientation associated with Lagrange multipluer vertex.
+   * @param dispTN Displacement associated with vertex on - side of fault.
+   * @param dispTP Displacement associated with vertex on + side of fault.
+   * @param residualN Residual associated with vertex on - side of fault.
+   * @param residualP Residual associated with vertex on + side of fault.
+   * @param jacobianN Jacobian associated with vertex on - side of fault.
+   * @param jacobianP Jacobian associated with vertex on + side of fault.
+   */
+  void _adjustSolnLumped1D(double_array* lagrangeIncr,
+			   double_array* dispTIncrN,
+			   double_array* dispTIncrP,
+			   const double_array& slip,
+			   const double_array& orientation,
+			   const double_array& dispTN,
+			   const double_array& dispTP,
+			   const double_array& residualN,
+			   const double_array& residualP,
+			   const double_array& jacobianN,
+			   const double_array& jacobianP);
+
+  /** Adjust solution in lumped formulation to match slip for 2-D.
+   *
+   * @param lagrangeIncr Increment in Lagrange multiplier.
+   * @param dispTIncrN Disp increment assoc. w/vertex on - side of fault.
+   * @param dispTIncrP Disp increment assoc. w/vertex on + side of fault.
+   * @param slip Slip associated with Lagrange multipler vertex.
+   * @param orientation Orientation associated with Lagrange multipluer vertex.
+   * @param dispTN Displacement associated with vertex on - side of fault.
+   * @param dispTP Displacement associated with vertex on + side of fault.
+   * @param residualN Residual associated with vertex on - side of fault.
+   * @param residualP Residual associated with vertex on + side of fault.
+   * @param jacobianN Jacobian associated with vertex on - side of fault.
+   * @param jacobianP Jacobian associated with vertex on + side of fault.
+   */
+  void _adjustSolnLumped2D(double_array* lagrangeIncr,
+			   double_array* dispTIncrN,
+			   double_array* dispTIncrP,
+			   const double_array& slip,
+			   const double_array& orientation,
+			   const double_array& dispTN,
+			   const double_array& dispTP,
+			   const double_array& residualN,
+			   const double_array& residualP,
+			   const double_array& jacobianN,
+			   const double_array& jacobianP);
+
+  /** Adjust solution in lumped formulation to match slip for 3-D.
+   *
+   * @param lagrangeIncr Increment in Lagrange multiplier.
+   * @param dispTIncrN Disp increment assoc. w/vertex on - side of fault.
+   * @param dispTIncrP Disp increment assoc. w/vertex on + side of fault.
+   * @param slip Slip associated with Lagrange multipler vertex.
+   * @param orientation Orientation associated with Lagrange multipluer vertex.
+   * @param dispTN Displacement associated with vertex on - side of fault.
+   * @param dispTP Displacement associated with vertex on + side of fault.
+   * @param residualN Residual associated with vertex on - side of fault.
+   * @param residualP Residual associated with vertex on + side of fault.
+   * @param jacobianN Jacobian associated with vertex on - side of fault.
+   * @param jacobianP Jacobian associated with vertex on + side of fault.
+   */
+  void _adjustSolnLumped3D(double_array* lagrangeIncr,
+			   double_array* dispTIncrN,
+			   double_array* dispTIncrP,
+			   const double_array& slip,
+			   const double_array& orientation,
+			   const double_array& dispTN,
+			   const double_array& dispTP,
+			   const double_array& residualN,
+			   const double_array& residualP,
+			   const double_array& jacobianN,
+			   const double_array& jacobianP);
+
   // PROTECTED MEMBERS //////////////////////////////////////////////////
 protected :