First stab at importing tracing routines

include/Makefile.in

@@ -729,6 +729,7 @@ include_HEADERS = \
         geom/edge_edge4.h \
         geom/edge_inf_edge2.h \
         geom/elem.h \
+        geom/elem_corner.h \
         geom/elem_cutter.h \
         geom/elem_hash.h \
         geom/elem_internal.h \
@@ -751,6 +752,7 @@ include_HEADERS = \
         geom/face_tri3_subdivision.h \
         geom/face_tri6.h \
         geom/face_tri7.h \
+        geom/intersection_tools.h \
         geom/node.h \
         geom/node_elem.h \
         geom/node_range.h \

include/geom/cell_hex.h

@@ -77,6 +77,12 @@ class Hex : public Cell
    */
   virtual unsigned int n_vertices() const override final { return 8; }
 
+  /**
+   * \returns 4. Every side has four vertices.
+   */
+  virtual unsigned int n_vertices_on_side(const unsigned short libmesh_dbg_var(s)) const override final
+  { libmesh_assert_less(s, this->n_sides()); return 4; }
+
   /**
    * \returns 12.  All hexahedra have 12 edges.
    */

include/geom/cell_hex20.h

@@ -124,8 +124,14 @@ 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;
 
+  virtual const unsigned int * nodes_on_edge_ptr(const unsigned short e) const override final
+  { return this->_nodes_on_edge_ptr<Hex20>(e); }
+
   /**
    * \returns \p true if the specified (local) node number is on the
    * specified edge.
@@ -240,15 +246,25 @@ 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); }
+
+  /**
+   * \returns 3. Every edge has two nodes.
+   */
+  virtual unsigned int n_nodes_on_edge(const unsigned short e) const override final
+  { return this->_n_nodes_on_edge_constant<Hex20>(e); }
+
 protected:
 
   /**
    * Data for links to nodes.
    */
   Node * _nodelinks_data[num_nodes];
 
-
-
 #ifdef LIBMESH_ENABLE_AMR
 
   /**

include/geom/cell_hex27.h

@@ -124,8 +124,14 @@ 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;
 
+  virtual const unsigned int * nodes_on_edge_ptr(const unsigned short e) const override final
+  { return this->_nodes_on_edge_ptr<Hex27>(e); }
+
   /**
    * \returns \p true if the specified (local) node number is on the
    * specified edge.
@@ -258,6 +264,18 @@ 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); }
+
+  /**
+   * \returns 3. Every edge has three nodes.
+   */
+  virtual unsigned int n_nodes_on_edge(const unsigned short e) const override final
+  { return this->_n_nodes_on_edge_constant<Hex27>(e); }
+
 protected:
 
 

include/geom/cell_hex8.h

@@ -109,8 +109,14 @@ 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;
 
+  virtual const unsigned int * nodes_on_edge_ptr(const unsigned short e) const override final
+  { return this->_nodes_on_edge_ptr<Hex8>(e); }
+
   /**
    * \returns \p true if the specified (local) node number is on the
    * specified edge.
@@ -215,6 +221,18 @@ 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); }
+
+  /**
+   * \returns 2. Every edge has two nodes.
+   */
+  virtual unsigned int n_nodes_on_edge(const unsigned short e) const override final
+  { return this->_n_nodes_on_edge_constant<Hex8>(e); }
+
 protected:
 
   /**

include/geom/cell_inf_hex.h

@@ -90,6 +90,12 @@ class InfHex : public InfCell
    */
   virtual unsigned int n_vertices() const override final { return 8; }
 
