Merge remote-tracking branch 'OpenFAST/rc-3.5.1' into f/PR_1815

andrew-platt · Oct 17, 2023 · a312b26 · a312b26
2 parents c77b2fb + 7d814a3
commit a312b26
Show file tree

Hide file tree

Showing 28 changed files with 33,628 additions and 4,297 deletions.
diff --git a/.github/workflows/automated-dev-tests.yml b/.github/workflows/automated-dev-tests.yml
@@ -74,7 +74,7 @@ jobs:
         run: |
           cmake --build . --target all
       - name: Cache the workspace
-        uses: actions/cache@v3.0.4
+        uses: actions/cache@v3
         with:
           path: ${{runner.workspace}}
           key: build-all-debug-${{ github.sha }}
@@ -157,7 +157,7 @@ jobs:
         run: |
           cmake --build . --target regression_test_module_drivers
       - name: Cache the workspace
-        uses: actions/cache@v3.0.4
+        uses: actions/cache@v3
         with:
           path: ${{runner.workspace}}
           key: build-drivers-release-${{ github.sha }}
@@ -200,6 +200,7 @@ jobs:
             -DVARIABLE_TRACKING=OFF \
             -DBUILD_FASTFARM:BOOL=ON \
             -DBUILD_OPENFAST_CPP_API:BOOL=ON \
+            -DBUILD_OPENFAST_CPP_DRIVER:BOOL=ON \
             -DBUILD_SHARED_LIBS:BOOL=OFF \
             -DBUILD_TESTING:BOOL=ON \
             -DCTEST_PLOT_ERRORS:BOOL=ON \
@@ -208,7 +209,7 @@ jobs:
         working-directory: ${{runner.workspace}}/openfast/build
         run: cmake --build . --target openfast_postlib
       - name: Cache the workspace
-        uses: actions/cache@v3.0.4
+        uses: actions/cache@v3
         with:
           path: ${{runner.workspace}}
           key: build-postlib-release-${{ github.sha }}
@@ -219,7 +220,7 @@ jobs:
     needs: build-postlib-release
     steps:
       - name: Cache the workspace
-        uses: actions/cache@v3.0.4
+        uses: actions/cache@v3
         with:
           path: ${{runner.workspace}}
           key: build-postlib-release-${{ github.sha }}
@@ -244,9 +245,9 @@ jobs:
       - name: Build OpenFAST C-Interfaces
         working-directory: ${{runner.workspace}}/openfast/build
         run: |
-          cmake --build . --target openfastlib openfast_cpp openfastcpp aerodyn_inflow_c_binding moordyn_c_binding ifw_c_binding hydrodyn_c_binding regression_test_controllers
+          cmake --build . --target openfastlib openfast_cpp_driver openfastcpp aerodyn_inflow_c_binding moordyn_c_binding ifw_c_binding hydrodyn_c_binding regression_test_controllers
       - name: Cache the workspace
-        uses: actions/cache@v3.0.4
+        uses: actions/cache@v3
         with:
           path: ${{runner.workspace}}
           key: build-interfaces-release-${{ github.sha }}
@@ -257,7 +258,7 @@ jobs:
     needs: build-postlib-release
     steps:
       - name: Cache the workspace
-        uses: actions/cache@v3.0.4
+        uses: actions/cache@v3
         with:
           path: ${{runner.workspace}}
           key: build-postlib-release-${{ github.sha }}
@@ -284,7 +285,7 @@ jobs:
         run: |
           cmake --build . --target openfast
       - name: Cache the workspace
-        uses: actions/cache@v3.0.4
+        uses: actions/cache@v3
         with:
           path: ${{runner.workspace}}
           key: build-openfast-release-${{ github.sha }}
@@ -295,7 +296,7 @@ jobs:
     needs: build-postlib-release
     steps:
       - name: Cache the workspace
-        uses: actions/cache@v3.0.4
+        uses: actions/cache@v3
         with:
           path: ${{runner.workspace}}
           key: build-postlib-release-${{ github.sha }}
