Add Elem::nodes_on_side_ptr

loganharbour · loganharbour · commit 3c1314680380 · 2022-11-09T13:39:24.000-07:00
diff --git a/include/geom/cell_hex20.h b/include/geom/cell_hex20.h
@@ -124,6 +124,9 @@ class Hex20 final : public Hex
 
   virtual std::vector<unsigned int> nodes_on_side(const unsigned int s) const override;
 
+  virtual const unsigned int * nodes_on_side_ptr(const unsigned short s) const override final
+  { return this->_nodes_on_side_ptr<Hex20>(s); }
+
   virtual std::vector<unsigned int> nodes_on_edge(const unsigned int e) const override;
 
   /**
diff --git a/include/geom/cell_hex27.h b/include/geom/cell_hex27.h
@@ -124,6 +124,9 @@ class Hex27 final : public Hex
 
   virtual std::vector<unsigned int> nodes_on_side(const unsigned int s) const override;
 
+  virtual const unsigned int * nodes_on_side_ptr(const unsigned short s) const override final
+  { return this->_nodes_on_side_ptr<Hex27>(s); }
+
   virtual std::vector<unsigned int> nodes_on_edge(const unsigned int e) const override;
 
   /**
diff --git a/include/geom/cell_hex8.h b/include/geom/cell_hex8.h
@@ -109,6 +109,9 @@ class Hex8 final : public Hex
 
   virtual std::vector<unsigned int> nodes_on_side(const unsigned int s) const override;
 
+  virtual const unsigned int * nodes_on_side_ptr(const unsigned short s) const override final
+  { return this->_nodes_on_side_ptr<Hex8>(s); }
+
   virtual std::vector<unsigned int> nodes_on_edge(const unsigned int e) const override;
 
   /**
diff --git a/include/geom/cell_inf_hex16.h b/include/geom/cell_inf_hex16.h
@@ -124,6 +124,9 @@ class InfHex16 final : public InfHex
 
   virtual std::vector<unsigned int> nodes_on_side(const unsigned int s) const override;
 
+  virtual const unsigned int * nodes_on_side_ptr(const unsigned short s) const override final
+  { return this->_nodes_on_side_ptr<InfHex16>(s); }
+
   virtual std::vector<unsigned int> nodes_on_edge(const unsigned int e) const override;
 
   /**
diff --git a/include/geom/cell_inf_hex18.h b/include/geom/cell_inf_hex18.h
@@ -129,6 +129,9 @@ class InfHex18 final : public InfHex
 
   virtual std::vector<unsigned int> nodes_on_side(const unsigned int s) const override;
 
+  virtual const unsigned int * nodes_on_side_ptr(const unsigned short s) const override final
+  { return this->_nodes_on_side_ptr<InfHex18>(s); }
+
   virtual std::vector<unsigned int> nodes_on_edge(const unsigned int e) const override;
 
   /**
diff --git a/include/geom/cell_inf_hex8.h b/include/geom/cell_inf_hex8.h
@@ -109,6 +109,9 @@ class InfHex8 final : public InfHex
 
   virtual std::vector<unsigned int> nodes_on_side(const unsigned int s) const override;
 
+  virtual const unsigned int * nodes_on_side_ptr(const unsigned short s) const override final
+  { return this->_nodes_on_side_ptr<InfHex8>(s); }
+
   virtual std::vector<unsigned int> nodes_on_edge(const unsigned int e) const override;
 
   /**
diff --git a/include/geom/cell_inf_prism12.h b/include/geom/cell_inf_prism12.h
@@ -115,6 +115,9 @@ class InfPrism12 final : public InfPrism
 
   virtual std::vector<unsigned int> nodes_on_side(const unsigned int s) const override;
 
+  virtual const unsigned int * nodes_on_side_ptr(const unsigned short s) const override final
+  { return this->_nodes_on_side_ptr<InfPrism12>(s); }
+
   virtual std::vector<unsigned int> nodes_on_edge(const unsigned int e) const override;
 
   /**
diff --git a/include/geom/cell_inf_prism6.h b/include/geom/cell_inf_prism6.h
@@ -111,6 +111,9 @@ class InfPrism6 final : public InfPrism
 
   virtual std::vector<unsigned int> nodes_on_side(const unsigned int s) const override;
 
+  virtual const unsigned int * nodes_on_side_ptr(const unsigned short s) const override final
+  { return this->_nodes_on_side_ptr<InfPrism6>(s); }
+
   virtual std::vector<unsigned int> nodes_on_edge(const unsigned int e) const override;
 
   /**
diff --git a/include/geom/cell_prism15.h b/include/geom/cell_prism15.h
@@ -129,6 +129,9 @@ class Prism15 final : public Prism
 
   virtual std::vector<unsigned int> nodes_on_side(const unsigned int s) const override;
 
+  virtual const unsigned int * nodes_on_side_ptr(const unsigned short s) const override final
+  { return this->_nodes_on_side_ptr<Prism15>(s); }
+
   virtual std::vector<unsigned int> nodes_on_edge(const unsigned int e) const override;
 
   /**
diff --git a/include/geom/cell_prism18.h b/include/geom/cell_prism18.h
@@ -129,6 +129,9 @@ class Prism18 final : public Prism
 
   virtual std::vector<unsigned int> nodes_on_side(const unsigned int s) const override;
 
+  virtual const unsigned int * nodes_on_side_ptr(const unsigned short s) const override final
+  { return this->_nodes_on_side_ptr<Prism18>(s); }
+
   virtual std::vector<unsigned int> nodes_on_edge(const unsigned int e) const override;
 
   /**
diff --git a/include/geom/cell_prism20.h b/include/geom/cell_prism20.h
@@ -133,6 +133,9 @@ class Prism20 final : public Prism
 
   virtual std::vector<unsigned int> nodes_on_side(const unsigned int s) const override;
 
+  virtual const unsigned int * nodes_on_side_ptr(const unsigned short s) const override final
+  { return this->_nodes_on_side_ptr<Prism20>(s); }
+
   virtual std::vector<unsigned int> nodes_on_edge(const unsigned int e) const override;
 
   /**
diff --git a/include/geom/cell_prism21.h b/include/geom/cell_prism21.h
@@ -136,6 +136,9 @@ class Prism21 final : public Prism
 
   virtual std::vector<unsigned int> nodes_on_side(const unsigned int s) const override;
 
+  virtual const unsigned int * nodes_on_side_ptr(const unsigned short s) const override final
+  { return this->_nodes_on_side_ptr<Prism21>(s); }
+
   virtual std::vector<unsigned int> nodes_on_edge(const unsigned int e) const override;
 
   /**
diff --git a/include/geom/cell_prism6.h b/include/geom/cell_prism6.h
@@ -107,6 +107,9 @@ class Prism6 final : public Prism
 
   virtual std::vector<unsigned int> nodes_on_side(const unsigned int s) const override;
 
+  virtual const unsigned int * nodes_on_side_ptr(const unsigned short s) const override final
+  { return this->_nodes_on_side_ptr<Prism6>(s); }
+
   virtual std::vector<unsigned int> nodes_on_edge(const unsigned int e) const override;
 
   /**
diff --git a/include/geom/cell_pyramid13.h b/include/geom/cell_pyramid13.h
@@ -128,6 +128,9 @@ class Pyramid13 final : public Pyramid
 
   virtual std::vector<unsigned int> nodes_on_side(const unsigned int s) const override;
 
+  virtual const unsigned int * nodes_on_side_ptr(const unsigned short s) const override final
+  { return this->_nodes_on_side_ptr<Pyramid13>(s); }
+
   virtual std::vector<unsigned int> nodes_on_edge(const unsigned int e) const override;
 
   /**
diff --git a/include/geom/cell_pyramid14.h b/include/geom/cell_pyramid14.h
@@ -131,6 +131,9 @@ class Pyramid14 final : public Pyramid
 
   virtual std::vector<unsigned int> nodes_on_side(const unsigned int s) const override;
 
+  virtual const unsigned int * nodes_on_side_ptr(const unsigned short s) const override final
+  { return this->_nodes_on_side_ptr<Pyramid14>(s); }
+
   virtual std::vector<unsigned int> nodes_on_edge(const unsigned int e) const override;
 
   /**
diff --git a/include/geom/cell_pyramid5.h b/include/geom/cell_pyramid5.h
@@ -106,6 +106,9 @@ class Pyramid5 final : public Pyramid
 
   virtual std::vector<unsigned int> nodes_on_side(const unsigned int s) const override;
 
+  virtual const unsigned int * nodes_on_side_ptr(const unsigned short s) const override final
+  { return this->_nodes_on_side_ptr<Pyramid5>(s); }
+
   virtual std::vector<unsigned int> nodes_on_edge(const unsigned int e) const override;
 
   /**
diff --git a/include/geom/cell_tet10.h b/include/geom/cell_tet10.h
@@ -118,6 +118,9 @@ class Tet10 final : public Tet
 
   virtual std::vector<unsigned int> nodes_on_side(const unsigned int s) const override;
 
+  virtual const unsigned int * nodes_on_side_ptr(const unsigned short s) const override final
+  { return this->_nodes_on_side_ptr<Tet10>(s); }
+
   virtual std::vector<unsigned int> nodes_on_edge(const unsigned int e) const override;
 
   /**
diff --git a/include/geom/cell_tet14.h b/include/geom/cell_tet14.h
@@ -124,6 +124,9 @@ class Tet14 final : public Tet
 
   virtual std::vector<unsigned int> nodes_on_side(const unsigned int s) const override;
 
+  virtual const unsigned int * nodes_on_side_ptr(const unsigned short s) const override final
+  { return this->_nodes_on_side_ptr<Tet14>(s); }
+
   virtual std::vector<unsigned int> nodes_on_edge(const unsigned int e) const override;
 
   /**
diff --git a/include/geom/cell_tet4.h b/include/geom/cell_tet4.h
@@ -113,6 +113,9 @@ class Tet4 final : public Tet
 
   virtual std::vector<unsigned int> nodes_on_side(const unsigned int s) const override;
 
+  virtual const unsigned int * nodes_on_side_ptr(const unsigned short s) const override final
+  { return this->_nodes_on_side_ptr<Tet4>(s); }
+
   virtual std::vector<unsigned int> nodes_on_edge(const unsigned int e) const override;
 
   /**
diff --git a/include/geom/edge.h b/include/geom/edge.h
@@ -58,6 +58,14 @@ class Edge : public Elem
   Edge & operator= (Edge &&) = delete;
   virtual ~Edge() = default;
 
+  /**
+   * Geometric constants for all edges.
+   */
+  static const int num_sides = 2;
+  static const int num_edges = 0;
+  static const int nodes_per_side = 1;
+  static const int nodes_per_edge = invalid_int;
+
   /**
    * \returns 1, the dimensionality of the object.
    */
