Use fem::Q1Element3 instead of fem::Element3

... because we need to use Q1Element3::{x,y,z}().
pism · Oct 14, 2020 · 19f1d14 · 19f1d14
1 parent dbd90ee
commit 19f1d14
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/src/stressbalance/blatter/Blatter.hh b/src/stressbalance/blatter/Blatter.hh
@@ -115,7 +115,7 @@ protected:
 
   void jacobian_dirichlet(const DMDALocalInfo &info, Parameters **P, Mat J);
 
-  virtual void jacobian_f(const fem::Element3 &element,
+  virtual void jacobian_f(const fem::Q1Element3 &element,
                           const Vector2 *u_nodal,
                           const double *B_nodal,
                           double K[2 * fem::q13d::n_chi][2 * fem::q13d::n_chi]);
@@ -133,23 +133,23 @@ protected:
                           const Vector2 ***x,
                           Vector2 ***R);
 
-  virtual void residual_f(const fem::Element3 &element,
+  virtual void residual_f(const fem::Q1Element3 &element,
                           const Vector2 *u_nodal,
                           const double *B_nodal,
                           Vector2 *residual);
 
-  virtual void residual_source_term(const fem::Element3 &element,
+  virtual void residual_source_term(const fem::Q1Element3 &element,
                                     const double *surface,
                                     Vector2 *residual);
 
-  virtual void residual_basal(const fem::Element3 &element,
+  virtual void residual_basal(const fem::Q1Element3 &element,
                               const fem::Q1Element3Face &face,
                               const double *tauc_nodal,
                               const double *f_nodal,
                               const Vector2 *u_nodal,
                               Vector2 *residual);
 
-  virtual void residual_lateral(const fem::Element3 &element,
+  virtual void residual_lateral(const fem::Q1Element3 &element,
                                 const fem::Q1Element3Face &face,
                                 const double *z_nodal,
                                 const double *sl_nodal,

diff --git a/src/stressbalance/blatter/jacobian.cc b/src/stressbalance/blatter/jacobian.cc
@@ -31,7 +31,7 @@ namespace stressbalance {
 /*!
  * Computes the Jacobian contribution of the "main" part of the Blatter system.
  */
-void Blatter::jacobian_f(const fem::Element3 &element,
+void Blatter::jacobian_f(const fem::Q1Element3 &element,
                          const Vector2 *velocity,
                          const double *hardness,
                          double K[16][16]) {

diff --git a/src/stressbalance/blatter/residual.cc b/src/stressbalance/blatter/residual.cc
@@ -33,7 +33,7 @@ static const Vector2 u_exterior = {0.0, 0.0};
 /*!
  * Computes the residual contribution of the "main" part of the Blatter system.
  */
-void Blatter::residual_f(const fem::Element3 &element,
+void Blatter::residual_f(const fem::Q1Element3 &element,
                          const Vector2 *u_nodal,
                          const double *B_nodal,
                          Vector2 *residual) {
@@ -88,7 +88,7 @@ void Blatter::residual_f(const fem::Element3 &element,
  *
  * This term contains the driving stress.
  */
-void Blatter::residual_source_term(const fem::Element3 &element,
+void Blatter::residual_source_term(const fem::Q1Element3 &element,
                                    const double *surface,
                                    Vector2 *residual) {
   double
@@ -117,7 +117,7 @@ void Blatter::residual_source_term(const fem::Element3 &element,
  *
  * This takes care of basal sliding.
  */
-void Blatter::residual_basal(const fem::Element3 &element,
+void Blatter::residual_basal(const fem::Q1Element3 &element,
                              const fem::Q1Element3Face &face,
                              const double *tauc_nodal,
                              const double *f_nodal,
@@ -155,7 +155,7 @@ void Blatter::residual_basal(const fem::Element3 &element,
  *
  * This takes care of "calving front" stress boundary conditions.
  */
-void Blatter::residual_lateral(const fem::Element3 &element,
+void Blatter::residual_lateral(const fem::Q1Element3 &element,
                                const fem::Q1Element3Face &face,
                                const double *z_nodal,
                                const double *sl_nodal,