@@ -322,7 +323,7 @@ jobs:
         run: |
           cmake --build . --target FAST.Farm
       - name: Cache the workspace
-        uses: actions/cache@v3.0.4
+        uses: actions/cache@v3
         with:
           path: ${{runner.workspace}}
           key: build-fastfarm-release-${{ github.sha }}
@@ -397,7 +398,7 @@ jobs:
     needs: build-drivers-release
     steps:
       - name: Cache the workspace
-        uses: actions/cache@v3.0.4
+        uses: actions/cache@v3
         with:
           path: ${{runner.workspace}}
           key: build-drivers-release-${{ github.sha }}
@@ -453,7 +454,7 @@ jobs:
     needs: build-all-debug
     steps:
       - name: Cache the workspace
-        uses: actions/cache@v3.0.4
+        uses: actions/cache@v3
         with:
           path: ${{runner.workspace}}
           key: build-all-debug-${{ github.sha }}
@@ -512,7 +513,7 @@ jobs:
     needs: build-interfaces-release
     steps:
       - name: Cache the workspace
-        uses: actions/cache@v3.0.4
+        uses: actions/cache@v3
         with:
           path: ${{runner.workspace}}
           key: build-interfaces-release-${{ github.sha }}
@@ -560,7 +561,7 @@ jobs:
     needs: build-openfast-release
     steps:
       - name: Cache the workspace
-        uses: actions/cache@v3.0.4
+        uses: actions/cache@v3
         with:
           path: ${{runner.workspace}}
           key: build-openfast-release-${{ github.sha }}
@@ -613,7 +614,7 @@ jobs:
     needs: build-openfast-release
     steps:
       - name: Cache the workspace
-        uses: actions/cache@v3.0.4
+        uses: actions/cache@v3
         with:
           path: ${{runner.workspace}}
           key: build-openfast-release-${{ github.sha }}
@@ -663,7 +664,7 @@ jobs:
     needs: build-openfast-release
     steps:
       - name: Cache the workspace
-        uses: actions/cache@v3.0.4
+        uses: actions/cache@v3
         with:
           path: ${{runner.workspace}}
           key: build-openfast-release-${{ github.sha }}
@@ -713,7 +714,7 @@ jobs:
     needs: build-openfast-release
     steps:
       - name: Cache the workspace
-        uses: actions/cache@v3.0.4
+        uses: actions/cache@v3
         with:
           path: ${{runner.workspace}}
           key: build-openfast-release-${{ github.sha }}
@@ -763,7 +764,7 @@ jobs:
     needs: build-openfast-release
     steps:
       - name: Cache the workspace
-        uses: actions/cache@v3.0.4
+        uses: actions/cache@v3
         with:
           path: ${{runner.workspace}}
           key: build-openfast-release-${{ github.sha }}
@@ -813,7 +814,7 @@ jobs:
     needs: build-openfast-release
     steps:
       - name: Cache the workspace
-        uses: actions/cache@v3.0.4
+        uses: actions/cache@v3
         with:
           path: ${{runner.workspace}}
           key: build-openfast-release-${{ github.sha }}
@@ -863,7 +864,7 @@ jobs:
     needs: build-openfast-release
     steps:
       - name: Cache the workspace
-        uses: actions/cache@v3.0.4
+        uses: actions/cache@v3
         with:
           path: ${{runner.workspace}}
           key: build-openfast-release-${{ github.sha }}
@@ -913,7 +914,7 @@ jobs:
     needs: build-fastfarm-release
     steps:
       - name: Cache the workspace
-        uses: actions/cache@v3.0.4
+        uses: actions/cache@v3
         with:
           path: ${{runner.workspace}}
           key: build-fastfarm-release-${{ github.sha }}

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -44,6 +44,7 @@ option(FPE_TRAP_ENABLED "Enable FPE trap in compiler options" off)
 option(ORCA_DLL_LOAD "Enable OrcaFlex Library Load" on)
 option(BUILD_FASTFARM "Enable building FAST.Farm" off)
 option(BUILD_OPENFAST_CPP_API "Enable building OpenFAST - C++ API" off)
