Skip to content

Commit

Permalink
Merge feature/MHK_AddedMass_Inertia into feature/AddedMass_DMST
Browse files Browse the repository at this point in the history
  • Loading branch information
@hkross
hkross committed Jan 4, 2025
2 parents 3750804 + 8a70a83 commit 504d378
Show file tree
Hide file tree
Showing 219 changed files with 59,398 additions and 33,248 deletions.
3 changes: 2 additions & 1 deletion .gitmodules
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[submodule "reg_tests/r-test"]
path = reg_tests/r-test
url = https://github.com/OpenFAST/r-test.git
url = https://github.com/OpenFAST/r-test.git
shallow = true
4 changes: 4 additions & 0 deletions cmake/OpenfastFortranOptions.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,10 @@ macro(set_fast_gfortran)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS},--stack,${stack_size}")
endif()

# Profiling
# set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -pg")
# set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pg")

check_f2008_features()
endmacro(set_fast_gfortran)

Expand Down
Binary file added docs/OtherSupporting/AeroDyn/Fluid_Inertia_Added_Mass_Implementation_Plan.docx
View file
Binary file not shown.
Binary file added docs/OtherSupporting/AeroDyn/UMERC24-Poster.pdf
View file
Binary file not shown.
18 changes: 8 additions & 10 deletions docs/source/user/aerodyn-aeroacoustics/example/AeroDyn.ipt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,15 @@ IEA Wind Task 37 land-based reference wind turbine
====== General Options ===================================================
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 AFAeroMod - Type of blade airfoil aerodynamics model (switch
0 TwrPotent - Type of tower influence on wind around the tower (switch)
0 TwrShadow - Type of tower influence on wind based on downstream tower shadow (switch) {0=none, 1=Powles model, 2=Eames model}
1 Wake_Mod - Wake/induction model (switch) {0=none, 1=BEMT, 3=OLAF} [Wake_Mod cannot be 2 or 3 when linearizing]
0 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}
False TwrAero - Calculate tower aerodynamic loads? (flag)
False FrozenWake - Assume frozen wake during linearization? (flag
False CavitCheck - Perform cavitation check? (flag)
False CavitCheck - Perform cavitation check? (flag) [UA_Mod must be 0 when CavitCheck=true]
False NacelleDrag - Include Nacelle Drag effects? (flag)
True CompAA - Flag to compute AeroAcoustics calculation
"AeroAcousticsInput.dat" AA_InputFile
====== Environmental Conditions ==========================================
"default" AirDens - Air density (kg/m^3)
True CompAA - Flag to compute AeroAcoustics calculation [used only when Wake_Mod = 1 or 2]
"AeroAcousticsInput.dat" AA_InputFile - AeroAcoustics input file [used only when CompAA=true]
====== Environmental Conditions ===================================================================
"default" AirDens - Air density (kg/m^3)

File continues...
10 changes: 5 additions & 5 deletions docs/source/user/aerodyn/appendix.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ to vary with time. This feature can be useful for debugging the aerodynamic resp
outside of OpenFAST.

2) Multi-rotor AeroDyn Driver Input File
:download:`(driver input file example) <examples/ad_driver_multiple.dvr>`:
:download:`(driver input file example) <examples/ad_driver_multiple.dvr>`


3) AeroDyn Primary Input File
:download:`(primary input file example) <examples/ad_primary_example.dat>`:
:download:`(primary input file example) <examples/ad_primary_example.dat>`

The primary AeroDyn input file defines modeling options, environmental conditions (except freestream flow), airfoils, tower nodal discretization and properties, tower, hub, and nacelle properties, as well as output file specifications.

Expand All @@ -35,14 +35,14 @@ The input file begins with two lines of header information which is for your use

4) Airfoil Data Input File

:download:`(profile data) <examples/ad_polar_example.dat>`:
:download:`(profile data) <examples/ad_polar_example.dat>`

:download:`(profile coordinates) <examples/ad_airfoil_example.dat>`:
:download:`(profile coordinates) <examples/ad_airfoil_example.dat>`

The airfoil data input files themselves (one for each airfoil) include tables containing coefficients of lift force, drag force, and pitching moment versus AoA, as well as UA model parameters. In these files, any line whose first non-blank character is an exclamation point (!) is ignored (for inserting comment lines). The non-comment lines should appear within the file in order, but comment lines may be intermixed as desired for reading clarity.

5) Blade Data Input File
:download:`(blade data input file example) <examples/ad_blade_example.dat>`:
:download:`(blade data input file example) <examples/ad_blade_example.dat>`

The blade data input file contains the nodal discretization, geometry, twist, chord, airfoil identifier, and buoyancy properties for a blade. Separate files are used for each blade, which permits modeling of aerodynamic imbalances.

