Merge remote-tracking branch 'OpenFAST/dev' into wavetank3

Author: andrew-platt

CMakeLists.txt

@@ -125,6 +125,11 @@ if (OPENMP)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
     link_libraries("${OpenMP_CXX_LIBRARIES}")
   endif()
+elseif (NOT BLA_VENDOR)
+  # If we're not using OpenMP, and a specific BLAS vendor has not been set, 
+  # set MKL threading to sequential to avoid potential issues with 
+  # small calculations taking longer due to threading overhead (turbsim).
+  set(MKL_THREADING "sequential")
 endif()
 
 #-------------------------------------------------------------------------------

docs/source/install/install_vs_windows.rst

@@ -11,21 +11,21 @@ Prerequisites
 
 1. A version of Visual Studio (VS).  
 
-    -  Currently VS 2013 Professional and VS 2015 Community Edition have been tested with OpenFAST.
+    -  NOTE: not all VS Studio versions are supported by the Intel compilers. In general, the Fortran compiler must be newer than Visual Studio.  A list of Intel Fortran compatible VS versions and specific installation notes are found `here <https://software.intel.com/en-us/intel-parallel-studio-xe-compilers-required-microsoft-visual-studio>`_.    
 
-    -  A list of Intel Fortran compatible VS versions and specific installation notes are found `here <https://software.intel.com/en-us/intel-parallel-studio-xe-compilers-required-microsoft-visual-studio>`_.    
+    -  Currently VS 2019 Community Edition, VS 2022 Professional, and VS 2022 Community Edition have been tested with OpenFAST.  Download VS 2022 Community `here <https://aka.ms/vs/17/release/vs_community.exe>`__.
 
-    -  The included C/C++ project files for MAP++ and the Registry are compatible with VS 2013, but will upgrade seemlessly to a newer version of VS.
+    -  When installing Visual Studio, select the ``Desktop development with C++`` under ``Workloads``.
 
-    -  If you download and install `Visual Studio 2015 Community Edition <https://go.microsoft.com/fwlink/?LinkId=691978&clcid=0x409>`__, you will need to be sure and select the ``C/C++ component`` using the ``Customize`` option.
+    -  Note: The included C/C++ project files for MAP++ and the Registry are compatible with VS 2019, but will upgrade seemlessly to a newer version of VS.
 
 2. Intel Fortran Compiler
 
-    -  Currently only version 2017.1 has been tested with OpenFAST, but any newer version should be compatible.
+    -  We recommend compiling with the IFX compiler from Intel.  This is included in the ``Intel Fortran Essentials`` installation package.  Currently tested with version 2025.3
 
-    -  You can download an Intel Fortran compiler `here <https://software.intel.com/en-us/fortran-compilers>`__.
+    -  You can download ``Intel Fortran Essentials`` `here <https://www.intel.com/content/www/us/en/developer/tools/oneapi/fortran-compiler-download.html>`__.  Note: do not install the ``oneAPI HPC Toolkit``
 
-    -  Only install Intel Fortran after you have completed your Visual Studio installation.
+    -  Only install Intel Fortran after you have completed your Visual Studio installation. Note that Intel Fortran must be compatible with your version of Visual Studio.  See `here <https://www.intel.com/content/www/us/en/developer/articles/reference-implementation/intel-compilers-compatibility-with-microsoft-visual-studio-and-xcode.html>`__ for compatibility tables.
 
 3. Git for Windows
 

docs/source/user/hydrodyn/input_files.rst

@@ -561,9 +561,9 @@ flow is directed away from the endplate where flow separation is
 expected, not when the relative flow is impinging on the endplate 
 where flow separation is unlikely. Option 0 is suitable for 
 strip-theory-only members, whereas option 1 might be better suited for 
-hybrid potential-flow members with drag force. Note that option 1 
+hybrid potential-flow members with drag force. Note that option 0 
 uses a leading coefficient of 1/4 when computing the drag force, while 
