C binding interface improvements

glue-codes/labview/src/WaveTank.f90

@@ -6,7 +6,7 @@ MODULE WaveTankTesting
     ! USE Precision
     USE MoorDyn_C
     USE SeaState_C_Binding
-    USE NWTC_C_Binding, ONLY: IntfStrLen, SetErr
+    USE NWTC_C_Binding, ONLY: IntfStrLen, SetErrStat_C
 
     IMPLICIT NONE
     SAVE
@@ -26,21 +26,7 @@ MODULE WaveTankTesting
 
 CONTAINS
 
-SUBROUTINE SetErrStat_C(ErrStatLocal, ErrMessLocal, ErrStatGlobal, ErrMessGlobal, RoutineName)
 
-INTEGER(C_INT), INTENT(IN   )               :: ErrStatLocal      ! Error status of the operation
-CHARACTER(*, KIND=C_CHAR),   INTENT(IN   )  :: ErrMessLocal      ! Error message if ErrStat /= ErrID_None
-INTEGER(C_INT), INTENT(INOUT)               :: ErrStatGlobal     ! Error status of the operation
-CHARACTER(KIND=C_CHAR),   INTENT(INOUT)     :: ErrMessGlobal     ! Error message if ErrStat /= ErrID_None
-CHARACTER(*),   INTENT(IN   )               :: RoutineName  ! Name of the routine error occurred in
-
-IF ( ErrStatLocal == ErrID_None ) RETURN
-
-IF (ErrStatGlobal /= ErrID_None) ErrMessGlobal = TRIM(ErrMessGlobal)//new_line('a')
-ErrMessGlobal = TRIM(ErrMessGlobal)//TRIM(RoutineName)//':'//TRIM(ErrMessLocal)
-ErrStatGlobal = MAX(ErrStatGlobal,ErrStatLocal)
-
-END SUBROUTINE 
 
 SUBROUTINE WaveTank_Init(   &
     MD_InputFile_c,         &

glue-codes/python/SeaState.py

@@ -1,40 +1,38 @@
 
 
-from OpynFAST.seastate import SeaStateLib
+from pyOpenFAST.seastate import SeaStateLib
 import matplotlib.pyplot as plt
 import numpy as np
 
 project_root = '/Users/rmudafor/Development/openfast'
 library_path = project_root + '/build/modules/seastate/libseastate_c_binding.dylib'
 
-if __name__=="__main__":
-
-    dt = 1.0
-    time_steps = 10
-
-    seastatelib = SeaStateLib(
-        library_path,
-        "NRELOffshrBsline5MW_OC4DeepCwindSemi_SeaState_WaveMod5.dat"
-    )
-
-    seastatelib.init(
-        time_interval=dt,
-        n_steps=time_steps,
-    )
-
-    seastate_outputs = np.zeros((time_steps, seastatelib.num_outs))
-    for i in range(time_steps):
-        seastatelib.calc_output(i)
-        seastate_outputs[i] = seastatelib.output_values
-        print(i, [f"{value:3.4f} - " for value in seastate_outputs[i]])
-    seastatelib.end()
-
-    # Plot the results
-    # plt.figure(figsize=(10, 6))
-    # plt.plot(seastate_outputs[:, 0])
-    # plt.plot(seastate_outputs[:, 1])
-    # plt.xlabel('Time Step')
-    # plt.ylabel('Value')
-    # plt.title('Sea State Outputs')
-    # plt.legend()
-    # plt.show()
+dt = 1.0
+time_steps = 10
+
+seastatelib = SeaStateLib(
+    library_path,
+    "NRELOffshrBsline5MW_OC4DeepCwindSemi_SeaState_WaveMod5.dat"
+)
+
+seastatelib.init(
+    time_interval=dt,
+    n_steps=time_steps,
+)
+
+seastate_outputs = np.zeros((time_steps, seastatelib.num_outs))
+for i in range(time_steps):
+    seastatelib.calc_output(i)
+    seastate_outputs[i] = seastatelib.output_values
+    print(i, [f"{value:3.4f} - " for value in seastate_outputs[i]])
+seastatelib.end()
+
+# Plot the results
+# plt.figure(figsize=(10, 6))
+# plt.plot(seastate_outputs[:, 0])
+# plt.plot(seastate_outputs[:, 1])
+# plt.xlabel('Time Step')
+# plt.ylabel('Value')
+# plt.title('Sea State Outputs')
+# plt.legend()
+# plt.show()

glue-codes/python/pyOpenFAST/aerodyn_inflow.py

@@ -169,7 +169,7 @@ class AeroDynInflowLib(CDLL):
     # NOTE: The length of the error message in Fortran is determined by the
     #       ErrMsgLen variable in the NWTC_Base.f90 file. If ErrMsgLen is modified,
     #       the corresponding size here must also be updated to match.
-    ERROR_MESSAGE_LENGTH: int = 1025
+    ERROR_MESSAGE_LENGTH: int = 8197
     DEFAULT_STRING_LENGTH: int = 1025
     CHANNEL_NAME_LENGTH: int = 20
     MAX_CHANNELS: int = 8000
@@ -220,6 +220,9 @@ def __init__(self, library_path: Union[str, Path]) -> None:
         self.transpose_dcm = 1
         self.point_load_output = 1
 
+        # MHK flag: 0->not MHK, 1->fixed bottom, 2->floating
+        self.mhk = 0
+
         # 0->None, 1->Info, 2->Warning, 3->Severe Error, 4->Fatal Error
         self.debug_level = 0
 
@@ -334,6 +337,15 @@ def adi_preinit(self) -> None:
             byref(c_int(self.num_turbines)),        # IN -> number of turbines
             byref(c_int(self.transpose_dcm)),       # IN -> transpose_dcm flag (0=false, 1=true)
             byref(c_int(self.point_load_output)),   # IN -> point_load_output flag (0=false, 1=true)
+            byref(c_float(self.gravity)),                        # IN -> gravity
+            byref(c_float(self.fluid_density)),                  # IN -> fluid density
+            byref(c_float(self.kinematic_viscosity)),            # IN -> kinematic viscosity
+            byref(c_float(self.sound_speed)),                    # IN -> speed of sound
+            byref(c_float(self.atmospheric_pressure)),           # IN -> atmospheric pressure
+            byref(c_float(self.vapor_pressure)),                 # IN -> vapor pressure
+            byref(c_float(self.water_depth)),                    # IN -> water depth
+            byref(c_float(self.mean_sea_level_offset)),          # IN -> MSL to SWL offset
+            byref(c_int(self.mhk)),                 # IN -> mhk flag (0=not MHK, 1=fixed bottom, 2=floating)
             byref(c_int(self.debug_level)),         # IN -> debug level (0=None to 4=Fatal)
             byref(self.error_status_c),             # OUT <- error status code
             self.error_message_c                    # OUT <- error message buffer
@@ -429,14 +441,6 @@ def adi_init(
             byref(c_int(ifw_input_string_length)),               # IN -> IfW input file string length
             output_file_root_name_c,                             # IN -> rootname for ADI file writing
             vtk_output_dir_c,                                    # IN -> directory for vtk output files
-            byref(c_float(self.gravity)),                        # IN -> gravity
-            byref(c_float(self.fluid_density)),                  # IN -> fluid density
-            byref(c_float(self.kinematic_viscosity)),            # IN -> kinematic viscosity
-            byref(c_float(self.sound_speed)),                    # IN -> speed of sound
-            byref(c_float(self.atmospheric_pressure)),           # IN -> atmospheric pressure
-            byref(c_float(self.vapor_pressure)),                 # IN -> vapor pressure
-            byref(c_float(self.water_depth)),                    # IN -> water depth
-            byref(c_float(self.mean_sea_level_offset)),          # IN -> MSL to SWL offset
             byref(c_int(self.interpolation_order)),              # IN -> interpolation order (1: linear, 2: quadratic)
             byref(c_double(self.dt)),                            # IN -> time step
             byref(c_double(self.t_max)),                         # IN -> maximum simulation time
@@ -695,6 +699,15 @@ def _initialize_routines(self) -> None:
             POINTER(c_int),                     # numTurbines
             POINTER(c_int),                     # transposeDCM
             POINTER(c_int),                     # pointLoadOutput
+            POINTER(c_float),                   # gravity
+            POINTER(c_float),                   # defFldDens
+            POINTER(c_float),                   # defKinVisc
+            POINTER(c_float),                   # defSpdSound
+            POINTER(c_float),                   # defPatm
+            POINTER(c_float),                   # defPvap
+            POINTER(c_float),                   # WtrDpth
+            POINTER(c_float),                   # MSL2SWL
+            POINTER(c_int),                     # MHK
             POINTER(c_int),                     # debuglevel
             POINTER(c_int),                     # ErrStat_C
             POINTER(c_char)                     # ErrMsg_C
@@ -736,14 +749,6 @@ def _initialize_routines(self) -> None:
             POINTER(c_int),                     # IfW input file string length
             POINTER(c_char),                    # OutRootName
             POINTER(c_char),                    # OutVTKdir
-            POINTER(c_float),                   # gravity
-            POINTER(c_float),                   # defFldDens
-            POINTER(c_float),                   # defKinVisc
-            POINTER(c_float),                   # defSpdSound
-            POINTER(c_float),                   # defPatm
-            POINTER(c_float),                   # defPvap
-            POINTER(c_float),                   # WtrDpth
-            POINTER(c_float),                   # MSL2SWL
             POINTER(c_int),                     # InterpOrder
             POINTER(c_double),                  # dt
             POINTER(c_double),                  # tmax

glue-codes/python/pyOpenFAST/interface_abc.py

@@ -30,7 +30,7 @@ class OpenFASTInterfaceType(CDLL):
     #           ErrMsgLen variable in the NWTC_Base.f90 file.  If that ever
     #           changes, it may be necessary to update the corresponding size
     #           here.
-    ERROR_MSG_C_LEN = 1025
+    ERROR_MSG_C_LEN = 8197
 
     #   NOTE:   the length of the name used for any output file written by the
     #           HD Fortran code is 1025.

modules/aerodyn/src/AeroDyn_Driver_Subs.f90

@@ -477,6 +477,7 @@ subroutine Init_ADI_ForDriver(iCase, ADI, dvr, FED, dt, needInitIW, errStat, err
       InitInp%IW_InitInp%RefHt      = dvr%IW_InitInp%RefHt
       InitInp%IW_InitInp%PLExp      = dvr%IW_InitInp%PLExp
       InitInp%IW_InitInp%MHK        = dvr%MHK
+      InitInp%IW_InitInp%OutputAccel= dvr%MHK /= MHK_None
       InitInp%IW_InitInp%FilePassingMethod = 0_IntKi ! read input file instead of passed file data
       ! AeroDyn
       InitInp%AD%Gravity   = 9.80665_ReKi

modules/aerodyn/src/AeroDyn_Inflow.f90

@@ -392,6 +392,7 @@ subroutine ADI_InitInflowWind(Root, i_IW, u_AD, o_AD, IW, dt, InitOutData, errSt
       ! the average values for the entire wind profile must be calculated and stored (we don't know if OLAF
       ! is used until after AD_Init below).
       InitInData%BoxExceedAllow = .true.
+      InitInData%OutputAccel = i_IW%OutputAccel
       CALL InflowWind_Init( InitInData, IW%u, IW%p, &
                      IW%x, IW%xd, IW%z, IW%OtherSt, &
                      IW%y, IW%m, dt,  InitOutData, errStat2, errMsg2 )