Skip to content

Commit f810117

Browse files
TobiKattmannTobiKattmann
committed
Revert enum class TURB_MODEL addition to comments and strings.
1 parent 67c1aa9 commit f810117

2 files changed

Lines changed: 32 additions & 32 deletions

File tree

‎SU2_CFD/src/output/CFlowCompOutput.cpp‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -119,14 +119,14 @@ void CFlowCompOutput::SetHistoryOutputFields(CConfig *config){
119119

120120
switch(turb_model){
121121
case TURB_MODEL::SA: case TURB_MODEL::SA_NEG: case TURB_MODEL::SA_E: case TURB_MODEL::SA_COMP: case TURB_MODEL::SA_E_COMP:
122-
/// DESCRIPTION: Root-mean square residual of nu tilde (TURB_MODEL::SA model).
123-
AddHistoryOutput("RMS_NU_TILDE", "rms[nu]", ScreenOutputFormat::FIXED, "RMS_RES", "Root-mean square residual of nu tilde (TURB_MODEL::SA model).", HistoryFieldType::RESIDUAL);
122+
/// DESCRIPTION: Root-mean square residual of nu tilde (SA model).
123+
AddHistoryOutput("RMS_NU_TILDE", "rms[nu]", ScreenOutputFormat::FIXED, "RMS_RES", "Root-mean square residual of nu tilde (SA model).", HistoryFieldType::RESIDUAL);
124124
break;
125125
case TURB_MODEL::SST: case TURB_MODEL::SST_SUST:
126-
/// DESCRIPTION: Root-mean square residual of kinetic energy (TURB_MODEL::SST model).
127-
AddHistoryOutput("RMS_TKE", "rms[k]", ScreenOutputFormat::FIXED, "RMS_RES", "Root-mean square residual of kinetic energy (TURB_MODEL::SST model).", HistoryFieldType::RESIDUAL);
128-
/// DESCRIPTION: Root-mean square residual of the dissipation (TURB_MODEL::SST model).
129-
AddHistoryOutput("RMS_DISSIPATION", "rms[w]", ScreenOutputFormat::FIXED, "RMS_RES", "Root-mean square residual of dissipation (TURB_MODEL::SST model).", HistoryFieldType::RESIDUAL);
126+
/// DESCRIPTION: Root-mean square residual of kinetic energy (SST model).
127+
AddHistoryOutput("RMS_TKE", "rms[k]", ScreenOutputFormat::FIXED, "RMS_RES", "Root-mean square residual of kinetic energy (SST model).", HistoryFieldType::RESIDUAL);
128+
/// DESCRIPTION: Root-mean square residual of the dissipation (SST model).
129+
AddHistoryOutput("RMS_DISSIPATION", "rms[w]", ScreenOutputFormat::FIXED, "RMS_RES", "Root-mean square residual of dissipation (SST model).", HistoryFieldType::RESIDUAL);
130130
break;
131131
default: break;
132132
}
@@ -146,14 +146,14 @@ void CFlowCompOutput::SetHistoryOutputFields(CConfig *config){
146146

147147
switch(turb_model){
148148
case TURB_MODEL::SA: case TURB_MODEL::SA_NEG: case TURB_MODEL::SA_E: case TURB_MODEL::SA_COMP: case TURB_MODEL::SA_E_COMP:
149-
/// DESCRIPTION: Maximum residual of nu tilde (TURB_MODEL::SA model).
150-
AddHistoryOutput("MAX_NU_TILDE", "max[nu]", ScreenOutputFormat::FIXED, "MAX_RES", "Maximum residual of nu tilde (TURB_MODEL::SA model).", HistoryFieldType::RESIDUAL);
149+
/// DESCRIPTION: Maximum residual of nu tilde (SA model).
150+
AddHistoryOutput("MAX_NU_TILDE", "max[nu]", ScreenOutputFormat::FIXED, "MAX_RES", "Maximum residual of nu tilde (SA model).", HistoryFieldType::RESIDUAL);
151151
break;
152152
case TURB_MODEL::SST: case TURB_MODEL::SST_SUST:
153-
/// DESCRIPTION: Maximum residual of kinetic energy (TURB_MODEL::SST model).
154-
AddHistoryOutput("MAX_TKE", "max[k]", ScreenOutputFormat::FIXED, "MAX_RES", "Maximum residual of kinetic energy (TURB_MODEL::SST model).", HistoryFieldType::RESIDUAL);
155-
/// DESCRIPTION: Maximum residual of the dissipation (TURB_MODEL::SST model).
156-
AddHistoryOutput("MAX_DISSIPATION", "max[w]", ScreenOutputFormat::FIXED, "MAX_RES", "Maximum residual of dissipation (TURB_MODEL::SST model).", HistoryFieldType::RESIDUAL);
153+
/// DESCRIPTION: Maximum residual of kinetic energy (SST model).
154+
AddHistoryOutput("MAX_TKE", "max[k]", ScreenOutputFormat::FIXED, "MAX_RES", "Maximum residual of kinetic energy (SST model).", HistoryFieldType::RESIDUAL);
155+
/// DESCRIPTION: Maximum residual of the dissipation (SST model).
156+
AddHistoryOutput("MAX_DISSIPATION", "max[w]", ScreenOutputFormat::FIXED, "MAX_RES", "Maximum residual of dissipation (SST model).", HistoryFieldType::RESIDUAL);
157157
break;
158158
default: break;
159159
}
@@ -173,14 +173,14 @@ void CFlowCompOutput::SetHistoryOutputFields(CConfig *config){
173173

174174
switch(turb_model){
175175
case TURB_MODEL::SA: case TURB_MODEL::SA_NEG: case TURB_MODEL::SA_E: case TURB_MODEL::SA_COMP: case TURB_MODEL::SA_E_COMP:
176-
/// DESCRIPTION: Maximum residual of nu tilde (TURB_MODEL::SA model).
177-
AddHistoryOutput("BGS_NU_TILDE", "bgs[nu]", ScreenOutputFormat::FIXED, "BGS_RES", "BGS residual of nu tilde (TURB_MODEL::SA model).", HistoryFieldType::RESIDUAL);
176+
/// DESCRIPTION: Maximum residual of nu tilde (SA model).
177+
AddHistoryOutput("BGS_NU_TILDE", "bgs[nu]", ScreenOutputFormat::FIXED, "BGS_RES", "BGS residual of nu tilde (SA model).", HistoryFieldType::RESIDUAL);
178178
break;
179179
case TURB_MODEL::SST: case TURB_MODEL::SST_SUST:
180-
/// DESCRIPTION: Maximum residual of kinetic energy (TURB_MODEL::SST model).
181-
AddHistoryOutput("BGS_TKE", "bgs[k]", ScreenOutputFormat::FIXED, "BGS_RES", "BGS residual of kinetic energy (TURB_MODEL::SST model).", HistoryFieldType::RESIDUAL);
182-
/// DESCRIPTION: Maximum residual of the dissipation (TURB_MODEL::SST model).
183-
AddHistoryOutput("BGS_DISSIPATION", "bgs[w]", ScreenOutputFormat::FIXED, "BGS_RES", "BGS residual of dissipation (TURB_MODEL::SST model).", HistoryFieldType::RESIDUAL);
180+
/// DESCRIPTION: Maximum residual of kinetic energy (SST model).
181+
AddHistoryOutput("BGS_TKE", "bgs[k]", ScreenOutputFormat::FIXED, "BGS_RES", "BGS residual of kinetic energy (SST model).", HistoryFieldType::RESIDUAL);
182+
/// DESCRIPTION: Maximum residual of the dissipation (SST model).
183+
AddHistoryOutput("BGS_DISSIPATION", "bgs[w]", ScreenOutputFormat::FIXED, "BGS_RES", "BGS residual of dissipation (SST model).", HistoryFieldType::RESIDUAL);
184184
break;
185185
default: break;
186186
}

‎SU2_CFD/src/output/CFlowIncOutput.cpp‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ void CFlowIncOutput::SetHistoryOutputFields(CConfig *config){
117117

118118
switch(turb_model){
119119
case TURB_MODEL::SA: case TURB_MODEL::SA_NEG: case TURB_MODEL::SA_E: case TURB_MODEL::SA_COMP: case TURB_MODEL::SA_E_COMP:
120-
/// DESCRIPTION: Root-mean square residual of nu tilde (TURB_MODEL::SA model).
121-
AddHistoryOutput("RMS_NU_TILDE", "rms[nu]", ScreenOutputFormat::FIXED, "RMS_RES", "Root-mean square residual of nu tilde (TURB_MODEL::SA model).", HistoryFieldType::RESIDUAL);
120+
/// DESCRIPTION: Root-mean square residual of nu tilde (SA model).
121+
AddHistoryOutput("RMS_NU_TILDE", "rms[nu]", ScreenOutputFormat::FIXED, "RMS_RES", "Root-mean square residual of nu tilde (SA model).", HistoryFieldType::RESIDUAL);
122122
break;
123123
case TURB_MODEL::SST: case TURB_MODEL::SST_SUST:
124124
/// DESCRIPTION: Root-mean square residual of kinetic energy (SST model).
@@ -146,14 +146,14 @@ void CFlowIncOutput::SetHistoryOutputFields(CConfig *config){
146146

147147
switch(turb_model){
148148
case TURB_MODEL::SA: case TURB_MODEL::SA_NEG: case TURB_MODEL::SA_E: case TURB_MODEL::SA_COMP: case TURB_MODEL::SA_E_COMP:
149-
/// DESCRIPTION: Maximum residual of nu tilde (TURB_MODEL::SA model).
150-
AddHistoryOutput("MAX_NU_TILDE", "max[nu]", ScreenOutputFormat::FIXED, "MAX_RES", "Maximum residual of nu tilde (TURB_MODEL::SA model).", HistoryFieldType::RESIDUAL);
149+
/// DESCRIPTION: Maximum residual of nu tilde (SA model).
150+
AddHistoryOutput("MAX_NU_TILDE", "max[nu]", ScreenOutputFormat::FIXED, "MAX_RES", "Maximum residual of nu tilde (SA model).", HistoryFieldType::RESIDUAL);
151151
break;
152152
case TURB_MODEL::SST: case TURB_MODEL::SST_SUST:
153-
/// DESCRIPTION: Maximum residual of kinetic energy (TURB_MODEL::SST model).
154-
AddHistoryOutput("MAX_TKE", "max[k]", ScreenOutputFormat::FIXED, "MAX_RES", "Maximum residual of kinetic energy (TURB_MODEL::SST model).", HistoryFieldType::RESIDUAL);
155-
/// DESCRIPTION: Maximum residual of the dissipation (TURB_MODEL::SST model).
156-
AddHistoryOutput("MAX_DISSIPATION", "max[w]", ScreenOutputFormat::FIXED, "MAX_RES", "Maximum residual of dissipation (TURB_MODEL::SST model).", HistoryFieldType::RESIDUAL);
153+
/// DESCRIPTION: Maximum residual of kinetic energy (SST model).
154+
AddHistoryOutput("MAX_TKE", "max[k]", ScreenOutputFormat::FIXED, "MAX_RES", "Maximum residual of kinetic energy (SST model).", HistoryFieldType::RESIDUAL);
155+
/// DESCRIPTION: Maximum residual of the dissipation (SST model).
156+
AddHistoryOutput("MAX_DISSIPATION", "max[w]", ScreenOutputFormat::FIXED, "MAX_RES", "Maximum residual of dissipation (SST model).", HistoryFieldType::RESIDUAL);
157157
break;
158158
default: break;
159159
}
@@ -177,14 +177,14 @@ void CFlowIncOutput::SetHistoryOutputFields(CConfig *config){
177177

178178
switch(turb_model){
179179
case TURB_MODEL::SA: case TURB_MODEL::SA_NEG: case TURB_MODEL::SA_E: case TURB_MODEL::SA_COMP: case TURB_MODEL::SA_E_COMP:
180-
/// DESCRIPTION: Maximum residual of nu tilde (TURB_MODEL::SA model).
181-
AddHistoryOutput("BGS_NU_TILDE", "bgs[nu]", ScreenOutputFormat::FIXED, "BGS_RES", "BGS residual of nu tilde (TURB_MODEL::SA model).", HistoryFieldType::RESIDUAL);
180+
/// DESCRIPTION: Maximum residual of nu tilde (SA model).
181+
AddHistoryOutput("BGS_NU_TILDE", "bgs[nu]", ScreenOutputFormat::FIXED, "BGS_RES", "BGS residual of nu tilde (SA model).", HistoryFieldType::RESIDUAL);
182182
break;
183183
case TURB_MODEL::SST: case TURB_MODEL::SST_SUST:
184-
/// DESCRIPTION: Maximum residual of kinetic energy (TURB_MODEL::SST model).
185-
AddHistoryOutput("BGS_TKE", "bgs[k]", ScreenOutputFormat::FIXED, "BGS_RES", "BGS residual of kinetic energy (TURB_MODEL::SST model).", HistoryFieldType::RESIDUAL);
186-
/// DESCRIPTION: Maximum residual of the dissipation (TURB_MODEL::SST model).
187-
AddHistoryOutput("BGS_DISSIPATION", "bgs[w]", ScreenOutputFormat::FIXED, "BGS_RES", "BGS residual of dissipation (TURB_MODEL::SST model).", HistoryFieldType::RESIDUAL);
184+
/// DESCRIPTION: Maximum residual of kinetic energy (SST model).
185+
AddHistoryOutput("BGS_TKE", "bgs[k]", ScreenOutputFormat::FIXED, "BGS_RES", "BGS residual of kinetic energy (SST model).", HistoryFieldType::RESIDUAL);
186+
/// DESCRIPTION: Maximum residual of the dissipation (SST model).
187+
AddHistoryOutput("BGS_DISSIPATION", "bgs[w]", ScreenOutputFormat::FIXED, "BGS_RES", "BGS residual of dissipation (SST model).", HistoryFieldType::RESIDUAL);
188188
break;
189189
default: break;
190190
}

0 commit comments

Comments
 (0)