Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
3489a20
ADI: init
ebranlard Oct 23, 2021
8d5a8a0
Using ADI%m%IW
ebranlard Oct 23, 2021
eff1758
Using ADI%xxx
ebranlard Oct 23, 2021
4a2e583
More of using ADI
ebranlard Oct 23, 2021
4042514
ADI: splitting y_ED
ebranlard Nov 4, 2021
0ed5d5e
ADI: using ADI_Init, and ADI%u(:)
ebranlard Nov 11, 2021
adf7a5c
ADI: starting IW outputs within ADI
ebranlard Nov 11, 2021
882bdb6
ADI: using ADI_CalcOutput but inconsitency in output times (uncomment…
ebranlard Nov 11, 2021
d26df93
ADI: using ADI_UpdateStates
ebranlard Nov 11, 2021
ed0f5d3
ADI: Using IW outputs
ebranlard Nov 11, 2021
b523ec7
ADI: AD VTK Surfaces and ADI_Data in ADI
ebranlard Nov 12, 2021
ae5f233
ADI: Starting FED (Fake ElastoDyn)
ebranlard Nov 12, 2021
aba7b4d
ADI: isolating FED ADI code from DVR
ebranlard Nov 12, 2021
a43bc74
Merge remote-tracking branch 'OpenFAST/dev' into f/driver-adi
andrew-platt Dec 6, 2021
89f90ef
AD-adi: add MHK pieces back into driver after merge
andrew-platt Dec 7, 2021
2d941d0
[bugfix] driver_adi: registry columns switched for default values
andrew-platt Dec 9, 2021
90b8642
adi_c_binding: Roughed in the fortran interface code.
andrew-platt Dec 9, 2021
d23426f
NWTC_IO: add interface for Num2LStr for 8 byte integers
andrew-platt Jan 6, 2022
35b75ec
adi_c_binding: Start coupling the library interface [not functioning]
andrew-platt Jan 6, 2022
c1933fe
ADI: pass ifw input file through adi_init
andrew-platt Jan 12, 2022
8db9df1
adi_c_binding: pass hub and root orientation info through from python
andrew-platt Jan 13, 2022
d8141e6
nwtc_io bugfix: prevent overrunning end of FileInfoType
andrew-platt Jan 13, 2022
61a3c04
adi_c_binding: pass nacelle position/orientation, setup pt meshes
andrew-platt Jan 13, 2022
a454870
adi_c_binding: add TransposeDCM option for passed DCMs
andrew-platt Jan 14, 2022
e4c0f33
adi_c_binding: mesh mapping in library interface
andrew-platt Jan 19, 2022
cad3f0d
adi_c_lib: add python vtk inputs, add output channel info
andrew-platt Jan 25, 2022
b977f43
adi_c_lib: comment out ADI_ReInit routine for now
andrew-platt Feb 1, 2022
d7aaf58
adi_c_lib: add hub motion passing to CalcOutput routine
andrew-platt Feb 3, 2022
7776808
adi_c_lib: add mesh to calcoutput call
andrew-platt Feb 8, 2022
a9e8bd1
adi_c_lib: add mesh to calcoutput call, and cleanup some naming to si…
andrew-platt Feb 14, 2022
938a545
Merge remote-tracking branch 'OpenFAST/dev' into f/driver-adi
andrew-platt Feb 22, 2022
facb838
AD: fix precision of NacellePosition in InitInputType
andrew-platt Feb 22, 2022
95e69f1
adi_c_lib: enable nacelle position at initinput
andrew-platt Feb 22, 2022
d5edb1c
adi: add intermediate arrays for writeoutput
andrew-platt Feb 22, 2022
0262371
adi_c_lib: fix mesh for calcoutput call and add mesh transfers
andrew-platt Feb 22, 2022
de94eec
adi_c_lib: add updatestates calls
andrew-platt Feb 24, 2022
b7ff727
adi_c_lib: minor modifications to adi to get correct number of channe…
andrew-platt Feb 24, 2022
4d9f536
adi_c_lib: Some adjustments to number of channels so can run with man…
andrew-platt Feb 24, 2022
31a1ff7
Merge remote-tracking branch 'OpenFAST/dev' into f/driver-adi
andrew-platt Mar 7, 2022
51100a6
ADI C: Send the correct time of T to UpdateStates (not T+dt)
andrew-platt Mar 22, 2022
35f970f
ADI C: change from logmap to euler angle set for DCM recalc
andrew-platt Mar 22, 2022
34c21e0
Merge remote-tracking branch 'ebranlard/f/UA-states' into f/driver-adi
andrew-platt Mar 22, 2022
712c6f4
ADI_C: adjust pathnames for vtk output, and change verbose level
andrew-platt May 2, 2022
e64e9e3
ADI_C: add tower and hub mesh outputs
andrew-platt Jun 21, 2022
405576b
ADI: fix seg fault in driver (probably a merge issue)
andrew-platt Jun 24, 2022
9e216a2
Merge remote-tracking branch 'OpenFAST/dev' into f/adi_c_binding
andrew-platt Jun 28, 2022
db94f10
ADI: cleanup driver code a bit
andrew-platt Jun 28, 2022
519584a
Merge remote-tracking branch 'OpenFAST/dev' into f/adi_c_binding
andrew-platt Jun 30, 2022
8027683
ADI: move python regression test to integration tests
andrew-platt Jul 1, 2022
413b38e
ADI: ad_driver cleanup up conflicts from dev merge
andrew-platt Jul 7, 2022
796cc16
ADI: segfault in ad_driver if no output channels
andrew-platt Jul 7, 2022
e0c4bbe
nwtclib: add optional name argument to MeshPrintInfo
andrew-platt Jul 15, 2022
7ddf723
adi_c: add optional name argument to MeshPrintInfo calls
andrew-platt Jul 15, 2022
cdda640
Merge remote-tracking branch 'OpenFAST/dev' into f/adi_c_binding
andrew-platt Jul 15, 2022
fab0489
Merge remote-tracking branch 'OpenFAST/dev' into f/adi_c_binding
andrew-platt Jul 20, 2022
8c3ae09
Merge remote-tracking branch 'origin/f/ad_driver_lineVTK' into f/adi_…
andrew-platt Jul 20, 2022
9194aec
Merge remote-tracking branch 'OpenFAST/dev' into f/adi_c_binding
andrew-platt Jul 20, 2022
c5423ff
ADI: platform surge/sway/heave outputs were incorrectly calculated
andrew-platt Jul 21, 2022
02a1eb7
ADI: modify CMakeLists to avoid module copy conflict
andrew-platt Jul 25, 2022
57b2ab0
ADI: add WrVTK_Type flag
andrew-platt Jul 25, 2022
25e5e2a
ADI_C: rename some meshes for better correspondance to AD15 driver
andrew-platt Jul 26, 2022
10ab5e2
AD driver: only write BaseSurface once if both line and surface vtk
andrew-platt Jul 26, 2022
210b9a5
ADI_C: temporarily comment intermediate nacelle motion mesh
andrew-platt Jul 28, 2022
2d3ddb8
ADI_C: add surface visualization option to ADI_C interface
andrew-platt Jul 28, 2022
1abb09e
ADI: preliminary user-defined function for hub motion
ebranlard Aug 10, 2022
e68c120
ADI: preliminary user-defined function for hub motion
ebranlard Aug 10, 2022
c5581d4
Merge remote-tracking branch 'ebranlard/f/adi_c_binding' into f/adi_c…
andrew-platt Oct 19, 2022
232ce9e
Merge remote-tracking branch 'origin/dev' into f/adi_c_binding
ebranlard Oct 20, 2022
d2392c9
ADI: removing screen outputs related to ProjMod and BEMMod
ebranlard Oct 20, 2022
50ce4a9
ADI: small cleanup of user Hub Motion routine
ebranlard Oct 21, 2022
f6bb1c1
ADI: update of VS solutions, and unused variables
ebranlard Oct 21, 2022
aeb0570
Merge remote-tracking branch 'origin/dev' into f/adi_c_binding
ebranlard Oct 22, 2022
a8ab335
ADI: Inflowwind pos/vel mapping put into AeroDyn
ebranlard Oct 22, 2022
6a22b8e
ADI: update python test case
andrew-platt Oct 24, 2022
ff689b7
ADI: add python-aerodyn to testing on GH
andrew-platt Oct 24, 2022
7cb75e6
ADI: fix python AD test script
andrew-platt Oct 24, 2022
8beb01f
AD15: prevent issues with Infinity and garbage in Cp, Ct, Cq outputs …
andrew-platt Oct 24, 2022
01c9a2c
ADI: add AeroProjMod to interface
andrew-platt Oct 24, 2022
061d13c
ADI: update py_ad_ case
andrew-platt Oct 24, 2022
2626eac
ADI: update pointer to r-test
andrew-platt Oct 24, 2022
12f11ed
Merge remote-tracking branch 'OpenFAST/dev' into f/adi_c_binding
andrew-platt Oct 24, 2022
e0cb9ba
ADI: python package for adi testing
andrew-platt Oct 24, 2022
7d49b00
ADI: adding vs solution, dll will need further testing on windows
ebranlard Oct 24, 2022
b821ab9
ADI: pointing to r-test dev
ebranlard Oct 24, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/tests-module-aerodyn/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ runs:
fi

if [[ ${{ inputs.test-target }} == "regression" ]] || [[ ${{ inputs.test-target }} == "all" ]]; then
ctest -VV -R ad_ # -j7 do not run these tests in parallel due to a bug in accessing shared files
ctest -VV -R ad_ -LE python # -j7 do not run these tests in parallel due to a bug in accessing shared files
fi

working-directory: ${{runner.workspace}}/openfast/build
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/automated-dev-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@ jobs:
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 aerodyn_inflow_c_binding -- -j ${{env.NUM_PROCS}}
cmake --build . --target ifw_c_binding -- -j ${{env.NUM_PROCS}}
cmake --build . --target hydrodyn_c_binding -- -j ${{env.NUM_PROCS}}
cmake --build . --target regression_test_controllers -- -j ${{env.NUM_PROCS}}
Expand Down Expand Up @@ -415,7 +416,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install numpy "Bokeh>=2.4"
pip install numpy "Bokeh>=2.4" vtk
sudo apt-get update -y
sudo apt-get install -y libhdf5-dev libopenmpi-dev libyaml-cpp-dev
- name: Run Interface / API tests
Expand All @@ -430,6 +431,7 @@ jobs:
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/aerodyn
${{runner.workspace}}/openfast/build/reg_tests/modules/inflowwind
${{runner.workspace}}/openfast/build/reg_tests/modules/hydrodyn
!${{runner.workspace}}/openfast/build/reg_tests/glue-codes/openfast-cpp/5MW_Baseline
Expand Down
27 changes: 25 additions & 2 deletions modules/aerodyn/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
if (GENERATE_TYPES)
generate_f90_types(src/AeroAcoustics_Registry.txt ${CMAKE_CURRENT_LIST_DIR}/src/AeroAcoustics_Types.f90)
generate_f90_types(src/AeroDyn_Registry.txt ${CMAKE_CURRENT_LIST_DIR}/src/AeroDyn_Types.f90)
generate_f90_types(src/AeroDyn_Inflow_Registry.txt ${CMAKE_CURRENT_LIST_DIR}/src/AeroDyn_Inflow_Types.f90)
generate_f90_types(src/AirfoilInfo_Registry.txt ${CMAKE_CURRENT_LIST_DIR}/src/AirfoilInfo_Types.f90)
generate_f90_types(src/BEMT_Registry.txt ${CMAKE_CURRENT_LIST_DIR}/src/BEMT_Types.f90)
generate_f90_types(src/DBEMT_Registry.txt ${CMAKE_CURRENT_LIST_DIR}/src/DBEMT_Types.f90)
Expand Down Expand Up @@ -73,6 +74,12 @@ set(FVW_LIBS_SOURCES
src/FVW_VTK.f90
)

# ADI lib
set(ADI_LIB_SOURCES
src/AeroDyn_Inflow.f90
src/AeroDyn_Inflow_Types.f90
)

# UnsteadyAero lib
add_library(uaaerolib ${UA_LIBS_SOURCES})
target_link_libraries(uaaerolib afinfolib nwtclibs)
Expand All @@ -92,6 +99,10 @@ target_link_libraries(aeroacoustics afinfolib nwtclibs)
add_library(aerodynlib ${AD_LIBS_SOURCES})
target_link_libraries(aerodynlib fvwlib uaaerolib afinfolib nwtclibs aeroacoustics)

# ADI lib
add_library(adilib ${ADI_LIB_SOURCES})
target_link_libraries(adilib aerodynlib ifwlib nwtclibs)

# AeroDyn driver
set(AD_DRIVER_SOURCES
src/AeroDyn_Driver.f90
Expand All @@ -100,7 +111,7 @@ set(AD_DRIVER_SOURCES
)

add_executable(aerodyn_driver ${AD_DRIVER_SOURCES})
target_link_libraries(aerodyn_driver ifwlib aerodynlib fvwlib uaaerolib afinfolib nwtclibs versioninfolib aeroacoustics ${CMAKE_DL_LIBS})
target_link_libraries(aerodyn_driver adilib ifwlib aerodynlib fvwlib uaaerolib afinfolib nwtclibs versioninfolib aeroacoustics ${CMAKE_DL_LIBS})


# UnsteadyAero driver
Expand All @@ -111,7 +122,19 @@ set(UA_DRIVER_SOURCES
add_executable(unsteadyaero_driver ${UA_DRIVER_SOURCES})
target_link_libraries(unsteadyaero_driver aerodynlib fvwlib uaaerolib afinfolib nwtclibs versioninfolib ${CMAKE_DL_LIBS})

install(TARGETS unsteadyaero_driver aerodyn_driver aerodynlib fvwlib uaaerolib afinfolib aeroacoustics

# c-bindings interface library
set(ADI_C_SOURCES
src/AeroDyn_Inflow_C_Binding.f90
)
add_library(aerodyn_inflow_c_binding SHARED ${ADI_C_SOURCES})
target_link_libraries(aerodyn_inflow_c_binding adilib nwtclibs ${CMAKE_DL_LIBS})
if(APPLE OR UNIX)
target_compile_definitions(aerodyn_inflow_c_binding PUBLIC -DIMPLICIT_DLLEXPORT)
endif()


install(TARGETS unsteadyaero_driver aerodyn_driver adilib aerodynlib fvwlib uaaerolib afinfolib aeroacoustics aerodyn_inflow_c_binding
EXPORT "${CMAKE_PROJECT_NAME}Libraries"
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
Expand Down
Loading