Add Elem::n_nodes_on_side

loganharbour · loganharbour · commit 0936e36e4d31 · 2022-11-09T11:32:03.000-07:00
diff --git a/include/geom/cell_hex20.h b/include/geom/cell_hex20.h
@@ -238,15 +238,19 @@ class Hex20 final : public Hex
 
   ElemType side_type (const unsigned int s) const override final;
 
+  /**
+   * \returns 8. Every side has eight nodes.
+   */
+  virtual unsigned int n_nodes_on_side(const unsigned short s) const override final
+  { return this->_n_nodes_on_side_constant<Hex20>(s); }
+
 protected:
 
   /**
    * Data for links to nodes.
    */
   Node * _nodelinks_data[num_nodes];
 
-
-
 #ifdef LIBMESH_ENABLE_AMR
 
   /**
diff --git a/include/geom/cell_hex27.h b/include/geom/cell_hex27.h
@@ -256,6 +256,12 @@ class Hex27 final : public Hex
 
   ElemType side_type (const unsigned int s) const override final;
 
+  /**
+   * \returns 9. Every side has eight nodes.
+   */
+  virtual unsigned int n_nodes_on_side(const unsigned short s) const override final
+  { return this->_n_nodes_on_side_constant<Hex27>(s); }
+
 protected:
 
 
diff --git a/include/geom/cell_hex8.h b/include/geom/cell_hex8.h
@@ -213,6 +213,12 @@ class Hex8 final : public Hex
 
   ElemType side_type (const unsigned int s) const override final;
 
+  /**
+   * \returns 4. Every side has four nodes.
+   */
+  virtual unsigned int n_nodes_on_side(const unsigned short s) const override final
+  { return this->_n_nodes_on_side_constant<Hex8>(s); }
+
 protected:
 
   /**
diff --git a/include/geom/cell_inf_hex.h b/include/geom/cell_inf_hex.h
@@ -198,6 +198,19 @@ class InfHex : public InfCell
    */
   static const unsigned int edge_sides_map[8][2];
 
+  /**
+   * Helper for n_nodes_on_side() for InfHex-derived classes.
+   *
+   * That is, returns InfHex::nodes_per_side - \p remove_num
+   * for sides 1-4, and InfHex::nodes_per_side for side 0.
+  */
+  template <class InfHexClass, unsigned short remove_num>
+  unsigned int _n_nodes_on_side(const unsigned short s) const
+  {
+    static_assert(std::is_base_of<InfHex, InfHexClass>::value, "Not a InfHex");
+    return this->_n_nodes_on_side_constant<InfHexClass>(s) - ((s == 0) ? 0 : remove_num);
+  }
+
 protected:
 
   /**
diff --git a/include/geom/cell_inf_hex16.h b/include/geom/cell_inf_hex16.h
@@ -236,6 +236,9 @@ class InfHex16 final : public InfHex
 
   ElemType side_type (const unsigned int s) const override final;
 
+  virtual unsigned int n_nodes_on_side(const unsigned short s) const override final
+  { return this->_n_nodes_on_side<InfHex16, 2>(s); }
+
 protected:
 
   /**
diff --git a/include/geom/cell_inf_hex18.h b/include/geom/cell_inf_hex18.h
@@ -251,6 +251,9 @@ class InfHex18 final : public InfHex
 
   ElemType side_type (const unsigned int s) const override final;
 
+  virtual unsigned int n_nodes_on_side(const unsigned short s) const override final
+  { return this->_n_nodes_on_side<InfHex18, 3>(s); }
+
 protected:
 
   /**
diff --git a/include/geom/cell_inf_hex8.h b/include/geom/cell_inf_hex8.h
@@ -186,6 +186,12 @@ class InfHex8 final : public InfHex
 
   ElemType side_type (const unsigned int s) const override final;
 
+  /**
+   * \returns 4. Every side has four nodes.
+   */
+  virtual unsigned int n_nodes_on_side(const unsigned short s) const override final
+  { return this->_n_nodes_on_side_constant<InfHex8>(s); }
+
 protected:
 
   /**
diff --git a/include/geom/cell_inf_prism12.h b/include/geom/cell_inf_prism12.h
@@ -224,6 +224,12 @@ class InfPrism12 final : public InfPrism
 
   ElemType side_type (const unsigned int s) const override final;
 
+  /**
+   * \returns 6. Every side has six nodes.
+   */
+  virtual unsigned int n_nodes_on_side(const unsigned short s) const override final
+  { return this->_n_nodes_on_side_constant<InfPrism12>(s); }
+
 protected:
 
   /**
diff --git a/include/geom/cell_inf_prism6.h b/include/geom/cell_inf_prism6.h
@@ -185,6 +185,9 @@ class InfPrism6 final : public InfPrism
 
   ElemType side_type (const unsigned int s) const override final;
 
+  virtual unsigned int n_nodes_on_side(const unsigned short s) const override final
+  { return this->_n_nodes_on_side_constant<InfPrism6>(s) - ((s == 0) ? 1 : 0); }
+
 protected:
 
   /**
diff --git a/include/geom/cell_prism.h b/include/geom/cell_prism.h
@@ -161,6 +161,19 @@ class Prism : public Cell
 
 protected:
 
+  /**
+   * Helper for n_nodes_on_side() for Prism-derived classes.
+   *
+   * That is, returns \p PrismClass::nodes_per_side for sides 1-3, and
+   * the same value minus \p remove_num for sides 0 and 4.
+  */
+  template <class PrismClass, unsigned short remove_num>
+  unsigned int _n_nodes_on_side(const unsigned short s) const
+  {
+    static_assert(std::is_base_of<Prism, PrismClass>::value, "Not a Prism");
+    return this->_n_nodes_on_side_constant<PrismClass>(s) - ((s == 0 || s == 4) ? remove_num : 0);
+  }
+
   /**
    * Data for links to parent/neighbor/interior_parent elements.
    */
