Skip to content

Commit 3c7c07d

Browse files
committed
Merge branch 'develop' into ad_updates
2 parents 61808ee + 6530c8a commit 3c7c07d

4 files changed

Lines changed: 6 additions & 6 deletions

File tree

Common/src/CConfig.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7351,7 +7351,7 @@ void CConfig::SetOutput(SU2_COMPONENT val_software, unsigned short val_izone) {
73517351
if (nMarker_Inlet_Species != 0) {
73527352
BoundaryTable << "Species Inlet boundary";
73537353
for (iMarker_Inlet = 0; iMarker_Inlet < nMarker_Inlet_Species; iMarker_Inlet++) {
7354-
BoundaryTable << Marker_Inlet[iMarker_Inlet];
7354+
BoundaryTable << Marker_Inlet_Species[iMarker_Inlet];
73557355
if (iMarker_Inlet < nMarker_Inlet_Species-1) BoundaryTable << " ";
73567356
}
73577357
BoundaryTable.PrintFooter();

meson_scripts/init.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ def init_submodules(
6767
github_repo_ninja = "https://github.com/ninja-build/ninja"
6868
sha_version_mpp = "5ff579f43781cae07411e5ab46291c9971536be6"
6969
github_repo_mpp = "https://github.com/mutationpp/Mutationpp"
70-
sha_version_coolprop = "0ce42fcf3bb2c373512bc825a4f0c1973a78f307"
70+
sha_version_coolprop = "bafdea1f39ee873a6bb9833e3a21fe41f90b85e8"
7171
github_repo_coolprop = "https://github.com/CoolProp/CoolProp"
72-
sha_version_mel = "2484cd3258ef800a10e361016cb341834ee7930b"
72+
sha_version_mel = "46205ab019e5224559091375a6d71aabae6bc5b9"
7373
github_repo_mel = "https://github.com/pcarruscag/MEL"
7474
sha_version_mlpcpp = "665c45b7d3533c977eb1f637918d5b8b75c07d3b"
7575
github_repo_mlpcpp = "https://github.com/EvertBunschoten/MLPCpp"
@@ -218,7 +218,7 @@ def submodule_status(path, sha_commit):
218218
cwd=sys.path[0],
219219
)
220220
# to update CoolProp external libraries
221-
if sha_commit == "0ce42fcf3bb2c373512bc825a4f0c1973a78f307":
221+
if "CoolProp" in path:
222222
# update coolprop
223223
original_path = os.getcwd()
224224
print("update CoolProp")

subprojects/CoolProp

Submodule CoolProp updated 104 files

0 commit comments

Comments
 (0)