Merge pull request #188 from WISDEM/develop

Version 1.1

.github/workflows/run_exhaustive_examples.yml

@@ -68,6 +68,17 @@ jobs:
       # Debugging session
       #- name: Setup tmate session
       #  uses: mxschmitt/action-tmate@v3
+
+      # Test walkthrough notebook
+      - name: Test postprocessing notebooks
+        run: |
+          cd examples/16_postprocessing
+          gdown --no-check-certificate 1_FJaN-W1DoPNmO6YLSjnftvq6-7bn4VI
+          unzip outputs
+          treon plot_FAST.ipynb
+          treon rev_DLCs_WEIS.ipynb
+          treon rev_Opt.ipynb
+          treon rev_WEIS_CSV.ipynb
         
       # Run all examples
       - name: Run tests within WEIS

OpenFAST/.github/actions/tests-module-aerodyn/action.yml

@@ -18,7 +18,7 @@ runs:
         fi
 
         if [[ ${{ inputs.test-target }} == "regression" ]] || [[ ${{ inputs.test-target }} == "all" ]]; then
-          ctest -VV -j7 -R ad_
+          ctest -VV -R ad_  #  -j7  do not run these tests in parallel due to a bug in accessing shared files
         fi
 
       working-directory: ${{runner.workspace}}/openfast/build

OpenFAST/.github/actions/tests-module-hydrodyn/action.yml

@@ -4,6 +4,6 @@ author: 'Rafael Mudafort https://github.com/rafmudaf'
 runs:
   using: "composite"
   steps:  
-    - run: ctest -VV -j7 -R hd_
+    - run: ctest -VV -j7 -R hd_ -LE python
       working-directory: ${{runner.workspace}}/openfast/build
       shell: bash

OpenFAST/.github/actions/tests-module-version/action.yml

@@ -0,0 +1,9 @@
+name: 'VersionInfo module tests'
+description: 'Run tests specific to the NWTC Library module'
+author: 'Rafael Mudafort https://github.com/rafmudaf'
+runs:
+  using: "composite"
+  steps: 
+    - run: ctest -VV -R versioninfo_utest
+      working-directory: ${{runner.workspace}}/openfast/build
+      shell: bash

OpenFAST/.github/workflows/automated-dev-tests.yml

@@ -24,6 +24,55 @@ env:
 
 
 jobs:
+
+  regression-tests-aerodyn-driver:
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@main
+        with:
+          submodules: recursive
+
+      - name: Setup Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.7'
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install numpy Bokeh==1.4
+
+      - name: Setup Workspace
+        run: cmake -E make_directory ${{runner.workspace}}/openfast/build
+      - name: Configure Build
+        working-directory: ${{runner.workspace}}/openfast/build
+        run: |
+          cmake \
+            -DCMAKE_INSTALL_PREFIX:PATH=${{runner.workspace}}/openfast/install \
+            -DCMAKE_Fortran_COMPILER:STRING=${{env.FORTRAN_COMPILER}} \
+            -DCMAKE_CXX_COMPILER:STRING=${{env.CXX_COMPILER}} \
+            -DCMAKE_C_COMPILER:STRING=${{env.C_COMPILER}} \
+            -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
+            -DBUILD_TESTING:BOOL=ON \
+            -DCTEST_PLOT_ERRORS:BOOL=ON \
+            ${GITHUB_WORKSPACE}
+      - name: Build AeroDyn Driver
+        working-directory: ${{runner.workspace}}/openfast/build
+        run: cmake --build . --target aerodyn_driver -- -j ${{env.NUM_PROCS}}
+
+      - name: Run AeroDyn tests
+        uses: ./.github/actions/tests-module-aerodyn
+        with:
+          test-target: regression
+
+      - name: Failing test artifacts
+        uses: actions/upload-artifact@v2
+        if: failure()
+        with:
+          name: regression-tests-aerodyn-module
+          path: |
+            ${{runner.workspace}}/openfast/build/reg_tests/modules
+
   regression-tests-release:
     runs-on: ubuntu-20.04
     steps:
@@ -60,12 +109,14 @@ jobs:
         working-directory: ${{runner.workspace}}/openfast/build
         run: cmake --build . --target install -- -j ${{env.NUM_PROCS}}
 
+        # SubDyn has only regression tests
       - name: Run SubDyn tests
         uses: ./.github/actions/tests-module-subdyn
