Skip to content

Commit

Permalink
Merge pull request #89 from OpenFAST/rc-3.4.1
Browse files Browse the repository at this point in the history 
  Merge dev to main for 3.4.1 release
  • Loading branch information
@andrew-platt
andrew-platt authored Feb 11, 2023
2 parents 1acc4a1 + ce9d821 commit 55384ed
Show file tree
Hide file tree
Showing 24 changed files with 130 additions and 128 deletions.
4 changes: 3 additions & 1 deletion glue-codes/openfast/5MW_Land_ModeShapes/NRELOffshrBsline5MW_Onshore_AeroDyn15.dat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,15 @@ NREL 5.0 MW offshore baseline aerodynamic input properties.
False Echo - Echo the input to "<rootname>.AD.ech"? (flag)
"default" DTAero - Time interval for aerodynamic calculations {or "default"} (s)
1 WakeMod - Type of wake/induction model (switch) {0=none, 1=BEMT, 2=DBEMT, 3=OLAF} [WakeMod cannot be 2 or 3 when linearizing]
1 2 AFAeroMod - Type of blade airfoil aerodynamics model (switch) {1=steady model, 2=Beddoes-Leishman unsteady model} [AFAeroMod must be 1 when linearizing]
1 AFAeroMod - Type of blade airfoil aerodynamics model (switch) {1=steady model, 2=Beddoes-Leishman unsteady model} [AFAeroMod must be 1 when linearizing]
1 TwrPotent - Type tower influence on wind based on potential flow around the tower (switch) {0=none, 1=baseline potential flow, 2=potential flow with Bak correction}
0 TwrShadow - Calculate tower influence on wind based on downstream tower shadow (switch) {0=none, 1=Powles model, 2=Eames model}
True TwrAero - Calculate tower aerodynamic loads? (flag)
True FrozenWake - Assume frozen wake during linearization? (flag) [used only when WakeMod=1 and when linearizing]
False CavitCheck - Perform cavitation check? (flag) [AFAeroMod must be 1 when CavitCheck=true]
False Buoyancy - Include buoyancy effects? (flag)
False CompAA - Flag to compute AeroAcoustics calculation [used only when WakeMod = 1 or 2]
"unused" AA_InputFile - AeroAcoustics input file [used only when CompAA=true]
====== Environmental Conditions ===================================================================
"default" AirDens - Air density (kg/m^3)
"default" KinVisc - Kinematic viscosity of working fluid (m^2/s)
Expand Down
4 changes: 2 additions & 2 deletions glue-codes/openfast/5MW_Land_ModeShapes/NRELOffshrBsline5MW_Onshore_ServoDyn.dat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ NREL 5.0 MW Baseline Wind Turbine for Use in Offshore Analysis. Properties from
False Echo - Echo input data to <RootName>.ech (flag)
"default" DT - Communication interval for controllers (s) (or "default")
---------------------- PITCH CONTROL -------------------------------------------
0 PCMode - Pitch control mode {0: none, 3: user-defined from routine PitchCntrl, 4: user-defined from Simulink/Labview, 5: user-defined from Bladed-style DLL} (switch)
0 PCMode - Pitch control mode {0: none, 3: user-defined from routine PitchCntrl, 4: user-defined from Simulink/Labview, 5: user-defined from Bladed-style DLL} (switch)
0 TPCOn - Time to enable active pitch control (s) [unused when PCMode=0]
9999.9 TPitManS(1) - Time to start override pitch maneuver for blade 1 and end standard pitch control (s)
9999.9 TPitManS(2) - Time to start override pitch maneuver for blade 2 and end standard pitch control (s)
Expand All @@ -16,7 +16,7 @@ False Echo - Echo input data to <RootName>.ech (flag)
0 BlPitchF(2) - Blade 2 final pitch for pitch maneuvers (degrees)
0 BlPitchF(3) - Blade 3 final pitch for pitch maneuvers (degrees) [unused for 2 blades]
---------------------- GENERATOR AND TORQUE CONTROL ----------------------------
1 5 VSContrl - Variable-speed control mode {0: none, 1: simple VS, 3: user-defined from routine UserVSCont, 4: user-defined from Simulink/Labview, 5: user-defined from Bladed-style DLL} (switch)
1 VSContrl - Variable-speed control mode {0: none, 1: simple VS, 3: user-defined from routine UserVSCont, 4: user-defined from Simulink/Labview, 5: user-defined from Bladed-style DLL} (switch)
2 GenModel - Generator model {1: simple, 2: Thevenin, 3: user-defined from routine UserGen} (switch) [used only when VSContrl=0]
94.4 GenEff - Generator efficiency [ignored by the Thevenin and user-defined generator models] (%)
True GenTiStr - Method to start the generator {T: timed using TimGenOn, F: generator speed using SpdGenOn} (flag)
Expand Down
4 changes: 2 additions & 2 deletions ...des/openfast/5MW_OC3Mnpl_DLL_WTurb_WavesIrr/NRELOffshrBsline5MW_OC3Monopile_AeroDyn15.dat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ True SumPrint - Generate a summary file listing input option
0 NTwOuts - Number of tower node outputs [0 - 9] (-)
1, 2, 3, 4, 5 TwOutNd - Tower nodes whose values will be output (-)
OutList - The next line(s) contains a list of output parameters. See OutListParameters.xlsx for a listing of available output channels, (-)
"RtFldFxh, RtFldFyh, RtFldFzh"
"RtFldMxh, RtFldMyh, RtFldMzh"
"RtAeroFxh, RtAeroFyh, RtAeroFzh"
"RtAeroMxh, RtAeroMyh, RtAeroMzh"
END of input file (the word "END" must appear in the first 3 columns of this last OutList line)
---------------------------------------------------------------------------------------
Binary file modified glue-codes/openfast/5MW_OC3Spar_DLL_WTurb_WavesIrr/5MW_OC3Spar_DLL_WTurb_WavesIrr.outb
View file
Binary file not shown.
Binary file modified glue-codes/openfast/5MW_OC4Jckt_ExtPtfm/5MW_OC4Jckt_ExtPtfm.outb
View file
Binary file not shown.
20 changes: 10 additions & 10 deletions glue-codes/openfast/EllipticalWing_OLAF/Elliptic_AD15_40.dat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,16 +83,16 @@ False SumPrint - Generate a summary file listing input option
"RtVAvgyh"
"RtVAvgzh"
"RtSkew"
"RtFldFxh"
"RtFldFyh"
"RtFldFzh"
"RtFldMxh"
"RtFldMyh"
"RtFldMzh"
"RtFldPwr"
"RtFldCp"
"RtFldCq"
"RtFldCt"
"RtAeroFxh"
"RtAeroFyh"
"RtAeroFzh"
"RtAeroMxh"
"RtAeroMyh"
"RtAeroMzh"
"RtAeroPwr"
"RtAeroCp"
"RtAeroCq"
"RtAeroCt"
END of input file (the word "END" must appear in the first 3 columns of this last OutList line)
====== Outputs for all blade stations (same ending as above for B1N1.... ============================ [optional section]
1 BldNd_BladesOut - Number of blades to output all node information at. Up to number of blades on turbine. (-)
Expand Down
20 changes: 10 additions & 10 deletions glue-codes/openfast/HelicalWake_OLAF/Helix_AD15.dat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,16 +83,16 @@ True SumPrint - Generate a summary file listing input option
"RtVAvgyh"
"RtVAvgzh"
"RtSkew"
"RtFldFxh"
"RtFldFyh"
"RtFldFzh"
"RtFldMxh"
"RtFldMyh"
"RtFldMzh"
"RtFldPwr"
"RtFldCp"
"RtFldCq"
"RtFldCt"
"RtAeroFxh"
"RtAeroFyh"
"RtAeroFzh"
"RtAeroMxh"
"RtAeroMyh"
"RtAeroMzh"
"RtAeroPwr"
"RtAeroCp"
"RtAeroCq"
"RtAeroCt"
"B1N9Clrnc," B1N9Clrnc, B1N9Clrnc
"B1N1Alpha" Angle of attack at Blade 3, Node 8
"B1N1Cl"
Expand Down
6 changes: 3 additions & 3 deletions glue-codes/openfast/SWRT_YFree_VS_EDG01/SWRT_AeroDyn15.dat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ True SumPrint - Generate a summary file listing input option
1, 2 TwOutNd - Tower nodes whose values will be output (-)
OutList - The next line(s) contains a list of output parameters. See OutListParameters.xlsx for a listing of available output channels, (-)
"RtTSR, RtSkew"
"RtFldCp, RtFldCq, RtFldCt"
"RtFldFxh, RtFldFyh, RtFldFzh"
"RtFldMxh, RtFldMyh, RtFldMzh"
"RtAeroCp, RtAeroCq, RtAeroCt"
"RtAeroFxh, RtAeroFyh, RtAeroFzh"
"RtAeroMxh, RtAeroMyh, RtAeroMzh"
END of input file (the word "END" must appear in the first 3 columns of this last OutList line)
---------------------------------------------------------------------------------------
2 changes: 1 addition & 1 deletion glue-codes/openfast/UAE_Upwind_Rigid_WRamp_PwrCurve/UAE_Upwind_Rigid_WRamp_PwrCurve_AD15.ipt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,6 @@ True SumPrint - Generate a summary file listing input option
0 NTwOuts - Number of tower node outputs [0 - 9] (-)
1, 2, 3, 4, 5 TwOutNd - Tower nodes whose values will be output (-)
OutList - The next line(s) contains a list of output parameters. See OutListParameters.xlsx for a listing of available output channels, (-)
"RtFldCp, RtFldCq, RtFldCt"
"RtAeroCp, RtAeroCq, RtAeroCt"
END of input file (the word "END" must appear in the first 3 columns of this last OutList line)
---------------------------------------------------------------------------------------
20 changes: 10 additions & 10 deletions modules/aerodyn/ad_BAR_CombinedCases/OpenFAST_BAR_00_AeroDyn15.dat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,16 +109,16 @@ False SumPrint - Generate a summary file listing input opti
0 NTwOuts - Number of tower node outputs [0 - 9] (-)
1, 2, 6 TwOutNd - Tower nodes whose values will be output (-)
OutList - The next line(s) contains a list of output parameters. See OutListParameters.xlsx for a listing of available output channels, (-)
"RtFldCp"
"RtFldCq"
"RtFldCt"
"RtFldFxh"
"RtFldFyh"
"RtFldFzh"
"RtFldMxh"
"RtFldMyh"
"RtFldMzh"
"RtFldPwr"
"RtAeroCp"
"RtAeroCq"
"RtAeroCt"
"RtAeroFxh"
"RtAeroFyh"
"RtAeroFzh"
"RtAeroMxh"
"RtAeroMyh"
"RtAeroMzh"
"RtAeroPwr"
"RtArea"
"RtSkew"
"RtSpeed"
Expand Down
18 changes: 9 additions & 9 deletions modules/aerodyn/ad_BAR_OLAF/OpenFAST_BAR_00_AeroDyn15.dat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,15 +109,15 @@ False SumPrint - Generate a summary file listing input opti
0 NTwOuts - Number of tower node outputs [0 - 9] (-)
1, 2, 6 TwOutNd - Tower nodes whose values will be output (-)
OutList - The next line(s) contains a list of output parameters. See OutListParameters.xlsx for a listing of available output channels, (-)
"RtFldCp"
"RtFldCq"
"RtFldCt"
"RtFldFxh"
"RtFldFyh"
"RtFldFzh"
"RtFldMxh"
"RtFldMyh"
"RtFldPwr"
"RtAeroCp"
"RtAeroCq"
"RtAeroCt"
"RtAeroFxh"
"RtAeroFyh"
"RtAeroFzh"
"RtAeroMxh"
"RtAeroMyh"
"RtAeroPwr"
"RtSkew"
"RtSpeed"
"RtTSR"
Expand Down
16 changes: 8 additions & 8 deletions modules/aerodyn/ad_BAR_RNAMotion/OpenFAST_BAR_00_AeroDyn15.dat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,14 +109,14 @@ False SumPrint - Generate a summary file listing input opti
0 NTwOuts - Number of tower node outputs [0 - 9] (-)
1, 2, 6 TwOutNd - Tower nodes whose values will be output (-)
OutList - The next line(s) contains a list of output parameters. See OutListParameters.xlsx for a listing of available output channels, (-)
"RtFldCp"
"RtFldCq"
"RtFldCt"
"RtFldFyh"
"RtFldFzh"
"RtFldMxh"
"RtFldMyh"
"RtFldPwr"
"RtAeroCp"
"RtAeroCq"
"RtAeroCt"
"RtAeroFyh"
"RtAeroFzh"
"RtAeroMxh"
"RtAeroMyh"
"RtAeroPwr"
"RtArea"
"RtSkew"
"RtSpeed"
Expand Down
20 changes: 10 additions & 10 deletions modules/aerodyn/ad_BAR_SineMotion/OpenFAST_BAR_00_AeroDyn15.dat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,16 +109,16 @@ False SumPrint - Generate a summary file listing input opti
0 NTwOuts - Number of tower node outputs [0 - 9] (-)
1, 2, 6 TwOutNd - Tower nodes whose values will be output (-)
OutList - The next line(s) contains a list of output parameters. See OutListParameters.xlsx for a listing of available output channels, (-)
"RtFldCp"
"RtFldCq"
"RtFldCt"
"RtFldFxh"
"RtFldFyh"
"RtFldFzh"
"RtFldMxh"
"RtFldMyh"
"RtFldMzh"
"RtFldPwr"
"RtAeroCp"
"RtAeroCq"
"RtAeroCt"
"RtAeroFxh"
"RtAeroFyh"
"RtAeroFzh"
"RtAeroMxh"
"RtAeroMyh"
"RtAeroMzh"
"RtAeroPwr"
"RtSkew"
"RtSpeed"
"RtTSR"
Expand Down
20 changes: 10 additions & 10 deletions modules/aerodyn/ad_BAR_SineMotion_UA4_DBEMT3/OpenFAST_BAR_00_AeroDyn15.dat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,16 +109,16 @@ False SumPrint - Generate a summary file listing input opti
0 NTwOuts - Number of tower node outputs [0 - 9] (-)
1, 2, 6 TwOutNd - Tower nodes whose values will be output (-)
OutList - The next line(s) contains a list of output parameters. See OutListParameters.xlsx for a listing of available output channels, (-)
"RtFldCp"
"RtFldCq"
"RtFldCt"
"RtFldFxh"
"RtFldFyh"
"RtFldFzh"
"RtFldMxh"
"RtFldMyh"
"RtFldMzh"
"RtFldPwr"
"RtAeroCp"
"RtAeroCq"
"RtAeroCt"
"RtAeroFxh"
"RtAeroFyh"
"RtAeroFzh"
"RtAeroMxh"
"RtAeroMyh"
"RtAeroMzh"
"RtAeroPwr"
"RtSkew"
"RtSpeed"
"RtTSR"
Expand Down
Binary file modified modules/aerodyn/ad_BAR_SineMotion_UA4_DBEMT3/ad_driver.outb
View file
Binary file not shown.
20 changes: 10 additions & 10 deletions modules/aerodyn/ad_EllipticalWingInf_OLAF/Elliptic_AD15_40.dat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,16 +83,16 @@ False SumPrint - Generate a summary file listing input option
"RtVAvgyh"
"RtVAvgzh"
"RtSkew"
"RtFldFxh"
"RtFldFyh"
"RtFldFzh"
"RtFldMxh"
"RtFldMyh"
"RtFldMzh"
"RtFldPwr"
"RtFldCp"
"RtFldCq"
"RtFldCt"
"RtAeroFxh"
"RtAeroFyh"
"RtAeroFzh"
"RtAeroMxh"
"RtAeroMyh"
"RtAeroMzh"
"RtAeroPwr"
"RtAeroCp"
"RtAeroCq"
"RtAeroCt"
END of input file (the word "END" must appear in the first 3 columns of this last OutList line)
====== Outputs for all blade stations (same ending as above for B1N1.... ============================ [optional section]
1 BldNd_BladesOut - Number of blades to output all node information at. Up to number of blades on turbine. (-)
Expand Down
12 changes: 6 additions & 6 deletions modules/aerodyn/ad_HelicalWakeInf_OLAF/Helix_AD15.dat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,12 @@ False SumPrint - Generate a summary file listing input optio
"RtVAvgyh"
"RtVAvgzh"
"RtSkew"
"RtFldFxh"
"RtFldMxh"
"RtFldPwr"
"RtFldCp"
"RtFldCq"
"RtFldCt"
"RtAeroFxh"
"RtAeroMxh"
"RtAeroPwr"
"RtAeroCp"
"RtAeroCq"
"RtAeroCt"
"B1N9Clrnc," B1N9Clrnc, B1N9Clrnc
"B1N1Alpha" Angle of attack at Blade 3, Node 8
"B1N1Cl"
Expand Down
18 changes: 9 additions & 9 deletions modules/aerodyn/ad_Kite_OLAF/AD.dat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,15 @@ False SumPrint - Generate a summary file listing input option
"RtVAvgyh"
"RtVAvgzh"
"RtSkew"
"RtFldFxh"
"RtFldFyh"
"RtFldFzh"
"RtFldMyh"
"RtFldMzh"
"RtFldPwr"
"RtFldCp"
"RtFldCq"
"RtFldCt"
"RtAeroFxh"
"RtAeroFyh"
"RtAeroFzh"
"RtAeroMyh"
"RtAeroMzh"
"RtAeroPwr"
"RtAeroCp"
"RtAeroCq"
"RtAeroCt"
END of input file (the word "END" must appear in the first 3 columns of this last OutList line)
====== Outputs for all blade stations (same ending as above for B1N1.... ============================ [optional section]
1 BldNd_BladesOut - Number of blades to output all node information at. Up to number of blades on turbine. (-)
Expand Down
Loading

0 comments on commit 55384ed

Please sign in to comment.