Rename Blatter::neumann_bc_face() to vertical_cliff_face()

The old name dates back the time when this code supported more generic Neumann BC.
pism · Oct 30, 2020 · 154bf21 · 154bf21
1 parent cee4149
commit 154bf21
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 12 deletions.
diff --git a/src/stressbalance/blatter/Blatter.cc b/src/stressbalance/blatter/Blatter.cc
@@ -217,13 +217,14 @@ bool Blatter::partially_submerged_face(int face, const double *z, const double *
 }
 
 /*!
- * Return true if the current face is a part of the Neumann boundary, false otherwise.
+ * Return true if the current face is a part of the lateral ice boundary (i.e. at a
+ * vertical cliff), false otherwise.
  *
- * A face is a part of the Neumann boundary if all four nodes are Neumann nodes. If a node
- * is *both* a Neumann and a Dirichlet node (this may happen), then we treat it as a
- * Neumann node here: element.add_contribution() will do the right thing in this case.
+ * A face is a part of the lateral boundary if all four nodes are boundary nodes. If a node
+ * is *both* a boundary and a Dirichlet node (this may happen), then we treat it as a
+ * boundary node here: element.add_contribution() will do the right thing in this case.
  */
-bool Blatter::neumann_bc_face(int face, const int *node_type) {
+bool Blatter::vertical_cliff_face(int face, const int *node_type) {
   auto nodes = fem::q13d::incident_nodes[face];
 
   // number of nodes per face

diff --git a/src/stressbalance/blatter/Blatter.hh b/src/stressbalance/blatter/Blatter.hh
@@ -115,7 +115,7 @@ protected:
                                       double *surface,
                                       double *sea_level) const;
 
-  virtual bool neumann_bc_face(int face, const int *node_type);
+  virtual bool vertical_cliff_face(int face, const int *node_type);
 
   virtual bool dirichlet_node(const DMDALocalInfo &info, const fem::Element3::GlobalIndex& I);
 

diff --git a/src/stressbalance/blatter/residual.cc b/src/stressbalance/blatter/residual.cc
@@ -385,7 +385,7 @@ void Blatter::compute_residual(DMDALocalInfo *petsc_info,
         // lateral boundary
         // loop over all vertical faces (see fem::q13d::incident_nodes for the order)
         for (int f = 0; f < 4; ++f) {
-          if (neumann_bc_face(f, node_type)) {
+          if (vertical_cliff_face(f, node_type)) {
             // use an N*N-point equally-spaced quadrature for partially-submerged faces
             fem::Q1Element3Face *face = (partially_submerged_face(f, z, sea_level) ?
                                          &m_face100 : &m_face4);

diff --git a/src/stressbalance/blatter/verification/BlatterTestXY.cc b/src/stressbalance/blatter/verification/BlatterTestXY.cc
@@ -39,7 +39,7 @@ BlatterTestXY::BlatterTestXY(IceGrid::ConstPtr grid, int Mz, int n_levels, int c
   m_B = m_flow_law->hardness(1e5, 0);
 }
 
-bool BlatterTestXY::neumann_bc_face(int face, const int *node_type) {
+bool BlatterTestXY::vertical_cliff_face(int face, const int *node_type) {
   (void) face;
   (void) node_type;
 

diff --git a/src/stressbalance/blatter/verification/BlatterTestXY.hh b/src/stressbalance/blatter/verification/BlatterTestXY.hh
@@ -48,7 +48,7 @@ public:
   BlatterTestXY(IceGrid::ConstPtr grid, int Mz, int n_levels, int coarsening_factor);
 
 protected:
-  bool neumann_bc_face(int face, const int *node_type);
+  bool vertical_cliff_face(int face, const int *node_type);
 
   bool dirichlet_node(const DMDALocalInfo &info, const fem::Element3::GlobalIndex& I);
 

diff --git a/src/stressbalance/blatter/verification/BlatterTestXZ.cc b/src/stressbalance/blatter/verification/BlatterTestXZ.cc
@@ -57,7 +57,7 @@ BlatterTestXZ::BlatterTestXZ(IceGrid::ConstPtr grid, int Mz, int n_levels, int c
   m_g   = m_config->get_number("constants.standard_gravity");
 }
 
-bool BlatterTestXZ::neumann_bc_face(int face, const int *node_type) {
+bool BlatterTestXZ::vertical_cliff_face(int face, const int *node_type) {
   (void) face;
   (void) node_type;
 

diff --git a/src/stressbalance/blatter/verification/BlatterTestXZ.hh b/src/stressbalance/blatter/verification/BlatterTestXZ.hh
@@ -48,7 +48,7 @@ public:
   BlatterTestXZ(IceGrid::ConstPtr grid, int Mz, int n_levels, int coarsening_factor);
 
 private:
-  bool neumann_bc_face(int face, const int *node_type);
+  bool vertical_cliff_face(int face, const int *node_type);
 
   bool dirichlet_node(const DMDALocalInfo &info, const fem::Element3::GlobalIndex& I);
 

diff --git a/src/stressbalance/blatter/verification/test_template.cc b/src/stressbalance/blatter/verification/test_template.cc
@@ -25,7 +25,7 @@ TestTemplate::TestTemplate(IceGrid::ConstPtr grid, int Mz, int n_levels, int coa
   // empty
 }
 
-bool TestTemplate::neumann_bc_face(int face, const int *node_type) {
+bool TestTemplate::vertical_cliff_face(int face, const int *node_type) {
   (void) face;
   (void) node_type;