Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

F/sea state+ #970

Closed
wants to merge 39 commits into from
Closed

F/sea state+ #970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
93492be
Reorganize HD src files for SeaState Module
HaymanConsulting Sep 21, 2021
32b2e74
Initial SeaState Module Functionality
HaymanConsulting Sep 22, 2021
13969b4
Merge remote-tracking branch 'HaymanConsulting/F/HD_MSL2SWL_fix' into…
HaymanConsulting Sep 22, 2021
5fd9600
Added Registry Pointers support
HaymanConsulting Dec 1, 2021
fe4cc1d
ExctnDisp/WaveDisp functionality update for HD
HaymanConsulting Dec 1, 2021
cbde766
Added SeaState module integration in OpenFAST
HaymanConsulting Dec 1, 2021
737ee8f
Added ExctnCutOff to Input file / parsing
HaymanConsulting Dec 6, 2021
d762b70
Update SeaState Interp Comments
HaymanConsulting Dec 6, 2021
9ea1f1c
Update VS build for SeaState
HaymanConsulting Dec 6, 2021
8417499
Merge remote-tracking branch 'NREL/dev' into f/SeaState+
HaymanConsulting Dec 7, 2021
01dda52
Update for SeaState managed outputs
HaymanConsulting Dec 9, 2021
607b1af
Small Cmake updates for SeaState functionality
HaymanConsulting Dec 9, 2021
34cb10e
CMakeLists change to find filename of seastae_Interp.f90
HaymanConsulting Dec 9, 2021
a892f92
More CMakeLists Corrections for SeaState Update
HaymanConsulting Dec 9, 2021
2e85095
More CMakelists debugging
HaymanConsulting Dec 9, 2021
4d3f68d
CMaklists bug fix?
HaymanConsulting Dec 10, 2021
3c17694
More Cmakelists debug for SeaState
HaymanConsulting Dec 10, 2021
ab392b1
FIxed gfortran compile errors and Cmake error
HaymanConsulting Dec 10, 2021
046d012
SeaState: fix case issue in file names for registry files
andrew-platt Dec 14, 2021
ec0458d
SeaState: regenerate Types files with -noextrap flags
andrew-platt Dec 14, 2021
4a566f2
Merge pull request #18 from andrew-platt/f/SeaState+
HaymanConsulting Dec 14, 2021
fc92514
Fixed broken WaveElevation data in Morison
HaymanConsulting Dec 21, 2021
ec32f76
Fixed output handling for channels larger than 9 characters
HaymanConsulting Dec 21, 2021
4600072
Remove debugging print statement
HaymanConsulting Jan 5, 2022
e397699
Fix reporting of max/min wave elevations in output file
HaymanConsulting Jan 5, 2022
903ebb2
Implemented SeaState outputs via the glue-code
HaymanConsulting Jan 5, 2022
79589c7
Bug fix for Max/Min WaveElevation Ouputs
HaymanConsulting Jan 18, 2022
9d14af7
vs-build bug fixe: Added new SeaState project
HaymanConsulting Jan 19, 2022
6cc5286
Updates for Writing Kinematics Files
HaymanConsulting Jan 24, 2022
b741b04
Bug Fix: Correct number of grid points in XY directions based on NX, …
HaymanConsulting Jan 25, 2022
34c38fc
Fixed bug with repeating wave kinematics
HaymanConsulting Jan 31, 2022
e361b6f
Finished WaveMod = 6 implementation plus bug fixes
HaymanConsulting Jan 31, 2022
78c3849
seastate: change WtrDpth to ReKi so double precision will compile
andrew-platt Feb 2, 2022
4baac0b
Tweaks to Writing and Reading Wave Kinematics + code cleanup
HaymanConsulting Feb 2, 2022
8d914b1
Merge pull request #19 from andrew-platt/f/SeaState+
HaymanConsulting Feb 2, 2022
62dbc21
Fixed a small type casting issue in SeaState Interpolator
HaymanConsulting Feb 3, 2022
595544c
Proposed bug fixes for OpenFAST issues #844 and #847
HaymanConsulting Feb 3, 2022
2592679
Altered casting (again) for Time index calculation in SeaState_Interp
HaymanConsulting Feb 9, 2022
325d1a9
Fix for elements below seabed check
HaymanConsulting Feb 16, 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
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ set(OPENFAST_MODULES
elastodyn
beamdyn
subdyn
seastate
hydrodyn
orcaflex-interface
extptfm
Expand Down
Binary file modified docs/OtherSupporting/OutListParameters.xlsx
View file
Open in desktop
Binary file not shown.
15 changes: 2 additions & 13 deletions modules/hydrodyn/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,51 +16,40 @@

if (GENERATE_TYPES)
generate_f90_types(src/Conv_Radiation.txt ${CMAKE_CURRENT_LIST_DIR}/src/Conv_Radiation_Types.f90)
generate_f90_types(src/Current.txt ${CMAKE_CURRENT_LIST_DIR}/src/Current_Types.f90)
generate_f90_types(src/HydroDyn.txt ${CMAKE_CURRENT_LIST_DIR}/src/HydroDyn_Types.f90)
generate_f90_types(src/Morison.txt ${CMAKE_CURRENT_LIST_DIR}/src/Morison_Types.f90)
generate_f90_types(src/SS_Radiation.txt ${CMAKE_CURRENT_LIST_DIR}/src/SS_Radiation_Types.f90)
generate_f90_types(src/SS_Excitation.txt ${CMAKE_CURRENT_LIST_DIR}/src/SS_Excitation_Types.f90)
generate_f90_types(src/WAMIT.txt ${CMAKE_CURRENT_LIST_DIR}/src/WAMIT_Types.f90)
generate_f90_types(src/WAMIT2.txt ${CMAKE_CURRENT_LIST_DIR}/src/WAMIT2_Types.f90)
generate_f90_types(src/Waves.txt ${CMAKE_CURRENT_LIST_DIR}/src/Waves_Types.f90)
generate_f90_types(src/Waves2.txt ${CMAKE_CURRENT_LIST_DIR}/src/Waves2_Types.f90)
endif()

set(HYDRODYN_SOURCES
src/Conv_Radiation.f90
src/Current.f90
src/HydroDyn.f90
src/HydroDyn_Input.f90
src/HydroDyn_Output.f90
src/Morison.f90
src/Morison_Output.f90
src/SS_Radiation.f90
src/SS_Excitation.f90
src/UserWaves.f90
src/WAMIT.f90
src/WAMIT2.f90
src/WAMIT_Interp.f90
src/Waves.f90
src/Waves2.f90
src/Waves2_Output.f90
src/Conv_Radiation_Types.f90
src/Current_Types.f90
src/HydroDyn_Types.f90
src/Morison_Types.f90
src/SS_Radiation_Types.f90
src/SS_Excitation_Types.f90
src/WAMIT_Types.f90
src/WAMIT2_Types.f90
src/Waves_Types.f90
src/Waves2_Types.f90
)

add_library(hydrodynlib ${HYDRODYN_SOURCES})
target_link_libraries(hydrodynlib nwtclibs)
target_link_libraries(hydrodynlib seastlib nwtclibs)

add_executable(hydrodyn_driver src/HydroDyn_DriverCode.f90)
target_link_libraries(hydrodyn_driver hydrodynlib nwtclibs versioninfolib)
target_link_libraries(hydrodyn_driver hydrodynlib seastlib nwtclibs versioninfolib)

#add_executable(ss_radiation
# src/SS_Radiation_DriverCode.f90)
Expand Down
1,140 changes: 273 additions & 867 deletions modules/hydrodyn/src/HydroDyn.f90
View file
Open in desktop

Large diffs are not rendered by default.

77 changes: 54 additions & 23 deletions modules/hydrodyn/src/HydroDyn.txt
View file
Open in desktop

Large diffs are not rendered by default.

Loading