From 5657f255b90574a4a89c7998b6c931096b7469fa Mon Sep 17 00:00:00 2001 From: reos-rcrozier <91322120+reos-rcrozier@users.noreply.github.com> Date: Tue, 24 Jan 2023 23:04:00 +0000 Subject: [PATCH 01/22] Added workflow-dispatch --- .github/workflows/automated-dev-tests.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/automated-dev-tests.yml b/.github/workflows/automated-dev-tests.yml index 0748beb9a5..c77200d524 100644 --- a/.github/workflows/automated-dev-tests.yml +++ b/.github/workflows/automated-dev-tests.yml @@ -2,6 +2,8 @@ name: 'Development Pipeline' on: + workflow_dispatch: + push: paths-ignore: - 'LICENSE' From cdf2ed0921a3bb94ab59152e0faba7d6e82a61ed Mon Sep 17 00:00:00 2001 From: reos-rcrozier <91322120+reos-rcrozier@users.noreply.github.com> Date: Wed, 25 Jan 2023 14:36:58 +0000 Subject: [PATCH 02/22] Revert "Added workflow-dispatch" This reverts commit 5657f255b90574a4a89c7998b6c931096b7469fa. --- .github/workflows/automated-dev-tests.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/automated-dev-tests.yml b/.github/workflows/automated-dev-tests.yml index c77200d524..0748beb9a5 100644 --- a/.github/workflows/automated-dev-tests.yml +++ b/.github/workflows/automated-dev-tests.yml @@ -2,8 +2,6 @@ name: 'Development Pipeline' on: - workflow_dispatch: - push: paths-ignore: - 'LICENSE' From c67ed7bafb6f84a2cd7fa2c8006d21724bda6583 Mon Sep 17 00:00:00 2001 From: reos-rcrozier <91322120+reos-rcrozier@users.noreply.github.com> Date: Wed, 26 Jul 2023 00:06:57 +0100 Subject: [PATCH 03/22] automated-dev-tests.yml: add Matlab runner and build simulink API This branch is to modify the workflow to add tests for the build of the Matlab Simulink interface. --- .github/workflows/automated-dev-tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/automated-dev-tests.yml b/.github/workflows/automated-dev-tests.yml index 0748beb9a5..0f7e03cbbf 100644 --- a/.github/workflows/automated-dev-tests.yml +++ b/.github/workflows/automated-dev-tests.yml @@ -43,6 +43,8 @@ jobs: with: python-version: '3.9' cache: 'pip' + - name: Set up MATLAB + uses: matlab-actions/setup-matlab@v1 - name: Install dependencies run: | python -m pip install --upgrade pip @@ -63,6 +65,7 @@ jobs: -DVARIABLE_TRACKING=OFF \ -DBUILD_TESTING:BOOL=ON \ -DCTEST_PLOT_ERRORS:BOOL=ON \ + -DBUILD_OPENFAST_SIMULINK_API=ON \ ${GITHUB_WORKSPACE} # -DDOUBLE_PRECISION=OFF \ - name: Build all From 7b556428d80d80d055fa286d09e0653a5361f888 Mon Sep 17 00:00:00 2001 From: reos-rcrozier <91322120+reos-rcrozier@users.noreply.github.com> Date: Wed, 26 Jul 2023 00:33:53 +0100 Subject: [PATCH 04/22] Create test_openfast_simulink.m Unit test for Matlab Simulink interface. --- .../examples/test_openfast_simulink.m | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 glue-codes/simulink/examples/test_openfast_simulink.m diff --git a/glue-codes/simulink/examples/test_openfast_simulink.m b/glue-codes/simulink/examples/test_openfast_simulink.m new file mode 100644 index 0000000000..0d0378a671 --- /dev/null +++ b/glue-codes/simulink/examples/test_openfast_simulink.m @@ -0,0 +1,21 @@ +%% Test OpenFAST Simulink Interface +classdef OpenFASTSimulinkTest < matlab.unittest.TestCase + + %% Test Method Block + methods (Test) + + function testOpenLoopRuns(testCase) + + this_file_path = fileparts(which(mfilename())); + + cd(this_file_path); + + % these variables are defined in the OpenLoop model's FAST_SFunc block: + FAST_InputFileName = fullfile(this_file_path, '..', '..', '..', 'reg_tests', 'r-test', 'glue-codes', 'openfast', 'AOC_WSt/AOC_WSt.fst'); + TMax = 5; % seconds + + sim('OpenLoop.mdl',[0,TMax]); + + end + end +end From ab24635df6ab95d59d2fc006ea2e2f66a5b803ff Mon Sep 17 00:00:00 2001 From: reos-rcrozier <91322120+reos-rcrozier@users.noreply.github.com> Date: Wed, 26 Jul 2023 00:45:15 +0100 Subject: [PATCH 05/22] Update test_openfast_simulink.m Use environment variable to get workspace root --- glue-codes/simulink/examples/test_openfast_simulink.m | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/glue-codes/simulink/examples/test_openfast_simulink.m b/glue-codes/simulink/examples/test_openfast_simulink.m index 0d0378a671..5c864e026c 100644 --- a/glue-codes/simulink/examples/test_openfast_simulink.m +++ b/glue-codes/simulink/examples/test_openfast_simulink.m @@ -6,12 +6,14 @@ function testOpenLoopRuns(testCase) + workspace_root = getenv("GITHUB_WORKSPACE"); + this_file_path = fileparts(which(mfilename())); cd(this_file_path); % these variables are defined in the OpenLoop model's FAST_SFunc block: - FAST_InputFileName = fullfile(this_file_path, '..', '..', '..', 'reg_tests', 'r-test', 'glue-codes', 'openfast', 'AOC_WSt/AOC_WSt.fst'); + FAST_InputFileName = fullfile(workspace_root, 'reg_tests', 'r-test', 'glue-codes', 'openfast', 'AOC_WSt', 'AOC_WSt.fst'); TMax = 5; % seconds sim('OpenLoop.mdl',[0,TMax]); From 1bee16bb03f1bdaac00d5ce7b4d0731cb00990f5 Mon Sep 17 00:00:00 2001 From: reos-rcrozier <91322120+reos-rcrozier@users.noreply.github.com> Date: Wed, 26 Jul 2023 01:01:50 +0100 Subject: [PATCH 06/22] Update automated-dev-tests.yml Added Simulink test run --- .github/workflows/automated-dev-tests.yml | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/.github/workflows/automated-dev-tests.yml b/.github/workflows/automated-dev-tests.yml index 0f7e03cbbf..01697d3b1b 100644 --- a/.github/workflows/automated-dev-tests.yml +++ b/.github/workflows/automated-dev-tests.yml @@ -164,6 +164,8 @@ jobs: with: python-version: '3.9' cache: 'pip' + - name: Set up MATLAB + uses: matlab-actions/setup-matlab@v1 - name: Install dependencies run: | python -m pip install --upgrade pip @@ -189,6 +191,7 @@ jobs: -DBUILD_SHARED_LIBS:BOOL=OFF \ -DBUILD_TESTING:BOOL=ON \ -DCTEST_PLOT_ERRORS:BOOL=ON \ + -DBUILD_OPENFAST_SIMULINK_API=ON \ ${GITHUB_WORKSPACE} - name: Build openfast-postlib working-directory: ${{runner.workspace}}/openfast/build @@ -550,7 +553,22 @@ jobs: !${{runner.workspace}}/openfast/build/reg_tests/glue-codes/openfast/UAE_VI !${{runner.workspace}}/openfast/build/reg_tests/glue-codes/openfast/WP_Baseline - + rtest-simulink: + runs-on: ubuntu-22.04 + needs: build-openfast-release + steps: + - name: Cache the workspace + uses: actions/cache@v3.0.4 + with: + path: ${{runner.workspace}} + key: build-openfast-release-${{ github.sha }} + - name: Run MATLAB tests and generate artifacts + uses: matlab-actions/run-tests@v1 + with: + source-folder: ${{runner.workspace}}/openfast/build/glue-codes/simulink; ${GITHUB_WORKSPACE}/glue-codes/simulink/examples + test-results-junit: test-results/results.xml + code-coverage-cobertura: code-coverage/coverage.xml + rtest-OF-5MW_OC4Semi_WSt_WavesWN: runs-on: ubuntu-20.04 needs: build-openfast-release From a1b18775c5ef58aa8739e09ced3f25bccbae08ca Mon Sep 17 00:00:00 2001 From: reos-rcrozier <91322120+reos-rcrozier@users.noreply.github.com> Date: Wed, 26 Jul 2023 01:31:58 +0100 Subject: [PATCH 07/22] Update automated-dev-tests.yml Rename simulink test and add step to set up Matlab. --- .github/workflows/automated-dev-tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/automated-dev-tests.yml b/.github/workflows/automated-dev-tests.yml index 01697d3b1b..6c048f195b 100644 --- a/.github/workflows/automated-dev-tests.yml +++ b/.github/workflows/automated-dev-tests.yml @@ -553,7 +553,7 @@ jobs: !${{runner.workspace}}/openfast/build/reg_tests/glue-codes/openfast/UAE_VI !${{runner.workspace}}/openfast/build/reg_tests/glue-codes/openfast/WP_Baseline - rtest-simulink: + rtest-OF-simulink: runs-on: ubuntu-22.04 needs: build-openfast-release steps: @@ -562,6 +562,8 @@ jobs: with: path: ${{runner.workspace}} key: build-openfast-release-${{ github.sha }} + - name: Set up MATLAB + uses: matlab-actions/setup-matlab@v1 - name: Run MATLAB tests and generate artifacts uses: matlab-actions/run-tests@v1 with: From 01e64cae0c391aa03994c719962660ad00cb3616 Mon Sep 17 00:00:00 2001 From: reos-rcrozier <91322120+reos-rcrozier@users.noreply.github.com> Date: Wed, 26 Jul 2023 02:12:24 +0100 Subject: [PATCH 08/22] automated-dev-tests.yml: fix matlab source-directories --- .github/workflows/automated-dev-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/automated-dev-tests.yml b/.github/workflows/automated-dev-tests.yml index 6c048f195b..25ecfa4a93 100644 --- a/.github/workflows/automated-dev-tests.yml +++ b/.github/workflows/automated-dev-tests.yml @@ -567,7 +567,7 @@ jobs: - name: Run MATLAB tests and generate artifacts uses: matlab-actions/run-tests@v1 with: - source-folder: ${{runner.workspace}}/openfast/build/glue-codes/simulink; ${GITHUB_WORKSPACE}/glue-codes/simulink/examples + source-folder: ${{runner.workspace}}/openfast/build/glue-codes/simulink; ${{runner.workspace}}/openfast/glue-codes/simulink/examples test-results-junit: test-results/results.xml code-coverage-cobertura: code-coverage/coverage.xml From 618d4ee70cddf320f6446f6dcc7401c4eef0cdf3 Mon Sep 17 00:00:00 2001 From: reos-rcrozier <91322120+reos-rcrozier@users.noreply.github.com> Date: Wed, 26 Jul 2023 06:54:45 +0100 Subject: [PATCH 09/22] Update test_openfast_simulink.m Change class name to match file name. --- glue-codes/simulink/examples/test_openfast_simulink.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glue-codes/simulink/examples/test_openfast_simulink.m b/glue-codes/simulink/examples/test_openfast_simulink.m index 5c864e026c..5bc8c2e158 100644 --- a/glue-codes/simulink/examples/test_openfast_simulink.m +++ b/glue-codes/simulink/examples/test_openfast_simulink.m @@ -1,5 +1,5 @@ %% Test OpenFAST Simulink Interface -classdef OpenFASTSimulinkTest < matlab.unittest.TestCase +classdef test_openfast_simulink < matlab.unittest.TestCase %% Test Method Block methods (Test) From 808f391d18e47aae04e241d26de4c5b4f992ac3c Mon Sep 17 00:00:00 2001 From: reos-rcrozier <91322120+reos-rcrozier@users.noreply.github.com> Date: Wed, 26 Jul 2023 07:41:35 +0100 Subject: [PATCH 10/22] Update test_openfast_simulink.m Ensure variables are available to Simulink model --- glue-codes/simulink/examples/test_openfast_simulink.m | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/glue-codes/simulink/examples/test_openfast_simulink.m b/glue-codes/simulink/examples/test_openfast_simulink.m index 5bc8c2e158..0686b125bd 100644 --- a/glue-codes/simulink/examples/test_openfast_simulink.m +++ b/glue-codes/simulink/examples/test_openfast_simulink.m @@ -15,8 +15,16 @@ function testOpenLoopRuns(testCase) % these variables are defined in the OpenLoop model's FAST_SFunc block: FAST_InputFileName = fullfile(workspace_root, 'reg_tests', 'r-test', 'glue-codes', 'openfast', 'AOC_WSt', 'AOC_WSt.fst'); TMax = 5; % seconds + + mdl = "OpenLoop"; + + %simIn = Simulink.SimulationInput(mdl); + %simIn = setBlockParameter(simIn, "sldemo_househeat/Set Point", "Value", FAST_InputFileName); + + assignin("base", "FAST_InputFileName", FAST_InputFileName); + assignin("base", "TMax", TMax); - sim('OpenLoop.mdl',[0,TMax]); + sim(mdl, [0,TMax]); end end From 6b880ef76bb8a8ce5afaf953f2af1ddb43b1a579 Mon Sep 17 00:00:00 2001 From: reos-rcrozier <91322120+reos-rcrozier@users.noreply.github.com> Date: Wed, 26 Jul 2023 12:15:00 +0100 Subject: [PATCH 11/22] Update automated-dev-tests.yml Actually build FAST_SFunc before testing --- .github/workflows/automated-dev-tests.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/automated-dev-tests.yml b/.github/workflows/automated-dev-tests.yml index 25ecfa4a93..d717a99805 100644 --- a/.github/workflows/automated-dev-tests.yml +++ b/.github/workflows/automated-dev-tests.yml @@ -564,6 +564,10 @@ jobs: key: build-openfast-release-${{ github.sha }} - name: Set up MATLAB uses: matlab-actions/setup-matlab@v1 + - name: Build FAST_SFunc + working-directory: ${{runner.workspace}}/openfast/build + run: | + cmake --build . --target FAST_SFunc - name: Run MATLAB tests and generate artifacts uses: matlab-actions/run-tests@v1 with: From 1758459fadf8ea6c31b0e0c7cd20caaf39882f3f Mon Sep 17 00:00:00 2001 From: reos-rcrozier <91322120+reos-rcrozier@users.noreply.github.com> Date: Wed, 26 Jul 2023 13:08:52 +0100 Subject: [PATCH 12/22] Update automated-dev-tests.yml Add dependencies --- .github/workflows/automated-dev-tests.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/automated-dev-tests.yml b/.github/workflows/automated-dev-tests.yml index d717a99805..268e61e1af 100644 --- a/.github/workflows/automated-dev-tests.yml +++ b/.github/workflows/automated-dev-tests.yml @@ -562,6 +562,10 @@ jobs: with: path: ${{runner.workspace}} key: build-openfast-release-${{ github.sha }} + - name: Install dependencies + run: | + sudo apt-get update -y + sudo apt-get install -y libhdf5-dev libopenmpi-dev libyaml-cpp-dev - name: Set up MATLAB uses: matlab-actions/setup-matlab@v1 - name: Build FAST_SFunc From 8ff7da30630e83bf7f62f683ce00f6705829f8e1 Mon Sep 17 00:00:00 2001 From: reos-rcrozier <91322120+reos-rcrozier@users.noreply.github.com> Date: Thu, 27 Jul 2023 10:28:14 +0100 Subject: [PATCH 13/22] Update CMakeLists.txt Remove references to openfoam library as that module has been removed --- glue-codes/simulink/CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/glue-codes/simulink/CMakeLists.txt b/glue-codes/simulink/CMakeLists.txt index f4251c35cd..f80dcf6546 100644 --- a/glue-codes/simulink/CMakeLists.txt +++ b/glue-codes/simulink/CMakeLists.txt @@ -38,7 +38,6 @@ matlab_add_mex( $ $ $ - $ $ $ $ @@ -50,7 +49,6 @@ matlab_add_mex( $ # MATLAB Specific $ $ - $ $ ${LAPACK_LIBRARIES} ${CMAKE_DL_LIBS} From 8711772890152bf895d7078eea0f55e9509fabe4 Mon Sep 17 00:00:00 2001 From: reos-rcrozier <91322120+reos-rcrozier@users.noreply.github.com> Date: Thu, 27 Jul 2023 10:49:34 +0100 Subject: [PATCH 14/22] Update simulink CMakeLists.txt Add references to external inflow module libs --- glue-codes/simulink/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/glue-codes/simulink/CMakeLists.txt b/glue-codes/simulink/CMakeLists.txt index f80dcf6546..88035beaee 100644 --- a/glue-codes/simulink/CMakeLists.txt +++ b/glue-codes/simulink/CMakeLists.txt @@ -38,6 +38,7 @@ matlab_add_mex( $ $ $ + $ $ $ $ @@ -49,6 +50,7 @@ matlab_add_mex( $ # MATLAB Specific $ $ + $ $ ${LAPACK_LIBRARIES} ${CMAKE_DL_LIBS} From 4f69111bb704d05b21681692cbc465d9d90bcaf1 Mon Sep 17 00:00:00 2001 From: reos-rcrozier <91322120+reos-rcrozier@users.noreply.github.com> Date: Thu, 27 Jul 2023 13:26:24 +0100 Subject: [PATCH 15/22] Update simulink CMakeLists.txt update another reference from openfoam to externalinflow --- glue-codes/simulink/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glue-codes/simulink/CMakeLists.txt b/glue-codes/simulink/CMakeLists.txt index 88035beaee..c2590df7dd 100644 --- a/glue-codes/simulink/CMakeLists.txt +++ b/glue-codes/simulink/CMakeLists.txt @@ -62,7 +62,7 @@ set_target_properties(FAST_SFunc PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/matlab) target_include_directories(FAST_SFunc PUBLIC $ - $ + $ $ ) if(APPLE OR UNIX) From d55ff5057921b08c7d4bea6163bdb8b08f5089fe Mon Sep 17 00:00:00 2001 From: reos-rcrozier <91322120+reos-rcrozier@users.noreply.github.com> Date: Thu, 27 Jul 2023 14:13:34 +0100 Subject: [PATCH 16/22] Update simulink CMakeLists.txt Add missing seastlib --- glue-codes/simulink/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/glue-codes/simulink/CMakeLists.txt b/glue-codes/simulink/CMakeLists.txt index c2590df7dd..23c6a39a94 100644 --- a/glue-codes/simulink/CMakeLists.txt +++ b/glue-codes/simulink/CMakeLists.txt @@ -52,6 +52,7 @@ matlab_add_mex( $ $ $ + $ ${LAPACK_LIBRARIES} ${CMAKE_DL_LIBS} ${CMAKE_Fortran_IMPLICIT_LINK_LIBRARIES} From b1b15190961cd63eb44a8f1a817c970789f7d6e7 Mon Sep 17 00:00:00 2001 From: reos-rcrozier <91322120+reos-rcrozier@users.noreply.github.com> Date: Tue, 1 Aug 2023 22:58:48 +0100 Subject: [PATCH 17/22] Update simulink CMakeLists.txt replace references to foamfastlib with extinflowlib again --- glue-codes/simulink/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/glue-codes/simulink/CMakeLists.txt b/glue-codes/simulink/CMakeLists.txt index be0788de98..900e9d73a5 100644 --- a/glue-codes/simulink/CMakeLists.txt +++ b/glue-codes/simulink/CMakeLists.txt @@ -33,10 +33,10 @@ set(MEX_LIBS $ $ # MATLAB Specific $ - $ + $ $ $ - $ + $ $ $ # MATLAB Specific ) From f8b05c9e937e8e8822a5a1054d6566f7f0f2c4f1 Mon Sep 17 00:00:00 2001 From: reos-rcrozier <91322120+reos-rcrozier@users.noreply.github.com> Date: Tue, 1 Aug 2023 23:47:13 +0100 Subject: [PATCH 18/22] Update automated-dev-tests.yml Add missing openblas packages for simulink test --- .github/workflows/automated-dev-tests.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/automated-dev-tests.yml b/.github/workflows/automated-dev-tests.yml index 2a11e0e241..6de72584b6 100644 --- a/.github/workflows/automated-dev-tests.yml +++ b/.github/workflows/automated-dev-tests.yml @@ -617,6 +617,7 @@ jobs: !${{runner.workspace}}/openfast/build/reg_tests/glue-codes/openfast/UAE_VI !${{runner.workspace}}/openfast/build/reg_tests/glue-codes/openfast/WP_Baseline + rtest-OF-simulink: runs-on: ubuntu-22.04 needs: build-openfast-release @@ -629,7 +630,7 @@ jobs: - name: Install dependencies run: | sudo apt-get update -y - sudo apt-get install -y libhdf5-dev libopenmpi-dev libyaml-cpp-dev + sudo apt-get install -y libhdf5-dev libopenmpi-dev libyaml-cpp-dev libopenblas-dev libopenblas-openmp-dev - name: Set up MATLAB uses: matlab-actions/setup-matlab@v1 - name: Build FAST_SFunc @@ -642,7 +643,8 @@ jobs: source-folder: ${{runner.workspace}}/openfast/build/glue-codes/simulink; ${{runner.workspace}}/openfast/glue-codes/simulink/examples test-results-junit: test-results/results.xml code-coverage-cobertura: code-coverage/coverage.xml - + + rtest-OF-5MW_OC4Semi_WSt_WavesWN: runs-on: ubuntu-22.04 needs: build-openfast-release From abd0b5539c7fb40b55992bf9a3319421e1ecb1ff Mon Sep 17 00:00:00 2001 From: reos-rcrozier <91322120+reos-rcrozier@users.noreply.github.com> Date: Wed, 2 Aug 2023 00:29:19 +0100 Subject: [PATCH 19/22] Update simulin CMakeLists.txt again added missing seastatelib --- glue-codes/simulink/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/glue-codes/simulink/CMakeLists.txt b/glue-codes/simulink/CMakeLists.txt index 900e9d73a5..59e708b381 100644 --- a/glue-codes/simulink/CMakeLists.txt +++ b/glue-codes/simulink/CMakeLists.txt @@ -39,6 +39,7 @@ set(MEX_LIBS $ $ $ # MATLAB Specific + $ ) # Build the matlab shared library (mex) using the current toolchain. From d2e691b861c89adab4e9ada527d38e3355524105 Mon Sep 17 00:00:00 2001 From: reos-rcrozier <91322120+reos-rcrozier@users.noreply.github.com> Date: Wed, 2 Aug 2023 00:52:00 +0100 Subject: [PATCH 20/22] Update simulink CMakeLists.txt Fix seastlib typo --- glue-codes/simulink/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glue-codes/simulink/CMakeLists.txt b/glue-codes/simulink/CMakeLists.txt index 59e708b381..b84ee0d80d 100644 --- a/glue-codes/simulink/CMakeLists.txt +++ b/glue-codes/simulink/CMakeLists.txt @@ -39,7 +39,7 @@ set(MEX_LIBS $ $ $ # MATLAB Specific - $ + $ ) # Build the matlab shared library (mex) using the current toolchain. From bed2c7ac0398c80945571e9e0d7ac65be75f2aa7 Mon Sep 17 00:00:00 2001 From: reos-rcrozier <91322120+reos-rcrozier@users.noreply.github.com> Date: Wed, 2 Aug 2023 03:00:11 +0100 Subject: [PATCH 21/22] Update automated-dev-tests.yml Add BLA_STATIC=ON to simulink test build --- .github/workflows/automated-dev-tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/automated-dev-tests.yml b/.github/workflows/automated-dev-tests.yml index 6de72584b6..e9cc5418eb 100644 --- a/.github/workflows/automated-dev-tests.yml +++ b/.github/workflows/automated-dev-tests.yml @@ -636,6 +636,9 @@ jobs: - name: Build FAST_SFunc working-directory: ${{runner.workspace}}/openfast/build run: | + cmake \ + -DBLA_STATIC:BOOL=ON \ + ${GITHUB_WORKSPACE} cmake --build . --target FAST_SFunc - name: Run MATLAB tests and generate artifacts uses: matlab-actions/run-tests@v1 From 170616d42fe9c5715bbc32602d107e55f8a065de Mon Sep 17 00:00:00 2001 From: reos-rcrozier <91322120+reos-rcrozier@users.noreply.github.com> Date: Thu, 3 Aug 2023 02:22:14 +0100 Subject: [PATCH 22/22] Update automated-dev-tests.yml Try using local static lapack for simulink --- .github/workflows/automated-dev-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/automated-dev-tests.yml b/.github/workflows/automated-dev-tests.yml index e9cc5418eb..c2c1fd8024 100644 --- a/.github/workflows/automated-dev-tests.yml +++ b/.github/workflows/automated-dev-tests.yml @@ -637,7 +637,7 @@ jobs: working-directory: ${{runner.workspace}}/openfast/build run: | cmake \ - -DBLA_STATIC:BOOL=ON \ + -DUSE_LOCAL_STATIC_LAPACK:BOOL=ON \ ${GITHUB_WORKSPACE} cmake --build . --target FAST_SFunc - name: Run MATLAB tests and generate artifacts