Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add FADO to init script #2433

Merged
merged 3 commits into from
Jan 26, 2025
Merged

add FADO to init script #2433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9cfe08d
add FADO to init script
pcarruscag Jan 26, 2025
423e3a3
fix
pcarruscag Jan 26, 2025
4a0b4ce
fix
pcarruscag Jan 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion externals/FADO
Open in desktop
Submodule FADO updated 3 files
+1 −1 examples/example1_SU2/settings_tmpl.cfg
+1 −1 examples/example2_SU2/settings_tmpl.cfg
+1 −1 examples/example3_SU2/settings.cfg
11 changes: 11 additions & 0 deletions meson_scripts/init.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ def init_submodules(
own_mpp=True,
own_cool=True,
own_mel=True,
own_fado=True,
own_mlpcpp=True,
):

Expand All @@ -71,6 +72,8 @@ def init_submodules(
github_repo_coolprop = "https://github.com/CoolProp/CoolProp"
sha_version_mel = "46205ab019e5224559091375a6d71aabae6bc5b9"
github_repo_mel = "https://github.com/pcarruscag/MEL"
sha_version_fado = "ce7ee018e4e699af5028d69baa1939fea290e18a"
github_repo_fado = "https://github.com/pcarruscag/FADO"
sha_version_mlpcpp = "6865a58b22f21a92977839d9c93eae9522402f55"
github_repo_mlpcpp = "https://github.com/EvertBunschoten/MLPCpp"

Expand All @@ -82,6 +85,7 @@ def init_submodules(
mpp_name = "Mutationpp"
coolprop_name = "CoolProp"
mel_name = "MEL"
fado_name = "FADO"
mlpcpp_name = "MLPCpp"

base_path = cur_dir + os.path.sep + "externals" + os.path.sep
Expand All @@ -91,6 +95,7 @@ def init_submodules(
alt_name_meson = base_path + "meson"
alt_name_ninja = base_path + "ninja"
alt_name_mel = base_path + "mel"
alt_name_fado = base_path + "FADO"
alt_name_mpp = cur_dir + os.path.sep + "subprojects" + os.path.sep + "Mutationpp"
alt_name_coolprop = cur_dir + os.path.sep + "subprojects" + os.path.sep + "CoolProp"
alt_name_mlpcpp = cur_dir + os.path.sep + "subprojects" + os.path.sep + "MLPCpp"
Expand Down Expand Up @@ -123,6 +128,8 @@ def init_submodules(
submodule_status(alt_name_coolprop, sha_version_coolprop)
if own_mel:
submodule_status(alt_name_mel, sha_version_mel)
if own_fado:
submodule_status(alt_name_fado, sha_version_fado)
if own_mlpcpp:
submodule_status(alt_name_mlpcpp, sha_version_mlpcpp)
# Otherwise download the zip file from git
Expand Down Expand Up @@ -157,6 +164,10 @@ def init_submodules(
)
if own_mel:
download_module(mel_name, alt_name_mel, github_repo_mel, sha_version_mel)
if own_fado:
download_module(
fado_name, alt_name_fado, github_repo_fado, sha_version_fado
)
if own_mlpcpp:
download_module(
mlpcpp_name, alt_name_mlpcpp, github_repo_mlpcpp, sha_version_mlpcpp
Expand Down
6 changes: 6 additions & 0 deletions preconfigure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ def run(
own_mpp=True,
own_cool=True,
own_mel=True,
own_fado=True,
own_mlpcpp=True,
):

Expand All @@ -94,6 +95,7 @@ def run(
own_mpp=own_mpp,
own_cool=own_cool,
own_mel=own_mel,
own_fado=own_fado,
own_mlpcpp=own_mlpcpp,
)

Expand Down Expand Up @@ -137,6 +139,9 @@ def run(
parser.add_argument(
"--no-mel", help="do not download own copy of MEL", action="store_false"
)
parser.add_argument(
"--no-fado", help="do not download own copy of FADO", action="store_false"
)
parser.add_argument(
"--no-mlpcpp",
help="do not download copy of MLpCpp",
Expand All @@ -152,5 +157,6 @@ def run(
own_mpp=args.no_mpp,
own_cool=args.no_coolprop,
own_mel=args.no_mel,
own_fado=args.no_fado,
own_mlpcpp=args.no_mlpcpp,
)
Loading