diff --git a/include/geom/cell_prism15.h b/include/geom/cell_prism15.h
@@ -243,6 +243,9 @@ class Prism15 final : public Prism
 
   ElemType side_type (const unsigned int s) const override final;
 
+  virtual unsigned int n_nodes_on_side(const unsigned short s) const override final
+  { return _n_nodes_on_side<Prism15, 2>(s); }
+
 protected:
 
   /**
diff --git a/include/geom/cell_prism18.h b/include/geom/cell_prism18.h
@@ -261,6 +261,9 @@ class Prism18 final : public Prism
 
   ElemType side_type (const unsigned int s) const override final;
 
+  virtual unsigned int n_nodes_on_side(const unsigned short s) const override final
+  { return _n_nodes_on_side<Prism18, 3>(s); }
+
 protected:
 
   /**
diff --git a/include/geom/cell_prism20.h b/include/geom/cell_prism20.h
@@ -260,6 +260,9 @@ class Prism20 final : public Prism
 
   ElemType side_type (const unsigned int s) const override final;
 
+  virtual unsigned int n_nodes_on_side(const unsigned short s) const override final
+  { return _n_nodes_on_side<Prism20, 2>(s); }
+
 protected:
 
   /**
diff --git a/include/geom/cell_prism21.h b/include/geom/cell_prism21.h
@@ -263,6 +263,9 @@ class Prism21 final : public Prism
 
   ElemType side_type (const unsigned int s) const override final;
 
+  virtual unsigned int n_nodes_on_side(const unsigned short s) const override final
+  { return _n_nodes_on_side<Prism21, 2>(s); }
+
 protected:
 
   /**
diff --git a/include/geom/cell_prism6.h b/include/geom/cell_prism6.h
@@ -203,6 +203,9 @@ class Prism6 final : public Prism
 
   ElemType side_type (const unsigned int s) const override final;
 
+  virtual unsigned int n_nodes_on_side(const unsigned short s) const override final
+  { return _n_nodes_on_side<Prism6, 1>(s); }
+
 protected:
 
   /**
diff --git a/include/geom/cell_pyramid.h b/include/geom/cell_pyramid.h
@@ -184,6 +184,18 @@ class Pyramid : public Cell
   static const unsigned int edge_sides_map[8][2];
 
 protected:
+  /**
+   * Helper for n_nodes_on_side() for Pyramid-derived classes.
+   *
+   * That is, returns PyramidClass::nodes_per_side - \p remove_num
+   * for sides 0-3, and PyramidClass::nodes_per_side for side 4.
+  */
+  template <class PyramidClass, unsigned short remove_num>
+  unsigned int _n_nodes_on_side(const unsigned short s) const
+  {
+    static_assert(std::is_base_of<Pyramid, PyramidClass>::value, "Not a Pyramid");
+    return this->_n_nodes_on_side_constant<PyramidClass>(s) - ((s != 4) ? remove_num : 0);
+  }
 
   /**
    * Data for links to parent/neighbor/interior_parent elements.
diff --git a/include/geom/cell_pyramid13.h b/include/geom/cell_pyramid13.h
@@ -231,6 +231,9 @@ class Pyramid13 final : public Pyramid
 
   ElemType side_type (const unsigned int s) const override final;
 
+  virtual unsigned int n_nodes_on_side(const unsigned short s) const override final
+  { return _n_nodes_on_side<Pyramid13, 2>(s); }
+
 protected:
 
   /**
diff --git a/include/geom/cell_pyramid14.h b/include/geom/cell_pyramid14.h
@@ -252,6 +252,9 @@ class Pyramid14 final : public Pyramid
 
   ElemType side_type (const unsigned int s) const override final;
 
+  virtual unsigned int n_nodes_on_side(const unsigned short s) const override final
+  { return _n_nodes_on_side<Pyramid14, 3>(s); }
+
 protected:
 
   /**
diff --git a/include/geom/cell_pyramid5.h b/include/geom/cell_pyramid5.h
@@ -196,6 +196,9 @@ class Pyramid5 final : public Pyramid
 
   ElemType side_type (const unsigned int s) const override final;
 
+  virtual unsigned int n_nodes_on_side(const unsigned short s) const override final
+  { return _n_nodes_on_side<Pyramid5, 1>(s); }
+
 protected:
 
   /**
diff --git a/include/geom/cell_tet10.h b/include/geom/cell_tet10.h
@@ -239,6 +239,12 @@ class Tet10 final : public Tet
 
   ElemType side_type (const unsigned int s) const override final;
 
+  /**
+   * \returns 6. Every side has six nodes.
+   */
+  virtual unsigned int n_nodes_on_side(const unsigned short s) const override final
+  { return this->_n_nodes_on_side_constant<Tet10>(s); }
+
 protected:
 
   /**
diff --git a/include/geom/cell_tet14.h b/include/geom/cell_tet14.h
@@ -239,6 +239,12 @@ class Tet14 final : public Tet
 
   ElemType side_type (const unsigned int s) const override final;
 
+  /**
+   * \returns 7. Every side has seven nodes.
+   */
+  virtual unsigned int n_nodes_on_side(const unsigned short s) const override final
+  { return this->_n_nodes_on_side_constant<Tet14>(s); }
+
 #ifdef LIBMESH_ENABLE_AMR
   virtual
   const std::vector<std::pair<unsigned char, unsigned char>> &
