Feature nemo turb v2

.gitignore

@@ -54,7 +54,7 @@ externals/autotools/include
 externals/autotools/share
 externals/autotools/lib
 externals/tecio/boost
-
+subprojects/
 #logs and errors
 *.log
 *.err

Common/include/CConfig.hpp

@@ -879,6 +879,7 @@ class CConfig {
   array<su2double, N_POLY_COEFFS> KtPolyCoefficientsND{{0.0}};  /*!< \brief Definition of the non-dimensional temperature polynomial coefficients for thermal conductivity. */
   su2double TurbIntensityAndViscRatioFreeStream[2]; /*!< \brief Freestream turbulent intensity and viscosity ratio for turbulence and transition models. */
   su2double Energy_FreeStream,     /*!< \brief Free-stream total energy of the fluid.  */
+  Energy_ve_FreeStream,            /*!< \brief Free-stream vibe-el energy of the fluid.  */
   ModVel_FreeStream,               /*!< \brief Magnitude of the free-stream velocity of the fluid.  */
   ModVel_FreeStreamND,             /*!< \brief Non-dimensional magnitude of the free-stream velocity of the fluid.  */
   Density_FreeStream,              /*!< \brief Free-stream density of the fluid. */
@@ -912,7 +913,8 @@ class CConfig {
   Time_Ref,                   /*!< \brief Reference time for non-dimensionalization. */
   Viscosity_Ref,              /*!< \brief Reference viscosity for non-dimensionalization. */
   Thermal_Conductivity_Ref,   /*!< \brief Reference conductivity for non-dimensionalization. */
-  Energy_Ref,                 /*!< \brief Reference viscosity for non-dimensionalization. */
+  Energy_Ref,                 /*!< \brief Reference energy for non-dimensionalization. */
+  Energy_ve_Ref,              /*!< \brief Reference vibe-el energy for non-dimensionalization. */
   Wall_Temperature,           /*!< \brief Temperature at an isotropic wall in Kelvin. */
   Omega_Ref,                  /*!< \brief Reference angular velocity for non-dimensionalization. */
   Force_Ref,                  /*!< \brief Reference body force for non-dimensionalization. */
@@ -923,6 +925,7 @@ class CConfig {
   Density_FreeStreamND,       /*!< \brief Farfield density value (external flow). */
   Velocity_FreeStreamND[3],   /*!< \brief Farfield velocity values (external flow). */
   Energy_FreeStreamND,        /*!< \brief Farfield energy value (external flow). */
+  Energy_ve_FreeStreamND,     /*!< \brief Farfield vibe-el energy value (external flow). */
   Viscosity_FreeStreamND,     /*!< \brief Farfield viscosity value (external flow). */
   Tke_FreeStreamND,           /*!< \brief Farfield kinetic energy (external flow). */
   Omega_FreeStreamND,         /*!< \brief Specific dissipation (external flow). */
@@ -1750,6 +1753,12 @@ class CConfig {
    */
   su2double GetEnergy_FreeStream(void) const { return Energy_FreeStream; }
 
+  /*!
+   * \brief Get the value of the freestream vibe-el energy.
+   * \return Freestream vibe-el energy.
+   */
+  su2double GetEnergy_ve_FreeStream(void) const { return Energy_ve_FreeStream; }
+
   /*!
    * \brief Get the value of the freestream viscosity.
    * \return Freestream viscosity.
@@ -1841,6 +1850,12 @@ class CConfig {
    */
   su2double GetEnergy_Ref(void) const { return Energy_Ref; }
 
+  /*!
+   * \brief Get the value of the reference vibe-el enegry for non-dimensionalization.
+   * \return Reference vibe-el energy for non-dimensionalization.
+   */
+  su2double GetEnergy_ve_Ref(void) const { return Energy_ve_Ref; }
+
   /*!
    * \brief Get the value of the reference temperature for non-dimensionalization.
    * \return Reference temperature for non-dimensionalization.
@@ -1969,6 +1984,12 @@ class CConfig {
    */
   su2double GetEnergy_FreeStreamND(void) const { return Energy_FreeStreamND; }
 
+  /*!
+   * \brief Get the value of the non-dimensionalized freestream vibe-el energy.
+   * \return Non-dimensionalized freestream vibe-el energy.
+   */
+  su2double GetEnergy_ve_FreeStreamND(void) const { return Energy_ve_FreeStreamND; }
+
   /*!
    * \brief Get the value of the non-dimensionalized freestream viscosity.
    * \return Non-dimensionalized freestream viscosity.
@@ -2595,6 +2616,12 @@ class CConfig {
    */
   void SetEnergy_Ref(su2double val_energy_ref) { Energy_Ref = val_energy_ref; }
 
+  /*!
+   * \brief Set the reference vibe-el energy for nondimensionalization.
+   * \param[in] val_energy_ve_ref - Value of the reference vibe-el energy.
+   */
+  void SetEnergy_ve_Ref(su2double val_energy_ve_ref) { Energy_ve_Ref = val_energy_ve_ref; }
+
   /*!
    * \brief Set the reference Omega for nondimensionalization.
    * \param[in] val_omega_ref - Value of the reference omega.
@@ -2777,12 +2804,24 @@ class CConfig {
    */
   void SetEnergy_FreeStreamND(su2double val_energy_freestreamnd) { Energy_FreeStreamND = val_energy_freestreamnd; }
 
+  /*!
+   * \brief Set the non-dimensional freestream vibe-el energy.
+   * \param[in] val_energy_ve_freestreamnd - Value of the non-dimensional freestream vibe-el energy.
+   */
+  void SetEnergy_ve_FreeStreamND(su2double val_energy_ve_freestreamnd) { Energy_ve_FreeStreamND = val_energy_ve_freestreamnd; }
+
   /*!
    * \brief Set the freestream energy.
    * \param[in] val_energy_freestream - Value of the freestream energy.
    */
   void SetEnergy_FreeStream(su2double val_energy_freestream) { Energy_FreeStream = val_energy_freestream; }
 
+  /*!
+   * \brief Set the freestream vibe-el energy.
+   * \param[in] val_energy_ve_freestream - Value of the freestream vibe-el energy.
+   */
+  void SetEnergy_ve_FreeStream(su2double val_energy_ve_freestream) { Energy_ve_FreeStream = val_energy_ve_freestream; }
+
   /*!
    * \brief Set the thermal diffusivity for solids.
    * \param[in] val_thermal_diffusivity - Value of the thermal diffusivity.
@@ -3894,6 +3933,7 @@ class CConfig {
   bool GetNEMOProblem(void) const {
     switch (Kind_Solver) {
       case MAIN_SOLVER::NEMO_EULER : case MAIN_SOLVER::NEMO_NAVIER_STOKES:
+      case MAIN_SOLVER::NEMO_RANS:
         return true;
       default:
         return false;

Common/include/option_structure.hpp

@@ -258,6 +258,7 @@ enum class MAIN_SOLVER {
   MULTIPHYSICS,
   NEMO_EULER,                  /*!< \brief Definition of the NEMO Euler solver. */
   NEMO_NAVIER_STOKES,          /*!< \brief Definition of the NEMO NS solver. */
+  NEMO_RANS,                   /*!< \brief Definition of the NEMO RANS solver. */
 };
 static const MapType<std::string, MAIN_SOLVER> Solver_Map = {
   MakePair("NONE", MAIN_SOLVER::NONE)
@@ -273,6 +274,7 @@ static const MapType<std::string, MAIN_SOLVER> Solver_Map = {
   MakePair("FEM_LES", MAIN_SOLVER::FEM_LES)
   MakePair("NEMO_EULER",MAIN_SOLVER::NEMO_EULER)
   MakePair("NEMO_NAVIER_STOKES",MAIN_SOLVER::NEMO_NAVIER_STOKES)
+  MakePair("NEMO_RANS", MAIN_SOLVER::NEMO_RANS)
   MakePair("HEAT_EQUATION", MAIN_SOLVER::HEAT_EQUATION)
   MakePair("ELASTICITY", MAIN_SOLVER::FEM_ELASTICITY)
   MakePair("TEMPLATE_SOLVER", MAIN_SOLVER::TEMPLATE_SOLVER)
@@ -852,6 +854,7 @@ enum class UPWIND {
   LAX_FRIEDRICH,          /*!< \brief Lax-Friedrich numerical method. */
   AUSMPLUSUP,             /*!< \brief AUSM+ -up numerical method (All Speed) */
   AUSMPLUSUP2,            /*!< \brief AUSM+ -up2 numerical method (All Speed) */
+  AUSMPWPLUS,             /*!< \brief AUSMplus numerical method. (MAYBE for NEMO ONLY)*/
   AUSMPLUSM,              /*!< \breif AUSM+M numerical method. (NEMO Only)*/
   BOUNDED_SCALAR          /*!< \brief Scalar advection numerical method. */
 };

Common/include/toolboxes/printing_toolbox.hpp

@@ -32,6 +32,7 @@
 #include <string>
 #include <sstream>
 #include <cmath>
+#include <cstdint>
 #include <algorithm>
 #include "../basic_types/datatype_structure.hpp"