-      - name: Run AeroDyn tests
-        uses: ./.github/actions/tests-module-aerodyn
-        with:
-          test-target: regression
+      # - name: Run AeroDyn tests
+      #   uses: ./.github/actions/tests-module-aerodyn
+      #   with:
+      #     test-target: regression
+        # HydroDyn has only regression tests
       - name: Run HydroDyn tests
         uses: ./.github/actions/tests-module-hydrodyn
       - name: Run InflowWind tests
@@ -106,7 +157,7 @@ jobs:
             install_deps: brew install gcovr
           - os: ubuntu-20.04
             FORTRAN_COMPILER: gfortran-10
-            install_deps: sudo apt-get install -y gcovr
+            install_deps: sudo apt-get update && sudo apt-get install -y gcovr
 
     name: regression-test-debug-${{ matrix.os }}-${{ matrix.FORTRAN_COMPILER }}
     steps:
@@ -151,10 +202,10 @@ jobs:
 
       - name: Run SubDyn tests
         uses: ./.github/actions/tests-module-subdyn
-      - name: Run AeroDyn tests
-        uses: ./.github/actions/tests-module-aerodyn
-        with:
-          test-target: regression
+      # - name: Run AeroDyn tests
+      #   uses: ./.github/actions/tests-module-aerodyn
+      #   with:
+      #     test-target: regression
       - name: Run HydroDyn tests
         uses: ./.github/actions/tests-module-hydrodyn
       - name: Run InflowWind tests
@@ -284,8 +335,12 @@ jobs:
         working-directory: ${{runner.workspace}}/openfast/build
         run: cmake --build . --target unit_tests -- -j ${{env.NUM_PROCS}}
 
+         # NWTC Library has only unit tests
       - name: Run NWTC Library tests
         uses: ./.github/actions/tests-module-nwtclibrary
+         # VersionInfo has only unit tests
+      - name: Run VersionInfo tests
+        uses: ./.github/actions/tests-module-version
       - name: Run AeroDyn tests
         uses: ./.github/actions/tests-module-aerodyn
         with:
@@ -387,7 +442,7 @@ jobs:
             -DCMAKE_Fortran_COMPILER:STRING=${{env.FORTRAN_COMPILER}} \
             -DCMAKE_CXX_COMPILER:STRING=${{env.CXX_COMPILER}} \
             -DCMAKE_C_COMPILER:STRING=${{env.C_COMPILER}} \
-            -DCMAKE_BUILD_TYPE:STRING=Debug \
+            -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
             -DBUILD_OPENFAST_CPP_API:BOOL=ON \
             -DBUILD_SHARED_LIBS:BOOL=ON \
             -DBUILD_TESTING:BOOL=ON \
@@ -398,7 +453,9 @@ jobs:
         working-directory: ${{runner.workspace}}/openfast/build
         run: |
           cmake --build . --target openfastlib -- -j ${{env.NUM_PROCS}}
+          cmake --build . --target openfast_cpp -- -j ${{env.NUM_PROCS}}
           cmake --build . --target openfastcpp -- -j ${{env.NUM_PROCS}}
+          cmake --build . --target hydrodyn_c_binding -- -j ${{env.NUM_PROCS}}
           cmake --build . --target ifw_c_binding -- -j ${{env.NUM_PROCS}}
           cmake --build . --target regression_tests -- -j ${{env.NUM_PROCS}}
 
@@ -434,8 +491,10 @@ jobs:
         uses: actions/upload-artifact@v2
         if: failure()
         with:
-          name: c-interface-reg-tests
+          name: interface-reg-tests
           path: |
             ${{runner.workspace}}/openfast/build/reg_tests/glue-codes/openfast-cpp
+            ${{runner.workspace}}/openfast/build/reg_tests/glue-codes/python
+            ${{runner.workspace}}/openfast/build/reg_tests/modules/hydrodyn
             ${{runner.workspace}}/openfast/build/reg_tests/modules/inflowwind
             !${{runner.workspace}}/openfast/build/reg_tests/glue-codes/openfast-cpp/5MW_Baseline

OpenFAST/README.rst

@@ -1,13 +1,11 @@
 OpenFAST
 ========
 
-|actions| |nbsp| |rtfd| |regtest-coverage|
+|actions| |nbsp| |rtfd|
 
 .. |actions| image:: https://github.com/openfast/openfast/actions/workflows/automated-dev-tests.yml/badge.svg?branch=dev
    :target: https://github.com/OpenFAST/openfast/actions/workflows/automated-dev-tests.yml?query=workflow%3A%22Development+Pipeline%22
    :alt: Build Status
