pad nodes consistently

Author: pcarruscag

Common/include/geometry/dual_grid/CEdge.hpp

@@ -43,6 +43,7 @@ class CEdge {
   using NodeArray = C2DContainer<Index, Index, StorageType::ColumnMajor, 64, DynamicSize, 2>;
   NodeArray Nodes;           /*!< \brief Vector to store the node indices of the edge. */
   su2activematrix Normal;    /*!< \brief Normal (area) of the edge. */
+  const Index nEdge, nEdgeSIMD;
 
   friend class CPhysicalGeometry;
 
@@ -70,11 +71,25 @@ class CEdge {
   inline unsigned long GetNode(unsigned long iEdge, unsigned long iNode) const { return Nodes(iEdge,iNode); }
 
   /*!
-   * \brief SIMD version of GetNode, iNode returned for multiple iEdges.
+   * \brief SIMD version of GetNode, iNode returned for contiguous iEdges.
    */
   template<class T, size_t N>
-  FORCEINLINE simd::Array<T,N> GetNode(simd::Array<T,N> iEdges, unsigned long iNode) const {
-    return simd::Array<T,N>(Nodes[iNode], iEdges);
+  FORCEINLINE simd::Array<T,N> GetNode(simd::Array<T,N> iEdge, unsigned long iNode) const {
+    return simd::Array<T,N>(&Nodes(iEdge[0],iNode));
+  }
+
+  /*!
+   * \brief Sets the tail of "Nodes" to repeat one of the last edges.
+   * \note This is needed when using the SIMD version of GetNode and
+   *       the number of edges is not a multiple of the simd width.
+   */
+  void SetPaddingNodes() {
+    for (auto iEdge = nEdge; iEdge < nEdgeSIMD; ++iEdge) {
+      /*--- Pad nodes by repeating the first edge in the last SIMD group. ---*/
+      const auto iEdge0 = nEdgeSIMD - simd::preferredLen<su2double>();
+      Nodes(iEdge, LEFT) = Nodes(iEdge0, LEFT);
+      Nodes(iEdge, RIGHT) = Nodes(iEdge0, RIGHT);
+    }
   }
 
   /*!

Common/src/geometry/CGeometry.cpp

@@ -1398,6 +1398,7 @@ void CGeometry::SetEdges(void) {
       }
     }
   }
+  edges->SetPaddingNodes();
 }
 
 void CGeometry::SetFaces(void) {

Common/src/geometry/dual_grid/CEdge.cpp

@@ -31,9 +31,10 @@
 
 using namespace GeometryToolbox;
 
-CEdge::CEdge(unsigned long nEdge, unsigned long nDim) {
+CEdge::CEdge(unsigned long nEdge_, unsigned long nDim)
+  : nEdge(nEdge_),
+    nEdgeSIMD(nextMultiple(nEdge_, simd::preferredLen<su2double>())) {
   /*--- Allocate with padding. ---*/
-  const auto nEdgeSIMD = nextMultiple(nEdge, simd::preferredLen<su2double>());
   Nodes.resize(nEdgeSIMD,2) = 0;
   Normal.resize(nEdgeSIMD,nDim) = su2double(0.0);
 }