cleanup SetMultiGridWall** functions

Author: pcarruscag

Common/include/geometry/CGeometry.hpp

@@ -815,14 +815,14 @@ class CGeometry {
    * \param[in] geometry - Geometrical definition of the problem.
    * \param[in] val_marker - Index of the boundary marker.
    */
-  inline virtual void SetMultiGridWallHeatFlux(CGeometry *geometry, unsigned short val_marker) {}
+  inline virtual void SetMultiGridWallHeatFlux(const CGeometry *geometry, unsigned short val_marker) {}
 
   /*!
    * \brief A virtual member.
    * \param[in] geometry - Geometrical definition of the problem.
    * \param[in] val_marker - Index of the boundary marker.
    */
-  inline virtual void SetMultiGridWallTemperature(CGeometry *geometry, unsigned short val_marker) {}
+  inline virtual void SetMultiGridWallTemperature(const CGeometry *geometry, unsigned short val_marker) {}
 
   /*!
    * \brief A virtual member.

Common/include/geometry/CMultiGridGeometry.hpp

@@ -37,6 +37,51 @@
  */
 class CMultiGridGeometry final : public CGeometry {
 
+  /*!
+   * \brief Set a representative wall value of the agglomerated control volumes on a particular boundary marker.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] val_marker - Index of the boundary marker.
+   * \param[in] wall_quantity - Object with methods Get(iVertex_fine) and Set(iVertex_coarse, val).
+   */
+  template <class T>
+  void SetMultiGridWallQuantity(const CGeometry *geometry, unsigned short val_marker, T& wall_quantity) {
+
+    for (auto iVertex = 0ul; iVertex < nVertex[val_marker]; iVertex++) {
+      const auto Point_Coarse = vertex[val_marker][iVertex]->GetNode();
+
+      if (!nodes->GetDomain(Point_Coarse)) continue;
+
+      su2double Area_Parent = 0.0;
+
+      /*--- Compute area parent by taking into account only volumes that are on the marker. ---*/
+      for (auto iChildren = 0u; iChildren < nodes->GetnChildren_CV(Point_Coarse); iChildren++) {
+        const auto Point_Fine = nodes->GetChildren_CV(Point_Coarse, iChildren);
+        const auto isVertex = geometry->nodes->GetDomain(Point_Fine) &&
+                             (geometry->nodes->GetVertex(Point_Fine, val_marker) != -1);
+        if (isVertex) {
+          Area_Parent += geometry->nodes->GetVolume(Point_Fine);
+        }
+      }
+
+      su2double Quantity_Coarse = 0.0;
+
+      /*--- Loop again to average coarser value. ---*/
+      for (auto iChildren = 0u; iChildren < nodes->GetnChildren_CV(Point_Coarse); iChildren++) {
+        const auto Point_Fine = nodes->GetChildren_CV(Point_Coarse, iChildren);
+        const auto isVertex = geometry->nodes->GetDomain(Point_Fine) &&
+                             (geometry->nodes->GetVertex(Point_Fine, val_marker) != -1);
+        if (isVertex) {
+          const auto Vertex_Fine = geometry->nodes->GetVertex(Point_Fine, val_marker);
+          const auto Area_Children = geometry->nodes->GetVolume(Point_Fine);
+          Quantity_Coarse += wall_quantity.Get(Vertex_Fine) * Area_Children / Area_Parent;
+        }
+      }
+
+      /*--- Set the value at the coarse level. ---*/
+      wall_quantity.Set(iVertex, Quantity_Coarse);
+    }
+  }
+
 public:
   /*--- This is to suppress Woverloaded-virtual, omitting it has no negative impact. ---*/
   using CGeometry::SetVertex;
@@ -134,14 +179,14 @@ class CMultiGridGeometry final : public CGeometry {
    * \param[in] geometry - Geometrical definition of the problem.
    * \param[in] val_marker - Index of the boundary marker.
    */
-  void SetMultiGridWallHeatFlux(CGeometry *geometry, unsigned short val_marker) override;
+  void SetMultiGridWallHeatFlux(const CGeometry *geometry, unsigned short val_marker) override;
 
   /*!
    * \brief Set a representative wall temperature of the agglomerated control volume on a particular boundary marker.
    * \param[in] geometry - Geometrical definition of the problem.
    * \param[in] val_marker - Index of the boundary marker.
    */
-  void SetMultiGridWallTemperature(CGeometry *geometry, unsigned short val_marker) override;
+  void SetMultiGridWallTemperature(const CGeometry *geometry, unsigned short val_marker) override;
 
   /*!
    * \brief Set the grid velocity at each node in the coarse mesh level based

Common/src/geometry/CMultiGridGeometry.cpp

@@ -1055,96 +1055,42 @@ void CMultiGridGeometry::SetCoord(CGeometry *geometry) {
   END_SU2_OMP_FOR
 }
 
-void CMultiGridGeometry::SetMultiGridWallHeatFlux(CGeometry *geometry, unsigned short val_marker){
+void CMultiGridGeometry::SetMultiGridWallHeatFlux(const CGeometry *geometry, unsigned short val_marker) {
 
-  unsigned long Point_Fine, Point_Coarse, iVertex;
-  unsigned short iChildren;
-  long Vertex_Fine;
-  su2double Area_Parent, Area_Children;
-  su2double WallHeatFlux_Fine, WallHeatFlux_Coarse;
-  bool isVertex;
-  int numberVertexChildren;
-
-  for(iVertex=0; iVertex < nVertex[val_marker]; iVertex++){
-    Point_Coarse = vertex[val_marker][iVertex]->GetNode();
-    if (nodes->GetDomain(Point_Coarse)){
-      Area_Parent = 0.0;
-      WallHeatFlux_Coarse = 0.0;
-      numberVertexChildren = 0;
-      /*--- Compute area parent by taking into account only volumes that are on the marker ---*/
-      for(iChildren=0; iChildren < nodes->GetnChildren_CV(Point_Coarse); iChildren++){
-        Point_Fine = nodes->GetChildren_CV(Point_Coarse, iChildren);
-        isVertex = (nodes->GetDomain(Point_Fine) && geometry->nodes->GetVertex(Point_Fine, val_marker) != -1);
-        if (isVertex){
-          numberVertexChildren += 1;
-          Area_Parent += geometry->nodes->GetVolume(Point_Fine);
-        }
-      }
+  struct {
+    const CGeometry* fine_grid;
+    unsigned short marker;
+    su2double* target;
 
-      /*--- Loop again and propagate values to the coarser level ---*/
-      for(iChildren=0; iChildren < nodes->GetnChildren_CV(Point_Coarse); iChildren++){
-        Point_Fine = nodes->GetChildren_CV(Point_Coarse, iChildren);
-        Vertex_Fine = geometry->nodes->GetVertex(Point_Fine, val_marker);
-        isVertex = (nodes->GetDomain(Point_Fine) && Vertex_Fine != -1);
-        if(isVertex){
-          Area_Children = geometry->nodes->GetVolume(Point_Fine);
-          //Get the customized BC values on fine level and compute the values at coarse level
-          WallHeatFlux_Fine = geometry->GetCustomBoundaryHeatFlux(val_marker, Vertex_Fine);
-          WallHeatFlux_Coarse += WallHeatFlux_Fine*Area_Children/Area_Parent;
-        }
+    su2double Get(unsigned long iVertex) { return fine_grid->GetCustomBoundaryHeatFlux(marker, iVertex); }
+    void Set(unsigned long iVertex, const su2double& val) { target[iVertex] = val; }
 
-      }
-      //Set the customized BC values at coarse level
-      CustomBoundaryHeatFlux[val_marker][iVertex] = WallHeatFlux_Coarse;
-    }
-  }
+  } wall_heat_flux;
+
+  wall_heat_flux.fine_grid = geometry;
+  wall_heat_flux.marker = val_marker;
+  wall_heat_flux.target = CustomBoundaryHeatFlux[val_marker];
 
+  SetMultiGridWallQuantity(geometry, val_marker, wall_heat_flux);
 }
 
