Skip to content

Commit 0cd78e4

Browse files
fmpmorgadofmpmorgado
committed
Change to enum class TRANSCOEFFMODEL
1 parent fbbc6ee commit 0cd78e4

File tree

7 files changed

+28
-28
lines changed

7 files changed

+28
-28
lines changed

‎Common/include/CConfig.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,6 @@ class CConfig {
475475
unsigned short Kind_Solver, /*!< \brief Kind of solver Euler, NS, Continuous adjoint, etc. */
476476
Kind_FluidModel, /*!< \brief Kind of the Fluid Model: Ideal or Van der Walls, ... . */
477477
Kind_InitOption, /*!< \brief Kind of Init option to choose if initializing with Reynolds number or with thermodynamic conditions */
478-
Kind_TransCoeffModel, /*!< \brief Transport coefficient Model for NEMO solver. */
479478
Kind_GridMovement, /*!< \brief Kind of the static mesh movement. */
480479
*Kind_SurfaceMovement, /*!< \brief Kind of the static mesh movement. */
481480
nKind_SurfaceMovement, /*!< \brief Kind of the dynamic mesh movement. */
@@ -1142,6 +1141,7 @@ class CConfig {
11421141
monoatomic; /*!< \brief Flag for monoatomic mixture. */
11431142
string GasModel, /*!< \brief Gas Model. */
11441143
*Wall_Catalytic; /*!< \brief Pointer to catalytic walls. */
1144+
TRANSCOEFFMODEL Kind_TransCoeffModel; /*!< \brief Transport coefficient Model for NEMO solver. */
11451145

11461146
/*!
11471147
* \brief Set the default values of config options not set in the config file using another config object.
@@ -3623,7 +3623,7 @@ class CConfig {
36233623
* \brief Get the transport coefficient model.
36243624
* \return Index of transport coefficient model.
36253625
*/
3626-
unsigned short GetKind_TransCoeffModel(void) const { return Kind_TransCoeffModel; }
3626+
TRANSCOEFFMODEL GetKind_TransCoeffModel(void) const { return Kind_TransCoeffModel; }
36273627

36283628
/*!
36293629
* \brief Get the total number of heat flux markers.

‎Common/include/option_structure.hpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -540,15 +540,15 @@ MakePair("ONESPECIES", ONESPECIES)
540540
/*!
541541
* \brief types of coefficient transport model
542542
*/
543-
enum ENUM_TRANSCOEFFMODEL {
544-
WILKE = 0,
545-
GUPTAYOS = 1,
546-
CHAPMANN_ENSKOG = 2
547-
};
548-
static const MapType<std::string, ENUM_TRANSCOEFFMODEL> TransCoeffModel_Map = {
549-
MakePair("WILKE", WILKE)
550-
MakePair("GUPTA-YOS", GUPTAYOS)
551-
MakePair("CHAPMANN-ENSKOG", CHAPMANN_ENSKOG)
543+
enum class TRANSCOEFFMODEL {
544+
WILKE,
545+
GUPTAYOS,
546+
CHAPMANN_ENSKOG
547+
};
548+
static const MapType<std::string, TRANSCOEFFMODEL> TransCoeffModel_Map = {
549+
MakePair("WILKE", TRANSCOEFFMODEL::WILKE)
550+
MakePair("GUPTA-YOS", TRANSCOEFFMODEL::GUPTAYOS)
551+
MakePair("CHAPMANN-ENSKOG", TRANSCOEFFMODEL::CHAPMANN_ENSKOG)
552552
};
553553

554554
/*!

‎Common/src/CConfig.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1149,7 +1149,7 @@ void CConfig::SetConfig_Options() {
11491149
/* DESCRIPTION: Specify chemical model for multi-species simulations - read by Mutation++ library*/
11501150
addStringOption("GAS_MODEL", GasModel, string("N2"));
11511151
/* DESCRIPTION: Specify transport coefficient model for multi-species simulations */
1152-
addEnumOption("TRANSPORT_COEFF_MODEL", Kind_TransCoeffModel, TransCoeffModel_Map, WILKE);
1152+
addEnumOption("TRANSPORT_COEFF_MODEL", Kind_TransCoeffModel, TransCoeffModel_Map, TRANSCOEFFMODEL::WILKE);
11531153
/* DESCRIPTION: Specify mass fraction of each species */
11541154
addDoubleListOption("GAS_COMPOSITION", nSpecies, Gas_Composition);
11551155
/* DESCRIPTION: Specify if mixture is frozen */
@@ -3587,11 +3587,11 @@ void CConfig::SetPostprocessing(SU2_COMPONENT val_software, unsigned short val_i
35873587
SU2_MPI::Error("Only STANDARD_AIR fluid model can be used with US Measurement System", CURRENT_FUNCTION);
35883588
}
35893589

3590-
if (Kind_FluidModel == SU2_NONEQ && Kind_TransCoeffModel != WILKE ) {
3590+
if (Kind_FluidModel == SU2_NONEQ && Kind_TransCoeffModel != TRANSCOEFFMODEL::WILKE ) {
35913591
SU2_MPI::Error("Only WILKE transport model is stable for the NEMO solver using SU2TClib. Use Mutation++ instead.", CURRENT_FUNCTION);
35923592
}
35933593

3594-
if (Kind_FluidModel == MUTATIONPP && (Kind_TransCoeffModel != WILKE && Kind_TransCoeffModel != CHAPMANN_ENSKOG)) {
3594+
if (Kind_FluidModel == MUTATIONPP && (Kind_TransCoeffModel != TRANSCOEFFMODEL::WILKE && Kind_TransCoeffModel != TRANSCOEFFMODEL::CHAPMANN_ENSKOG)) {
35953595
SU2_MPI::Error("Only WILKE and Chapmann-Enskog transport model can be used with Mutation++ at the moment.", CURRENT_FUNCTION);
35963596
}
35973597

‎SU2_CFD/include/fluid/CNEMOGas.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ class CNEMOGas : public CFluidModel {
4848
nHeavy, /*!< \brief Number of heavy particles in gas */
4949
nEl, /*!< \brief Number of electrons in gas */
5050
nDim, /*!< \brief Number of dimensions. */
51-
nEnergyEq = 2, /*!< \brief Number of energy equations for the 2T model. */
52-
Kind_TransCoeffModel; /*!< \brief Transport coefficients model for NEMO solver. */
51+
nEnergyEq = 2; /*!< \brief Number of energy equations for the 2T model. */
52+
TRANSCOEFFMODEL Kind_TransCoeffModel; /*!< \brief Transport coefficients model for NEMO solver. */
5353

5454
unsigned iSpecies, /*!< \brief Common iteration counter for species */
5555
jSpecies, /*!< \brief Common iteration counter for species */

‎SU2_CFD/src/fluid/CMutationTCLib.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ CMutationTCLib::CMutationTCLib(const CConfig* config, unsigned short val_nDim):
4242
/*--- Set up inputs to define type of mixture in the Mutation++ library ---*/
4343

4444
/*--- Define transport model ---*/
45-
if(Kind_TransCoeffModel == WILKE)
45+
if(Kind_TransCoeffModel == TRANSCOEFFMODEL::WILKE)
4646
transport_model = "Wilke";
47-
else if (Kind_TransCoeffModel == GUPTAYOS)
47+
else if (Kind_TransCoeffModel == TRANSCOEFFMODEL::GUPTAYOS)
4848
transport_model = "Gupta-Yos";
49-
else if (Kind_TransCoeffModel == CHAPMANN_ENSKOG)
49+
else if (Kind_TransCoeffModel == TRANSCOEFFMODEL::CHAPMANN_ENSKOG)
5050
transport_model = "Chapmann-Enskog_LDLT";
5151

5252
opt.setStateModel("ChemNonEqTTv");

‎SU2_CFD/src/fluid/CSU2TCLib.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1004,9 +1004,9 @@ vector<su2double>& CSU2TCLib::ComputeSpeciesEnthalpy(su2double val_T, su2double
10041004

10051005
vector<su2double>& CSU2TCLib::GetDiffusionCoeff(){
10061006

1007-
if(Kind_TransCoeffModel == WILKE)
1007+
if(Kind_TransCoeffModel == TRANSCOEFFMODEL::WILKE)
10081008
DiffusionCoeffWBE();
1009-
if(Kind_TransCoeffModel == GUPTAYOS)
1009+
if(Kind_TransCoeffModel == TRANSCOEFFMODEL::GUPTAYOS)
10101010
DiffusionCoeffGY();
10111011

10121012
return DiffusionCoeff;
@@ -1015,9 +1015,9 @@ vector<su2double>& CSU2TCLib::GetDiffusionCoeff(){
10151015

10161016
su2double CSU2TCLib::GetViscosity(){
10171017

1018-
if(Kind_TransCoeffModel == WILKE)
1018+
if(Kind_TransCoeffModel == TRANSCOEFFMODEL::WILKE)
10191019
ViscosityWBE();
1020-
if(Kind_TransCoeffModel == GUPTAYOS)
1020+
if(Kind_TransCoeffModel == TRANSCOEFFMODEL::GUPTAYOS)
10211021
ViscosityGY();
10221022

10231023
return Mu;
@@ -1026,9 +1026,9 @@ su2double CSU2TCLib::GetViscosity(){
10261026

10271027
vector<su2double>& CSU2TCLib::GetThermalConductivities(){
10281028

1029-
if(Kind_TransCoeffModel == WILKE)
1029+
if(Kind_TransCoeffModel == TRANSCOEFFMODEL::WILKE)
10301030
ThermalConductivitiesWBE();
1031-
if(Kind_TransCoeffModel == GUPTAYOS)
1031+
if(Kind_TransCoeffModel == TRANSCOEFFMODEL::GUPTAYOS)
10321032
ThermalConductivitiesGY();
10331033

10341034
return ThermalConductivities;

‎SU2_CFD/src/solvers/CNEMOEulerSolver.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1282,17 +1282,17 @@ void CNEMOEulerSolver::SetNondimensionalization(CConfig *config, unsigned short
12821282
if (viscous) {
12831283

12841284
switch(config->GetKind_TransCoeffModel()){
1285-
case WILKE:
1285+
case TRANSCOEFFMODEL::WILKE:
12861286
ModelTable << "Wilke-Blottner-Eucken";
12871287
NonDimTable.PrintFooter();
12881288
break;
12891289

1290-
case GUPTAYOS:
1290+
case TRANSCOEFFMODEL::GUPTAYOS:
12911291
ModelTable << "Gupta-Yos";
12921292
NonDimTable.PrintFooter();
12931293
break;
12941294

1295-
case CHAPMANN_ENSKOG:
1295+
case TRANSCOEFFMODEL::CHAPMANN_ENSKOG:
12961296
ModelTable << "CHAPMANN-ENSKOG_LDLT";
12971297
NonDimTable.PrintFooter();
12981298
break;

0 commit comments

Comments
 (0)