Skip to content

Commit 42dcf5a

Browse files
bigfootedpcarruscag
bigfooted
and
pcarruscag
authored
change to enum class: SGS_MODEL, SHOCK_CAPTURING, VERIFICATION_SOLUTION (#1457)
* change to enum: SGS_MODEL, SHOCK_CAPTURING, VERIFICATION_SOLUTION Co-authored-by: Pedro Gomes <[email protected]>
1 parent 0a88a1a commit 42dcf5a

File tree

8 files changed

+93
-89
lines changed

8 files changed

+93
-89
lines changed

‎Common/include/CConfig.hpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -528,8 +528,8 @@ class CConfig {
528528
Kind_Upwind_Template, /*!< \brief Upwind scheme for the template model. */
529529
Kind_FEM, /*!< \brief Finite element scheme for the flow equations. */
530530
Kind_FEM_Flow, /*!< \brief Finite element scheme for the flow equations. */
531-
Kind_FEM_DG_Shock, /*!< \brief Shock capturing method for the FEM DG solver. */
532531
Kind_Matrix_Coloring; /*!< \brief Type of matrix coloring for sparse Jacobian computation. */
532+
FEM_SHOCK_CAPTURING_DG Kind_FEM_Shock_Capturing_DG; /*!< \brief Shock capturing method for the FEM DG solver. */
533533
BGS_RELAXATION Kind_BGS_RelaxMethod; /*!< \brief Kind of relaxation method for Block Gauss Seidel method in FSI problems. */
534534
bool ReconstructionGradientRequired; /*!< \brief Enable or disable a second gradient calculation for upwind reconstruction only. */
535535
bool LeastSquaresRequired; /*!< \brief Enable or disable memory allocation for least-squares gradient methods. */
@@ -556,7 +556,7 @@ class CConfig {
556556

557557
unsigned short nTurbVar; /*!< \brief Number of Turbulence variables, i.e. 1 for SA-types, 2 for SST. */
558558
TURB_MODEL Kind_Turb_Model; /*!< \brief Turbulent model definition. */
559-
unsigned short Kind_SGS_Model; /*!< \brief LES SGS model definition. */
559+
TURB_SGS_MODEL Kind_SGS_Model; /*!< \brief LES SGS model definition. */
560560
TURB_TRANS_MODEL Kind_Trans_Model; /*!< \brief Transition model definition. */
561561
unsigned short Kind_ActDisk, Kind_Engine_Inflow,
562562
*Kind_Data_Riemann,
@@ -1079,7 +1079,7 @@ class CConfig {
10791079
bool Jacobian_Spatial_Discretization_Only; /*!< \brief Flag to know if only the exact Jacobian of the spatial discretization must be computed. */
10801080
bool Compute_Average; /*!< \brief Whether or not to compute averages for unsteady simulations in FV or DG solver. */
10811081
unsigned short Comm_Level; /*!< \brief Level of MPI communications to be performed. */
1082-
unsigned short Kind_Verification_Solution; /*!< \brief Verification solution for accuracy assessment. */
1082+
VERIFICATION_SOLUTION Kind_Verification_Solution; /*!< \brief Verification solution for accuracy assessment. */
10831083

10841084
bool Time_Domain; /*!< \brief Determines if the multizone problem is solved in time-domain */
10851085
unsigned long nOuterIter, /*!< \brief Determines the number of outer iterations in the multizone problem */
@@ -1170,7 +1170,7 @@ class CConfig {
11701170
map<string, COptionBase*> option_map;
11711171

11721172

1173-
// All of the addXxxOptions take in the name of the option, and a refernce to the field of that option
1173+
// All of the addXxxOptions take in the name of the option, and a reference to the field of that option
11741174
// in the option structure. Depending on the specific type, it may take in a default value, and may
11751175
// take in extra options. The addXxxOptions mostly follow the same pattern, so please see addDoubleOption
11761176
// for detailed comments.
@@ -4195,7 +4195,7 @@ class CConfig {
41954195
* \brief Get the kind of the subgrid scale model.
41964196
* \return Kind of the subgrid scale model.
41974197
*/
4198-
unsigned short GetKind_SGS_Model(void) const { return Kind_SGS_Model; }
4198+
TURB_SGS_MODEL GetKind_SGS_Model(void) const { return Kind_SGS_Model; }
41994199

42004200
/*!
42014201
* \brief Get the kind of time integration method.
@@ -4428,7 +4428,7 @@ class CConfig {
44284428
* during the computation.
44294429
* \return Kind of shock capturing method in FEM DG solver.
44304430
*/
4431-
unsigned short GetKind_FEM_DG_Shock(void) const { return Kind_FEM_DG_Shock; }
4431+
FEM_SHOCK_CAPTURING_DG GetKind_FEM_DG_Shock(void) const { return Kind_FEM_Shock_Capturing_DG; }
44324432

44334433
/*!
44344434
* \brief Get the kind of matrix coloring used for the sparse Jacobian computation.
@@ -8888,7 +8888,7 @@ class CConfig {
88888888
* \brief Get the verification solution.
88898889
* \return The verification solution to be used.
88908890
*/
8891-
unsigned short GetVerification_Solution(void) const { return Kind_Verification_Solution;}
8891+
VERIFICATION_SOLUTION GetVerification_Solution(void) const { return Kind_Verification_Solution;}
88928892

88938893
/*!
88948894
* \brief Get topology optimization.

‎Common/include/option_structure.hpp‎

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -842,13 +842,13 @@ static const MapType<std::string, ENUM_FEM> FEM_Map = {
842842
/*!
843843
* \brief Types of shock capturing method in Discontinuous Galerkin numerical method.
844844
*/
845-
enum ENUM_SHOCK_CAPTURING_DG {
846-
NO_SHOCK_CAPTURING = 0, /*!< \brief Shock capturing is not used. */
847-
PERSSON = 1 /*!< \brief Per-Olof Persson's sub-cell shock capturing method. */
845+
enum class FEM_SHOCK_CAPTURING_DG {
846+
NONE, /*!< \brief Shock capturing is not used. */
847+
PERSSON /*!< \brief Per-Olof Persson's sub-cell shock capturing method. */
848848
};
849-
static const MapType<std::string, ENUM_SHOCK_CAPTURING_DG> ShockCapturingDG_Map = {
850-
MakePair("NONE", NO_SHOCK_CAPTURING)
851-
MakePair("PERSSON", PERSSON)
849+
static const MapType<std::string, FEM_SHOCK_CAPTURING_DG> ShockCapturingDG_Map = {
850+
MakePair("NONE", FEM_SHOCK_CAPTURING_DG::NONE)
851+
MakePair("PERSSON", FEM_SHOCK_CAPTURING_DG::PERSSON)
852852
};
853853

854854
/*!
@@ -926,19 +926,19 @@ static const MapType<std::string, TURB_TRANS_MODEL> Trans_Model_Map = {
926926
/*!
927927
* \brief Types of subgrid scale models
928928
*/
929-
enum ENUM_SGS_MODEL {
930-
NO_SGS_MODEL = 0, /*!< \brief No subgrid scale model. */
931-
IMPLICIT_LES = 1, /*!< \brief Implicit LES, i.e. no explicit SGS model. */
932-
SMAGORINSKY = 2, /*!< \brief Smagorinsky SGS model. */
933-
WALE = 3, /*!< \brief Wall-Adapting Local Eddy-viscosity SGS model. */
934-
VREMAN = 4 /*!< \brief Vreman SGS model. */
929+
enum class TURB_SGS_MODEL {
930+
NONE , /*!< \brief No subgrid scale model. */
931+
IMPLICIT_LES, /*!< \brief Implicit LES, i.e. no explicit SGS model. */
932+
SMAGORINSKY , /*!< \brief Smagorinsky SGS model. */
933+
WALE , /*!< \brief Wall-Adapting Local Eddy-viscosity SGS model. */
934+
VREMAN /*!< \brief Vreman SGS model. */
935935
};
936-
static const MapType<std::string, ENUM_SGS_MODEL> SGS_Model_Map = {
937-
MakePair("NONE", NO_SGS_MODEL)
938-
MakePair("IMPLICIT_LES", IMPLICIT_LES)
939-
MakePair("SMAGORINSKY", SMAGORINSKY)
940-
MakePair("WALE", WALE)
941-
MakePair("VREMAN", VREMAN)
936+
static const MapType<std::string, TURB_SGS_MODEL> SGS_Model_Map = {
937+
MakePair("NONE", TURB_SGS_MODEL::NONE)
938+
MakePair("IMPLICIT_LES", TURB_SGS_MODEL::IMPLICIT_LES)
939+
MakePair("SMAGORINSKY", TURB_SGS_MODEL::SMAGORINSKY)
940+
MakePair("WALE", TURB_SGS_MODEL::WALE)
941+
MakePair("VREMAN", TURB_SGS_MODEL::VREMAN)
942942
};
943943

944944

@@ -2218,35 +2218,35 @@ static const MapType<std::string, ENUM_PROJECTION_FUNCTION> Projection_Function_
22182218
/*!
22192219
* \brief the different validation solution
22202220
*/
2221-
enum ENUM_VERIFICATION_SOLUTIONS {
2222-
NO_VERIFICATION_SOLUTION = 0, /*!< \brief No verification solution, standard solver mode. */
2223-
INVISCID_VORTEX = 1, /*!< \brief Inviscid vortex. Exact solution of the unsteady Euler equations. */
2224-
RINGLEB = 2, /*!< \brief Ringleb flow. Exact solution of the steady Euler equations. */
2225-
NS_UNIT_QUAD = 31, /*!< \brief Exact solution of the laminar Navier Stokes equations without heat conduction. */
2226-
TAYLOR_GREEN_VORTEX = 32, /*!< \brief Taylor Green Vortex. */
2227-
INC_TAYLOR_GREEN_VORTEX = 33, /*!< \brief Incompressible Taylor Green Vortex (2D). */
2228-
MMS_NS_UNIT_QUAD = 61, /*!< \brief Manufactured solution of the laminar Navier Stokes equations on a unit quad. */
2229-
MMS_NS_UNIT_QUAD_WALL_BC = 62, /*!< \brief Manufactured solution of the laminar Navier Stokes equations on a unit quad with wall BC's. */
2230-
MMS_NS_TWO_HALF_CIRCLES = 63, /*!< \brief Manufactured solution of the laminar Navier Stokes equations between two half circles. */
2231-
MMS_NS_TWO_HALF_SPHERES = 64, /*!< \brief Manufactured solution of the laminar Navier Stokes equations between two half spheres. */
2232-
MMS_INC_EULER = 65, /*!< \brief Manufactured solution of the incompressible Euler equations. */
2233-
MMS_INC_NS = 66, /*!< \brief Manufactured solution of the laminar incompressible Navier Stokes equations. */
2234-
USER_DEFINED_SOLUTION = 99, /*!< \brief User defined solution. */
2235-
};
2236-
static const MapType<std::string, ENUM_VERIFICATION_SOLUTIONS> Verification_Solution_Map = {
2237-
MakePair("NO_VERIFICATION_SOLUTION", NO_VERIFICATION_SOLUTION)
2238-
MakePair("INVISCID_VORTEX", INVISCID_VORTEX)
2239-
MakePair("RINGLEB", RINGLEB)
2240-
MakePair("NS_UNIT_QUAD", NS_UNIT_QUAD)
2241-
MakePair("TAYLOR_GREEN_VORTEX", TAYLOR_GREEN_VORTEX)
2242-
MakePair("INC_TAYLOR_GREEN_VORTEX", INC_TAYLOR_GREEN_VORTEX)
2243-
MakePair("MMS_NS_UNIT_QUAD", MMS_NS_UNIT_QUAD)
2244-
MakePair("MMS_NS_UNIT_QUAD_WALL_BC", MMS_NS_UNIT_QUAD_WALL_BC)
2245-
MakePair("MMS_NS_TWO_HALF_CIRCLES", MMS_NS_TWO_HALF_CIRCLES)
2246-
MakePair("MMS_NS_TWO_HALF_SPHERES", MMS_NS_TWO_HALF_SPHERES)
2247-
MakePair("MMS_INC_EULER", MMS_INC_EULER)
2248-
MakePair("MMS_INC_NS", MMS_INC_NS)
2249-
MakePair("USER_DEFINED_SOLUTION", USER_DEFINED_SOLUTION)
2221+
enum class VERIFICATION_SOLUTION {
2222+
NONE, /*!< \brief No verification solution, standard solver mode. */
2223+
INVISCID_VORTEX, /*!< \brief Inviscid vortex. Exact solution of the unsteady Euler equations. */
2224+
RINGLEB, /*!< \brief Ringleb flow. Exact solution of the steady Euler equations. */
2225+
NS_UNIT_QUAD, /*!< \brief Exact solution of the laminar Navier Stokes equations without heat conduction. */
2226+
TAYLOR_GREEN_VORTEX, /*!< \brief Taylor Green Vortex. */
2227+
INC_TAYLOR_GREEN_VORTEX, /*!< \brief Incompressible Taylor Green Vortex (2D). */
2228+
MMS_NS_UNIT_QUAD, /*!< \brief Manufactured solution of the laminar Navier Stokes equations on a unit quad. */
2229+
MMS_NS_UNIT_QUAD_WALL_BC, /*!< \brief Manufactured solution of the laminar Navier Stokes equations on a unit quad with wall BC's. */
2230+
MMS_NS_TWO_HALF_CIRCLES, /*!< \brief Manufactured solution of the laminar Navier Stokes equations between two half circles. */
2231+
MMS_NS_TWO_HALF_SPHERES, /*!< \brief Manufactured solution of the laminar Navier Stokes equations between two half spheres. */
2232+
MMS_INC_EULER, /*!< \brief Manufactured solution of the incompressible Euler equations. */
2233+
MMS_INC_NS, /*!< \brief Manufactured solution of the laminar incompressible Navier Stokes equations. */
2234+
USER_DEFINED_SOLUTION, /*!< \brief User defined solution. */
2235+
};
2236+
static const MapType<std::string, VERIFICATION_SOLUTION> Verification_Solution_Map = {
2237+
MakePair("NO_VERIFICATION_SOLUTION", VERIFICATION_SOLUTION::NONE)
2238+
MakePair("INVISCID_VORTEX", VERIFICATION_SOLUTION::INVISCID_VORTEX)
2239+
MakePair("RINGLEB", VERIFICATION_SOLUTION::RINGLEB)
2240+
MakePair("NS_UNIT_QUAD", VERIFICATION_SOLUTION::NS_UNIT_QUAD)
2241+
MakePair("TAYLOR_GREEN_VORTEX", VERIFICATION_SOLUTION::TAYLOR_GREEN_VORTEX)
2242+
MakePair("INC_TAYLOR_GREEN_VORTEX", VERIFICATION_SOLUTION::INC_TAYLOR_GREEN_VORTEX)
2243+
MakePair("MMS_NS_UNIT_QUAD", VERIFICATION_SOLUTION::MMS_NS_UNIT_QUAD)
2244+
MakePair("MMS_NS_UNIT_QUAD_WALL_BC", VERIFICATION_SOLUTION::MMS_NS_UNIT_QUAD_WALL_BC)
2245+
MakePair("MMS_NS_TWO_HALF_CIRCLES", VERIFICATION_SOLUTION::MMS_NS_TWO_HALF_CIRCLES)
2246+
MakePair("MMS_NS_TWO_HALF_SPHERES", VERIFICATION_SOLUTION::MMS_NS_TWO_HALF_SPHERES)
2247+
MakePair("MMS_INC_EULER", VERIFICATION_SOLUTION::MMS_INC_EULER)
2248+
MakePair("MMS_INC_NS", VERIFICATION_SOLUTION::MMS_INC_NS)
2249+
MakePair("USER_DEFINED_SOLUTION", VERIFICATION_SOLUTION::USER_DEFINED_SOLUTION)
22502250
};
22512251

22522252
/*!

‎Common/src/CConfig.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1075,19 +1075,19 @@ void CConfig::SetConfig_Options() {
10751075
#endif
10761076
/*!\brief MATH_PROBLEM \n DESCRIPTION: Mathematical problem \n Options: DIRECT, ADJOINT \ingroup Config*/
10771077
addMathProblemOption("MATH_PROBLEM", ContinuousAdjoint, false, DiscreteAdjoint, discAdjDefault, Restart_Flow, discAdjDefault);
1078-
/*!\brief KIND_TURB_MODEL \n DESCRIPTION: Specify turbulence model \n Options: see \link Turb_Model_Map \endlink \n DEFAULT: NO_TURB_MODEL \ingroup Config*/
1078+
/*!\brief KIND_TURB_MODEL \n DESCRIPTION: Specify turbulence model \n Options: see \link Turb_Model_Map \endlink \n DEFAULT: NONE \ingroup Config*/
10791079
addEnumOption("KIND_TURB_MODEL", Kind_Turb_Model, Turb_Model_Map, TURB_MODEL::NONE);
1080-
/*!\brief KIND_TRANS_MODEL \n DESCRIPTION: Specify transition model OPTIONS: see \link Trans_Model_Map \endlink \n DEFAULT: NO_TRANS_MODEL \ingroup Config*/
1080+
/*!\brief KIND_TRANS_MODEL \n DESCRIPTION: Specify transition model OPTIONS: see \link Trans_Model_Map \endlink \n DEFAULT: NONE \ingroup Config*/
10811081
addEnumOption("KIND_TRANS_MODEL", Kind_Trans_Model, Trans_Model_Map, TURB_TRANS_MODEL::NONE);
10821082

1083-
/*!\brief KIND_SGS_MODEL \n DESCRIPTION: Specify subgrid scale model OPTIONS: see \link SGS_Model_Map \endlink \n DEFAULT: NO_SGS_MODEL \ingroup Config*/
1084-
addEnumOption("KIND_SGS_MODEL", Kind_SGS_Model, SGS_Model_Map, NO_SGS_MODEL);
1083+
/*!\brief KIND_SGS_MODEL \n DESCRIPTION: Specify subgrid scale model OPTIONS: see \link SGS_Model_Map \endlink \n DEFAULT: NONE \ingroup Config*/
1084+
addEnumOption("KIND_SGS_MODEL", Kind_SGS_Model, SGS_Model_Map, TURB_SGS_MODEL::NONE);
10851085

1086-
/*!\brief KIND_FEM_DG_SHOCK \n DESCRIPTION: Specify shock capturing method for DG OPTIONS: see \link ShockCapturingDG_Map \endlink \n DEFAULT: NO_SHOCK_CAPTURING \ingroup Config*/
1087-
addEnumOption("KIND_FEM_DG_SHOCK", Kind_FEM_DG_Shock, ShockCapturingDG_Map, NO_SHOCK_CAPTURING);
1086+
/*!\brief KIND_FEM_DG_SHOCK \n DESCRIPTION: Specify shock capturing method for DG OPTIONS: see \link ShockCapturingDG_Map \endlink \n DEFAULT: NONE \ingroup Config*/
1087+
addEnumOption("KIND_FEM_DG_SHOCK", Kind_FEM_Shock_Capturing_DG, ShockCapturingDG_Map, FEM_SHOCK_CAPTURING_DG::NONE);
10881088

10891089
/*!\brief KIND_VERIFICATION_SOLUTION \n DESCRIPTION: Specify the verification solution OPTIONS: see \link Verification_Solution_Map \endlink \n DEFAULT: NO_VERIFICATION_SOLUTION \ingroup Config*/
1090-
addEnumOption("KIND_VERIFICATION_SOLUTION", Kind_Verification_Solution, Verification_Solution_Map, NO_VERIFICATION_SOLUTION);
1090+
addEnumOption("KIND_VERIFICATION_SOLUTION", Kind_Verification_Solution, Verification_Solution_Map, VERIFICATION_SOLUTION::NONE);
10911091

10921092
/*!\brief KIND_MATRIX_COLORING \n DESCRIPTION: Specify the method for matrix coloring for Jacobian computations OPTIONS: see \link MatrixColoring_Map \endlink \n DEFAULT GREEDY_COLORING \ingroup Config*/
10931093
addEnumOption("KIND_MATRIX_COLORING", Kind_Matrix_Coloring, MatrixColoring_Map, GREEDY_COLORING);
@@ -5694,12 +5694,12 @@ void CConfig::SetOutput(SU2_COMPONENT val_software, unsigned short val_izone) {
56945694
case MAIN_SOLVER::FEM_LES:
56955695
if (Kind_Regime == ENUM_REGIME::COMPRESSIBLE) cout << "Compressible LES equations." << endl;
56965696
if (Kind_Regime == ENUM_REGIME::INCOMPRESSIBLE) cout << "Incompressible LES equations." << endl;
5697-
cout << "Subgrid Scale model: ";
5697+
cout << "LES Subgrid Scale model: ";
56985698
switch (Kind_SGS_Model) {
5699-
case IMPLICIT_LES: cout << "Implicit LES" << endl; break;
5700-
case SMAGORINSKY: cout << "Smagorinsky " << endl; break;
5701-
case WALE: cout << "WALE" << endl; break;
5702-
case VREMAN: cout << "VREMAN" << endl; break;
5699+
case TURB_SGS_MODEL::IMPLICIT_LES: cout << "Implicit LES" << endl; break;
5700+
case TURB_SGS_MODEL::SMAGORINSKY: cout << "Smagorinsky " << endl; break;
5701+
case TURB_SGS_MODEL::WALE: cout << "WALE" << endl; break;
5702+
case TURB_SGS_MODEL::VREMAN: cout << "VREMAN" << endl; break;
57035703
default:
57045704
SU2_MPI::Error("Subgrid Scale model not specified.", CURRENT_FUNCTION);
57055705

‎SU2_CFD/src/output/CFlowCompFEMOutput.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ void CFlowCompFEMOutput::SetVolumeOutputFields(CConfig *config){
151151
AddVolumeOutput("LAMINAR_VISCOSITY", "Laminar_Viscosity", "PRIMITIVE", "Laminar viscosity");
152152
}
153153

154-
if (config->GetKind_Solver() == MAIN_SOLVER::FEM_LES && (config->GetKind_SGS_Model() != IMPLICIT_LES)) {
154+
if (config->GetKind_Solver() == MAIN_SOLVER::FEM_LES && (config->GetKind_SGS_Model() != TURB_SGS_MODEL::IMPLICIT_LES)) {
155155
AddVolumeOutput("EDDY_VISCOSITY", "Eddy_Viscosity", "PRIMITIVE", "Turbulent eddy viscosity");
156156
}
157157
}
@@ -221,7 +221,7 @@ void CFlowCompFEMOutput::LoadVolumeDataFEM(CConfig *config, CGeometry *geometry,
221221
if (config->GetKind_Solver() == MAIN_SOLVER::FEM_NAVIER_STOKES){
222222
SetVolumeOutputValue("LAMINAR_VISCOSITY", index, DGFluidModel->GetLaminarViscosity());
223223
}
224-
if ((config->GetKind_Solver() == MAIN_SOLVER::FEM_LES) && (config->GetKind_SGS_Model() != IMPLICIT_LES)){
224+
if ((config->GetKind_Solver() == MAIN_SOLVER::FEM_LES) && (config->GetKind_SGS_Model() != TURB_SGS_MODEL::IMPLICIT_LES)){
225225
// todo: Export Eddy instead of Laminar viscosity
226226
SetVolumeOutputValue("EDDY_VISCOSITY", index, DGFluidModel->GetLaminarViscosity());
227227
}

‎SU2_CFD/src/solvers/CFEM_DG_EulerSolver.cpp‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5754,7 +5754,11 @@ void CFEM_DG_EulerSolver::Shock_Capturing_DG(CConfig *config,
57545754

57555755
/*--- Run shock capturing algorithm ---*/
57565756
switch( config->GetKind_FEM_DG_Shock() ) {
5757-
case NONE:
5757+
case FEM_SHOCK_CAPTURING_DG::NONE:
5758+
break;
5759+
case FEM_SHOCK_CAPTURING_DG::PERSSON:
5760+
// to be done
5761+
//Shock_Capturing_DG_Persson(elemBeg, elemEnd, workArray);
57585762
break;
57595763
}
57605764
}

‎SU2_CFD/src/solvers/CFEM_DG_NSSolver.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,22 +117,22 @@ CFEM_DG_NSSolver::CFEM_DG_NSSolver(CGeometry *geometry, CConfig *config, unsigne
117117
SGSModelUsed accordingly. */
118118
switch( config->GetKind_SGS_Model() ) {
119119

120-
case IMPLICIT_LES:
120+
case TURB_SGS_MODEL::IMPLICIT_LES:
121121
SGSModel = nullptr;
122122
SGSModelUsed = false;
123123
break;
124124

125-
case SMAGORINSKY:
125+
case TURB_SGS_MODEL::SMAGORINSKY:
126126
SGSModel = new CSmagorinskyModel;
127127
SGSModelUsed = true;
128128
break;
129129

130-
case WALE:
130+
case TURB_SGS_MODEL::WALE:
131131
SGSModel = new CWALEModel;
132132
SGSModelUsed = true;
133133
break;
134134

135-
case VREMAN:
135+
case TURB_SGS_MODEL::VREMAN:
136136
SGSModel = new CVremanModel;
137137
SGSModelUsed = true;
138138
break;
@@ -2975,9 +2975,9 @@ void CFEM_DG_NSSolver::Shock_Capturing_DG(CConfig *config,
29752975

29762976
/*--- Run shock capturing algorithm ---*/
29772977
switch( config->GetKind_FEM_DG_Shock() ) {
2978-
case NONE:
2978+
case FEM_SHOCK_CAPTURING_DG::NONE:
29792979
break;
2980-
case PERSSON:
2980+
case FEM_SHOCK_CAPTURING_DG::PERSSON:
29812981
Shock_Capturing_DG_Persson(elemBeg, elemEnd, workArray);
29822982
break;
29832983
}

0 commit comments

Comments
 (0)