Merge pull request #1445 from OpenFAST/rc-3.4.1

OpenFAST v3.4.1
OpenFAST · Feb 12, 2023 · c7ca978 · c7ca978
2 parents e8ec53f + 9ea4053
commit c7ca978
Show file tree

Hide file tree

Showing 13 changed files with 2,547 additions and 2,486 deletions.
diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -7,7 +7,7 @@ version: 2
 
 formats:
   - htmlzip
-  - pdf
+  # - pdf
   # - epub
 
 python:

diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
@@ -29,15 +29,13 @@ else()
     # Add a sphinx-only HTML target to avoid building doxygen while developing documentation
     add_custom_target(sphinx-html
         COMMAND ${SPHINX_EXECUTABLE} -M html
-        "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}"
-        -c ${CMAKE_CURRENT_SOURCE_DIR})
+        "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}")
 
     # PDF documentation generation using sphinx -> latex -> pdflatex
     find_package(LATEX COMPONENTS PDFLATEX BIBTEX)
     if (LATEX_FOUND)
         add_custom_target(sphinx-pdf
             COMMAND ${SPHINX_EXECUTABLE} -M latexpdf
-            "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}"
-            -c ${CMAKE_CURRENT_BINARY_DIR})
+            "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}")
     endif()
 endif()
diff --git a/docs/OtherSupporting/OutListParameters.xlsx b/docs/OtherSupporting/OutListParameters.xlsx
diff --git a/docs/conf.py b/docs/conf.py
@@ -28,7 +28,7 @@
 sourcedir = sys.argv[-2]
 
 # Use this to turn Doxygen on or off
-useDoxygen = True
+useDoxygen = False
 
 # This function was adapted from https://gitlab.kitware.com/cmb/smtk
 # Only run when on readthedocs
@@ -130,7 +130,7 @@ def runDoxygen(sourcfile, doxyfileIn, doxyfileOut):
 # The short X.Y version.
 version = u'3.4'
 # The full version, including alpha/beta/rc tags.
-release = u'v3.4.0'
+release = u'v3.4.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/docs/source/user/api_change.rst b/docs/source/user/api_change.rst
@@ -10,6 +10,16 @@ The line number corresponds to the resulting line number after all changes are i
 Thus, be sure to implement each in order so that subsequent line numbers are correct.
 
 
+OpenFAST v3.4.1 to OpenFAST v3.4.1 
+----------------------------------
+
+Restored the AeroDyn channel names with `Aero` in the name.  These had be
+changed to `Fld` in v3.4.0 which caused headaches for users.  The `Fld` names
+are now aliases to the `Aero` names.
+
+
+============================================= ==== ================= ========================================================================================================================================================================================================
+Added in OpenFAST `dev`
 OpenFAST v3.3.0 to OpenFAST v3.4.0 
 ----------------------------------
 

