Fixing Schmidt diffusivity model and adding option of Constant Lewis number (#1787)

* fixing CConstantSchmidt diffusivity

* adding option Different lewis numbers

* merging different and unity lewis options

* spelling fix

Author: Cristopher-Morales

Common/include/CConfig.hpp

@@ -832,11 +832,13 @@ class CConfig {
   nMu_S,                         /*!< \brief Number of species reference S for Sutherland model. */
   nThermal_Conductivity_Constant,/*!< \brief Number of species constant thermal conductivity. */
   nPrandtl_Lam,                  /*!< \brief Number of species laminar Prandtl number. */
-  nPrandtl_Turb;                 /*!< \brief Number of species turbulent Prandtl number. */
+  nPrandtl_Turb,                 /*!< \brief Number of species turbulent Prandtl number. */
+  nConstant_Lewis_Number;       /*!< \brief Number of species Lewis Number. */
   su2double Diffusivity_Constant;   /*!< \brief Constant mass diffusivity for scalar transport.  */
   su2double Diffusivity_ConstantND; /*!< \brief Non-dim. constant mass diffusivity for scalar transport.  */
   su2double Schmidt_Number_Laminar;   /*!< \brief Laminar Schmidt number for mass diffusion.  */
   su2double Schmidt_Number_Turbulent; /*!< \brief Turbulent Schmidt number for mass diffusion.  */
+  su2double *Constant_Lewis_Number;   /*!< \brief Different Lewis number for mass diffusion.  */
   array<su2double, N_POLY_COEFFS> CpPolyCoefficientsND{{0.0}};  /*!< \brief Definition of the non-dimensional temperature polynomial coefficients for specific heat Cp. */
   array<su2double, N_POLY_COEFFS> MuPolyCoefficientsND{{0.0}};  /*!< \brief Definition of the non-dimensional temperature polynomial coefficients for viscosity. */
   array<su2double, N_POLY_COEFFS> KtPolyCoefficientsND{{0.0}};  /*!< \brief Definition of the non-dimensional temperature polynomial coefficients for thermal conductivity. */
@@ -3851,6 +3853,12 @@ class CConfig {
    */
   su2double GetSchmidt_Number_Turbulent(void) const { return Schmidt_Number_Turbulent; }
 
+  /*!
+   * \brief Get the value of the Lewis number for each species.
+   * \return Lewis Number.
+   */
+  su2double GetConstant_Lewis_Number(unsigned short val_index = 0) const { return Constant_Lewis_Number[val_index]; }
+
   /*!
    * \brief Get the value of the reference viscosity for Sutherland model.
    * \return The reference viscosity.

Common/include/option_structure.hpp

@@ -721,13 +721,15 @@ static const MapType<std::string, CONDUCTIVITYMODEL_TURB> TurbConductivityModel_
 enum class DIFFUSIVITYMODEL {
   CONSTANT_DIFFUSIVITY, /*!< \brief Constant mass diffusivity for scalar transport. */
   CONSTANT_SCHMIDT,     /*!< \brief Constant Schmidt number for mass diffusion in scalar transport. */
-  UNITY_LEWIS,          /*!< \brief Unity Lewis model */
+  UNITY_LEWIS,          /*!< \brief Unity Lewis model for mass diffusion in scalar transport. */
+  CONSTANT_LEWIS,      /*!< \brief Different Lewis number model for mass diffusion in scalar transport. */
 };
 
 static const MapType<std::string, DIFFUSIVITYMODEL> Diffusivity_Model_Map = {
   MakePair("CONSTANT_DIFFUSIVITY", DIFFUSIVITYMODEL::CONSTANT_DIFFUSIVITY)
   MakePair("CONSTANT_SCHMIDT", DIFFUSIVITYMODEL::CONSTANT_SCHMIDT)
   MakePair("UNITY_LEWIS", DIFFUSIVITYMODEL::UNITY_LEWIS)
+  MakePair("CONSTANT_LEWIS", DIFFUSIVITYMODEL::CONSTANT_LEWIS)
 };
 
 /*!

Common/src/CConfig.cpp

@@ -1334,6 +1334,8 @@ void CConfig::SetConfig_Options() {
   addDoubleOption("SCHMIDT_NUMBER_LAMINAR", Schmidt_Number_Laminar, 1.0);
   /*!\brief SCHMIDT_TURB \n DESCRIPTION: Turbulent Schmidt number of mass diffusion \n DEFAULT 0.70 (more or less experimental value) \ingroup Config*/
   addDoubleOption("SCHMIDT_NUMBER_TURBULENT", Schmidt_Number_Turbulent, 0.7);
+  /*!\brief DESCRIPTION: Constant Lewis number for mass diffusion */
+  addDoubleListOption("CONSTANT_LEWIS_NUMBER", nConstant_Lewis_Number, Constant_Lewis_Number);
 
   vel_inf[0] = 1.0; vel_inf[1] = 0.0; vel_inf[2] = 0.0;
   /*!\brief FREESTREAM_VELOCITY\n DESCRIPTION: Free-stream velocity (m/s) */
@@ -3756,6 +3758,7 @@ void CConfig::SetPostprocessing(SU2_COMPONENT val_software, unsigned short val_i
   const su2double Thermal_Conductivity_Constant_Default = (SystemMeasurements == SI) ? 2.57E-2 : (2.57E-2 * 0.577789317);
   const su2double Prandtl_Lam_Default = 0.72;
   const su2double Prandtl_Turb_Default = 0.9;
+  const su2double Lewis_Number_Default = 1.0;
 
   auto SetDefaultIfEmpty = [](su2double*& array, unsigned short& size, const su2double& default_val) {
     if (array == nullptr) {
@@ -3777,6 +3780,7 @@ void CConfig::SetPostprocessing(SU2_COMPONENT val_software, unsigned short val_i
                     Thermal_Conductivity_Constant_Default);
   SetDefaultIfEmpty(Prandtl_Lam, nPrandtl_Lam, Prandtl_Lam_Default);
   SetDefaultIfEmpty(Prandtl_Turb, nPrandtl_Turb, Prandtl_Turb_Default);
+  SetDefaultIfEmpty(Constant_Lewis_Number, nConstant_Lewis_Number, Lewis_Number_Default);
 
   /*--- Check whether inputs for FLUID_MIXTURE are correctly specified. ---*/
 
@@ -5368,6 +5372,15 @@ void CConfig::SetPostprocessing(SU2_COMPONENT val_software, unsigned short val_i
         !(OptionIsSet("DIFFUSIVITY_CONSTANT")))
       SU2_MPI::Error("A DIFFUSIVITY_CONSTANT=<value> has to be set with DIFFUSIVITY_MODEL= CONSTANT_DIFFUSIVITY.", CURRENT_FUNCTION);
 
+    /*--- Check whether the number of entries of the constant Lewis number equals the number of transported scalar
+       equations solved. nConstant_Lewis_Number is used because it is required for the diffusivity fluid mixing
+       models--- */
+    if (Kind_Diffusivity_Model == DIFFUSIVITYMODEL::CONSTANT_LEWIS && nConstant_Lewis_Number != nSpecies_Init)
+      SU2_MPI::Error(
+          "The use of CONSTANT_LEWIS requires the number of entries for CONSTANT_LEWIS_NUMBER ,\n"
+          "to be equal to the number of entries of SPECIES_INIT",
+          CURRENT_FUNCTION);
+
     // Helper function that checks scalar variable bounds,
     auto checkScalarBounds = [&](su2double scalar, string name, su2double lowerBound, su2double upperBound) {
       if (scalar < lowerBound || scalar > upperBound)

…include/fluid/CUnityLewisDiffusivity.hpp …lude/fluid/CConstantLewisDiffusivity.hppSU2_CFD/include/fluid/CUnityLewisDiffusivity.hpp renamed to SU2_CFD/include/fluid/CConstantLewisDiffusivity.hpp SU2_CFD/include/fluid/CUnityLewisDiffusivity.hpp renamed to SU2_CFD/include/fluid/CConstantLewisDiffusivity.hpp

@@ -1,7 +1,7 @@
 /*!
- * \file CUnityLewisDiffusivity.hpp
- * \brief Defines unity Lewis mass diffusivity.
- * \author M.Heimgartner
+ * \file CConstantLewisDiffusivity.hpp
+ * \brief Defines Constant Lewis mass diffusivity.
+ * \author M.Heimgartner, C.Morales
  * \version 7.4.0 "Blackbird"
  *
  * SU2 Project Website: https://su2code.github.io
@@ -30,20 +30,25 @@
 #include "CDiffusivityModel.hpp"
 
 /*!
- * \class CUnityLewisDiffusivity
- * \brief Defines a unity Lewis mass diffusivity model for species equations.
- * \author M.Heimgartner
+ * \class CConstantLewisDiffusivity
+ * \brief Defines a Constant Lewis mass diffusivity model for species equations.
+ * \author M.Heimgartner, C.Morales
  */
-class CUnityLewisDiffusivity final : public CDiffusivityModel {
+class CConstantLewisDiffusivity final : public CDiffusivityModel {
  public:
+  /*!
+   * \brief Constructor of the class.
+   */
+  CConstantLewisDiffusivity(su2double Lewis) : Lewis_(Lewis) {}
+
   /*!
    * \brief Set diffusivity.
    */
   void SetDiffusivity(su2double T, su2double rho, su2double mu_lam, su2double mu_turb, su2double cp,
                       su2double kt) override {
-    diff_ = kt / (Lewis * rho * cp);
+    diff_ = kt / (Lewis_ * rho * cp);
   }
 
  private:
-  const su2double Lewis{1.0};
+  const su2double Lewis_{1.0};
 };

SU2_CFD/include/fluid/CConstantSchmidtRANS.hpp

@@ -35,14 +35,13 @@
 #include "../../include/fluid/CConstantPrandtl.hpp"
 #include "../../include/fluid/CConstantPrandtlRANS.hpp"
 #include "../../include/fluid/CConstantSchmidt.hpp"
-#include "../../include/fluid/CConstantSchmidtRANS.hpp"
 #include "../../include/fluid/CConstantViscosity.hpp"
 #include "../../include/fluid/CFluidScalar.hpp"
 #include "../../include/fluid/CPolynomialConductivity.hpp"
 #include "../../include/fluid/CPolynomialConductivityRANS.hpp"
 #include "../../include/fluid/CPolynomialViscosity.hpp"
 #include "../../include/fluid/CSutherland.hpp"
-#include "../../include/fluid/CUnityLewisDiffusivity.hpp"
+#include "../../include/fluid/CConstantLewisDiffusivity.hpp"
 
 unique_ptr<CViscosityModel> CFluidModel::MakeLaminarViscosityModel(const CConfig* config, unsigned short iSpecies) {
   switch (config->GetKind_ViscosityModel()) {
@@ -112,15 +111,14 @@ unique_ptr<CDiffusivityModel> CFluidModel::MakeMassDiffusivityModel(const CConfi
       return unique_ptr<CConstantDiffusivity>(new CConstantDiffusivity(config->GetDiffusivity_ConstantND()));
       break;
     case DIFFUSIVITYMODEL::CONSTANT_SCHMIDT:
-      if ((config->GetKind_Solver() == MAIN_SOLVER::RANS) || (config->GetKind_Solver() == MAIN_SOLVER::DISC_ADJ_RANS)) {
-        return unique_ptr<CConstantSchmidtRANS>(
-            new CConstantSchmidtRANS(config->GetSchmidt_Number_Laminar(), config->GetSchmidt_Number_Turbulent()));
-      } else {
-        return unique_ptr<CConstantSchmidt>(new CConstantSchmidt(config->GetSchmidt_Number_Laminar()));
-      }
+      return unique_ptr<CConstantSchmidt>(new CConstantSchmidt(config->GetSchmidt_Number_Laminar()));
       break;
     case DIFFUSIVITYMODEL::UNITY_LEWIS:
-      return unique_ptr<CUnityLewisDiffusivity>(new CUnityLewisDiffusivity());
+      return unique_ptr<CConstantLewisDiffusivity>(new CConstantLewisDiffusivity(1.0));
+      break;
+    case DIFFUSIVITYMODEL::CONSTANT_LEWIS:
+      return unique_ptr<CConstantLewisDiffusivity>(
+          new CConstantLewisDiffusivity(config->GetConstant_Lewis_Number(iSpecies)));
       break;
     default:
       SU2_MPI::Error("Diffusivity model not available.", CURRENT_FUNCTION);