-void CMultiGridGeometry::SetMultiGridWallTemperature(CGeometry *geometry, unsigned short val_marker){
+void CMultiGridGeometry::SetMultiGridWallTemperature(const CGeometry *geometry, unsigned short val_marker){
 
-  unsigned long Point_Fine, Point_Coarse, iVertex;
-  unsigned short iChildren;
-  long Vertex_Fine;
-  su2double Area_Parent, Area_Children;
-  su2double WallTemperature_Fine, WallTemperature_Coarse;
-  bool isVertex;
-  int numberVertexChildren;
-
-  for(iVertex=0; iVertex < nVertex[val_marker]; iVertex++){
-    Point_Coarse = vertex[val_marker][iVertex]->GetNode();
-    if (nodes->GetDomain(Point_Coarse)){
-      Area_Parent = 0.0;
-      WallTemperature_Coarse = 0.0;
-      numberVertexChildren = 0;
-      /*--- Compute area parent by taking into account only volumes that are on the marker ---*/
-      for(iChildren=0; iChildren < nodes->GetnChildren_CV(Point_Coarse); iChildren++){
-        Point_Fine = nodes->GetChildren_CV(Point_Coarse, iChildren);
-        isVertex = (nodes->GetDomain(Point_Fine) && geometry->nodes->GetVertex(Point_Fine, val_marker) != -1);
-        if (isVertex){
-          numberVertexChildren += 1;
-          Area_Parent += geometry->nodes->GetVolume(Point_Fine);
-        }
-      }
+  struct {
+    const CGeometry* fine_grid;
+    unsigned short marker;
+    su2double* target;
 
-      /*--- Loop again and propagate values to the coarser level ---*/
-      for(iChildren=0; iChildren < nodes->GetnChildren_CV(Point_Coarse); iChildren++){
-        Point_Fine = nodes->GetChildren_CV(Point_Coarse, iChildren);
-        Vertex_Fine = geometry->nodes->GetVertex(Point_Fine, val_marker);
-        isVertex = (nodes->GetDomain(Point_Fine) && Vertex_Fine != -1);
-        if(isVertex){
-          Area_Children = geometry->nodes->GetVolume(Point_Fine);
-          //Get the customized BC values on fine level and compute the values at coarse level
-          WallTemperature_Fine = geometry->GetCustomBoundaryTemperature(val_marker, Vertex_Fine);
-          WallTemperature_Coarse += WallTemperature_Fine*Area_Children/Area_Parent;
-        }
+    su2double Get(unsigned long iVertex) { return fine_grid->GetCustomBoundaryTemperature(marker, iVertex); }
+    void Set(unsigned long iVertex, const su2double& val) { target[iVertex] = val; }
 
-      }
-      //Set the customized BC values at coarse level
-      CustomBoundaryTemperature[val_marker][iVertex] = WallTemperature_Coarse;
-    }
-  }
+  } wall_temperature;
+
+  wall_temperature.fine_grid = geometry;
+  wall_temperature.marker = val_marker;
+  wall_temperature.target = CustomBoundaryTemperature[val_marker];
 
+  SetMultiGridWallQuantity(geometry, val_marker, wall_temperature);
 }
 
 void CMultiGridGeometry::SetRestricted_GridVelocity(CGeometry *fine_mesh, const CConfig *config) {