-option 2 uses the more common leading coefficient of 1/2 since drag 
+option 1 uses the more common leading coefficient of 1/2 since drag 
 is usually only applied to one of the two endplates of the member 
 instead of on both.
 

modules/hydrodyn/src/Morison.f90

@@ -462,7 +462,7 @@ typedef   ^                            ^                             ReKi
 typedef   ^                            ^                             ReKi                     V_rel_n_HiPass                {:}            -         -         "High-pass filtered normal relative flow velocity at joints"   m/s
 typedef   ^                            ^                             ReKi                     zFillGroup                    {:}            -         -         "Instantaneous highest point of each filled group"  m
 typedef   ^                            ^                             MeshMapType              VisMeshMap                      -            -         -         "Mesh mapping for visualization mesh" -
-typedef   ^                            ^                          SeaSt_WaveField_MiscVarType WaveField_m                     -            -         -         "misc var information from the SeaState Interpolation module"   -
+typedef   ^                            ^                             GridInterp_MiscVarType   WaveField_m                     -            -         -         "misc var information from the Grid Interpolation module"   -
 
 # ..... Parameters ................................................................................................................
 # Define parameters here:

modules/hydrodyn/src/Morison.txt

@@ -8037,7 +8037,9 @@ SUBROUTINE MrsnOut_Init( InitInp, y,  p, InitOut, ErrStat, ErrMsg )
             ! Need to search mesh for the two markers which surround the requested output location and then store those marker indices and compute the
             ! scale factor based on how far they are from the requested output location.
             ! Since this is being done on markers and not nodes, the subroutine must be called after the Morison_Init() subroutine is called
-
+            IF (p%Members(memberIndx)%Flipped) THEN
+               p%MOutLst(I)%NodeLocs(J) = 1.0 - p%MOutLst(I)%NodeLocs(J)
+            END IF
             CALL GetNeighboringNodes(p%Members(memberIndx), p%MOutLst(I)%NodeLocs(J),  m1, m2, i1, i2, s, ErrStat, ErrMsg)
 
             p%MOutLst(I)%MeshIndx1(J) = m1

modules/hydrodyn/src/Morison_Output.f90

@@ -530,7 +530,7 @@ MODULE Morison_Types
     REAL(ReKi) , DIMENSION(:), ALLOCATABLE  :: V_rel_n_HiPass      !< High-pass filtered normal relative flow velocity at joints [m/s]
     REAL(ReKi) , DIMENSION(:), ALLOCATABLE  :: zFillGroup      !< Instantaneous highest point of each filled group [m]
     TYPE(MeshMapType)  :: VisMeshMap      !< Mesh mapping for visualization mesh [-]
-    TYPE(SeaSt_WaveField_MiscVarType)  :: WaveField_m      !< misc var information from the SeaState Interpolation module [-]
+    TYPE(GridInterp_MiscVarType)  :: WaveField_m      !< misc var information from the Grid Interpolation module [-]
   END TYPE Morison_MiscVarType
 ! =======================
 ! =========  Morison_ParameterType  =======
@@ -4693,7 +4693,7 @@ subroutine Morison_CopyMisc(SrcMiscData, DstMiscData, CtrlCode, ErrStat, ErrMsg)
    call NWTC_Library_CopyMeshMapType(SrcMiscData%VisMeshMap, DstMiscData%VisMeshMap, CtrlCode, ErrStat2, ErrMsg2)
    call SetErrStat(ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName)
    if (ErrStat >= AbortErrLev) return
-   call SeaSt_WaveField_CopyMisc(SrcMiscData%WaveField_m, DstMiscData%WaveField_m, CtrlCode, ErrStat2, ErrMsg2)
+   call GridInterp_CopyMisc(SrcMiscData%WaveField_m, DstMiscData%WaveField_m, CtrlCode, ErrStat2, ErrMsg2)
    call SetErrStat(ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName)
    if (ErrStat >= AbortErrLev) return
 end subroutine