Expand Down
30 changes: 24 additions & 6 deletions docs/source/user/aerodyn/driver.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,21 @@ An example of inputs is given below:
**SeaState data**

SeaState can be called by the AeroDyn driver to define a wave field as part of the inflow information.
For MHK turbines with waves and currents, SeaState will query InflowWind and sum the velocities and
accelerations from the wave and current fields. If SeaState is activated, InflowWind must also be
activated, though the current can be set to 0 if desired. An example of inputs for this section is given below:

.. code::
----- SeaState Data ---------------------------------------------------------------------
1 CompSeaSt - Compute wave velocities (switch) {0=No Waves; 1=SeaState}
"MHK_RM1_Floating_SeaState.dat" SeaStFile - Name of the SeaState input file [used only when CompSeaSt=1]
**Turbine data**

The user specifies the number of turbines as follows:
Expand Down Expand Up @@ -466,13 +481,16 @@ An example of an AeroDyn driver for a basic inflow, basic HAWT, and combined cas
1.700000000000000e+03 Pvap - Vapour pressure of working fluid (Pa) [used only for an MHK turbine cavitation check]
0 WtrDpth - Water depth (m)
----- Inflow Data -----------------------------------------------------------------------
0 CompInflow - Compute inflow wind velocities (switch) {0=Steady Wind; 1=InflowWind}
"unused" InflowFile - Name of the InflowWind input file [used only when CompInflow=1]
9.0 HWindSpeed - Horizontal wind speed [used only when CompInflow=0 and AnalysisType=1] (m/s)
140 RefHt - Reference height for horizontal wind speed [used only when CompInflow=0] (m)
0.10 PLExp - Power law exponent [used only when CompInflow=0 and AnalysisType=1] (-)
0 CompInflow - Compute inflow wind velocities (switch) {0=Steady Wind; 1=InflowWind}
"unused" InflowFile - Name of the InflowWind input file [used only when CompInflow=1]
9.0 HWindSpeed - Horizontal wind speed [used only when CompInflow=0 and AnalysisType=1] (m/s)
140 RefHt - Reference height for horizontal wind speed [used only when CompInflow=0] (m)
0.10 PLExp - Power law exponent [used only when CompInflow=0 and AnalysisType=1] (-)
----- SeaState Data ---------------------------------------------------------------------
0 CompSeaSt - Compute wave velocities (switch) {0=No Waves; 1=SeaState}
"unused" SeaStFile - Name of the SeaState input file [used only when CompSeaSt=1]
----- Turbine Data ----------------------------------------------------------------------
1 NumTurbines - Number of turbines
1 NumTurbines - Number of turbines
----- Turbine(1) Geometry ---------------------------------------------------------------
True BasicHAWTFormat(1) - Flag to switch between basic or generic input format {True: next 7 lines are basic inputs, False: Base/Twr/Nac/Hub/Bld geometry and motion must follow}
0,0,0 BaseOriginInit(1) - Coordinate of tower base in base coordinates (m)
Expand Down
50 changes: 25 additions & 25 deletions docs/source/user/aerodyn/examples/ad_blade_example.dat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,29 @@
Description line for this file -- file corresponds to inputs in Test01_UAE_AeroDyn.dat
====== Blade Properties =================================================================
23 NumBlNds - Number of blade nodes used in the analysis (-)
BlSpn BlCrvAC BlSwpAC BlCrvAng BlTwist BlChord BlAFID BlCb BlCenBn BlCenBt
(m) (m) (m) (deg) (deg) (m) (-) (-) (m) (m)
0.0 0.0 0.0 0.0 0.000 0.219 1 0.0 0.0 0.0
0.1360 0.0 0.0 0.0 0.000 0.219 1 0.0 0.0 0.0
0.4481 0.0 0.0 0.0 -0.098 0.181 1 0.0 0.0 0.0
0.8001 0.0 0.0 0.0 19.423 0.714 3 0.0 0.0 0.0
1.0767 0.0 0.0 0.0 14.318 0.711 4 0.0 0.0 0.0
1.2779 0.0 0.0 0.0 10.971 0.691 5 0.0 0.0 0.0
1.4958 0.0 0.0 0.0 8.244 0.668 6 0.0 0.0 0.0
1.7137 0.0 0.0 0.0 6.164 0.647 7 0.0 0.0 0.0
1.9149 0.0 0.0 0.0 4.689 0.627 7 0.0 0.0 0.0
2.1160 0.0 0.0 0.0 3.499 0.606 8 0.0 0.0 0.0
2.3340 0.0 0.0 0.0 2.478 0.584 8 0.0 0.0 0.0
2.5520 0.0 0.0 0.0 1.686 0.561 8 0.0 0.0 0.0
2.7530 0.0 0.0 0.0 1.115 0.542 8 0.0 0.0 0.0
2.9542 0.0 0.0 0.0 0.666 0.522 8 0.0 0.0 0.0
3.1721 0.0 0.0 0.0 0.267 0.499 8 0.0 0.0 0.0
3.3900 0.0 0.0 0.0 -0.079 0.478 8 0.0 0.0 0.0
3.5912 0.0 0.0 0.0 -0.381 0.457 9 0.0 0.0 0.0
3.7924 0.0 0.0 0.0 -0.679 0.437 9 0.0 0.0 0.0
3.9684 0.0 0.0 0.0 -0.933 0.419 9 0.0 0.0 0.0
4.1444 0.0 0.0 0.0 -1.184 0.401 10 0.0 0.0 0.0
4.3456 0.0 0.0 0.0 -1.466 0.381 10 0.0 0.0 0.0
4.5216 0.0 0.0 0.0 -1.711 0.363 10 0.0 0.0 0.0
4.5970 0.0 0.0 0.0 -1.711 0.363 10 0.0 0.0 0.0
BlSpn BlCrvAC BlSwpAC BlCrvAng BlTwist BlChord BlAFID t_c BlCb BlCenBn BlCenBt BlCpn BlCpt BlCan BlCat BlCam
(m) (m) (m) (deg) (deg) (m) (-) (-) (-) (m) (m) (-) (-) (-) (-) (-)
0.0 0.0 0.0 0.0 0.000 0.219 1 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
0.1360 0.0 0.0 0.0 0.000 0.219 1 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
0.4481 0.0 0.0 0.0 -0.098 0.181 1 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
0.8001 0.0 0.0 0.0 19.423 0.714 3 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
1.0767 0.0 0.0 0.0 14.318 0.711 4 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
1.2779 0.0 0.0 0.0 10.971 0.691 5 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
1.4958 0.0 0.0 0.0 8.244 0.668 6 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
1.7137 0.0 0.0 0.0 6.164 0.647 7 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
1.9149 0.0 0.0 0.0 4.689 0.627 7 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
2.1160 0.0 0.0 0.0 3.499 0.606 8 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
2.3340 0.0 0.0 0.0 2.478 0.584 8 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
2.5520 0.0 0.0 0.0 1.686 0.561 8 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
2.7530 0.0 0.0 0.0 1.115 0.542 8 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
2.9542 0.0 0.0 0.0 0.666 0.522 8 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
3.1721 0.0 0.0 0.0 0.267 0.499 8 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
3.3900 0.0 0.0 0.0 -0.079 0.478 8 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
3.5912 0.0 0.0 0.0 -0.381 0.457 9 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
3.7924 0.0 0.0 0.0 -0.679 0.437 9 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
3.9684 0.0 0.0 0.0 -0.933 0.419 9 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
4.1444 0.0 0.0 0.0 -1.184 0.401 10 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
4.3456 0.0 0.0 0.0 -1.466 0.381 10 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
4.5216 0.0 0.0 0.0 -1.711 0.363 10 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
4.5970 0.0 0.0 0.0 -1.711 0.363 10 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0