@@ -188,11 +196,20 @@ class Edge : public Elem
 
   virtual std::vector<unsigned int> nodes_on_side(const unsigned int s) const override;
 
+  virtual const unsigned int * nodes_on_side_ptr(const unsigned short s) const override final
+  { libmesh_assert_less(s, this->n_sides()); return side_nodes_map[s]; }
+
   virtual std::vector<unsigned int> nodes_on_edge(const unsigned int e) const override;
 
   virtual std::vector<unsigned int> sides_on_edge(const unsigned int) const override final
   { return {}; }
 
+  /**
+   * This maps the \f$ j^{th} \f$ node of the \f$ i^{th} \f$ side to
+   * element node numbers.
+   */
+  static const unsigned int side_nodes_map[2][1];
+
   /**
    * \returns The "circumcenter of mass" (area-weighted average of
    * triangulation circumcenters) of the element.
diff --git a/include/geom/edge_edge2.h b/include/geom/edge_edge2.h
@@ -171,11 +171,7 @@ class Edge2 : public Edge
    * Geometric constants for Edge2.
    */
   static const int num_nodes = 2;
-  static const int num_sides = 2;
-  static const int num_edges = 0;
   static const int num_children = 2;
-  static const int nodes_per_side = 1;
-  static const int nodes_per_edge = invalid_int;
 
 protected:
 