@@ -4780,7 +4780,7 @@ subroutine Morison_DestroyMisc(MiscData, ErrStat, ErrMsg)
    end if
    call NWTC_Library_DestroyMeshMapType(MiscData%VisMeshMap, ErrStat2, ErrMsg2)
    call SetErrStat(ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName)
-   call SeaSt_WaveField_DestroyMisc(MiscData%WaveField_m, ErrStat2, ErrMsg2)
+   call GridInterp_DestroyMisc(MiscData%WaveField_m, ErrStat2, ErrMsg2)
    call SetErrStat(ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName)
 end subroutine
 
@@ -4821,7 +4821,7 @@ subroutine Morison_PackMisc(RF, Indata)
    call RegPackAlloc(RF, InData%V_rel_n_HiPass)
    call RegPackAlloc(RF, InData%zFillGroup)
    call NWTC_Library_PackMeshMapType(RF, InData%VisMeshMap) 
-   call SeaSt_WaveField_PackMisc(RF, InData%WaveField_m) 
+   call GridInterp_PackMisc(RF, InData%WaveField_m) 
    if (RegCheckErr(RF, RoutineName)) return
 end subroutine
 
@@ -4868,7 +4868,7 @@ subroutine Morison_UnPackMisc(RF, OutData)
    call RegUnpackAlloc(RF, OutData%V_rel_n_HiPass); if (RegCheckErr(RF, RoutineName)) return
    call RegUnpackAlloc(RF, OutData%zFillGroup); if (RegCheckErr(RF, RoutineName)) return
    call NWTC_Library_UnpackMeshMapType(RF, OutData%VisMeshMap) ! VisMeshMap 
-   call SeaSt_WaveField_UnpackMisc(RF, OutData%WaveField_m) ! WaveField_m 
+   call GridInterp_UnpackMisc(RF, OutData%WaveField_m) ! WaveField_m 
 end subroutine
 
 subroutine Morison_CopyParam(SrcParamData, DstParamData, CtrlCode, ErrStat, ErrMsg)

modules/hydrodyn/src/Morison_Types.f90

@@ -43,7 +43,7 @@ typedef ^                      ^                   SS_Exc_ContinuousStateType
 # Define any data that are used only for efficiency purposes (these variables are not associated with time):
 #   e.g. indices for searching in an array, large arrays that are local variables in any routine called multiple times, etc.
 typedef ^                      MiscVarType         INTEGER                      LastIndWave      -  1 -   "last used index in the WaveTime array" -
-typedef   ^                      ^                 SeaSt_WaveField_MiscVarType  WaveField_m      -  - -   "misc var information from the SeaState Interpolation module"   -
+typedef ^                      ^                   GridInterp_MiscVarType       WaveField_m      -  - -   "misc var information from the Grid Interpolation module"   -
 
 
 # ..... Parameters .........................

modules/hydrodyn/src/SS_Excitation.txt

@@ -73,7 +73,7 @@ MODULE SS_Excitation_Types
 ! =========  SS_Exc_MiscVarType  =======
   TYPE, PUBLIC :: SS_Exc_MiscVarType
     INTEGER(IntKi)  :: LastIndWave = 1      !< last used index in the WaveTime array [-]
-    TYPE(SeaSt_WaveField_MiscVarType)  :: WaveField_m      !< misc var information from the SeaState Interpolation module [-]
+    TYPE(GridInterp_MiscVarType)  :: WaveField_m      !< misc var information from the Grid Interpolation module [-]
   END TYPE SS_Exc_MiscVarType
 ! =======================
 ! =========  SS_Exc_ParameterType  =======
@@ -494,7 +494,7 @@ subroutine SS_Exc_CopyMisc(SrcMiscData, DstMiscData, CtrlCode, ErrStat, ErrMsg)
    ErrStat = ErrID_None
    ErrMsg  = ''
    DstMiscData%LastIndWave = SrcMiscData%LastIndWave