4 changes: 4 additions & 0 deletions docs/source/user/aerodyn/index.rst
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
.. _AD_user_guide:

AeroDyn Users Guide and Theory Manual
======================================

Expand All @@ -16,6 +18,8 @@ can be downladed from the list below.
- :download:`Development Plan for the Aerodynamic Linearization of OpenFAST <../../../OtherSupporting/AeroDyn/AeroLin_2019-12.pdf>`
- :download:`AeroDyn Meshes and Related Calculations <../../../OtherSupporting/AeroDyn/AeroDynMesh_Rev4.docx>`
- :download:`Calculation of Buoyancy on a Marine Hydrokinetic Turbine in AeroDyn <../../../OtherSupporting/AeroDyn/Buoyancy_Implementation_Plan_Rev11.docx>`
- :download:`Calculation of Fluid Inertia and Added Mass Loads on an MHK Turbine in AeroDyn <../../../OtherSupporting/AeroDyn/Fluid_Inertia_Added_Mass_Implementation_Plan.docx>`
- :download:`Determination of Added Mass Coefficients for Floating Hydrokinetic Turbine Blades using Computational Fluid Dynamics <../../../OtherSupporting/AeroDyn/UMERC24-Poster.pdf>`

.. - :download:` <AeroDyn_Plan_TCF_AddedMass_Force.docx*>`
Expand Down
Loading

0 comments on commit 504d378

Please sign in to comment.