Skip to content

Commit 2e783a3

Browse files
committed
Merge remote-tracking branch 'upstream/dev' into b/of_registry_B4Ki_bounds
2 parents 9623788 + 024dbc1 commit 2e783a3

File tree

327 files changed

+53510
-36082
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

327 files changed

+53510
-36082
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ runs:
1414
- run: |
1515
1616
if [[ ${{ inputs.test-target }} == "unit" ]] || [[ ${{ inputs.test-target }} == "all" ]]; then
17-
ctest -VV -R fvw_utest
17+
ctest -VV -R aerodyn_utest
1818
fi
1919
2020
if [[ ${{ inputs.test-target }} == "regression" ]] || [[ ${{ inputs.test-target }} == "all" ]]; then

.github/workflows/build-docker-image-automatic.yml renamed to .github/workflows/deploy.yml

Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,41 @@
1-
# This workflow builds an OpenFAST docker image for the linux/amd64 and linux/aarch64 architectures on merge into
2-
# `main` from a release candidate branch. The image is tagged both with "latest" and the version extracted from the
3-
# release candidate branch's name (e.g. "rc-3.5.3") before being pushed to the `nrel/openfast` repository. The build
4-
# cache is stored in GitHub actions.
5-
name: build-docker-image-automatic
1+
# This workflow uploads the `openfast` python package to PyPI before building an OpenFAST docker image for the
2+
# linux/amd64 and linux/aarch64 architectures on release. The image is tagged both with "latest" and the version
3+
# extracted from the release candidate branch's name (e.g. "rc-3.5.3") before being pushed to the `nrel/openfast`
4+
# repository. The build cache is stored in GitHub actions.
5+
name: deploy
66

77
on:
8+
workflow_dispatch:
9+
810
release:
911
types:
1012
- released
1113

1214
jobs:
13-
build-and-push:
15+
publish-to-pypi:
16+
runs-on: ubuntu-latest
17+
permissions:
18+
id-token: write
19+
contents: read
20+
21+
steps:
22+
- name: Checkout Repository
23+
uses: actions/checkout@v4
24+
25+
- name: Install Poetry
26+
uses: snok/install-poetry@v1.3.4
27+
28+
- name: Build a binary wheel and a source tarball
29+
run: poetry build
30+
working-directory: openfast_python
31+
32+
- name: Publish package distributions to PyPI
33+
uses: pypa/gh-action-pypi-publish@v1.8.14
34+
with:
35+
packages-dir: openfast_python/dist
36+
37+
38+
docker-build-and-push:
1439
runs-on: ubuntu-latest
1540
timeout-minutes: 300
1641
env:

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,12 @@ vs-build/
4343
.fortls
4444
.devcontainer
4545
.idea
46+
.env
4647

4748
# backup files
4849
*.asv
4950
~$*.xlsx
51+
.*.swp
5052

5153
# LaTeX compiling files
5254
*.aux

.gitmodules

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
[submodule "reg_tests/r-test"]
22
path = reg_tests/r-test
3-
url = https://github.com/OpenFAST/r-test.git
4-
[submodule "unit_tests/pfunit"]
5-
path = unit_tests/pfunit
6-
url = https://github.com/Goddard-Fortran-Ecosystem/pFUnit.git
3+
url = https://github.com/OpenFAST/r-test.git

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ set(OPENFAST_MODULES
189189
inflowwind
190190
extloads
191191
aerodyn
192-
aerodyn14
192+
aerodisk
193193
servodyn
194194
elastodyn
195195
beamdyn
@@ -210,6 +210,7 @@ set(OPENFAST_MODULES
210210
supercontroller
211211
externalinflow
212212
openfast-library
213+
simple-elastodyn
213214
)
214215

215216
set(OPENFAST_REGISTRY_INCLUDES "" CACHE INTERNAL "Registry includes paths")

cmake/OpenfastFortranOptions.cmake

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,9 @@ endmacro(set_fast_intel_fortran)
158158
# arch
159159
#
160160
macro(set_fast_intel_fortran_posix)
161-
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fpic -fpp")
161+
# Set size where temporary are stored on heap instead of stack
162+
# 1000: size in kB (1 MB)
163+
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fpic -fpp -heap-arrays 1000")
162164

163165
# debug flags
164166
if(CMAKE_BUILD_TYPE MATCHES Debug)
@@ -201,7 +203,9 @@ macro(set_fast_intel_fortran_windows)
201203
# Turn off specific warnings
202204
# - 5199: too many continuation lines
203205
# - 5268: 132 column limit
204-
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} /Qdiag-disable:5199,5268 /fpp")
206+
# Set size where temporary are stored on heap instead of stack
207+
# 1000: size in kB (1 MB)
208+
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} /Qdiag-disable:5199,5268 /fpp /heap-arrays:1000")
205209

206210
# If double precision, make constants double precision
207211
if (DOUBLE_PRECISION)
3.23 MB
Binary file not shown.
-44.4 KB
Binary file not shown.

docs/OtherSupporting/OpenFAST_Algorithms/OpenFAST_Algorithms.tex

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ \section{Definitions and Nomenclature}
4141
\hline
4242
ElastoDyn & ED & ED \\
4343
BeamDyn & BD & BD \\
44-
AeroDyn14 & AD14 & AD14 \\
4544
AeroDyn & AD & AD \\
4645
ServoDyn & SrvD & SrvD \\
4746
SubDyn & SD & SD \\
4.51 KB
Binary file not shown.

0 commit comments

Comments
 (0)