From 1a30b5821b75e9d1cc6c81a7a0ba66c42327207b Mon Sep 17 00:00:00 2001 From: Pedro Gomes Date: Fri, 24 Jan 2025 16:22:21 -0800 Subject: [PATCH 1/4] add submodule --- .gitmodules | 3 +++ externals/FADO | 1 + 2 files changed, 4 insertions(+) create mode 160000 externals/FADO diff --git a/.gitmodules b/.gitmodules index 2c655cb36da..4c6d8a819f8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -27,3 +27,6 @@ [submodule "subprojects/MLPCpp"] path = subprojects/MLPCpp url = https://github.com/EvertBunschoten/MLPCpp.git +[submodule "externals/FADO"] + path = externals/FADO + url = https://github.com/pcarruscag/FADO.git diff --git a/externals/FADO b/externals/FADO new file mode 160000 index 00000000000..ee0eb0ba08e --- /dev/null +++ b/externals/FADO @@ -0,0 +1 @@ +Subproject commit ee0eb0ba08e04c83051d805ee64de6d97d9fda38 From bd72165069e39834a2ee77abc34cb70831a2d4d9 Mon Sep 17 00:00:00 2001 From: Pedro Gomes Date: Fri, 24 Jan 2025 16:39:13 -0800 Subject: [PATCH 2/4] install --- SU2_PY/meson.build | 2 ++ 1 file changed, 2 insertions(+) diff --git a/SU2_PY/meson.build b/SU2_PY/meson.build index 85ae325f3f0..5c00ac9b1ad 100644 --- a/SU2_PY/meson.build +++ b/SU2_PY/meson.build @@ -70,3 +70,5 @@ install_data(['FSI_tools/__init__.py', install_data(['SU2_Nastran/__init__.py', 'SU2_Nastran/pysu2_nastran.py'], install_dir: join_paths(get_option('bindir'), 'SU2_Nastran')) + +install_subdir(['../externals/FADO'], install_dir: join_paths(get_option('bindir'), 'FADO')) From 9697a85c98e67bd13a596ff3fa00489bcd48edbe Mon Sep 17 00:00:00 2001 From: Pedro Gomes Date: Fri, 24 Jan 2025 17:37:08 -0800 Subject: [PATCH 3/4] fixes for importing easily --- SU2_PY/meson.build | 2 +- TestCases/serial_regression.py | 4 ++++ externals/FADO | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/SU2_PY/meson.build b/SU2_PY/meson.build index 5c00ac9b1ad..ced81290346 100644 --- a/SU2_PY/meson.build +++ b/SU2_PY/meson.build @@ -71,4 +71,4 @@ install_data(['SU2_Nastran/__init__.py', 'SU2_Nastran/pysu2_nastran.py'], install_dir: join_paths(get_option('bindir'), 'SU2_Nastran')) -install_subdir(['../externals/FADO'], install_dir: join_paths(get_option('bindir'), 'FADO')) +install_subdir(['../externals/FADO'], install_dir: get_option('bindir')) diff --git a/TestCases/serial_regression.py b/TestCases/serial_regression.py index b4b9cd473a9..7f8baec7e9a 100644 --- a/TestCases/serial_regression.py +++ b/TestCases/serial_regression.py @@ -30,6 +30,10 @@ from TestCase import TestCase from TestCase import parse_args +import FADO +FADO.printDocumentation() + + def main(): '''This program runs SU2 and ensures that the output matches specified values. This will be used to do checks when code is pushed to github diff --git a/externals/FADO b/externals/FADO index ee0eb0ba08e..de318644e81 160000 --- a/externals/FADO +++ b/externals/FADO @@ -1 +1 @@ -Subproject commit ee0eb0ba08e04c83051d805ee64de6d97d9fda38 +Subproject commit de318644e81037cfd20af3e12c51bf14dcdf77ba From 4d9a0d9aab2f4e86d1f651f30a4645d5a46f7fcb Mon Sep 17 00:00:00 2001 From: Pedro Gomes <38071223+pcarruscag@users.noreply.github.com> Date: Fri, 24 Jan 2025 19:40:31 -0800 Subject: [PATCH 4/4] Update TestCases/serial_regression.py --- TestCases/serial_regression.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/TestCases/serial_regression.py b/TestCases/serial_regression.py index 7f8baec7e9a..b4b9cd473a9 100644 --- a/TestCases/serial_regression.py +++ b/TestCases/serial_regression.py @@ -30,10 +30,6 @@ from TestCase import TestCase from TestCase import parse_args -import FADO -FADO.printDocumentation() - - def main(): '''This program runs SU2 and ensures that the output matches specified values. This will be used to do checks when code is pushed to github