-.. |regtest-coverage| image:: https://codecov.io/gh/openfast/openfast/branch/dev/graph/badge.svg?token=lZzalptLMO
-   :target: https://codecov.io/gh/openfast/openfast
 .. |rtfd| image:: https://readthedocs.org/projects/openfast/badge/?version=dev
    :target: https://openfast.readthedocs.io/en/dev
    :alt: Documentation Status

OpenFAST/cmake/FindMKL.cmake

@@ -54,20 +54,15 @@ find_library(MKL_CORE_LIB
   PATHS ${MKLSEARCHPATHS}
   NO_DEFAULT_PATH)
 
-find_library(MKL_RT_LIB
-  NAMES mkl_rt libmkl_rt mkl_rt_dll
-  PATHS ${MKLSEARCHPATHS}
-  NO_DEFAULT_PATH)
-
-if (MKL_IFACE_LIB AND MKL_SEQ_LIB AND MKL_CORE_LIB AND MKL_RT_LIB)
-  set(MKL_LIBRARIES ${MKL_RT_LIB} ${MKL_IFACE_LIB} ${MKL_SEQ_LIB} ${MKL_CORE_LIB})
+if (MKL_IFACE_LIB AND MKL_SEQ_LIB AND MKL_CORE_LIB)
+  set(MKL_LIBRARIES ${MKL_IFACE_LIB} ${MKL_SEQ_LIB} ${MKL_CORE_LIB})
 else()
   set(MKL_LIBRARIES "")
   set(MKL_INCLUDE_DIRS "")
 endif()
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(MKL DEFAULT_MSG
-  MKL_LIBRARIES MKL_RT_LIB MKL_IFACE_LIB MKL_SEQ_LIB MKL_CORE_LIB) # MKL_INCLUDE_DIRS)
+  MKL_LIBRARIES MKL_IFACE_LIB MKL_SEQ_LIB MKL_CORE_LIB) # MKL_INCLUDE_DIRS)
 mark_as_advanced(
-  MKL_INCLUDE_DIRS MKL_LIBRARIES MKL_RT_LIB MKL_IFACE_LIB MKL_SEQ_LIB MKL_CORE_LIB)
+  MKL_INCLUDE_DIRS MKL_LIBRARIES MKL_IFACE_LIB MKL_SEQ_LIB MKL_CORE_LIB)

OpenFAST/docs/conf.py

@@ -67,6 +67,17 @@ def runDoxygen(sourcfile, doxyfileIn, doxyfileOut):
     'sphinxcontrib.bibtex',
     'sphinxcontrib.mermaid',
 ]
+bibtex_bibfiles = [
+    'source/user/aerodyn-aeroacoustics/references.bib',
+    'source/user/aerodyn-olaf/bibliography.bib',
+    'source/user/aerodyn/bibliography.bib',
+    'source/user/beamdyn/references.bib',
+    'source/user/extptfm/bibliography.bib',
+    'source/user/fast.farm/bibliography.bib',
+    'source/user/hydrodyn/references.bib',
+    'source/user/servodyn-stc/StC_Refs.bib',
+    'source/user/subdyn/references_SD.bib'
+]
 
 autodoc_default_flags = [
     'members',
@@ -117,16 +128,16 @@ def runDoxygen(sourcfile, doxyfileIn, doxyfileOut):
 # built documents.
 #
 # The short X.Y version.
-version = u'3.0'
+version = u'3.2'
 # The full version, including alpha/beta/rc tags.
-release = u'v3.0.0'
+release = u'v3.2.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
 #
 # This is also used if you do content translation via gettext catalogs.
 # Usually you set "language" from the command line for these cases.
-language = None
+# language = None  # Default is English and None is not a valid option
 
 #If true, figures, tables and code-blocks are automatically numbered if they 
 #have a caption. At same time, the numref role is enabled. For now, it works 

OpenFAST/docs/requirements.txt

@@ -3,7 +3,7 @@ docutils==0.16
 Pygments>=2.2
 pyparsing>=2.1
 Sphinx>=1.8.5
-sphinxcontrib-bibtex>=0.3.3,<2.0.0
+sphinxcontrib-bibtex>=2.0.0
 sphinxcontrib-doxylink>=1.3
 sphinxcontrib-mermaid>=0.6
 sphinx_rtd_theme>=0.3