Skip to content

Commit f717ed5

Browse files
author
rois1995
committed
- Modify screen output in SU2 header
1 parent 583bdf3 commit f717ed5

File tree

1 file changed

+32
-26
lines changed

1 file changed

+32
-26
lines changed

Common/src/CConfig.cpp

Lines changed: 32 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6328,42 +6328,48 @@ void CConfig::SetOutput(SU2_COMPONENT val_software, unsigned short val_izone) {
63286328
cout << "Transition model: Simplified Langtry and Menter's "<< NEquations+NTurbEqs <<" equation model";
63296329
}
63306330
if (lmParsedOptions.CrossFlow) {
6331-
cout << " w/ cross-flow corrections" << endl;
6331+
cout << " w/ cross-flow corrections";
6332+
if (!lmParsedOptions.SLM) {
6333+
cout << " (2015)";
6334+
}
6335+
cout << endl;
63326336
} else {
63336337
if (!lmParsedOptions.SLM) {
63346338
cout << " (2009)" << endl;
6335-
} else {
6336-
cout << " (2015)" << endl;
63376339
}
63386340
}
63396341
break;
63406342
}
63416343
}
6342-
if (Kind_Trans_Model == TURB_TRANS_MODEL::LM) {
63436344

6344-
cout << "Correlation Functions: ";
6345-
switch (lmParsedOptions.Correlation) {
6346-
case TURB_TRANS_CORRELATION::MALAN: cout << "Malan et al. (2009)" << endl; break;
6347-
case TURB_TRANS_CORRELATION::SULUKSNA: cout << "Suluksna et al. (2009)" << endl; break;
6348-
case TURB_TRANS_CORRELATION::KRAUSE: cout << "Krause et al. (2008)" << endl; break;
6349-
case TURB_TRANS_CORRELATION::KRAUSE_HYPER: cout << "Krause et al. (2008, paper)" << endl; break;
6350-
case TURB_TRANS_CORRELATION::MEDIDA_BAEDER: cout << "Medida and Baeder (2011)" << endl; break;
6351-
case TURB_TRANS_CORRELATION::MEDIDA: cout << "Medida PhD (2014)" << endl; break;
6352-
case TURB_TRANS_CORRELATION::MENTER_LANGTRY: cout << "Menter and Langtry (2009)" << endl; break;
6353-
case TURB_TRANS_CORRELATION::DEFAULT:
6354-
switch (Kind_Turb_Model) {
6355-
case TURB_MODEL::SA: cout << "Malan et al. (2009)" << endl; break;
6356-
case TURB_MODEL::SST: cout << "Menter and Langtry (2009)" << endl; break;
6357-
case TURB_MODEL::NONE: SU2_MPI::Error("No turbulence model has been selected but LM transition model is active.", CURRENT_FUNCTION); break;
6358-
}
6359-
break;
6345+
if (Kind_Trans_Model == TURB_TRANS_MODEL::LM) {
6346+
if (!lmParsedOptions.SLM){
6347+
cout << "Correlation Functions: ";
6348+
switch (lmParsedOptions.Correlation) {
6349+
case TURB_TRANS_CORRELATION::MALAN: cout << "Malan et al. (2009)" << endl; break;
6350+
case TURB_TRANS_CORRELATION::SULUKSNA: cout << "Suluksna et al. (2009)" << endl; break;
6351+
case TURB_TRANS_CORRELATION::KRAUSE: cout << "Krause et al. (2008)" << endl; break;
6352+
case TURB_TRANS_CORRELATION::KRAUSE_HYPER: cout << "Krause et al. (2008, paper)" << endl; break;
6353+
case TURB_TRANS_CORRELATION::MEDIDA_BAEDER: cout << "Medida and Baeder (2011)" << endl; break;
6354+
case TURB_TRANS_CORRELATION::MEDIDA: cout << "Medida PhD (2014)" << endl; break;
6355+
case TURB_TRANS_CORRELATION::MENTER_LANGTRY: cout << "Menter and Langtry (2009)" << endl; break;
6356+
case TURB_TRANS_CORRELATION::DEFAULT:
6357+
switch (Kind_Turb_Model) {
6358+
case TURB_MODEL::SA: cout << "Malan et al. (2009)" << endl; break;
6359+
case TURB_MODEL::SST: cout << "Menter and Langtry (2009)" << endl; break;
6360+
case TURB_MODEL::NONE: SU2_MPI::Error("No turbulence model has been selected but LM transition model is active.", CURRENT_FUNCTION); break;
6361+
}
6362+
break;
6363+
}
63606364
}
6361-
cout << "Correlation Functions for Simplified LM model: ";
6362-
switch (lmParsedOptions.Correlation_SLM) {
6363-
case TURB_TRANS_CORRELATION_SLM::CODER_SLM: cout << "Coder et al. (2012)" << endl; break;
6364-
case TURB_TRANS_CORRELATION_SLM::MOD_EPPLER_SLM: cout << "Modified Eppler (from Coder et al. 2012)" << endl; break;
6365-
case TURB_TRANS_CORRELATION_SLM::MENTER_SLM:
6366-
case TURB_TRANS_CORRELATION_SLM::DEFAULT: cout << "Menter et al. (2015)" << endl; break;
6365+
else {
6366+
cout << "Correlation Functions for Simplified LM model: ";
6367+
switch (lmParsedOptions.Correlation_SLM) {
6368+
case TURB_TRANS_CORRELATION_SLM::CODER_SLM: cout << "Coder et al. (2012)" << endl; break;
6369+
case TURB_TRANS_CORRELATION_SLM::MOD_EPPLER_SLM: cout << "Modified Eppler (from Coder et al. 2012)" << endl; break;
6370+
case TURB_TRANS_CORRELATION_SLM::MENTER_SLM:
6371+
case TURB_TRANS_CORRELATION_SLM::DEFAULT: cout << "Menter et al. (2015)" << endl; break;
6372+
}
63676373
}
63686374
}
63696375
cout << "Hybrid RANS/LES: ";

0 commit comments

Comments
 (0)