diff --git a/modules/aerodyn/CMakeLists.txt b/modules/aerodyn/CMakeLists.txt
@@ -38,6 +38,7 @@ set(AEROACOUSTIC_SOURCES
 # AeroDyn lib
 set(AD_LIBS_SOURCES
   src/AeroDyn.f90
+  src/AeroDyn_IO_Params.f90
   src/AeroDyn_IO.f90
   src/AeroDyn_AllBldNdOuts_IO.f90
   src/BEMT.f90

diff --git a/modules/aerodyn/src/AeroDyn_Driver_Subs.f90 b/modules/aerodyn/src/AeroDyn_Driver_Subs.f90
@@ -2097,7 +2097,7 @@ end subroutine userHubMotion_Init
 !----------------------------------------------------------------------------------------------------------------------------------
 !> User routine to set hub motion
 subroutine userHubMotion(nt, iWT, dvr, ADI, FED, arr, azimuth, rotSpeed, rotAcc, errStat, errMsg)
-   use AeroDyn_IO, only: RtFldMxh
+   use AeroDyn_IO, only: RtAeroMxh
    integer(IntKi)             , intent(in   ) :: nt       !< time step number
    integer(IntKi)             , intent(in   ) :: iWT      !< Wind turbine index
    type(Dvr_SimData),           intent(in   ) :: dvr      !< Driver arr 
@@ -2177,7 +2177,7 @@ subroutine userHubMotion(nt, iWT, dvr, ADI, FED, arr, azimuth, rotSpeed, rotAcc,
    alphaTq = min(max(alphaTq, 0._ReKi), 1.0_ReKi) ! Bounding value
 
    ! --- Rotor torque
-   rotTorque = ADI%m%AD%rotors(iWT)%AllOuts( RtFldMxh )
+   rotTorque = ADI%m%AD%rotors(iWT)%AllOuts( RtAeroMxh )
    ! Optional filtering of input torque
    rotTorque_filt = ( 1.0 - alphaTq )*rotTorque + alphaTq*rotTorque_filt_prev
 

diff --git a/modules/aerodyn/src/AeroDyn_IO.f90 b/modules/aerodyn/src/AeroDyn_IO.f90
diff --git a/modules/aerodyn/src/AeroDyn_IO_Params.f90 b/modules/aerodyn/src/AeroDyn_IO_Params.f90
diff --git a/reg_tests/r-test b/reg_tests/r-test
diff --git a/vs-build/AeroDyn/AeroDyn_Driver.vfproj b/vs-build/AeroDyn/AeroDyn_Driver.vfproj
@@ -160,6 +160,9 @@
 			<FileConfiguration Name="Debug|Win32">
 				<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="true"/></FileConfiguration></File>
 		<File RelativePath="..\..\modules\AeroDyn\src\AeroDyn_IO.f90">
+			<FileConfiguration Name="Debug|Win32">
+				<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="true"/></FileConfiguration></File>
+		<File RelativePath="..\..\modules\AeroDyn\src\AeroDyn_IO_Params.f90">
 			<FileConfiguration Name="Debug|Win32">
 				<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="true"/></FileConfiguration></File></Filter>
 		<Filter Name="AeroDyn_Driver">

diff --git a/vs-build/AeroDyn_Inflow_c_binding/AeroDyn_Inflow_c_binding.vfproj b/vs-build/AeroDyn_Inflow_c_binding/AeroDyn_Inflow_c_binding.vfproj
@@ -255,6 +255,9 @@
 			<FileConfiguration Name="Debug|Win32">
 				<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="true"/></FileConfiguration></File>
 		<File RelativePath="..\..\modules\AeroDyn\src\AeroDyn_IO.f90">
+			<FileConfiguration Name="Debug|Win32">
+				<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="true"/></FileConfiguration></File>
+		<File RelativePath="..\..\modules\AeroDyn\src\AeroDyn_IO_Params.f90">
 			<FileConfiguration Name="Debug|Win32">
 				<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="true"/></FileConfiguration></File></Filter>
 		<Filter Name="AirFoil_Info">

diff --git a/vs-build/FASTlib/FASTlib.vfproj b/vs-build/FASTlib/FASTlib.vfproj
@@ -456,6 +456,7 @@
 		<File RelativePath="..\..\modules\aerodyn\src\AeroDyn_AllBldNdOuts_IO.f90"/>
 		<File RelativePath="..\..\modules\aerodyn\src\AeroDyn_Inflow.f90"/>
 		<File RelativePath="..\..\modules\aerodyn\src\AeroDyn_IO.f90"/>
+		<File RelativePath="..\..\modules\aerodyn\src\AeroDyn_IO_Params.f90"/>
 		<File RelativePath="..\..\modules\aerodyn\src\AirfoilInfo.f90"/>
 		<File RelativePath="..\..\modules\aerodyn\src\BEMT.f90"/>
 		<File RelativePath="..\..\modules\aerodyn\src\BEMTUncoupled.f90"/>