diff --git a/include/geom/edge_edge3.h b/include/geom/edge_edge3.h
@@ -198,11 +198,7 @@ class Edge3 : public Edge
    * Geometric constants for Edge3.
    */
   static const int num_nodes = 3;
-  static const int num_sides = 2;
-  static const int num_edges = 0;
   static const int num_children = 2;
-  static const int nodes_per_side = 1;
-  static const int nodes_per_edge = invalid_int;
 
 protected:
 
diff --git a/include/geom/edge_edge4.h b/include/geom/edge_edge4.h
@@ -192,11 +192,7 @@ class Edge4 final : public Edge
    * Geometric constants for Edge4.
    */
   static const int num_nodes = 4;
-  static const int num_sides = 2;
-  static const int num_edges = 0;
   static const int num_children = 2;
-  static const int nodes_per_side = 1;
-  static const int nodes_per_edge = invalid_int;
 
 protected:
 
diff --git a/include/geom/elem.h b/include/geom/elem.h
@@ -744,6 +744,15 @@ class Elem : public ReferenceCountedObject<Elem>,
    */
   virtual std::vector<unsigned int> nodes_on_side(const unsigned int /*s*/) const = 0;
 
+  /**
+   * \returns A pointer to the beginning of the array that contains the
+   * (local) node numbers on the specified side
+   *
+   * This does not create temproraries, unlike \p nodes_on_side.
+   * Use n_nodes_on_side for indexing.
+   */
+  virtual const unsigned int * nodes_on_side_ptr(const unsigned short) const = 0;
+
   /**
    * \returns the (local) node numbers on the specified edge
    */
