New data structure for multidimensional data (+some bugfixes)

Common/include/code_config.hpp

@@ -60,6 +60,13 @@
 template<bool condition>
 using su2enable_if = typename std::enable_if<condition,bool>::type;
 
+/*--- Compile-time type selection. ---*/
+template<bool B, class T, class F> struct su2conditional { typedef T type; };
+template<class T, class F> struct su2conditional<false, T, F> { typedef F type; };
+
+template<bool B, class T, class F>
+using su2conditional_t = typename su2conditional<B,T,F>::type;
+
 /*--- Detect compilation with OpenMP. ---*/
 #if defined(_OPENMP)
 #define HAVE_OMP
@@ -103,7 +110,7 @@ using su2double = codi::RealForward;
 using su2double = double;
 #endif
 
-/*--- This type can be used for (rare) compatiblity cases or for
+/*--- This type can be used for (rare) compatibility cases or for
  * computations that are intended to be (always) passive. ---*/
 using passivedouble = double;
 

Common/include/fem/fem_geometry_structure.hpp

@@ -1227,11 +1227,14 @@ class CMeshFEM_DG: public CMeshFEM {
   void SetWallDistance(su2double val) override;
 
   /*!
-   * \brief Set the wall distance based on an previously constructed ADT
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] WallADT - The ADT to compute the wall distance
+   * \brief Reduce the wall distance based on an previously constructed ADT.
+   * \details The ADT might belong to another zone, giving rise to lower wall distances
+   * than those already stored.
+   * \param[in] WallADT - The ADT to reduce the wall distance
+   * \param[in] config - Config of this geometry (not the ADT zone's geometry)
+   * \param[in] iZone - ignored
    */
-  void SetWallDistance(const CConfig *config, CADTElemClass* WallADT) override;
+  void SetWallDistance(CADTElemClass* WallADT, const CConfig* config, unsigned short iZone) override;
 };
 
 /*!

Common/include/geometry/CGeometry.hpp

@@ -1683,11 +1683,14 @@ class CGeometry {
   virtual std::unique_ptr<CADTElemClass> ComputeViscousWallADT(const CConfig *config) const { return nullptr; }
 
   /*!
-   * \brief Set the wall distance based on an previously constructed ADT
-   * \param[in] config - Definition of the particular problem.
-   * \param[in] WallADT - The ADT to compute the wall distance
-   */
-  virtual void SetWallDistance(const CConfig *config, CADTElemClass* WallADT) {}
+   * \brief Reduce the wall distance based on an previously constructed ADT.
+   * \details The ADT might belong to another zone, giving rise to lower wall distances
+   * than those already stored.
+   * \param[in] WallADT - The ADT to reduce the wall distance
+   * \param[in] config - Config of this geometry (not the ADT zone's geometry)
+   * \param[in] iZone - Zone whose markers made the ADT
+   */
+  virtual void SetWallDistance(CADTElemClass* WallADT, const CConfig* config, unsigned short iZone = numeric_limits<unsigned short>::max()) {}
 
   /*!
    * \brief Set wall distances a specific value

Common/include/geometry/CPhysicalGeometry.hpp

@@ -104,9 +104,6 @@ class CPhysicalGeometry final : public CGeometry {
   unsigned long *Elem_ID_BoundTria_Linear{nullptr};
   unsigned long *Elem_ID_BoundQuad_Linear{nullptr};
 
-  vector<int> GlobalMarkerStorageDispl;
-  vector<su2double> GlobalRoughness_Height;
-
   su2double Streamwise_Periodic_RefNode[MAXNDIM] = {0}; /*!< \brief Coordinates of the reference node [m] on the receiving periodic marker, for recovered pressure/temperature computation only.*/
 
 public:
@@ -767,10 +764,14 @@ class CPhysicalGeometry final : public CGeometry {
   std::unique_ptr<CADTElemClass> ComputeViscousWallADT(const CConfig *config) const override;
 
   /*!
-   * \brief Set the wall distance based on an previously constructed ADT
-   * \param[in] WallADT - The ADT to compute the wall distance
+   * \brief Reduce the wall distance based on an previously constructed ADT.
+   * \details The ADT might belong to another zone, giving rise to lower wall distances
+   * than those already stored.
+   * \param[in] WallADT - The ADT to reduce the wall distance
+   * \param[in] config - ignored
+   * \param[in] iZone - zone whose markers made the ADT
    */
-  void SetWallDistance(const CConfig *config, CADTElemClass* WallADT) override;
+  void SetWallDistance(CADTElemClass* WallADT, const CConfig* config, unsigned short iZone) override;
 
   /*!
    * \brief Set wall distances a specific value
@@ -781,11 +782,6 @@ class CPhysicalGeometry final : public CGeometry {
     }
   }
 
-  /*!
-   * \brief Set roughness values for markers in a global array.
-   */
-  void SetGlobalMarkerRoughness(const CConfig* config);
-
   /*!
    * \brief For streamwise periodicity, find & store a unique reference node on the designated periodic inlet.
    * \param[in] config - Definition of the particular problem.

Common/include/geometry/dual_grid/CPoint.hpp

@@ -32,6 +32,7 @@
 #include "../../containers/container_decorators.hpp"
 #include "../../toolboxes/graph_toolbox.hpp"
 #include <vector>
+#include "../../toolboxes/ndflattener.hpp"
 
 using namespace std;
 
@@ -85,7 +86,14 @@ class CPoint {
   su2vector<bool> Agglomerate;                 /*!< \brief This flag indicates if the element has been agglomerated. */
 
   su2vector<unsigned short> nNeighbor;    /*!< \brief Number of neighbors, needed by some numerical methods. */
+
+  /*--- Closest element on a viscous wall, and distance to it. ---*/
   su2activevector Wall_Distance;          /*!< \brief Distance to the nearest wall. */
+  su2vector<int> ClosestWall_Rank; /*!< \brief Rank of process holding the closest wall element. */
+  su2vector<unsigned short> ClosestWall_Zone; /*!< \brief Zone index of closest wall element. */
+  su2vector<unsigned short> ClosestWall_Marker; /*!< \brief Marker index of closest wall element, for given rank and zone index. */
+  su2vector<unsigned long> ClosestWall_Elem; /*!< \brief Element index of closest wall element, for givenrank, zone and marker index. */
+
   su2activevector SharpEdge_Distance;     /*!< \brief Distance to a sharp edge. */
   su2activevector Curvature;              /*!< \brief Value of the surface curvature (SU2_GEO). */
   su2activevector MaxLength;              /*!< \brief The maximum cell-center to cell-center length. */
@@ -415,8 +423,22 @@ class CPoint {
    * \brief Set the value of the distance to the nearest wall.
    * \param[in] iPoint - Index of the point.
    * \param[in] distance - Value of the distance.
-   */
-  inline void SetWall_Distance(unsigned long iPoint, su2double distance) { Wall_Distance(iPoint) = distance; }
+   * \param[in] rankID - Rank of process holding the closest wall element.
+   * \param[in] zoneID - Zone index of closest wall element.
+   * \param[in] markerID - Marker index of closest wall element.
+   * \param[in] elemID - Element index of closest wall element.
+   */
+  inline void SetWall_Distance(unsigned long iPoint, su2double distance,
+                               int rankID = -1,
+                               unsigned short zoneID = numeric_limits<unsigned short>::max(),
+                               unsigned short markerID = numeric_limits<unsigned short>::max(),
+                               unsigned long elemID = numeric_limits<unsigned long>::max() ) {
+    Wall_Distance(iPoint) = distance;
+    ClosestWall_Rank(iPoint) = rankID;
+    ClosestWall_Zone(iPoint) = zoneID;
+    ClosestWall_Marker(iPoint) = markerID;
+    ClosestWall_Elem(iPoint) = elemID;
+  }
 
   /*!
    * \brief Get the value of the distance to the nearest wall.
@@ -829,4 +851,19 @@ class CPoint {
    */
   void SetIndex(unsigned long iPoint, bool input);
 
+  /*!
+   * \brief Set wall roughnesses according to stored closest wall information.
+   * \param[in] roughness - Mapping [rank][zone][marker] -> roughness
+   */
+  template<typename Roughness_type>
+  void SetWallRoughness(Roughness_type const& roughness){
+    for (unsigned long iPoint=0; iPoint<GlobalIndex.size(); ++iPoint) {
+      int rankID = ClosestWall_Rank[iPoint];
+      unsigned short zoneID = ClosestWall_Zone[iPoint];
+      unsigned short markerID = ClosestWall_Marker[iPoint];
+      if(rankID != -1){
+        SetRoughnessHeight(iPoint, roughness[rankID][zoneID][markerID]);
+      }
+    }
+  }
 };