+option(BUILD_OPENFAST_CPP_DRIVER "Enable building OpenFAST C++ driver using C++ API" off)
 option(BUILD_OPENFAST_SIMULINK_API "Enable building OpenFAST for use with Simulink" off)
 option(OPENMP "Enable OpenMP support" off)
 option(USE_LOCAL_STATIC_LAPACK "Enable downloading and building static LAPACK and BLAS libs" off)

diff --git a/docs/source/user/moordyn/index.rst b/docs/source/user/moordyn/index.rst
@@ -5,8 +5,8 @@ MoorDyn Users Guide
 
 The documentation for MoorDyn is avaible `here <https://moordyn.readthedocs.io>`_. It features instructions 
 for the use of MoorDynF, the module in OpenFAST, and MoorDynC, the standalone C++ code. Input file formats
-are described in the `inputs section <>`_.
-(`MoorDyn usage <https://moordyn.readthedocs.io/en/latest/inputs.html>`_, specifically the section for V2)
+are described in the `inputs section <https://moordyn.readthedocs.io/en/latest/inputs.html>`_
+(`MoorDyn usage <https://moordyn.readthedocs.io/en/latest/inputs.html#the-v2-input-file>`_, specifically the section for V2),
 usage of MoorDyn at the FAST.Farm level
 (`MoorDyn with FAST.Farm <https://moordyn.readthedocs.io/en/latest/inputs.html#moordyn-with-fast-farm-inputs>`_),
 and links to publications with the relevant theory.

diff --git a/glue-codes/openfast/CMakeLists.txt b/glue-codes/openfast/CMakeLists.txt
@@ -20,9 +20,6 @@ add_executable(openfast src/FAST_Prog.f90)
 target_link_libraries(openfast openfastlib_static)
 set_target_properties(openfast PROPERTIES LINKER_LANGUAGE Fortran)
 
-add_executable(openfast_cpp src/FAST_Prog.cpp src/FastLibAPI.cpp)
-target_link_libraries(openfast_cpp openfastlib)
-
 string(TOUPPER ${CMAKE_Fortran_COMPILER_ID} _compiler_id)
 if (${_compiler_id} STREQUAL "GNU" AND NOT ${VARIABLE_TRACKING})
   # With variable tracking enabled, the compile step frequently aborts on large modules and
@@ -33,5 +30,15 @@ if (${_compiler_id} STREQUAL "GNU" AND NOT ${VARIABLE_TRACKING})
   set_source_files_properties(src/FAST_Prog.f90 PROPERTIES COMPILE_FLAGS "-fno-var-tracking -fno-var-tracking-assignments")
 endif()
 
-install(TARGETS openfast openfast_cpp
+install(TARGETS openfast
   RUNTIME DESTINATION bin)
+
+if(BUILD_OPENFAST_CPP_DRIVER)
+  add_executable(openfast_cpp_driver src/FAST_Prog.cpp src/FastLibAPI.cpp)
+  target_link_libraries(openfast_cpp_driver openfastlib)
+
+  install(TARGETS openfast_cpp_driver
+    RUNTIME DESTINATION bin)
+endif()
+
+
diff --git a/modules/aerodyn/src/AeroDyn.f90 b/modules/aerodyn/src/AeroDyn.f90
@@ -2848,6 +2848,8 @@ subroutine DiskAvgValues(p, u, m, x_hat_disk, y_hat_disk, z_hat_disk, Azimuth)
    ! calculate disk-averaged velocities
    m%AvgDiskVel = 0.0_ReKi
    m%AvgDiskVelDist = 0.0_ReKi ! TODO potentially get rid of that in the future
+   if (p%NumBlades <= 0) return  ! The Intel compiler gets array bounds issues in this routine with no blades.
+
    do k=1,p%NumBlades
       do j=1,p%NumBlNds
          m%AvgDiskVelDist = m%AvgDiskVelDist + m%DisturbedInflow(:,j,k)