@@ -1962,7 +1971,6 @@ class Elem : public ReferenceCountedObject<Elem>,
                              const unsigned int i,
                              ElemType edgetype);
 
-
   /**
    * Helper for overriding n_nodes_on_side in derived classes.
    *
@@ -1977,6 +1985,17 @@ class Elem : public ReferenceCountedObject<Elem>,
     return ElemClass::nodes_per_side;
   }
 
+  /**
+   * Helper for overriding nodes_on_side in derived classes.
+  */
+  template <class ElemClass>
+  const unsigned int * _nodes_on_side_ptr(const unsigned short s) const
+  {
+    static_assert(std::is_base_of<Elem, ElemClass>::value, "Not an Elem");
+    libmesh_assert_less(s, std::extent<decltype(ElemClass::side_nodes_map)>::value);
+    return ElemClass::side_nodes_map[s];
+  }
+
 #ifdef LIBMESH_ENABLE_AMR
 
   /**
diff --git a/include/geom/face_inf_quad4.h b/include/geom/face_inf_quad4.h
@@ -105,6 +105,9 @@ class InfQuad4 : public InfQuad
 
   virtual std::vector<unsigned int> nodes_on_side(const unsigned int s) const override;
 
+  virtual const unsigned int * nodes_on_side_ptr(const unsigned short s) const override final
+  { return this->_nodes_on_side_ptr<InfQuad4>(s); }
+
   virtual std::vector<unsigned int> nodes_on_edge(const unsigned int e) const override;
 
   /**
diff --git a/include/geom/face_inf_quad6.h b/include/geom/face_inf_quad6.h
@@ -106,6 +106,9 @@ class InfQuad6 : public InfQuad
 
   virtual std::vector<unsigned int> nodes_on_side(const unsigned int s) const override;
 
+  virtual const unsigned int * nodes_on_side_ptr(const unsigned short s) const override final
+  { return this->_nodes_on_side_ptr<InfQuad6>(s); }
+
   virtual std::vector<unsigned int> nodes_on_edge(const unsigned int e) const override;
 
   /**
diff --git a/include/geom/face_quad4.h b/include/geom/face_quad4.h
@@ -101,6 +101,9 @@ class Quad4 : public Quad
 
   virtual std::vector<unsigned int> nodes_on_side(const unsigned int s) const override;
 
+  virtual const unsigned int * nodes_on_side_ptr(const unsigned short s) const override final
+  { return this->_nodes_on_side_ptr<Quad4>(s); }
+
   virtual std::vector<unsigned int> nodes_on_edge(const unsigned int e) const override;
 
   /**
diff --git a/include/geom/face_quad8.h b/include/geom/face_quad8.h
@@ -104,6 +104,9 @@ class Quad8 : public Quad
 
   virtual std::vector<unsigned int> nodes_on_side(const unsigned int s) const override;
 
+  virtual const unsigned int * nodes_on_side_ptr(const unsigned short s) const override final
+  { return this->_nodes_on_side_ptr<Quad8>(s); }
+
   virtual std::vector<unsigned int> nodes_on_edge(const unsigned int e) const override;
 
   /**
diff --git a/include/geom/face_quad9.h b/include/geom/face_quad9.h
@@ -104,6 +104,9 @@ class Quad9 : public Quad
 
   virtual std::vector<unsigned int> nodes_on_side(const unsigned int s) const override;
 
+  virtual const unsigned int * nodes_on_side_ptr(const unsigned short s) const override final
+  { return this->_nodes_on_side_ptr<Quad9>(s); }
+
   virtual std::vector<unsigned int> nodes_on_edge(const unsigned int e) const override;
 
   /**
diff --git a/include/geom/face_tri3.h b/include/geom/face_tri3.h
@@ -109,6 +109,9 @@ class Tri3 : public Tri
 
   virtual std::vector<unsigned int> nodes_on_side(const unsigned int s) const override;
 
+  virtual const unsigned int * nodes_on_side_ptr(const unsigned short s) const override final
+  { return this->_nodes_on_side_ptr<Tri3>(s); }
+
   virtual std::vector<unsigned int> nodes_on_edge(const unsigned int e) const override;
 
   /**
diff --git a/include/geom/face_tri6.h b/include/geom/face_tri6.h
@@ -114,6 +114,9 @@ class Tri6 : public Tri
 
   virtual std::vector<unsigned int> nodes_on_side(const unsigned int s) const override;
 
+  virtual const unsigned int * nodes_on_side_ptr(const unsigned short s) const override final
+  { return this->_nodes_on_side_ptr<Tri6>(s); }
+
   virtual std::vector<unsigned int> nodes_on_edge(const unsigned int e) const override;
 
   /**
diff --git a/include/geom/face_tri7.h b/include/geom/face_tri7.h
@@ -114,6 +114,9 @@ class Tri7 : public Tri
 
   virtual std::vector<unsigned int> nodes_on_side(const unsigned int s) const override;
 
+  virtual const unsigned int * nodes_on_side_ptr(const unsigned short s) const override final
+  { return this->_nodes_on_side_ptr<Tri7>(s); }
+
   virtual std::vector<unsigned int> nodes_on_edge(const unsigned int e) const override;
 
   /**
diff --git a/include/geom/node_elem.h b/include/geom/node_elem.h
@@ -83,6 +83,12 @@ class NodeElem : public Elem
   virtual unsigned int n_nodes_on_side(const unsigned short) const override
   { libmesh_not_implemented(); return 0; }
 
+  /**
+   * The \p Elem::nodes_on_side_ptr makes no sense for nodes.
+   */
+  virtual const unsigned int * nodes_on_side_ptr(const unsigned short) const override final
+  { libmesh_not_implemented(); return nullptr; }
+
   /**
    * \returns 0.
    */
diff --git a/include/geom/remote_elem.h b/include/geom/remote_elem.h
diff --git a/src/geom/edge.C b/src/geom/edge.C
diff --git a/src/geom/edge_edge2.C b/src/geom/edge_edge2.C
diff --git a/src/geom/edge_edge3.C b/src/geom/edge_edge3.C
diff --git a/src/geom/edge_edge4.C b/src/geom/edge_edge4.C
diff --git a/tests/geom/elem_test.C b/tests/geom/elem_test.C