-   call SeaSt_WaveField_CopyMisc(SrcMiscData%WaveField_m, DstMiscData%WaveField_m, CtrlCode, ErrStat2, ErrMsg2)
+   call GridInterp_CopyMisc(SrcMiscData%WaveField_m, DstMiscData%WaveField_m, CtrlCode, ErrStat2, ErrMsg2)
    call SetErrStat(ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName)
    if (ErrStat >= AbortErrLev) return
 end subroutine
@@ -508,7 +508,7 @@ subroutine SS_Exc_DestroyMisc(MiscData, ErrStat, ErrMsg)
    character(*), parameter        :: RoutineName = 'SS_Exc_DestroyMisc'
    ErrStat = ErrID_None
    ErrMsg  = ''
-   call SeaSt_WaveField_DestroyMisc(MiscData%WaveField_m, ErrStat2, ErrMsg2)
+   call GridInterp_DestroyMisc(MiscData%WaveField_m, ErrStat2, ErrMsg2)
    call SetErrStat(ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName)
 end subroutine
 
@@ -518,7 +518,7 @@ subroutine SS_Exc_PackMisc(RF, Indata)
    character(*), parameter         :: RoutineName = 'SS_Exc_PackMisc'
    if (RF%ErrStat >= AbortErrLev) return
    call RegPack(RF, InData%LastIndWave)
-   call SeaSt_WaveField_PackMisc(RF, InData%WaveField_m) 
+   call GridInterp_PackMisc(RF, InData%WaveField_m) 
    if (RegCheckErr(RF, RoutineName)) return
 end subroutine
 
@@ -528,7 +528,7 @@ subroutine SS_Exc_UnPackMisc(RF, OutData)
    character(*), parameter            :: RoutineName = 'SS_Exc_UnPackMisc'
    if (RF%ErrStat /= ErrID_None) return
    call RegUnpack(RF, OutData%LastIndWave); if (RegCheckErr(RF, RoutineName)) return
-   call SeaSt_WaveField_UnpackMisc(RF, OutData%WaveField_m) ! WaveField_m 
+   call GridInterp_UnpackMisc(RF, OutData%WaveField_m) ! WaveField_m 
 end subroutine
 
 subroutine SS_Exc_CopyParam(SrcParamData, DstParamData, CtrlCode, ErrStat, ErrMsg)

modules/hydrodyn/src/SS_Excitation_Types.f90

@@ -241,7 +241,7 @@ SUBROUTINE WAMIT_Init( InitInp, u, p, x, xd, z, OtherState, y, m, Interval, ErrS
 
       ! Set up wave excitation grid - Can no longer use the WaveField parameters due to different headings
       ! Copy WaveField grid parameters
-      call SeaSt_WaveField_CopyParam(p%WaveField%GridParams, p%ExctnGridParams, 0, ErrStat2, ErrMsg2); CALL SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName)
+      call GridInterp_CopyParam(p%WaveField%VolGridParams, p%ExctnGridParams, 0, ErrStat2, ErrMsg2); CALL SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName)
       if ( p%ExctnDisp == 0 ) then
          p%ExctnGridParams%n(2:3)     =  1_IntKi
          p%ExctnGridParams%delta(2:3) =  0.0_SiKi
@@ -257,7 +257,6 @@ SUBROUTINE WAMIT_Init( InitInp, u, p, x, xd, z, OtherState, y, m, Interval, ErrS
          p%ExctnGridParams%pZero(4) = -Pi
       end if
       p%ExctnGridParams%n(4)    =  p%NExctnHdg+1
-      p%ExctnGridParams%Z_depth = -1.0   ! Set to Z_depth to a negative value to indicate uniform "z" grid for platform heading
 
          ! This module's implementation requires that if NBodyMod = 2 or 3, then there is one instance of a WAMIT module for each body, therefore, HydroDyn may have NBody > 1, but this WAMIT module will have NBody = 1
       if ( (p%NBodyMod > 1) .and. (p%NBody > 1) ) then