Skip to content

Commit 8060c6c

Browse files
andrew-plattandrew-platt
committed
Merge remote-tracking branch 'OpenFAST/dev' into f/SoilDyn
2 parents 7618542 + 0279390 commit 8060c6c

File tree

109 files changed

+16806
-5128
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+16806
-5128
lines changed

‎docs/OtherSupporting/OpenFAST_Algorithms/OpenFAST_Algorithms.pdf‎

-72 Bytes
Binary file not shown.

‎docs/OtherSupporting/OpenFAST_Algorithms/OpenFAST_Algorithms.tex‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ \section{Input-Output Relationships}
204204
\State$\mathit{u\_IceD\_tmp(:)} \gets \Call{TransferMeshMotions}{y\_SD}$
205205
\State$\mathit{u\_SlD\_tmp} \gets \Call{TransferMeshMotions}{y\_SD}$
206206
\State$\mathit{u\_HD\_tmp} \gets \Call{TransferMeshMotions}{y\_ED,y\_SD}$
207-
\State$\mathit{u\_SrvD\_tmp} \gets \Call{TransferMeshMotions}{y\_ED,y\_SD}$\footnote{Only if using ServoDyn Structural control with platform TMD.}
207+
\State$\mathit{u\_SrvD\_tmp} \gets \Call{TransferMeshMotions}{y\_BD,y\_ED,y\_SD}$\footnote{Only if using ServoDyn Structural control.}
208208
\State$\mathit{u\_SD\_tmp} \gets \!
209209
\begin{aligned}[t]
210210
& \Call{TransferMeshMotions}{\mathit{y\_ED}} \\
@@ -223,7 +223,7 @@ \section{Input-Output Relationships}
223223
& \mathit{y\_SD}, \mathit{u\_SD\_tmp}, \\
224224
& \mathit{y\_MAP}, \mathit{u\_MAP\_tmp}, \\
225225
& \mathit{y\_FEAM},\mathit{u\_FEAM\_tmp},\\
226-
& \mathit{y\_SrvD},\mathit{u\_SrvD\_tmp}\footnote{Only if using ServoDyn Structural control with platform TMD.} ) % SrvD%PtfmStC only
226+
& \mathit{y\_SrvD},\mathit{u\_SrvD\_tmp}\footnote{Only if using ServoDyn Structural control.} ) % SrvD%PtfmStC only
227227
\end{aligned}$
228228

229229
\State
@@ -276,7 +276,7 @@ \section{Input-Output Relationships}
276276
\State $\mathit{u\_IceF} \gets \Call{TransferMeshMotions}{\mathit{y\_SD}}$
277277
\State $\mathit{u\_IceD(:)} \gets \Call{TransferMeshMotions}{\mathit{y\_SD}}$
278278
\State $\mathit{u\_SlD} \gets \Call{TransferMeshPosition}{\mathit{y\_SD}}$
279-
\State $\mathit{u\_SrvD} \gets \Call{TransferMeshMotions}{\mathit{y\_ED,y\_SD}}$\footnote{Only if using ServoDyn Structural control with platform TMD.} % For SrvD%PtfmStC
279+
\State $\mathit{u\_SrvD} \gets \Call{TransferMeshMotions}{\mathit{y\_BD,y\_ED,y\_SD}}$\footnote{Only if using ServoDyn Structural control.} % For SrvD%PtfmStC
280280

281281
\EndProcedure
282282
\end{algorithmic}
@@ -361,7 +361,7 @@ \section{Solve Option 2 Improvements}
361361
\State $\mathit{y\_IfW} \gets \Call{IfW\_CalcOutput}{\mathit{u\_IfW}$ and other $\mathit{IfW}$ data structures$}$
362362
\State
363363
\State $\mathit{u\_AD}($InflowWind only$) \gets \Call{TransferOutputsToInputs}{\mathit{y\_IfW}}$
364-
\State $\mathit{u\_SrvD} \gets \Call{TransferOutputsToInputs}{\mathit{y\_ED},\mathit{y\_BD},\mathit{y\_IfW}}$
364+
\State $\mathit{u\_SrvD} \gets \Call{TransferOutputsToInputs}{\mathit{y\_BD},\mathit{y\_ED},\mathit{y\_IfW},\mathit{y\_SD}}$
365365
\State $\Call{AD\_UpdateStates}{\mathit{p\_AD},\mathit{u\_AD},\mathit{x\_AD},\mathit{xd\_AD},\mathit{z\_AD}}$
366366
\State $\Call{SrvD\_UpdateStates}{\mathit{p\_SrvD},\mathit{u\_SrvD},\mathit{x\_SrvD},\mathit{xd\_SrvD},\mathit{z\_SrvD}}$
367367
\State