diff --git a/include/geom/cell_tet4.h b/include/geom/cell_tet4.h
@@ -246,6 +246,12 @@ class Tet4 final : public Tet
 
   ElemType side_type (const unsigned int s) const override final;
 
+  /**
+   * \returns 3. Every side has three nodes.
+   */
+  virtual unsigned int n_nodes_on_side(const unsigned short s) const override final
+  { return this->_n_nodes_on_side_constant<Tet4>(s); }
+
 protected:
 
   /**
diff --git a/include/geom/edge.h b/include/geom/edge.h
@@ -212,6 +212,12 @@ class Edge : public Elem
 
   ElemType side_type (const unsigned int s) const override final;
 
+  /**
+   * \returns 1. Every side has one node.
+   */
+  virtual unsigned int n_nodes_on_side(const unsigned short libmesh_dbg_var(s)) const override final
+  { libmesh_assert_less(s, 2); return 1; }
+
 protected:
 
   /**
diff --git a/include/geom/elem.h b/include/geom/elem.h
@@ -592,6 +592,11 @@ class Elem : public ReferenceCountedObject<Elem>,
    */
   virtual unsigned int n_nodes () const = 0;
 
+  /**
+   * \returns The number of nodes on the side with index \p s.
+   */
+  virtual unsigned int n_nodes_on_side (const unsigned short s) const = 0;
+
   /**
    * The maximum number of nodes *any* element can contain.
    * This is useful for replacing heap vectors with stack arrays.
@@ -1958,6 +1963,20 @@ class Elem : public ReferenceCountedObject<Elem>,
                              ElemType edgetype);
 
 
+  /**
+   * Helper for overriding n_nodes_on_side in derived classes.
+   *
+   * Performs bound checking on \p s and returns nodes_per_side
+   * for the given class for all sides.
+  */
+  template <class ElemClass>
+  unsigned int _n_nodes_on_side_constant(const unsigned short libmesh_dbg_var(s)) const
+  {
+    static_assert(std::is_base_of<Elem, ElemClass>::value, "Not an Elem");
+    libmesh_assert_less(s, this->n_sides());
+    return ElemClass::nodes_per_side;
+  }
+
 #ifdef LIBMESH_ENABLE_AMR
 
   /**
diff --git a/include/geom/face_inf_quad4.h b/include/geom/face_inf_quad4.h
@@ -162,6 +162,9 @@ class InfQuad4 : public InfQuad
 
   ElemType side_type (const unsigned int s) const override final;
 
+  virtual unsigned int n_nodes_on_side(const unsigned short s) const override final
+  { return this->_n_nodes_on_side_constant<InfQuad4>(s); }
+
 protected:
 
   /**
diff --git a/include/geom/face_inf_quad6.h b/include/geom/face_inf_quad6.h
@@ -198,6 +198,9 @@ class InfQuad6 : public InfQuad
 
   ElemType side_type (const unsigned int s) const override final;
 
+  virtual unsigned int n_nodes_on_side(const unsigned short s) const override final
+  { return this->_n_nodes_on_side_constant<InfQuad6>(s) - (s == 0 ? 0 : 1); }
+
 protected:
 
   /**
diff --git a/include/geom/face_quad4.h b/include/geom/face_quad4.h
@@ -176,6 +176,12 @@ class Quad4 : public Quad
 
   ElemType side_type (const unsigned int s) const override final;
 
+  /**
+   * \returns 2. Every side has seven nodes.
+   */
+  virtual unsigned int n_nodes_on_side(const unsigned short s) const override final
+  { return this->_n_nodes_on_side_constant<Quad4>(s); }
+
 protected:
 
   /**
diff --git a/include/geom/face_quad8.h b/include/geom/face_quad8.h
@@ -215,6 +215,12 @@ class Quad8 : public Quad
 
   ElemType side_type (const unsigned int s) const override final;
 
+  /**
+   * \returns 3. Every side has three nodes.
+   */
+  virtual unsigned int n_nodes_on_side(const unsigned short s) const override final
+  { return this->_n_nodes_on_side_constant<Quad8>(s); }
+
 protected:
 
   /**
diff --git a/include/geom/face_quad9.h b/include/geom/face_quad9.h
@@ -222,6 +222,12 @@ class Quad9 : public Quad
 
   ElemType side_type (const unsigned int s) const override final;
 
+  /**
+   * \returns 3. Every side has three nodes.
+   */
+  virtual unsigned int n_nodes_on_side(const unsigned short s) const override final
+  { return this->_n_nodes_on_side_constant<Quad9>(s); }
+
 protected:
 
   /**
diff --git a/include/geom/face_tri3.h b/include/geom/face_tri3.h
@@ -201,6 +201,12 @@ class Tri3 : public Tri
 
   ElemType side_type (const unsigned int s) const override final;
 
+  /**
+   * \returns 2. Every side has two nodes.
+   */
+  virtual unsigned int n_nodes_on_side(const unsigned short s) const override final
+  { return this->_n_nodes_on_side_constant<Tri3>(s); }
+
 protected:
 
   /**
diff --git a/include/geom/face_tri6.h b/include/geom/face_tri6.h
diff --git a/include/geom/face_tri7.h b/include/geom/face_tri7.h
diff --git a/include/geom/node_elem.h b/include/geom/node_elem.h
diff --git a/include/geom/remote_elem.h b/include/geom/remote_elem.h
diff --git a/tests/geom/elem_test.C b/tests/geom/elem_test.C
