Skip to content

AD15: revert to Aero names for output channels (Fld is now an alias) #1428

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andrew-platt merged 3 commits into from
Feb 2, 2023
Merged

AD15: revert to Aero names for output channels (Fld is now an alias) #1428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b4cc405
AD15: add back in the `Aero` names for output channels as alias
andrew-platt Feb 1, 2023
0d5d1f8
Update input files 5MW_Land_ModeShapes
andrew-platt Feb 1, 2023
469ba98
AD15: change AeroDyn_Output_Params to AeroDyn_IO_Params
andrew-platt Feb 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified docs/OtherSupporting/OutListParameters.xlsx
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions modules/aerodyn/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions modules/aerodyn/src/AeroDyn_Driver_Subs.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
2,518 changes: 42 additions & 2,476 deletions modules/aerodyn/src/AeroDyn_IO.f90
View file
Open in desktop

Large diffs are not rendered by default.

2,479 changes: 2,479 additions & 0 deletions modules/aerodyn/src/AeroDyn_IO_Params.f90
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion reg_tests/r-test
Open in desktop
Submodule r-test updated 24 files
+3 −1 glue-codes/openfast/5MW_Land_ModeShapes/NRELOffshrBsline5MW_Onshore_AeroDyn15.dat
+2 −2 glue-codes/openfast/5MW_Land_ModeShapes/NRELOffshrBsline5MW_Onshore_ServoDyn.dat
+2 −2 glue-codes/openfast/5MW_OC3Mnpl_DLL_WTurb_WavesIrr/NRELOffshrBsline5MW_OC3Monopile_AeroDyn15.dat
+ − glue-codes/openfast/5MW_OC3Spar_DLL_WTurb_WavesIrr/5MW_OC3Spar_DLL_WTurb_WavesIrr.outb
+ − glue-codes/openfast/5MW_OC4Jckt_ExtPtfm/5MW_OC4Jckt_ExtPtfm.outb
+10 −10 glue-codes/openfast/EllipticalWing_OLAF/Elliptic_AD15_40.dat
+10 −10 glue-codes/openfast/HelicalWake_OLAF/Helix_AD15.dat
+3 −3 glue-codes/openfast/SWRT_YFree_VS_EDG01/SWRT_AeroDyn15.dat
+1 −1 glue-codes/openfast/UAE_Upwind_Rigid_WRamp_PwrCurve/UAE_Upwind_Rigid_WRamp_PwrCurve_AD15.ipt
+10 −10 modules/aerodyn/ad_BAR_CombinedCases/OpenFAST_BAR_00_AeroDyn15.dat
+9 −9 modules/aerodyn/ad_BAR_OLAF/OpenFAST_BAR_00_AeroDyn15.dat
+8 −8 modules/aerodyn/ad_BAR_RNAMotion/OpenFAST_BAR_00_AeroDyn15.dat
+10 −10 modules/aerodyn/ad_BAR_SineMotion/OpenFAST_BAR_00_AeroDyn15.dat
+10 −10 modules/aerodyn/ad_BAR_SineMotion_UA4_DBEMT3/OpenFAST_BAR_00_AeroDyn15.dat
+ − modules/aerodyn/ad_BAR_SineMotion_UA4_DBEMT3/ad_driver.outb
+10 −10 modules/aerodyn/ad_EllipticalWingInf_OLAF/Elliptic_AD15_40.dat
+6 −6 modules/aerodyn/ad_HelicalWakeInf_OLAF/Helix_AD15.dat
+9 −9 modules/aerodyn/ad_Kite_OLAF/AD.dat
+8 −8 modules/aerodyn/ad_MultipleHAWT/OpenFAST_BAR_00_AeroDyn15_2WT.dat
+9 −9 modules/aerodyn/ad_QuadRotor_OLAF/OpenFAST_BAR_00_AeroDyn15_FVW_5WT.dat
+1 −1 modules/aerodyn/ad_VerticalAxis_OLAF/AD.dat
+3 −3 modules/aerodyn/ad_timeseries_shutdown/ad_primary.dat
+4 −4 modules/aerodyn/py_ad_5MW_OC4Semi_WSt_WavesWN/ad_primary.dat
+2 −2 modules/aerodyn/py_ad_5MW_OC4Semi_WSt_WavesWN/py_ad_driver.out
3 changes: 3 additions & 0 deletions vs-build/AeroDyn/AeroDyn_Driver.vfproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
3 changes: 3 additions & 0 deletions vs-build/AeroDyn_Inflow_c_binding/AeroDyn_Inflow_c_binding.vfproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
1 change: 1 addition & 0 deletions vs-build/FASTlib/FASTlib.vfproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down