‎docs/OtherSupporting/OutListParameters.xlsx‎

4.71 KB
Binary file not shown.

‎docs/conf.py‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,17 @@ def runDoxygen(sourcfile, doxyfileIn, doxyfileOut):
6767
'sphinxcontrib.bibtex',
6868
'sphinxcontrib.mermaid',
6969
]
70+
bibtex_bibfiles = [
71+
'source/user/aerodyn-aeroacoustics/references.bib',
72+
'source/user/aerodyn-olaf/bibliography.bib',
73+
'source/user/aerodyn/bibliography.bib',
74+
'source/user/beamdyn/references.bib',
75+
'source/user/extptfm/bibliography.bib',
76+
'source/user/fast.farm/bibliography.bib',
77+
'source/user/hydrodyn/references.bib',
78+
'source/user/servodyn-stc/StC_Refs.bib',
79+
'source/user/subdyn/references_SD.bib'
80+
]
7081

7182
autodoc_default_flags = [
7283
'members',
@@ -117,9 +128,9 @@ def runDoxygen(sourcfile, doxyfileIn, doxyfileOut):
117128
# built documents.
118129
#
119130
# The short X.Y version.
120-
version = u'3.0'
131+
version = u'3.1'
121132
# The full version, including alpha/beta/rc tags.
122-
release = u'v3.0.0'
133+
release = u'v3.1.0'
123134

124135
# The language for content autogenerated by Sphinx. Refer to documentation
125136
# for a list of supported languages.

‎docs/requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ docutils==0.16
33
Pygments>=2.2
44
pyparsing>=2.1
55
Sphinx>=1.8.5
6-
sphinxcontrib-bibtex>=0.3.3,<2.0.0
6+
sphinxcontrib-bibtex>=2.0.0
77
sphinxcontrib-doxylink>=1.3
88
sphinxcontrib-mermaid>=0.6
99
sphinx_rtd_theme>=0.3

‎docs/source/user/aerodyn-aeroacoustics/example/AD15.ipt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
------- AERODYN v15.03.\* INPUT FILE ------------------------------------------------
1+
------- AERODYN INPUT FILE -----------------------------------------------
22
IEA Wind Task 37 land-based reference wind turbine
33
====== General Options ===================================================
44
False Echo - Echo the input to "<rootname>.AD.ech"? (flag)
55
"default" DT_AA - Time interval for aerodynamic calculations {or "default"} (s)
66
1 WakeMod - Type of wake/induction model (switch) {0=none, 1=BEMT}
77
2 AFAeroMod - Type of blade airfoil aerodynamics model (switch
8-
0 TwrPotent - Type tower influence on wind around the tower (switch)
9-
False TwrShadow - Calculate tower influence on wind (flag)
8+
0 TwrPotent - Type of tower influence on wind around the tower (switch)
9+
0 TwrShadow - Type of tower influence on wind based on downstream tower shadow (switch) {0=none, 1=Powles model, 2=Eames model}
1010
False TwrAero - Calculate tower aerodynamic loads? (flag)
1111
False FrozenWake - Assume frozen wake during linearization? (flag
1212
False CavitCheck - Perform cavitation check? (flag)

‎docs/source/user/aerodyn-aeroacoustics/example/AFtab.dat‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
! ------------ AirfoilInfo v1.01.x Input File ----------------------------------
1+
! ------------ AirfoilInfo Input File ------------------------------------------
22
! AeroElasticSE FAST driver
33
!
44
!
55
! ------------------------------------------------------------------------------
6-
DEFAULT InterpOrd ! Interpolation order to use for quasi-steady table lookup {1=linear; 3=cubic spline; "default"} [default=3]
6+
DEFAULT InterpOrd ! Interpolation order to use for quasi-steady table lookup {1=linear; 3=cubic spline; "default"} [default=1]
77
1 NonDimArea ! The non-dimensional area of the airfoil (area/chord^2) (set to 1.0 if unsure or unneeded)
88
@"AF20_Coords.txt" NumCoords ! The number of coordinates in the airfoil shape file. Set to zero if coordinates not included.
9-
AF20_BL.txt BL_file ! The file name including the boundary layer characteristics of the profile. Ignored if the aeroacoustic module is not called.
9+
AF20_BL.txt BL_file ! The file name including the boundary layer characteristics of the profile. Optional and ignored if the aeroacoustic module is not called.
1010
1 NumTabs ! Number of airfoil tables in this file. Each table must have lines for Re and Ctrl.
1111
! ------------------------------------------------------------------------------
1212
! data for table 1

‎docs/source/user/aerodyn-aeroacoustics/example/AeroAcousticsInput.dat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
------- AeroAcoustics Module v1.00.* INPUT FILE ------------------------------------------------
1+
------- AeroAcoustics Module INPUT FILE -------------------------------------------------------------
22
IEA task 37 RWT turbine -- https://github.com/IEAWindTask37/IEA-3.4-130-RWT
33
====== General Options ============================================================================
4-
False Echo - Echo the input to "<rootname>.AD.ech"? (flag)
4+
False Echo - Echo the input to "<rootname>.AD.NN.ech"? (flag)
55
0.1 DT_AA - Time interval for aeroacoustics calculations (s), must be a multiple of DT_Aero from AeroDyn15 (or "default")
66
0 AAStart - Time after which the AeroAcoustics module is run (s)
77
70 BldPrcnt - Percentage of the blade span, starting from the tip, that will contribute to the overall noise levels. (float)

‎docs/source/user/aerodyn-aeroacoustics/references.bib‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@article{Amiet:1975,
1+
@article{aa-Amiet:1975,
22
author= {Roy K. Amiet},
33
title= {Acoustic Radiation from an Airfoil in a Turbulent Stream},
44
journal= {Journal of Sound and Vibration},
@@ -9,15 +9,15 @@ @article{Amiet:1975
99
doi= {10.1016/S0022-460X(75)80105-2}
1010
}
1111

12-
@techreport{Bortolotti:2019,
12+
@techreport{aa-Bortolotti:2019,
1313
author= {Pietro Bortolotti and Helena Canet Tarres and Katherine Dykes and Karl Merz and Latha Sethuraman and David Verelst and Frederik Zahle},
1414
year= {2019},
1515
title= {Systems Engineering in Wind Energy - WP2.1 Reference Wind Turbines},
1616
institution= {IEA Technical Report},
1717
URL= {https://www.nrel.gov/docs/fy19osti/73492.pdf}
1818
}
1919

20-
@techreport{Brooks:1989,
20+
@techreport{aa-Brooks:1989,
2121
author= {Thomas F. Brooks and D. Stuart Pope and Michael A. Marcolini},
2222
year= {1989},
2323
title= {Airfoil Self-Noise and Prediction},
@@ -26,7 +26,7 @@ @techreport{Brooks:1989
2626
number= { 1218}
2727
}
2828

29-
@article{Drela:1987,
29+
@article{aa-Drela:1987,
3030
author = {Drela, Mark and Giles, Michael B.},
3131
title = {Viscous-inviscid analysis of transonic and low Reynolds number airfoils},
3232
journal = {AIAA Journal},
@@ -37,7 +37,7 @@ @article{Drela:1987
3737
doi = {10.2514/3.9789},
3838
}
3939

40-
@inproceedings{Guidati:1997,
40+
@inproceedings{aa-Guidati:1997,
4141
author = {Gianfranco Guidati and Rainer Bareiss and Siegfried Wagner and Rene Parchen and Gianfranco Guidati and Rainer Bareiss and Siegfried Wagner and Rene Parchen},
4242
title = {Simulation and measurement of inflow-turbulence noise on airfoils},
4343
booktitle = {3rd AIAA/CEAS Aeroacoustics Conference},
@@ -46,7 +46,7 @@ @inproceedings{Guidati:1997
4646
}
4747

4848

49-
@article{Lowson:1970,
49+
@article{aa-Lowson:1970,
5050
author= {Martin V. Lowson},
5151
year= {1970},
5252
title= {Theoretical Analysis of Compressor Noise Evaluation},
@@ -56,7 +56,7 @@ @article{Lowson:1970
5656
doi= {10.1121/1.1911508}
5757
}
5858

59-
@article{Klein:2018,
59+
@article{aa-Klein:2018,
6060
author= {Levin Klein and Jonas Gude and Florian Wenz and Thorsten Lutz and Ewald Krämer},
6161
year= {2018},
6262
title= {Advanced Computational Fluid Dynamics (CFD)–Multi-Body Simulation (MBS) Coupling to Assess Low-Frequency Emissions from Wind Turbines},
@@ -66,7 +66,7 @@ @article{Klein:2018
6666
doi= {10.5194/wes-3-713-2018}
6767
}
6868

69-
@techreport{MoriartyMigliore:2003,
69+
@techreport{aa-MoriartyMigliore:2003,
7070
author= {Patrick J. Moriarty and Paul G. Migliore},
7171
year= {2003},
7272
title= {Semi-Empirical Aeroacoustic Noise Prediction Code for Wind Turbines},
@@ -76,23 +76,23 @@ @techreport{MoriartyMigliore:2003
7676
URL= {https://www.nrel.gov/docs/fy04osti/34478.pdf}
7777
}
7878

79-
@inproceedings{MoriartyGuidatiMigliore:2004,
79+
@inproceedings{aa-MoriartyGuidatiMigliore:2004,
8080
author = {Patrick Moriarty and Gianfranco Guidati and Paul Migliore},
8181
title = {Recent Improvement of a Semi-Empirical Aeroacoustic Prediction Code for Wind Turbines},
8282
booktitle = {10th AIAA/CEAS Aeroacoustics Conference},
8383
year= {2004},
8484
doi = {10.2514/6.2004-3041}
8585
}
8686

87-
@inproceedings{MoriartyGuidatiMigliore:2005,
87+
@inproceedings{aa-MoriartyGuidatiMigliore:2005,
8888
author = {Patrick Moriarty and Gianfranco Guidati and Paul Migliore},
8989
title = {Prediction of Turbulent Inflow and Trailing-Edge Noise for Wind Turbines},
9090
booktitle = {11th AIAA/CEAS Aeroacoustics Conference},
9191
year = {2005},
9292
doi = {10.2514/6.2005-2881}
9393
}
9494

95-
@techreport{MoriartyHansen:2005,
95+
@techreport{aa-MoriartyHansen:2005,
9696
author= {Patrick J. Moriarty and A. C. Hansen},
9797
year= {2005},
9898
title= {AeroDyn Theory Manual},
@@ -102,7 +102,7 @@ @techreport{MoriartyHansen:2005
102102
URL= {https://www.nrel.gov/docs/fy05osti/36881.pdf}
103103
}
104104

105-
@techreport{Moriarty:2005,
105+
@techreport{aa-Moriarty:2005,
106106
author= { Patrick J. Moriarty},
107107
year= {2005},
108108
title= {NAFNoise User's Guide},
@@ -111,29 +111,29 @@ @techreport{Moriarty:2005
111111
URL= {https://github.com/NREL/NAFNoise/blob/master/NAFNoise.pdf}
112112
}
113113

114-
@misc{xfoil:699,
114+
@misc{aa-xfoil:699,
115115
author= {Mark Drela},
116116
title= {{XF}oil, release 6.99},
117117
url= {https://web.mit.edu/drela/Public/web/xfoil/}
118118
}
119119

120-
@misc{openfast:2019,
120+
@misc{aa-openfast:2019,
121121
title= {Open{FAST}, dev branch},
122122
year= {2019},
123123
publisher= {GitHub},
124124
journal= {GitHub repository},
125125
url= {https://github.com/OpenFAST/openfast}
126126
}
127127

128-
@techreport{Parchen:1998,
128+
@techreport{aa-Parchen:1998,
129129
author= {René R. Parchen},
130130
year= {1998},
131131
title= {Progress Report {DRAW}: A Prediction Scheme for Trailing Edge Noise Based on Detailed Boundary Layer Characteristics},
132132
institution= {TNO Institute of Applied Physics}
133133
}
134134

135135

136-
@inproceedings{Paterson:1976,
136+
@inproceedings{aa-Paterson:1976,
137137
author = {R. Paterson and R. Amiet},
138138
title = {Acoustic radiation and surface pressure characteristics of an airfoil due to incident turbulence},
139139
booktitle = {3rd Aeroacoustics Conference},
@@ -144,7 +144,7 @@ @inproceedings{Paterson:1976
144144
doi = {10.2514/6.1976-571}
145145
}
146146

147-
@article{Sucameli:2018,
147+
@article{aa-Sucameli:2018,
148148
doi = {10.1088/1742-6596/1037/2/022038},
149149
year = 2018,
150150
month = {jun},
@@ -158,7 +158,7 @@ @article{Sucameli:2018
158158
}
159159

160160

161-
@techreport{Viterna:1981,
161+
@techreport{aa-Viterna:1981,
162162
author= {Larry A. Viterna},
163163
year= {1981},
164164
title= {Method for Predicting Impulsive Noise Generated by Wind Turbine Rotors},
@@ -169,7 +169,7 @@ @techreport{Viterna:1981
169169

170170

171171

172-
@article{Zhu:2005,
172+
@article{aa-Zhu:2005,
173173
author= {Wei J. Zhu and Nicolai Heilskov and Wen Zhong Shen},
174174
year= {2005},
175175
title= {Modeling of Aerodynamically Generated Noise From Wind Turbines},

‎docs/source/user/aerodyn-aeroacoustics/refs.rst‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,5 @@
55

66
.. bibliography:: references.bib
77
:labelprefix: aa-
8-
:keyprefix: aa-
98

109

0 commit comments

Comments
 (0)