consolidate cat wall check

Author: WallyMaier

Common/include/CConfig.hpp

@@ -6230,6 +6230,13 @@ class CConfig {
    */
   bool GetViscous_Wall(unsigned short iMarker) const;
 
+  /*!
+   * \brief Determines whether a marker with index iMarker is a catalytic boundary.
+   * \param iMarker
+   * \return <TRUE> it marker with index iMarker is a catalytic boundary.
+   */
+  bool GetCatalytic_Wall(unsigned short iMarker) const;
+
   /*!
    * \brief Determines if problem is adjoint.
    * \return true if Adjoint.

Common/src/CConfig.cpp

@@ -7801,6 +7801,16 @@ bool CConfig::GetViscous_Wall(unsigned short iMarker) const {
           Marker_All_KindBC[iMarker] == CHT_WALL_INTERFACE);
 }
 
+bool CConfig::GetCatalytic_Wall(unsigned short iMarker) const {
+
+  for (unsigned short iMarker_Catalytic = 0; iMarker_Catalytic < nWall_Catalytic; iMarker_Catalytic++){
+
+    string Catalytic_Tag = Wall_Catalytic[iMarker_Catalytic];
+
+    return (Catalytic_Tag == Marker_All_TagBound[iMarker]);
+  }
+}
+
 bool CConfig::GetSolid_Wall(unsigned short iMarker) const {
 
   return GetViscous_Wall(iMarker) ||

SU2_CFD/include/solvers/CFVMFlowSolverBase.inl

@@ -2613,44 +2613,30 @@ void CFVMFlowSolverBase<V, FlowRegime>::Friction_Forces(const CGeometry* geometr
         const auto& thermal_conductivity_tr = nodes->GetThermalConductivity(iPoint);
         const auto& thermal_conductivity_ve = nodes->GetThermalConductivity_ve(iPoint);
 
-	const su2double dTvedn = -GeometryToolbox::DotProduct(nDim, Grad_Temp_ve, UnitNormal);
+        const su2double dTvedn = -GeometryToolbox::DotProduct(nDim, Grad_Temp_ve, UnitNormal);
 
-        /*--- Surface energy balance: trans-rot heat flux, vib-el heat flux ---*/ 
+        /*--- Surface energy balance: trans-rot heat flux, vib-el heat flux ---*/
         HeatFlux[iMarker][iVertex] = -(thermal_conductivity_tr*dTdn + thermal_conductivity_ve*dTvedn);
 
-        //TODO: CHECK ME
-        bool catalytic = false;
-        unsigned short iMarker_Catalytic = 0;
-        while( iMarker_Catalytic < config->GetnWall_Catalytic()){
-
-          string Catalytic_Tag = config->GetWall_Catalytic_TagBound(iMarker_Catalytic);
-
-          if (Marker_Tag == Catalytic_Tag){
-            catalytic = true;
-            break;
-          } else {
-            iMarker_Catalytic++;
-          }
-        }
-
+        /*--- Compute enthalpy transport to surface due to mass diffusion ---*/
+        bool catalytic = config->GetCatalytic_Wall(iMarker);
         if (catalytic){
 
           const auto nSpecies = config->GetnSpecies();
-      	  const auto& Grad_PrimVar = nodes->GetGradient_Primitive(iPoint);
-	  const auto& PrimVar = nodes->GetPrimitive(iPoint);
+          const auto& Grad_PrimVar = nodes->GetGradient_Primitive(iPoint);
+          const auto& PrimVar = nodes->GetPrimitive(iPoint);
           const auto& Ds = nodes->GetDiffusionCoeff(iPoint);
           const auto& hs = nodes->GetEnthalpys(iPoint);
           const su2double rho = PrimVar[prim_idx.Density()];
 
-          /*--- Compute enthalpy transport to surface due to mass diffusion ---*/ 
           su2double sumJhs = 0.0;
           for (auto iSpecies = 0u; iSpecies < nSpecies; iSpecies++) {
             for (auto iDim = 0u; iDim < nDim; iDim++) {
               su2double dYdn = 1.0/rho*(Grad_PrimVar[iSpecies][iDim] - PrimVar[iSpecies]*Grad_PrimVar[prim_idx.Density()][iDim]/rho);
               sumJhs += rho*Ds[iSpecies]*hs[iSpecies]*dYdn*UnitNormal[iDim];
             }
           }
-          /*--- Surface energy balance: mass diffusion ---*/ 
+          /*--- Surface energy balance: mass diffusion ---*/
           HeatFlux[iMarker][iVertex] += sumJhs;
 
         }

SU2_CFD/src/solvers/CNEMONSSolver.cpp

@@ -331,32 +331,14 @@ void CNEMONSSolver::BC_HeatFlux_Wall(CGeometry *geometry,
                                      CConfig *config,
                                      unsigned short val_marker) {
 
-  bool catalytic = false;
-  unsigned short iMarker_Catalytic = 0;
-
-  const auto Marker_Tag = config->GetMarker_All_TagBound(val_marker);
-
-  while( iMarker_Catalytic < config->GetnWall_Catalytic()){
-
-    string Catalytic_Tag = config->GetWall_Catalytic_TagBound(iMarker_Catalytic);
+  bool catalytic = config->GetCatalytic_Wall(val_marker);
 
-    if (Marker_Tag == Catalytic_Tag){
+  if (catalytic) { BC_HeatFluxCatalytic_Wall(geometry, solver_container, conv_numerics,
+                                             sour_numerics, config, val_marker);
 
-      catalytic = true;
-      BC_HeatFluxCatalytic_Wall(geometry, solver_container, conv_numerics,
-                                sour_numerics, config, val_marker);
-      break;
-
-    } else {
-
-      iMarker_Catalytic++;
-
-    }
+  } else { BC_HeatFluxNonCatalytic_Wall(geometry, solver_container, conv_numerics,
+                                        sour_numerics, config, val_marker);
   }
-
-  if(!catalytic) BC_HeatFluxNonCatalytic_Wall(geometry, solver_container, conv_numerics,
-                                              sour_numerics, config, val_marker);
-
 }
 
 void CNEMONSSolver::BC_HeatFluxCatalytic_Wall(CGeometry *geometry,
@@ -532,28 +514,14 @@ void CNEMONSSolver::BC_Isothermal_Wall(CGeometry *geometry, CSolver **solver_con
                                        CNumerics *conv_numerics, CNumerics *sour_numerics,
                                        CConfig *config, unsigned short val_marker) {
 
-  bool catalytic = false;
-  unsigned short iMarker_Catalytic = 0;
-
-  const auto Marker_Tag = config->GetMarker_All_TagBound(val_marker);
-
-  while( iMarker_Catalytic < config->GetnWall_Catalytic()){
-
-    string Catalytic_Tag = config->GetWall_Catalytic_TagBound(iMarker_Catalytic);
+  bool catalytic = config->GetCatalytic_Wall(val_marker);
 
-    if (Marker_Tag == Catalytic_Tag){
+  if (catalytic) { BC_IsothermalCatalytic_Wall(geometry, solver_container, conv_numerics,
+                                             sour_numerics, config, val_marker);
 
-      catalytic = true;
-      BC_IsothermalCatalytic_Wall(geometry, solver_container, conv_numerics,
-                                  sour_numerics, config, val_marker);
-      break;
-    } else {
-      iMarker_Catalytic++;
-    }
+  } else { BC_IsothermalNonCatalytic_Wall(geometry, solver_container, conv_numerics,
+                                          sour_numerics, config, val_marker);
   }
-
-  if(!catalytic) BC_IsothermalNonCatalytic_Wall(geometry, solver_container, conv_numerics,
-                                                sour_numerics, config, val_marker);
 }
 
 void CNEMONSSolver::BC_IsothermalNonCatalytic_Wall(CGeometry *geometry,