SeaSt c-bind: replace numTimeSteps with time_max

- reorder arguments into Init

Author: andrew-platt

glue-codes/labview/src/WaveTank.f90

@@ -222,7 +222,7 @@ subroutine WaveTank_Init(  &
    call SeaSt_C_Init(            &
       SS_InputFile_C,            &
       OutRootName_C,             &
-      1000_c_int,                & !FIXME: do we need the number of timesteps???
+      SimSettings%Sim%TMax,      &
       SimSettings%Sim%DT,        &
       SimSettings%ModSettings%WaveTimeShift, & 
       SS_NumChannels_C,          &

glue-codes/labview/src/WaveTank_IO.f90

@@ -99,7 +99,7 @@ subroutine ParseInputFile(FileInfo_In, SimSettings, ErrStat, ErrMsg)
    ! Separator/header lines skipped automatically
    ! ----- Simulation control -------------
    call ParseVar( FileInfo_In, CurLine, 'DT',               SimSettings%Sim%DT,                    ErrStat2, ErrMsg2); if(Failed()) return;  ! timestep (unused)
-   call ParseVar( FileInfo_In, CurLine, 'TMax',             SimSettings%Sim%TMax,                  ErrStat2, ErrMsg2); if(Failed()) return;  ! Max sim time (unused)
+   call ParseVar( FileInfo_In, CurLine, 'TMax',             SimSettings%Sim%TMax,                  ErrStat2, ErrMsg2); if(Failed()) return;  ! Max sim time (used only with SeaState wavemod 5)
    call ParseVar( FileInfo_In, CurLine, 'MHK',              SimSettings%Sim%MHK,                   ErrStat2, ErrMsg2); if(Failed()) return;  ! MHK turbine type (switch) {0=Not an MHK turbine; 1=Fixed MHK turbine; 2=Floating MHK turbine}
    call ParseVar( FileInfo_In, CurLine, 'InterpOrd',        SimSettings%Sim%InterpOrd,             ErrStat2, ErrMsg2); if(Failed()) return;  ! Interpolation order [unused]
 !TODO: These are placeholders for later use.  Some of the logic is incomplete which is why this has been commented out.

glue-codes/python/pyOpenFAST/seastate.py

@@ -119,8 +119,8 @@ def _initialize_routines(self):
         self.SeaSt_C_Init.argtypes = [
             POINTER(c_char),        # intent(in   ) :: InputFile_c(IntfStrLen)
             POINTER(c_char),        # intent(in   ) :: OutRootName_c(IntfStrLen)
-            POINTER(c_int),         # intent(in   ) :: NSteps_c
             POINTER(c_double),      # intent(in   ) :: TimeInterval_c
+            POINTER(c_double),      # intent(in   ) :: TMax_c
             POINTER(c_double),      # intent(in   ) :: WaveTimeShift (positive only)
             POINTER(c_int),         # intent(  out) :: NumChannels_c
             POINTER(c_char),        # intent(  out) :: OutputChannelNames_C
@@ -261,7 +261,7 @@ def seastate_init(
         self,
         primary_ss_file,
         outrootname: str = "./seastate.SeaSt",
-        n_steps: int = 801,
+        time_max: float = 60,
         time_interval: float = 0.125,
     ):
 
@@ -283,8 +283,8 @@ def seastate_init(
         self.SeaSt_C_Init(
             ss_file_c,
             outrootname_c,
-            byref(c_int(n_steps)),
             byref(c_double(time_interval)),
+            byref(c_double(time_max)),
             byref(c_double(self.WaveTimeShift)),
             byref(self._numChannels),
             _channel_names,

modules/seastate/src/SeaState_C_Binding.f90

@@ -196,15 +196,15 @@ end subroutine SeaSt_C_PreInit
 
 
 !> Initialize the library (PreInit must be called first)
-subroutine SeaSt_C_Init(InputFile_C, OutRootName_C, NSteps_C, TimeInterval_C, WaveTimeShift_C, NumChannels_C, OutputChannelNames_C, OutputChannelUnits_C, ErrStat_C, ErrMsg_C) BIND (C, NAME='SeaSt_C_Init')
+subroutine SeaSt_C_Init(InputFile_C, OutRootName_C, TimeInterval_C, TMax_C, WaveTimeShift_C, NumChannels_C, OutputChannelNames_C, OutputChannelUnits_C, ErrStat_C, ErrMsg_C) BIND (C, NAME='SeaSt_C_Init')
 #ifndef IMPLICIT_DLLEXPORT
 !DEC$ ATTRIBUTES DLLEXPORT :: SeaSt_C_Init
 !GCC$ ATTRIBUTES DLLEXPORT :: SeaSt_C_Init
 #endif
    character(kind=c_char),     intent(in   ) :: InputFile_C(IntfStrLen)
    character(kind=c_char),     intent(in   ) :: OutRootName_C(IntfStrLen)
-   integer(c_int),             intent(in   ) :: NSteps_C
    real(c_double),             intent(in   ) :: TimeInterval_C
+   real(c_double),             intent(in   ) :: TMax_c 
    real(c_double),             intent(in   ) :: WaveTimeShift_C
    integer(c_int),             intent(  out) :: NumChannels_C
    character(kind=c_char),     intent(  out) :: OutputChannelNames_C(ChanLen*MaxOutPts+1)
@@ -251,7 +251,7 @@ subroutine SeaSt_C_Init(InputFile_C, OutRootName_C, NSteps_C, TimeInterval_C, Wa
 
    ! Set other inputs for calling SeaSt_Init
    InitInp%UseInputFile = .TRUE.                            ! don't allow passing of full file contents as a string
-   InitInp%TMax         = (NSteps_C - 1) * TimeInterval_C   ! Using this to match the SeaState driver; could otherwise get TMax directly  !FIXME: type conversion
+   InitInp%TMax         = real(TMax_c, DbKi)
    InitInp%WaveFieldMod = 0_IntKi 
    InitInp%WrWvKinMod   = 0_IntKi 
    InitInp%Linearize    = .false.
@@ -304,7 +304,7 @@ subroutine ShowPassedData()
       call WrScr("   --------------------------------------------------------")
       call WrScr("   InputFile_C             -> "//trim(InitInp%InputFile))
       call WrScr("   OutRootName_C           -> "//trim(InitInp%OutRootName))
-      call WrScr("   NSteps_C                -> "//trim(Num2LStr(NSteps_C)))
+      call WrScr("   TMax_C                  -> "//trim(Num2LStr(TMax_C)))
       call WrScr("   TimeInterval_C          -> "//trim(Num2LStr(TimeInterval_C)))
       call WrScr("   WaveTimeShift_C         -> "//trim(Num2LStr(WaveTimeShift_C)))
       call WrScr("-----------------------------------------------------------")