From e3afd54cc1763e1e8750c6bf0ba8653e2e65e9ab Mon Sep 17 00:00:00 2001 From: Nikhar Abbas Date: Thu, 21 Oct 2021 08:35:11 -0600 Subject: [PATCH] Minor compilation bug fixes --- modules/hydrodyn/src/Waves.f90 | 2 +- modules/moordyn/CMakeLists.txt | 2 +- modules/moordyn/src/MoorDyn.f90 | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/hydrodyn/src/Waves.f90 b/modules/hydrodyn/src/Waves.f90 index 9cc8b600da..d5126db56f 100644 --- a/modules/hydrodyn/src/Waves.f90 +++ b/modules/hydrodyn/src/Waves.f90 @@ -30,7 +30,7 @@ MODULE Waves IMPLICIT NONE - PRIVATE + PUBLIC TYPE(ProgDesc), PARAMETER :: Waves_ProgDesc = ProgDesc( 'Waves', '', '' ) diff --git a/modules/moordyn/CMakeLists.txt b/modules/moordyn/CMakeLists.txt index b70f184379..c2f53fd83f 100644 --- a/modules/moordyn/CMakeLists.txt +++ b/modules/moordyn/CMakeLists.txt @@ -25,7 +25,7 @@ set(MOORDYN_LIBS_SOURCES ) add_library(moordynlib ${MOORDYN_LIBS_SOURCES}) -target_link_libraries(moordynlib nwtclibs) +target_link_libraries(moordynlib hydrodynlib nwtclibs) install(TARGETS moordynlib EXPORT "${CMAKE_PROJECT_NAME}Libraries" diff --git a/modules/moordyn/src/MoorDyn.f90 b/modules/moordyn/src/MoorDyn.f90 index 7c35fe9632..c10c53fad0 100644 --- a/modules/moordyn/src/MoorDyn.f90 +++ b/modules/moordyn/src/MoorDyn.f90 @@ -24,7 +24,7 @@ MODULE MoorDyn USE MoorDyn_IO USE NWTC_Library - USE WAVES, only: WaveGrid_n, WaveGrid_x0, WaveGrid_dx, WaveGrid_nx, WaveGrid_y0, WaveGrid_dy, WaveGrid_ny, WaveGrid_nz ! seeing if I can get waves data here directly... + USE Waves, ONLY : WaveGrid_n, WaveGrid_x0, WaveGrid_dx, WaveGrid_nx, WaveGrid_y0, WaveGrid_dy, WaveGrid_ny, WaveGrid_nz ! seeing if I can get waves data here directly... IMPLICIT NONE @@ -6994,7 +6994,7 @@ SUBROUTINE ScaleVector( u_in, newlength, u_out ) if (length_squared > 0) then scaler = newlength/sqrt(length_squared) else ! if original vector is zero, return zero - scaler = 0_DbKi + scaler = 0.0_DbKi end if DO J=1,3