Skip to content

Commit

Permalink
Merge pull request #1838 from andrew-platt/m/dev_to_dev-unstable
Browse files Browse the repository at this point in the history
Merge dev to dev-unstable-pointers
  • Loading branch information
andrew-platt authored Oct 26, 2023
2 parents f36dab9 + 0bb6022 commit 468ddf2
Show file tree
Hide file tree
Showing 56 changed files with 4,423 additions and 2,542 deletions.
47 changes: 24 additions & 23 deletions .github/workflows/automated-dev-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,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 }}
Expand Down Expand Up @@ -160,7 +160,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 }}
Expand Down Expand Up @@ -205,6 +205,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 \
Expand All @@ -214,7 +215,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 }}
Expand All @@ -225,7 +226,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 }}
Expand All @@ -250,9 +251,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 }}
Expand All @@ -263,7 +264,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 }}
Expand All @@ -290,7 +291,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 }}
Expand All @@ -301,7 +302,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 }}
Expand All @@ -328,7 +329,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 }}
Expand Down Expand Up @@ -403,7 +404,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 }}
Expand Down Expand Up @@ -461,7 +462,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 }}
Expand Down Expand Up @@ -522,7 +523,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 }}
Expand Down Expand Up @@ -570,7 +571,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 }}
Expand Down Expand Up @@ -623,7 +624,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 }}
Expand Down Expand Up @@ -653,7 +654,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 }}
Expand Down Expand Up @@ -702,7 +703,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 }}
Expand Down Expand Up @@ -752,7 +753,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 }}
Expand Down Expand Up @@ -802,7 +803,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 }}
Expand Down Expand Up @@ -852,7 +853,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 }}
Expand Down Expand Up @@ -902,7 +903,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 }}
Expand Down Expand Up @@ -952,7 +953,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 }}
Expand Down Expand Up @@ -1001,7 +1002,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 }}
Expand Down
12 changes: 6 additions & 6 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@
# Required
version: 2

# select the docker image to use: stable | latest
build:
os: "ubuntu-22.04"
tools:
python: "3.11"

formats:
- htmlzip
# - pdf
# - epub

python:
version: 3.7
install:
- requirements: docs/requirements.txt
system_packages: true

# select the docker image to use: stable | latest
build:
image: stable

sphinx:
builder: html
Expand Down
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Binary file modified docs/OtherSupporting/OutListParameters.xlsx
Binary file not shown.
133 changes: 133 additions & 0 deletions docs/changelogs/v3.5.1.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
**Feature or improvement description**
Pull request to merge `rc-3.5.1` into `main` and create a tagged release for v3.5.1.

See the milestone and project pages for additional information

https://github.com/OpenFAST/openfast/milestone/10
https://github.com/orgs/OpenFAST/projects/4

Test results, if applicable
See GitHub Actions

### Release checklist:
- [ ] Update the documentation version in docs/conf.py
- [ ] Update the versions in docs/source/user/api_change.rst
- [ ] Verify readthedocs builds correctly
- [ ] Create a tag in OpenFAST
- [ ] Create a merge commit in r-test and add a corresponding tag
- [ ] Compile executables for Windows builds
- [ ] FAST_SFunc.mexw64
- [ ] OpenFAST-Simulink_x64.dll
- [ ] openfast_x64.exe
- [ ] DISCON.dll (x64)
- [ ] AeroDyn_Driver
- [ ] AeroDyn_Inflow_C_Binding
- [ ] BeamDyn_Driver
- [ ] HydroDyn_Driver
- [ ] HydroDyn_C_Binding (x64)
- [ ] InflowWind_Driver
- [ ] IfW_C_Binding (x64)
- [ ] MoorDyn_Driver
- [ ] FAST.Farm (x64)

# Changelog

## General

### Build systems

#1586 CMake: Remove openfast_cpp target if BUILD_OPENFAST_CPP_API not selected
#1647 Fix adding OpenMP flags to CMAKE_Fortran_FLAGS
#1818 VS-build updates for rc-3.5.1 and other minor updates. Includes truing up some Types files.


### Documentation

#1788 Readthedocs configuration changes


## Solvers

### FAST.Farm

#1648 Fix bug with Mod_AmbWind=3 -- hub point wasn't shifted.


## Module changes

### AeroDyn

#1657 AD Driver: stack size for 64 bit solutions (see #1260)
#1658 AD/TailFin: Bug Fix: remove chord in fy (see #1653)
#1659 AD: Adding rtest for TailFin polar-based model
#1679 AD: nodal outputs in different coordinate systems (new feature)
#1700 Remove deleted variables BlFB and BlMB from AeroDyn_AllBldNdOuts_IO


### BeamDyn

#1771 Change BD states to follow the blade root reference frame. Small performance improvements around azimuth=180.
#1796 Resolve BeamDyn initial strain for rotated blade. Backport of #1663


### ElastoDyn

#1654 fix segfault when BldNd_BladesOut==0 (Also for AeroDyn)


### HydroDyn

#1621 [BugFix] HD wave visualization with 2nd order waves
#1780 [BugFix] AddF0 for multiple potential-flow bodies with NBodyMod/=0 (backport of #1776)
#1768 new feature: Visualization of HydroDyn Morison mesh (also MoorDyn lines)
#1806 fixed some existing bugs with the strip-theory loads and updated the radiation convolution integral to 2nd order


### InflowWind

#1620 [BugFix] ServoDyn inputs for Lidar allocated twice, and a few other minor issues
#1655 [BugFix] InflowWind was not setting InitOut MWS data.
#1748 [BugFix] compute vel avg profile when exceed allowed
#1759 [BugFix] InflowWind Flow Field fails to calculate AvgVel for large wind files when using Intel Compiler
#1769 [BugFix] Add additional modulo in IfW_FlowField to correct error with exhausted field from Grid3D on long simulations (see #1746 and PR #1730)


### MAP++

#1752 MAP++ linear spring approach improvement (@rbergua)


### MoorDyn

#1768 MoorDyn line visualization (see HydroDyn above)
#1727 MoorDyn updates and bug fixes (naming, catenary solve improvement, output channels, bugs with added mass, rods, and comment typos
#1815 MoorDyn dynamic relaxation and fixed bodies
#1816 Fixed drag coefficient scaling


### NWTC-Library

#1731 Blade Pitch input to ElastoDyn drifts during solution if ServoDyn is not active (improvements to Extrap/Interp routines)


### SubDyn

#1802 Increase SubDyn output to allow NMOutputs up to 99. Backport of features from dev (multiple commits)


## Regression tests

#1581, #1593 Update floating MHK case input files
#1694 Improved linearization file comparison
#1695 AD: adding linearization tests for aerodyn continuous-states model
#1801 Add Mod_AmbWind=3 regression test to the CI


## Input file changes

No input files change with this release, as this only includes minor bugfixes.

Full list of changes: https://openfast.readthedocs.io/en/main/source/user/api_change.html

Full input file sets: https://github.com/OpenFAST/r-test/tree/v3.5.1 (example input files from the regression testing)

2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ def runDoxygen(sourcfile, doxyfileIn, doxyfileOut):
# The short X.Y version.
version = u'3.5'
# The full version, including alpha/beta/rc tags.
release = u'v3.5.0'
release = u'v3.5.1'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
Loading

0 comments on commit 468ddf2

Please sign in to comment.