Skip to content

Updates so it compiles on Ubuntu 20.04 in debug / single prec #18

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

Merged
HaymanConsulting merged 2 commits into from
Dec 14, 2021
Merged

Updates so it compiles on Ubuntu 20.04 in debug / single prec #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
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
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
7 changes: 0 additions & 7 deletions modules/hydrodyn/src/HydroDyn_Types.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,9 @@
!! unpack routines associated with each defined data type. This code is automatically generated by the FAST Registry.
MODULE HydroDyn_Types
!---------------------------------------------------------------------------------------------------------------------------------
USE Conv_Radiation_Types
USE SS_Radiation_Types
USE SeaState_Interp_Types
USE SS_Excitation_Types
USE WAMIT_Types
USE WAMIT2_Types
USE Morison_Types
USE Current_Types
USE Waves_Types
USE Waves2_Types
USE SeaState_Types
USE NWTC_Library
IMPLICIT NONE
Expand Down
11 changes: 0 additions & 11 deletions modules/openfast-library/src/FAST_Types.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,6 @@ MODULE FAST_Types
USE AeroDyn14_Types
USE AeroDyn_Types
USE SubDyn_Types
USE Current_Types
USE Waves_Types
USE Waves2_Types
USE SeaState_Interp_Types
USE SeaState_Types
USE Conv_Radiation_Types
USE SS_Radiation_Types
USE SS_Excitation_Types
USE WAMIT_Types
USE WAMIT2_Types
USE Morison_Types
USE HydroDyn_Types
USE IceFloe_Types
USE OpenFOAM_Types
Expand Down
4 changes: 2 additions & 2 deletions modules/seastate/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ if (GENERATE_TYPES)
generate_f90_types(src/Current.txt ${CMAKE_CURRENT_LIST_DIR}/src/Current_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 -noextrap)
generate_f90_types(src/seastate_Interp.txt ${CMAKE_CURRENT_LIST_DIR}/src/SeaState_Interp_Types.f90 -noextrap)
generate_f90_types(src/SeaState_Interp.txt ${CMAKE_CURRENT_LIST_DIR}/src/SeaState_Interp_Types.f90 -noextrap)
generate_f90_types(src/SeaState.txt ${CMAKE_CURRENT_LIST_DIR}/src/SeaState_Types.f90 -noextrap)
endif()

Expand All @@ -27,7 +27,7 @@ set(SEAST_SOURCES
src/Waves.f90
src/Waves2.f90
src/UserWaves.f90
src/seastate_Interp.f90
src/SeaState_Interp.f90
src/SeaState_Input.f90
src/SeaState.f90
src/SeaState_Output.f90
Expand Down
0 modules/seastate/src/seastate_Interp.f90 → modules/seastate/src/SeaState_Interp.f90
View file
Open in desktop
File renamed without changes.
0 modules/seastate/src/seastate_Interp.txt → modules/seastate/src/SeaState_Interp.txt
View file
Open in desktop
File renamed without changes.
326 changes: 0 additions & 326 deletions modules/seastate/src/SeaState_Types.f90
View file
Open in desktop

Large diffs are not rendered by default.

310 changes: 0 additions & 310 deletions modules/seastate/src/Waves2_Types.f90
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions modules/seastate/src/Waves_Types.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ MODULE Waves_Types
INTEGER(IntKi) :: WaveStMod !< Model for stretching incident wave kinematics to instantaneous free surface {0: none=no stretching, 1: vertical stretching, 2: extrapolation stretching, 3: Wheeler stretching} [-]
REAL(DbKi) :: WaveTMax !< Analysis time for incident wave calculations; the actual analysis time may be larger than this value in order for the maintain an effecient FFT [(sec)]
REAL(SiKi) :: WaveTp !< Peak spectral period of incident waves [(sec)]
REAL(SiKi) :: WtrDens !< Water density [(kg/m^3)]
REAL(SiKi) :: WtrDpth !< Water depth [(meters)]
REAL(ReKi) :: WtrDens !< Water density [(kg/m^3)]
REAL(ReKi) :: WtrDpth !< Water depth [(meters)]
INTEGER(IntKi) :: NWaveElev !< Number of points where the incident wave elevations are computed (the XY grid point locations) [-]
REAL(SiKi) , DIMENSION(:), ALLOCATABLE :: WaveElevxi !< xi-coordinates for points where the incident wave elevations can be output [(meters)]
REAL(SiKi) , DIMENSION(:), ALLOCATABLE :: WaveElevyi !< yi-coordinates for points where the incident wave elevations can be output [(meters)]
Expand Down Expand Up @@ -795,9 +795,9 @@ SUBROUTINE Waves_UnPackInitInput( ReKiBuf, DbKiBuf, IntKiBuf, Outdata, ErrStat,
Db_Xferred = Db_Xferred + 1
OutData%WaveTp = REAL(ReKiBuf(Re_Xferred), SiKi)
Re_Xferred = Re_Xferred + 1
OutData%WtrDens = REAL(ReKiBuf(Re_Xferred), SiKi)
OutData%WtrDens = ReKiBuf(Re_Xferred)
Re_Xferred = Re_Xferred + 1
OutData%WtrDpth = REAL(ReKiBuf(Re_Xferred), SiKi)
OutData%WtrDpth = ReKiBuf(Re_Xferred)
Re_Xferred = Re_Xferred + 1
OutData%NWaveElev = IntKiBuf(Int_Xferred)
Int_Xferred = Int_Xferred + 1
Expand Down