+  /**
+   * \returns 4. Every side has four vertices.
+   */
+  virtual unsigned int n_vertices_on_side(const unsigned short libmesh_dbg_var(s)) const override final
+  { libmesh_assert_less(s, this->n_sides()); return 4; }
+
   /**
    * \returns \p true if the specified (local) node number is a
    * "mid-edge" node on an infinite element edge.
@@ -194,6 +200,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:
 
   /**

include/geom/cell_inf_hex16.h

@@ -124,8 +124,14 @@ 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;
 
+  virtual const unsigned int * nodes_on_edge_ptr(const unsigned short e) const override final
+  { return this->_nodes_on_edge_ptr<InfHex16>(e); }
+
   /**
    * \returns \p true if the specified (local) node number is on the
    * specified edge.
@@ -238,6 +244,12 @@ 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); }
+
+  virtual unsigned int n_nodes_on_edge(const unsigned short e) const override final
+  { return this->_n_nodes_on_edge_constant<InfHex16>(e) - ((e < 4) ? 0 : 1); }
+
 protected:
 
   /**

include/geom/cell_inf_hex18.h

@@ -129,8 +129,14 @@ 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;
 
+  virtual const unsigned int * nodes_on_edge_ptr(const unsigned short e) const override final
+  { return this->_nodes_on_edge_ptr<InfHex18>(e); }
+
   /**
    * \returns \p true if the specified (local) node number is on the
    * specified edge.
@@ -253,6 +259,12 @@ 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); }
+
+  virtual unsigned int n_nodes_on_edge(const unsigned short e) const override final
+  { return this->_n_nodes_on_edge_constant<InfHex18>(e) - ((e < 4) ? 0 : 1); }
+
 protected:
 
   /**

include/geom/cell_inf_hex8.h

@@ -109,8 +109,14 @@ 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;
 
+  virtual const unsigned int * nodes_on_edge_ptr(const unsigned short e) const override final
+  { return this->_nodes_on_edge_ptr<InfHex8>(e); }
+
   /**
    * \returns \p true if the specified (local) node number is on the
    * specified edge.
@@ -188,6 +194,18 @@ 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); }
+
+  /**
+   * \returns 2. Every edge has two nodes.
+   */
+  virtual unsigned int n_nodes_on_edge(const unsigned short e) const override final
+  { return this->_n_nodes_on_edge_constant<InfHex8>(e); }
+
 protected:
 
   /**

include/geom/cell_inf_prism.h

@@ -86,6 +86,9 @@ class InfPrism : public InfCell
    */
   virtual unsigned int n_vertices() const override final { return 6; }
 
+  virtual unsigned int n_vertices_on_side(const unsigned short s) const override final
+  { libmesh_assert_less(s, this->n_sides()); return 4 - (s == 0); }
+
   /**
    * \returns 6.  All infinite prisms have 6 edges,
    * 3 lying in the base, and 3 perpendicular to the base.

include/geom/cell_inf_prism12.h

@@ -115,8 +115,14 @@ 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;
 
+  virtual const unsigned int * nodes_on_edge_ptr(const unsigned short e) const override final
+  { return this->_nodes_on_edge_ptr<InfPrism12>(e); }
+
   /**
    * \returns \p true if the specified (local) node number is on the
    * specified edge.
@@ -226,6 +232,15 @@ 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); }
+
+  virtual unsigned int n_nodes_on_edge(const unsigned short e) const override final
+  { return this->_n_nodes_on_edge_constant<InfPrism12>(e) - ((e < 3) ? 0 : 1); }
+
 protected:
 
   /**

include/geom/cell_inf_prism6.h

@@ -111,8 +111,14 @@ 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;
 
+  virtual const unsigned int * nodes_on_edge_ptr(const unsigned short e) const override final
+  { return this->_nodes_on_edge_ptr<InfPrism6>(e); }
+
   /**
    * \returns \p true if the specified (local) node number is on the
    * specified edge.
@@ -187,6 +193,12 @@ 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); }
+
+  virtual unsigned int n_nodes_on_edge(const unsigned short e) const override final
+  { return this->_n_nodes_on_edge_constant<InfPrism6>(e); }
+
 protected:
 
   /**

include/geom/cell_prism.h

@@ -83,6 +83,9 @@ class Prism : public Cell
    */
   virtual unsigned int n_vertices() const override final { return 6; }
 
+  virtual unsigned int n_vertices_on_side(const unsigned short s) const override final
+  { libmesh_assert_less(s, this->n_sides()); return 4 - (s == 0 || s == 4); }
+
   /**
    * \returns 9.  All prisms have 9 edges.
    */
@@ -160,6 +163,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.
    */

include/geom/cell_prism15.h

@@ -129,8 +129,14 @@ 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;
 
+  virtual const unsigned int * nodes_on_edge_ptr(const unsigned short e) const override final
+  { return this->_nodes_on_edge_ptr<Prism15>(e); }
+
   /**
    * \returns \p true if the specified (local) node number is on the
    * specified edge.
@@ -245,6 +251,15 @@ 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); }
+
+  /**
+   * \returns 3. Every edge has three nodes.
+   */
+  virtual unsigned int n_nodes_on_edge(const unsigned short e) const override final
+  { return this->_n_nodes_on_edge_constant<Prism15>(e); }
+
 protected:
 
   /**