Skip to content

Commit b7e3414

Browse files
committed
Merge remote-tracking branch 'upstream/develop' into fix_cornernode_comp
2 parents 787960a + cde8892 commit b7e3414

File tree

4 files changed

+20
-4
lines changed

4 files changed

+20
-4
lines changed

Common/src/CConfig.cpp

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3481,6 +3481,22 @@ void CConfig::SetPostprocessing(SU2_COMPONENT val_software, unsigned short val_i
34813481
if (Kind_Solver == MAIN_SOLVER::INC_RANS && Kind_Turb_Model == TURB_MODEL::NONE){
34823482
SU2_MPI::Error("A turbulence model must be specified with KIND_TURB_MODEL if SOLVER= INC_RANS", CURRENT_FUNCTION);
34833483
}
3484+
if (Kind_Turb_Model == TURB_MODEL::NONE && Kind_Trans_Model != TURB_TRANS_MODEL::NONE) {
3485+
SU2_MPI::Error("KIND_TURB_MODEL cannot be NONE to use a transition model", CURRENT_FUNCTION);
3486+
}
3487+
switch (Kind_Solver) {
3488+
case MAIN_SOLVER::EULER:
3489+
case MAIN_SOLVER::INC_EULER:
3490+
case MAIN_SOLVER::FEM_EULER:
3491+
case MAIN_SOLVER::NEMO_EULER:
3492+
if (nMarker_HeatFlux + nMarker_Isothermal + nMarker_HeatTransfer +
3493+
nMarker_Smoluchowski_Maxwell + nMarker_CHTInterface > 0) {
3494+
SU2_MPI::Error("Euler solvers are only compatible with slip walls (MARKER_EULER)", CURRENT_FUNCTION);
3495+
}
3496+
break;
3497+
default:
3498+
break;
3499+
}
34843500

34853501
/*--- Postprocess SST_OPTIONS into structure. ---*/
34863502
if (Kind_Turb_Model == TURB_MODEL::SST) {

meson_options.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ option('extra-deps', type : 'string', value : '', description: 'comma-separated
2020
option('enable-mpp', type : 'boolean', value : false, description: 'enable Mutation++ support')
2121
option('install-mpp', type : 'boolean', value : false, description: 'install Mutation++ in the directory defined with --prefix')
2222
option('enable-coolprop', type : 'boolean', value : false, description: 'enable CoolProp support')
23-
option('enable-mlpcpp', type : 'boolean', value : false, description: 'enable profiling through gprof')
24-
option('enable-gprof', type : 'boolean', value : false, description: 'enable MLPCpp support')
23+
option('enable-mlpcpp', type : 'boolean', value : false, description: 'enable MLPCpp support')
24+
option('enable-gprof', type : 'boolean', value : false, description: 'enable profiling through gprof')
2525
option('opdi-backend', type : 'combo', choices : ['auto', 'macro', 'ompt'], value : 'auto', description: 'OpDiLib backend choice')
2626
option('codi-tape', type : 'combo', choices : ['JacobianLinear', 'JacobianReuse', 'JacobianMultiUse', 'PrimalLinear', 'PrimalReuse', 'PrimalMultiUse'], value : 'JacobianLinear', description: 'CoDiPack tape choice')
2727
option('opdi-shared-read-opt', type : 'boolean', value : true, description : 'OpDiLib shared reading optimization')

meson_scripts/init.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ def init_submodules(
7171
github_repo_coolprop = "https://github.com/CoolProp/CoolProp"
7272
sha_version_mel = "46205ab019e5224559091375a6d71aabae6bc5b9"
7373
github_repo_mel = "https://github.com/pcarruscag/MEL"
74-
sha_version_mlpcpp = "c19c53ea2b85ccfb185f1c6c87044dc0b5bc7ae0"
74+
sha_version_mlpcpp = "6865a58b22f21a92977839d9c93eae9522402f55"
7575
github_repo_mlpcpp = "https://github.com/EvertBunschoten/MLPCpp"
7676

7777
medi_name = "MeDiPack"

0 commit comments

Comments
 (0)