implement review changes

Author: bigfooted

Common/include/CConfig.hpp

@@ -297,7 +297,7 @@ class CConfig {
   su2double **Inlet_Velocity;                /*!< \brief Specified flow velocity vectors for supersonic inlet boundaries. */
   su2double **Inlet_SpeciesVal;              /*!< \brief Specified species vector for inlet boundaries. */
   su2double **Inlet_TurbVal;                 /*!< \brief Specified turbulent intensity and viscosity ratio for inlet boundaries. */
-  unsigned short **Kind_Wall_Species;        /*!< \brief Species boundary condition type for wall boundaries (FLUX or VALUE) per species. */
+  WALL_SPECIES_TYPE **Kind_Wall_Species;        /*!< \brief Species boundary condition type for wall boundaries (FLUX or VALUE) per species. */
   su2double **Wall_SpeciesVal;               /*!< \brief Specified species flux or value for wall boundaries per species. */
   su2double *EngineInflow_Target;            /*!< \brief Specified fan face targets for nacelle boundaries. */
   su2double *Inflow_Mach;                    /*!< \brief Specified fan face mach for nacelle boundaries. */
@@ -1399,7 +1399,7 @@ class CConfig {
 
   template <class Tenum>
   void addWallSpeciesOption(const string name, unsigned short & nMarker_Wall_Species, string * & Marker_Wall_Species,
-                            unsigned short** & option_field, const map<string, Tenum> & enum_map,
+                            WALL_SPECIES_TYPE** & option_field, const map<string, Tenum> & enum_map,
                             su2double** & value, unsigned short & nSpecies_per_Wall);
 
   void addExhaustOption(const string& name, unsigned short & nMarker_Exhaust, string * & Marker_Exhaust,

Common/include/option_structure.hpp

@@ -1839,12 +1839,12 @@ static const MapType<std::string, RIEMANN_TYPE> Giles_Map = {
  * \brief Types of wall species boundary conditions.
  */
 enum class WALL_SPECIES_TYPE {
-  WALL_SPECIES_FLUX = 1,   /*!< \brief Neumann flux boundary condition for wall species. */
-  WALL_SPECIES_VALUE = 2   /*!< \brief Dirichlet value boundary condition for wall species. */
+  WALL_SPECIES_FLUX,   /*!< \brief Neumann flux boundary condition for wall species. */
+  WALL_SPECIES_VALUE   /*!< \brief Dirichlet value boundary condition for wall species. */
 };
 static const MapType<std::string, WALL_SPECIES_TYPE> Wall_Map = {
-  MakePair("FLUX", WALL_SPECIES_FLUX)
-  MakePair("VALUE", WALL_SPECIES_VALUE)
+  MakePair("FLUX", WALL_SPECIES_TYPE::WALL_SPECIES_FLUX)
+  MakePair("VALUE", WALL_SPECIES_TYPE::WALL_SPECIES_VALUE)
 };
 
 /*!

Common/include/option_structure.inl

@@ -1309,13 +1309,13 @@ class COptionWallSpecies : public COptionBase {
   string name;  // identifier for the option
   unsigned short& size;
   string*& marker;
-  unsigned short**& field;  // Reference to the field name (now 2D: marker x species)
+  WALL_SPECIES_TYPE**& field;  // Reference to the field name (now 2D: marker x species)
   su2double**& value;       // Now 2D: marker x species
   unsigned short& nSpecies_per_Wall;
 
  public:
   COptionWallSpecies(string option_field_name, unsigned short& nMarker_Wall_Species, string*& Marker_Wall_Species,
-                     unsigned short**& option_field, const map<string, Tenum> m, su2double**& value,
+                     WALL_SPECIES_TYPE**& option_field, const map<string, Tenum> m, su2double**& value,
                      unsigned short& nSpecies_per_Wall)
       : size(nMarker_Wall_Species),
         marker(Marker_Wall_Species),
@@ -1416,11 +1416,11 @@ class COptionWallSpecies : public COptionBase {
     // Allocate arrays
     this->size = marker_indices.size();
     this->marker = new string[this->size];
-    this->field = new unsigned short*[this->size];
+    this->field = new WALL_SPECIES_TYPE*[this->size];
     this->value = new su2double*[this->size];
 
     for (unsigned short i = 0; i < this->size; i++) {
-      this->field[i] = new unsigned short[this->nSpecies_per_Wall];
+      this->field[i] = new WALL_SPECIES_TYPE[this->nSpecies_per_Wall];
       this->value[i] = new su2double[this->nSpecies_per_Wall];
     }
 

Common/src/CConfig.cpp

@@ -515,7 +515,7 @@ void CConfig::addRiemannOption(const string name, unsigned short & nMarker_Riema
 
 template <class Tenum>
 void CConfig::addWallSpeciesOption(const string name, unsigned short & nMarker_Wall_Species, string * & Marker_Wall_Species,
-                                   unsigned short** & option_field, const map<string, Tenum> & enum_map,
+                                   WALL_SPECIES_TYPE** & option_field, const map<string, Tenum> & enum_map,
                                    su2double** & value, unsigned short & nSpecies_per_Wall) {
   assert(option_map.find(name) == option_map.end());
   all_options.insert(pair<string, bool>(name, true));

SU2_CFD/include/solvers/CSpeciesSolver.hpp

@@ -157,8 +157,9 @@ class CSpeciesSolver : public CScalarSolver<CSpeciesVariable> {
    * \param[in] config - Definition of the particular problem.
    * \param[in] val_marker - Surface marker where the boundary condition is applied.
    */
-  void BC_Isothermal_Wall(CGeometry* geometry, CSolver** solver_container, CNumerics* conv_numerics,
-                          CNumerics* visc_numerics, CConfig* config, unsigned short val_marker) override;
+  void BC_Isothermal_Wall(CGeometry* geometry, CSolver** solver_container,
+                          CNumerics* conv_numerics, CNumerics* visc_numerics,
+                          CConfig* config, unsigned short val_marker) override;
 
   /*!
    * \brief Impose the heat flux Neumann wall boundary condition (flux).
@@ -169,21 +170,19 @@ class CSpeciesSolver : public CScalarSolver<CSpeciesVariable> {
    * \param[in] config - Definition of the particular problem.
    * \param[in] val_marker - Surface marker where the boundary condition is applied.
    */
-  void BC_HeatFlux_Wall(CGeometry* geometry, CSolver** solver_container, CNumerics* conv_numerics,
-                        CNumerics* visc_numerics, CConfig* config, unsigned short val_marker) override;
+  void BC_HeatFlux_Wall(CGeometry* geometry, CSolver** solver_container,
+                        CNumerics* conv_numerics, CNumerics* visc_numerics,
+                        CConfig* config, unsigned short val_marker) override;
 
   /*!
    * \brief Generic wall boundary condition implementation.
    * \param[in] geometry - Geometrical definition of the problem.
    * \param[in] solver_container - Container vector with all the solutions.
-   * \param[in] conv_numerics - Description of the numerical method.
-   * \param[in] visc_numerics - Description of the numerical method.
    * \param[in] config - Definition of the particular problem.
    * \param[in] val_marker - Surface marker where the boundary condition is applied.
-   * \param[in] cht_mode - Flag for conjugate heat transfer mode (default: false).
    */
-  void BC_Wall_Generic(CGeometry* geometry, CSolver** solver_container, CNumerics* conv_numerics,
-                       CNumerics* visc_numerics, CConfig* config, unsigned short val_marker, bool cht_mode = false);
+  void BC_Wall_Generic(CGeometry* geometry, CSolver** solver_container,
+                       CConfig* config, unsigned short val_marker);
 
   /*--- Note that BC_Sym_Plane, BC_HeatFlux_Wall, BC_Isothermal_Wall are all treated as zero-flux BC for the
    * mass-factions, which can be fulfilled by no additional residual contribution on these nodes.

SU2_CFD/src/solvers/CSpeciesSolver.cpp

@@ -420,15 +420,15 @@ void CSpeciesSolver::BC_Inlet(CGeometry* geometry, CSolver** solver_container, C
 
 
 void CSpeciesSolver::BC_Isothermal_Wall(CGeometry* geometry, CSolver** solver_container,
-                                                CNumerics* conv_numerics, CNumerics* visc_numerics, CConfig* config,
-                                                unsigned short val_marker) {
-  BC_Wall_Generic(geometry, solver_container, conv_numerics, visc_numerics, config, val_marker);
+                                                CNumerics* conv_numerics, CNumerics* visc_numerics,
+                                                CConfig* config, unsigned short val_marker) {
+  BC_Wall_Generic(geometry, solver_container, config, val_marker);
 }
 
 void CSpeciesSolver::BC_HeatFlux_Wall(CGeometry* geometry, CSolver** solver_container,
-                                                CNumerics* conv_numerics, CNumerics* visc_numerics, CConfig* config,
-                                                unsigned short val_marker) {
-  BC_Wall_Generic(geometry, solver_container, conv_numerics, visc_numerics, config, val_marker, false);
+                                                CNumerics* conv_numerics, CNumerics* visc_numerics,
+                                                CConfig* config, unsigned short val_marker) {
+  BC_Wall_Generic(geometry, solver_container, config, val_marker);
 }
 
 void CSpeciesSolver::BC_Wall_Generic(CGeometry* geometry, CSolver** solver_container,
@@ -438,48 +438,49 @@ void CSpeciesSolver::BC_Wall_Generic(CGeometry* geometry, CSolver** solver_conta
 
   string Marker_Tag = config->GetMarker_All_TagBound(val_marker);
 
-  SU2_OMP_FOR_DYN(OMP_MIN_SIZE)
-  for (auto iVertex = 0u; iVertex < geometry->nVertex[val_marker]; iVertex++) {
+  for (auto iVar = 0u; iVar < nVar; iVar++) {
 
-    const auto iPoint = geometry->vertex[val_marker][iVertex]->GetNode();
+    // Get wall species boundary condition type and value for this marker and species
+    const su2double WallSpeciesValue = config->GetWall_SpeciesVal(Marker_Tag, iVar);
+    const WALL_SPECIES_TYPE wallspeciestype = config->GetWall_SpeciesType(Marker_Tag, iVar);
 
-    if (!geometry->nodes->GetDomain(iPoint)) continue;
+    SU2_OMP_FOR_DYN(OMP_MIN_SIZE)
+    for (auto iVertex = 0u; iVertex < geometry->nVertex[val_marker]; iVertex++) {
 
-    const auto Normal = geometry->vertex[val_marker][iVertex]->GetNormal();
+      const auto iPoint = geometry->vertex[val_marker][iVertex]->GetNode();
 
-    su2double Area = GeometryToolbox::Norm(nDim, Normal);
+      if (!geometry->nodes->GetDomain(iPoint)) continue;
 
-    for (auto iVar = 0u; iVar < nVar; iVar++) {
+      const auto Normal = geometry->vertex[val_marker][iVertex]->GetNormal();
 
-      // Get wall species boundary condition type and value for this marker and species
-      su2double WallSpeciesValue = config->GetWall_SpeciesVal(Marker_Tag, iVar);
-      unsigned short wallspeciestype = config->GetWall_SpeciesType(Marker_Tag, iVar);
+      su2double Area = GeometryToolbox::Norm(nDim, Normal);
 
       su2double WallSpecies = WallSpeciesValue;
 
       /*--- Get the scalar values from the python wrapper. ---*/
       if (py_custom) {
-        WallSpecies = GetCustomBoundaryScalar(val_marker, iVertex, iVar);
+        WallSpecies = CustomBoundaryScalar[val_marker](iVertex,iVar);
       }
 
-    switch(wallspeciestype) {
-      case WALL_SPECIES_TYPE::WALL_SPECIES_FLUX:
-        //Flux Boundary condition
-        LinSysRes(iPoint, iVar) -= WallSpecies * Area;
-      break;
-      case WALL_SPECIES_TYPE::WALL_SPECIES_VALUE:
-        //Dirichlet Strong Boundary Condition
-        nodes->SetSolution(iPoint, iVar, WallSpecies);
-        nodes->SetSolution_Old(iPoint, iVar, WallSpecies);
-        LinSysRes(iPoint, iVar) = 0.0;
-        if (implicit) {
-          unsigned long total_index = iPoint * nVar + iVar;
-          Jacobian.DeleteValsRowi(total_index);
-        }
-      break;
+      switch(wallspeciestype) {
+        case WALL_SPECIES_TYPE::WALL_SPECIES_FLUX:
+          //Flux Boundary condition
+          LinSysRes(iPoint, iVar) -= WallSpecies * Area;
+        break;
+        case WALL_SPECIES_TYPE::WALL_SPECIES_VALUE:
+          //Dirichlet Strong Boundary Condition
+          nodes->SetSolution(iPoint, iVar, WallSpecies);
+          nodes->SetSolution_Old(iPoint, iVar, WallSpecies);
+          LinSysRes(iPoint, iVar) = 0.0;
+          if (implicit) {
+            unsigned long total_index = iPoint * nVar + iVar;
+            Jacobian.DeleteValsRowi(total_index);
+          }
+        break;
+      }
     }
+    END_SU2_OMP_FOR
   }
-  END_SU2_OMP_FOR
 }