Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/develop' into HEAD
Browse files Browse the repository at this point in the history
  • Loading branch information
@thomasdick
thomasdick committed Nov 29, 2021
2 parents 231670e + 0a88a1a commit 4ee9c76
Show file tree
Hide file tree
Showing 80 changed files with 1,735 additions and 2,073 deletions.
48 changes: 24 additions & 24 deletions Common/include/CConfig.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -486,8 +486,8 @@ class CConfig {
CONDUCTIVITYMODEL Kind_ConductivityModel; /*!< \brief Kind of the Thermal Conductivity Model */
CONDUCTIVITYMODEL_TURB Kind_ConductivityModel_Turb; /*!< \brief Kind of the Turbulent Thermal Conductivity Model */
FREESTREAM_OPTION Kind_FreeStreamOption; /*!< \brief Kind of free stream option to choose if initializing with density or temperature */
unsigned short Kind_Solver, /*!< \brief Kind of solver Euler, NS, Continuous adjoint, etc. */
Kind_FluidModel, /*!< \brief Kind of the Fluid Model: Ideal or Van der Walls, ... . */
MAIN_SOLVER Kind_Solver; /*!< \brief Kind of solver: Euler, NS, Continuous adjoint, etc. */
unsigned short Kind_FluidModel, /*!< \brief Kind of the Fluid Model: Ideal, van der Waals, etc. */
Kind_InitOption, /*!< \brief Kind of Init option to choose if initializing with Reynolds number or with thermodynamic conditions */
Kind_GridMovement, /*!< \brief Kind of the static mesh movement. */
*Kind_SurfaceMovement, /*!< \brief Kind of the static mesh movement. */
Expand Down Expand Up @@ -568,10 +568,11 @@ class CConfig {
STRUCT_DEFORMATION Kind_Struct_Solver; /*!< \brief Determines the geometric condition (small or large deformations) for structural analysis. */
unsigned short Kind_DV_FEA; /*!< \brief Kind of Design Variable for FEA problems.*/

unsigned short nTurbVar; /*!< \brief Number of Turbulence variables, i.e. 1 for SA-types, 2 for SST. */
TURB_MODEL Kind_Turb_Model; /*!< \brief Turbulent model definition. */
unsigned short Kind_SGS_Model; /*!< \brief LES SGS model definition. */
unsigned short Kind_Trans_Model, /*!< \brief Transition model definition. */
Kind_ActDisk, Kind_Engine_Inflow,
TURB_TRANS_MODEL Kind_Trans_Model; /*!< \brief Transition model definition. */
unsigned short Kind_ActDisk, Kind_Engine_Inflow,
*Kind_Data_Riemann,
*Kind_Data_Giles; /*!< \brief Kind of inlet boundary treatment. */
INLET_TYPE Kind_Inlet;
Expand Down Expand Up @@ -3589,25 +3590,18 @@ class CConfig {
* \param[in] val_zone - Zone where the soler is applied.
* \return Governing equation that we are solving.
*/
unsigned short GetKind_Solver(void) const { return Kind_Solver; }

/*!
* \brief Governing equations of the flow (it can be different from the run time equation).
* \param[in] val_zone - Zone where the soler is applied.
* \return Governing equation that we are solving.
*/
void SetKind_Solver(unsigned short val_solver) { Kind_Solver = val_solver; }
MAIN_SOLVER GetKind_Solver(void) const { return Kind_Solver; }

/*!
* \brief Return true if a fluid solver is in use.
*/
bool GetFluidProblem(void) const {
switch (Kind_Solver) {
case EULER : case NAVIER_STOKES: case RANS:
case INC_EULER : case INC_NAVIER_STOKES: case INC_RANS:
case NEMO_EULER : case NEMO_NAVIER_STOKES:
case DISC_ADJ_INC_EULER: case DISC_ADJ_INC_NAVIER_STOKES: case DISC_ADJ_INC_RANS:
case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
case MAIN_SOLVER::EULER : case MAIN_SOLVER::NAVIER_STOKES: case MAIN_SOLVER::RANS:
case MAIN_SOLVER::INC_EULER : case MAIN_SOLVER::INC_NAVIER_STOKES: case MAIN_SOLVER::INC_RANS:
case MAIN_SOLVER::NEMO_EULER : case MAIN_SOLVER::NEMO_NAVIER_STOKES:
case MAIN_SOLVER::DISC_ADJ_INC_EULER: case MAIN_SOLVER::DISC_ADJ_INC_NAVIER_STOKES: case MAIN_SOLVER::DISC_ADJ_INC_RANS:
case MAIN_SOLVER::DISC_ADJ_EULER: case MAIN_SOLVER::DISC_ADJ_NAVIER_STOKES: case MAIN_SOLVER::DISC_ADJ_RANS:
return true;
default:
return false;
Expand All @@ -3618,23 +3612,23 @@ class CConfig {
* \brief Return true if a structural solver is in use.
*/
bool GetStructuralProblem(void) const {
return (Kind_Solver == FEM_ELASTICITY) || (Kind_Solver == DISC_ADJ_FEM);
return (Kind_Solver == MAIN_SOLVER::FEM_ELASTICITY) || (Kind_Solver == MAIN_SOLVER::DISC_ADJ_FEM);
}

/*!
* \brief Return true if a heat solver is in use.
*/
bool GetHeatProblem(void) const {
return (Kind_Solver == HEAT_EQUATION) || (Kind_Solver == DISC_ADJ_HEAT);
return (Kind_Solver == MAIN_SOLVER::HEAT_EQUATION) || (Kind_Solver == MAIN_SOLVER::DISC_ADJ_HEAT);
}

/*!
* \brief Return true if a high order FEM solver is in use.
*/
bool GetFEMSolver(void) const {
switch (Kind_Solver) {
case FEM_EULER: case FEM_NAVIER_STOKES: case FEM_RANS: case FEM_LES:
case DISC_ADJ_FEM_EULER: case DISC_ADJ_FEM_NS: case DISC_ADJ_FEM_RANS:
case MAIN_SOLVER::FEM_EULER: case MAIN_SOLVER::FEM_NAVIER_STOKES: case MAIN_SOLVER::FEM_RANS: case MAIN_SOLVER::FEM_LES:
case MAIN_SOLVER::DISC_ADJ_FEM_EULER: case MAIN_SOLVER::DISC_ADJ_FEM_NS: case MAIN_SOLVER::DISC_ADJ_FEM_RANS:
return true;
default:
return false;
Expand All @@ -3646,7 +3640,7 @@ class CConfig {
*/
bool GetNEMOProblem(void) const {
switch (Kind_Solver) {
case NEMO_EULER : case NEMO_NAVIER_STOKES:
case MAIN_SOLVER::NEMO_EULER : case MAIN_SOLVER::NEMO_NAVIER_STOKES:
return true;
default:
return false;
Expand Down Expand Up @@ -4230,6 +4224,12 @@ class CConfig {
*/
void SetKind_SU2(SU2_COMPONENT val_kind_su2) { Kind_SU2 = val_kind_su2 ; }

/*!
* \brief Get the number of Turbulence Variables.
* \return Number of Turbulence Variables.
*/
unsigned short GetnTurbVar(void) const { return nTurbVar; }

/*!
* \brief Get the kind of the turbulence model.
* \return Kind of the turbulence model.
Expand All @@ -4240,7 +4240,7 @@ class CConfig {
* \brief Get the kind of the transition model.
* \return Kind of the transion model.
*/
unsigned short GetKind_Trans_Model(void) const { return Kind_Trans_Model; }
TURB_TRANS_MODEL GetKind_Trans_Model(void) const { return Kind_Trans_Model; }

/*!
* \brief Get the kind of the subgrid scale model.
Expand Down Expand Up @@ -6263,7 +6263,7 @@ class CConfig {
* \param[in] val_solver - Solver of the simulation.
* \param[in] val_system - Runtime system that we are solving.
*/
void SetGlobalParam(unsigned short val_solver, unsigned short val_system);
void SetGlobalParam(MAIN_SOLVER val_solver, unsigned short val_system);

/*!
* \brief Center of rotation for a rotational periodic boundary.
Expand Down
146 changes: 73 additions & 73 deletions Common/include/option_structure.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,71 +225,71 @@ static const MapType<std::string, AVERAGE_TYPE> Average_Map = {
/*!
* \brief different solver types for the CFD component
*/
enum ENUM_MAIN_SOLVER {
NO_SOLVER = 0, /*!< \brief Definition of no solver. */
EULER = 1, /*!< \brief Definition of the Euler's solver. */
NAVIER_STOKES = 2, /*!< \brief Definition of the Navier-Stokes' solver. */
RANS = 3, /*!< \brief Definition of the Reynolds-averaged Navier-Stokes' (RANS) solver. */
INC_EULER = 4, /*!< \brief Definition of the incompressible Euler's solver. */
INC_NAVIER_STOKES =5, /*!< \brief Definition of the incompressible Navier-Stokes' solver. */
INC_RANS = 6, /*!< \brief Definition of the incompressible Reynolds-averaged Navier-Stokes' (RANS) solver. */
HEAT_EQUATION = 7, /*!< \brief Definition of the finite volume heat solver. */
FEM_ELASTICITY = 9, /*!< \brief Definition of a FEM solver. */
ADJ_EULER = 10, /*!< \brief Definition of the continuous adjoint Euler's solver. */
ADJ_NAVIER_STOKES = 11, /*!< \brief Definition of the continuous adjoint Navier-Stokes' solver. */
ADJ_RANS = 12, /*!< \brief Definition of the continuous adjoint Reynolds-averaged Navier-Stokes' (RANS) solver. */
TEMPLATE_SOLVER = 13, /*!< \brief Definition of template solver. */
DISC_ADJ_EULER = 15, /*!< \brief Definition of the discrete adjoint Euler solver. */
DISC_ADJ_RANS = 16, /*!< \brief Definition of the discrete adjoint Reynolds-averaged Navier-Stokes' (RANS) solver. */
DISC_ADJ_NAVIER_STOKES = 17, /*!< \brief Definition of the discrete adjoint Navier-Stokes' solver. */
DISC_ADJ_INC_EULER = 18, /*!< \brief Definition of the discrete adjoint incompressible Euler solver. */
DISC_ADJ_INC_RANS = 19, /*!< \brief Definition of the discrete adjoint imcompressible Reynolds-averaged Navier-Stokes' (RANS) solver. */
DISC_ADJ_INC_NAVIER_STOKES = 20, /*!< \brief Definition of the discrete adjoint imcompressible Navier-Stokes'. */
DISC_ADJ_HEAT = 21, /*!< \brief Definition of the discrete adjoint heat solver. */
DISC_ADJ_FEM_EULER = 22, /*!< \brief Definition of the discrete adjoint FEM Euler solver. */
DISC_ADJ_FEM_RANS = 23, /*!< \brief Definition of the discrete adjoint FEM Reynolds-averaged Navier-Stokes' (RANS) solver. */
DISC_ADJ_FEM_NS = 24, /*!< \brief Definition of the discrete adjoint FEM Navier-Stokes' solver. */
DISC_ADJ_FEM = 25, /*!< \brief Definition of the discrete adjoint FEM solver. */
FEM_EULER = 26, /*!< \brief Definition of the finite element Euler's solver. */
FEM_NAVIER_STOKES = 27, /*!< \brief Definition of the finite element Navier-Stokes' solver. */
FEM_RANS = 28, /*!< \brief Definition of the finite element Reynolds-averaged Navier-Stokes' (RANS) solver. */
FEM_LES = 29, /*!< \brief Definition of the finite element Large Eddy Simulation Navier-Stokes' (LES) solver. */
MULTIPHYSICS = 30,
NEMO_EULER = 41, /*!< \brief Definition of the NEMO Euler solver. */
NEMO_NAVIER_STOKES = 42 /*!< \brief Definition of the NEMO NS solver. */
};
static const MapType<std::string, ENUM_MAIN_SOLVER> Solver_Map = {
MakePair("NONE", NO_SOLVER)
MakePair("EULER", EULER)
MakePair("NAVIER_STOKES", NAVIER_STOKES)
MakePair("RANS", RANS)
MakePair("INC_EULER", INC_EULER)
MakePair("INC_NAVIER_STOKES", INC_NAVIER_STOKES)
MakePair("INC_RANS", INC_RANS)
MakePair("FEM_EULER", FEM_EULER)
MakePair("FEM_NAVIER_STOKES", FEM_NAVIER_STOKES)
MakePair("FEM_RANS", FEM_RANS)
MakePair("FEM_LES", FEM_LES)
MakePair("NEMO_EULER",NEMO_EULER)
MakePair("NEMO_NAVIER_STOKES",NEMO_NAVIER_STOKES)
MakePair("ADJ_EULER", ADJ_EULER)
MakePair("ADJ_NAVIER_STOKES", ADJ_NAVIER_STOKES)
MakePair("ADJ_RANS", ADJ_RANS )
MakePair("HEAT_EQUATION", HEAT_EQUATION)
MakePair("ELASTICITY", FEM_ELASTICITY)
MakePair("DISC_ADJ_EULER", DISC_ADJ_EULER)
MakePair("DISC_ADJ_RANS", DISC_ADJ_RANS)
MakePair("DISC_ADJ_NAVIERSTOKES", DISC_ADJ_NAVIER_STOKES)
MakePair("DISC_ADJ_INC_EULER", DISC_ADJ_INC_EULER)
MakePair("DISC_ADJ_INC_RANS", DISC_ADJ_INC_RANS)
MakePair("DISC_ADJ_INC_NAVIERSTOKES", DISC_ADJ_INC_NAVIER_STOKES)
MakePair("DISC_ADJ_HEAT_EQUATION", DISC_ADJ_HEAT)
MakePair("DISC_ADJ_FEM_EULER", DISC_ADJ_FEM_EULER)
MakePair("DISC_ADJ_FEM_RANS", DISC_ADJ_FEM_RANS)
MakePair("DISC_ADJ_FEM_NS", DISC_ADJ_FEM_NS)
MakePair("DISC_ADJ_FEM", DISC_ADJ_FEM)
MakePair("TEMPLATE_SOLVER", TEMPLATE_SOLVER)
MakePair("MULTIPHYSICS", MULTIPHYSICS)
enum class MAIN_SOLVER {
NONE, /*!< \brief Definition of no solver. */
EULER, /*!< \brief Definition of the Euler's solver. */
NAVIER_STOKES, /*!< \brief Definition of the Navier-Stokes' solver. */
RANS, /*!< \brief Definition of the Reynolds-averaged Navier-Stokes' (RANS) solver. */
INC_EULER, /*!< \brief Definition of the incompressible Euler's solver. */
INC_NAVIER_STOKES, /*!< \brief Definition of the incompressible Navier-Stokes' solver. */
INC_RANS, /*!< \brief Definition of the incompressible Reynolds-averaged Navier-Stokes' (RANS) solver. */
HEAT_EQUATION, /*!< \brief Definition of the finite volume heat solver. */
FEM_ELASTICITY, /*!< \brief Definition of a FEM solver. */
ADJ_EULER, /*!< \brief Definition of the continuous adjoint Euler's solver. */
ADJ_NAVIER_STOKES, /*!< \brief Definition of the continuous adjoint Navier-Stokes' solver. */
ADJ_RANS, /*!< \brief Definition of the continuous adjoint Reynolds-averaged Navier-Stokes' (RANS) solver. */
TEMPLATE_SOLVER, /*!< \brief Definition of template solver. */
DISC_ADJ_EULER, /*!< \brief Definition of the discrete adjoint Euler solver. */
DISC_ADJ_RANS, /*!< \brief Definition of the discrete adjoint Reynolds-averaged Navier-Stokes' (RANS) solver. */
DISC_ADJ_NAVIER_STOKES, /*!< \brief Definition of the discrete adjoint Navier-Stokes' solver. */
DISC_ADJ_INC_EULER, /*!< \brief Definition of the discrete adjoint incompressible Euler solver. */
DISC_ADJ_INC_RANS, /*!< \brief Definition of the discrete adjoint incompressible Reynolds-averaged Navier-Stokes' (RANS) solver. */
DISC_ADJ_INC_NAVIER_STOKES, /*!< \brief Definition of the discrete adjoint incompressible Navier-Stokes'. */
DISC_ADJ_HEAT, /*!< \brief Definition of the discrete adjoint heat solver. */
DISC_ADJ_FEM_EULER, /*!< \brief Definition of the discrete adjoint FEM Euler solver. */
DISC_ADJ_FEM_RANS, /*!< \brief Definition of the discrete adjoint FEM Reynolds-averaged Navier-Stokes' (RANS) solver. */
DISC_ADJ_FEM_NS, /*!< \brief Definition of the discrete adjoint FEM Navier-Stokes' solver. */
DISC_ADJ_FEM, /*!< \brief Definition of the discrete adjoint FEM solver. */
FEM_EULER, /*!< \brief Definition of the finite element Euler's solver. */
FEM_NAVIER_STOKES, /*!< \brief Definition of the finite element Navier-Stokes' solver. */
FEM_RANS, /*!< \brief Definition of the finite element Reynolds-averaged Navier-Stokes' (RANS) solver. */
FEM_LES, /*!< \brief Definition of the finite element Large Eddy Simulation Navier-Stokes' (LES) solver. */
MULTIPHYSICS,
NEMO_EULER, /*!< \brief Definition of the NEMO Euler solver. */
NEMO_NAVIER_STOKES, /*!< \brief Definition of the NEMO NS solver. */
};
static const MapType<std::string, MAIN_SOLVER> Solver_Map = {
MakePair("NONE", MAIN_SOLVER::NONE)
MakePair("EULER", MAIN_SOLVER::EULER)
MakePair("NAVIER_STOKES", MAIN_SOLVER::NAVIER_STOKES)
MakePair("RANS", MAIN_SOLVER::RANS)
MakePair("INC_EULER", MAIN_SOLVER::INC_EULER)
MakePair("INC_NAVIER_STOKES", MAIN_SOLVER::INC_NAVIER_STOKES)
MakePair("INC_RANS", MAIN_SOLVER::INC_RANS)
MakePair("FEM_EULER", MAIN_SOLVER::FEM_EULER)
MakePair("FEM_NAVIER_STOKES", MAIN_SOLVER::FEM_NAVIER_STOKES)
MakePair("FEM_RANS", MAIN_SOLVER::FEM_RANS)
MakePair("FEM_LES", MAIN_SOLVER::FEM_LES)
MakePair("NEMO_EULER",MAIN_SOLVER::NEMO_EULER)
MakePair("NEMO_NAVIER_STOKES",MAIN_SOLVER::NEMO_NAVIER_STOKES)
MakePair("ADJ_EULER", MAIN_SOLVER::ADJ_EULER)
MakePair("ADJ_NAVIER_STOKES", MAIN_SOLVER::ADJ_NAVIER_STOKES)
MakePair("ADJ_RANS", MAIN_SOLVER::ADJ_RANS )
MakePair("HEAT_EQUATION", MAIN_SOLVER::HEAT_EQUATION)
MakePair("ELASTICITY", MAIN_SOLVER::FEM_ELASTICITY)
MakePair("DISC_ADJ_EULER", MAIN_SOLVER::DISC_ADJ_EULER)
MakePair("DISC_ADJ_RANS", MAIN_SOLVER::DISC_ADJ_RANS)
MakePair("DISC_ADJ_NAVIERSTOKES", MAIN_SOLVER::DISC_ADJ_NAVIER_STOKES)
MakePair("DISC_ADJ_INC_EULER", MAIN_SOLVER::DISC_ADJ_INC_EULER)
MakePair("DISC_ADJ_INC_RANS", MAIN_SOLVER::DISC_ADJ_INC_RANS)
MakePair("DISC_ADJ_INC_NAVIERSTOKES", MAIN_SOLVER::DISC_ADJ_INC_NAVIER_STOKES)
MakePair("DISC_ADJ_HEAT_EQUATION", MAIN_SOLVER::DISC_ADJ_HEAT)
MakePair("DISC_ADJ_FEM_EULER", MAIN_SOLVER::DISC_ADJ_FEM_EULER)
MakePair("DISC_ADJ_FEM_RANS", MAIN_SOLVER::DISC_ADJ_FEM_RANS)
MakePair("DISC_ADJ_FEM_NS", MAIN_SOLVER::DISC_ADJ_FEM_NS)
MakePair("DISC_ADJ_FEM", MAIN_SOLVER::DISC_ADJ_FEM)
MakePair("TEMPLATE_SOLVER", MAIN_SOLVER::TEMPLATE_SOLVER)
MakePair("MULTIPHYSICS", MAIN_SOLVER::MULTIPHYSICS)
};

/*!
Expand Down Expand Up @@ -919,15 +919,15 @@ static const MapType<std::string, TURB_MODEL> Turb_Model_Map = {
/*!
* \brief Types of transition models
*/
enum ENUM_TRANS_MODEL {
NO_TRANS_MODEL = 0, /*!< \brief No transition model. */
LM = 1, /*!< \brief Kind of transition model (Langtry-Menter (LM) for SST and Spalart-Allmaras). */
BC = 2 /*!< \brief Kind of transition model (BAS-CAKMAKCIOGLU (BC) for Spalart-Allmaras). */
enum class TURB_TRANS_MODEL {
NONE, /*!< \brief No transition model. */
LM, /*!< \brief Kind of transition model (Langtry-Menter (LM) for SST and Spalart-Allmaras). */
BC /*!< \brief Kind of transition model (BAS-CAKMAKCIOGLU (BC) for Spalart-Allmaras). */
};
static const MapType<std::string, ENUM_TRANS_MODEL> Trans_Model_Map = {
MakePair("NONE", NO_TRANS_MODEL)
MakePair("LM", LM)
MakePair("BC", BC)
static const MapType<std::string, TURB_TRANS_MODEL> Trans_Model_Map = {
MakePair("NONE", TURB_TRANS_MODEL::NONE)
MakePair("LM", TURB_TRANS_MODEL::LM)
MakePair("BC", TURB_TRANS_MODEL::BC)
};

/*!
Expand Down
2 changes: 1 addition & 1 deletion Common/include/toolboxes/MMS/CVerificationSolution.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class CVerificationSolution {
unsigned short nDim; /*!< \brief Number of dimension of the problem. */
unsigned short nVar; /*!< \brief Number of variables of the problem */

unsigned short Kind_Solver; /*!< \brief The kind of solver we are running. */
MAIN_SOLVER Kind_Solver; /*!< \brief The kind of solver we are running. */

private:

Expand Down
Loading

0 comments on commit 4ee9c76

Please sign in to comment.