Skip to content

Commit

Permalink
Merge pull request #2 from bjonkman/LuWang_hydro
Browse files Browse the repository at this point in the history 
HydroDyn/SeaState Code Cleanup + Registry updates
  • Loading branch information
@luwang00
luwang00 authored May 19, 2022
2 parents 48e5680 + 2e2d9a9 commit 4d7f0ed
Show file tree
Hide file tree
Showing 120 changed files with 11,392 additions and 4,769 deletions.
9 changes: 9 additions & 0 deletions .github/actions/tests-module-version/action.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
name: 'VersionInfo module tests'
description: 'Run tests specific to the NWTC Library module'
author: 'Rafael Mudafort https://github.com/rafmudaf'
runs:
using: "composite"
steps:
- run: ctest -VV -R versioninfo_utest
working-directory: ${{runner.workspace}}/openfast/build
shell: bash
6 changes: 6 additions & 0 deletions .github/workflows/automated-dev-tests.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,14 @@ jobs:
working-directory: ${{runner.workspace}}/openfast/build
run: cmake --build . --target install -- -j ${{env.NUM_PROCS}}

# SubDyn has only regression tests
- name: Run SubDyn tests
uses: ./.github/actions/tests-module-subdyn
- name: Run AeroDyn tests
uses: ./.github/actions/tests-module-aerodyn
with:
test-target: regression
# HydroDyn has only regression tests
- name: Run HydroDyn tests
uses: ./.github/actions/tests-module-hydrodyn
- name: Run InflowWind tests
Expand Down Expand Up @@ -284,8 +286,12 @@ jobs:
working-directory: ${{runner.workspace}}/openfast/build
run: cmake --build . --target unit_tests -- -j ${{env.NUM_PROCS}}

# NWTC Library has only unit tests
- name: Run NWTC Library tests
uses: ./.github/actions/tests-module-nwtclibrary
# VersionInfo has only unit tests
- name: Run VersionInfo tests
uses: ./.github/actions/tests-module-version
- name: Run AeroDyn tests
uses: ./.github/actions/tests-module-aerodyn
with:
Expand Down
Binary file modified docs/OtherSupporting/OutListParameters.xlsx
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions docs/source/user/aerodyn/examples/ad_driver_example.dvr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ False Echo - Echo input parameters to "<rootname>.ech"?
3 AnalysisType - {1: multiple turbines, one simulation, 2: one turbine, one time-dependent simulation, 3: one turbine, combined cases}
11.0 TMax - Total run time [used only when AnalysisType/=3] (s)
0.5 DT - Simulation time step [used only when AnalysisType/=3] (s)
"./AD.dat" AeroFile - Name of the primary AeroDyn input file
"ad_primary_example.dat" AeroFile - Name of the primary AeroDyn input file
----- Environmental Conditions ----------------------------------------------------------
1025 FldDens - Density of working fluid (kg/m^3)
1.4639E-05 KinVisc - Kinematic viscosity of working fluid (m^2/s)
Expand All @@ -19,7 +19,7 @@ False Echo - Echo input parameters to "<rootname>.ech"?
"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.10 PLExp - Power law exponent [used only when CompInflow=0 and AnalysisType=1] (-)
----- Turbine Data ----------------------------------------------------------------------
1 NumTurbines - Number of turbines
----- Turbine(1) Geometry ---------------------------------------------------------------
Expand Down
56 changes: 28 additions & 28 deletions docs/source/user/aerodyn/examples/ad_primary_example.dat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ Description line that will be printed in the output file and written to the scre
====== General Options ============================================================================
True 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 WakeMod - Type of wake/induction model (switch) {0=none, 1=BEMT, 2=DBEMT, 3=OLAF} [WakeMod cannot be 2 or 3 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]
0 TwrPotent - Type of 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 - Type of tower influence on wind based on downstream tower shadow (switch) {0=none, 1=Powles model, 2=Eames model}
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) [used only when WakeMod=1 and when linearizing]
False CavitCheck - Perform cavitation check? (flag) [AFAeroMod must be 1 when CavitCheck=true]
False CompAA - Flag to compute AeroAcoustics calculation [only used when WakeMod=1 or 2]
"unused" AA_InputFile - Aeroacoustics input file
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 All @@ -32,12 +32,12 @@ True TIDrag - Include the drag term in the tangential-induc
2 DBEMT_Mod - Type of dynamic BEMT (DBEMT) model {1=constant tau1, 2=time-dependent tau1} (-) [used only when WakeMod=2]
4 tau1_const - Time constant for DBEMT (s) [used only when WakeMod=2 and DBEMT_Mod=1]
====== OLAF -- cOnvecting LAgrangian Filaments (Free Vortex Wake) Theory Options ================== [used only when WakeMod=3]
"unused" OLAFInputFileName - Input file for OLAF [used only when WakeMod=3]
"unused" OLAFInputFileName - Input file for OLAF [used only when WakeMod=3]
====== Beddoes-Leishman Unsteady Airfoil Aerodynamics Options ===================================== [used only when AFAeroMod=2]
1 UAMod - Unsteady Aero Model Switch (switch) {1=Baseline model (Original), 2=Gonzalez's variant (changes in Cn,Cc,Cm), 3=Minnema/Pierce variant (changes in Cc and Cm)}, 4=HGM, 5=HGM+vortex, 6=Oye, 7=Boeing-Vertol [used only when AFAeroMod=2]
1 UAMod - Unsteady Aero Model Switch (switch) {1=Baseline model (Original), 2=Gonzalez's variant (changes in Cn,Cc,Cm), 3=Minnema/Pierce variant (changes in Cc and Cm), 4=HGM, 5=HGM+vortex, 6=Oye, 7=Boeing-Vertol} [used only when AFAeroMod=2]
FALSE FLookup - Flag to indicate whether a lookup for f' will be calculated (TRUE) or whether best-fit exponential equations will be used (FALSE); if FALSE S1-S4 must be provided in airfoil input files (flag) [used only when AFAeroMod=2]
0.25 UAStartRad - Starting radius for dynamic stall (fraction of rotor radius) [used only when AFAeroMod=2; if line is missing UAStartRad=0]
0.95 UAEndRad - Ending radius for dynamic stall (fraction of rotor radius) [used only when AFAeroMod=2; if line is missing UAEndRad=1]
0.25 UAStartRad - Starting radius for dynamic stall (fraction of rotor radius [0.0,1.0]) [used only when AFAeroMod=2; if line is missing UAStartRad=0]
0.95 UAEndRad - Ending radius for dynamic stall (fraction of rotor radius [0.0,1.0]) [used only when AFAeroMod=2; if line is missing UAEndRad=1]
====== Airfoil Information =========================================================================
1 AFTabMod - Interpolation method for multiple airfoil tables {1=1D interpolation on AoA (first table only); 2=2D interpolation on AoA and Re; 3=2D interpolation on AoA and UserProp} (-)
1 InCol_Alfa - The column in the airfoil tables that contains the angle of attack (-)
Expand All @@ -63,13 +63,13 @@ True UseBlCm - Include aerodynamic pitching moment in calcul
"Test01_UAE_AeroDyn_blade.dat" ADBlFile(3) - Name of file containing distributed aerodynamic properties for Blade #3 (-) [unused if NumBl < 3]
====== Tower Influence and Aerodynamics ============================================================= [used only when TwrPotent/=0, TwrShadow/=0, or TwrAero=True]
5 NumTwrNds - Number of tower nodes used in the analysis (-) [used only when TwrPotent/=0, TwrShadow/=0, or TwrAero=True]
TwrElev TwrDiam TwrCd TwrTI ! [TwrTI used only with TwrShadow=2]
(m) (m) (-) (-)
0.0000000E+00 6.0000000E+00 0.0000000E+00 1.0000000E-01
2.0000000E+01 5.5000000E+00 0.0000000E+00 1.0000000E-01
4.0000000E+01 5.0000000E+00 0.0000000E+00 1.0000000E-01
6.0000000E+01 4.5000000E+00 0.0000000E+00 1.0000000E-01
8.0000000E+01 4.0000000E+00 0.0000000E+00 1.0000000E-01
TwrElev TwrDiam TwrCd TwrTI
(m) (m) (-) (-) ! TwrTI used only when TwrShadow=2
0.0000000E+00 6.0000000E+00 0.0000000E+00 1.0000000E-01
2.0000000E+01 5.5000000E+00 0.0000000E+00 1.0000000E-01
4.0000000E+01 5.0000000E+00 0.0000000E+00 1.0000000E-01
6.0000000E+01 4.5000000E+00 0.0000000E+00 1.0000000E-01
8.0000000E+01 4.0000000E+00 0.0000000E+00 1.0000000E-01
====== Outputs ====================================================================================
True SumPrint - Generate a summary file listing input options and interpolated properties to "<rootname>.AD.sum"? (flag)
4 NBlOuts - Number of blade node outputs [0 - 9] (-)
Expand All @@ -89,17 +89,17 @@ True SumPrint - Generate a summary file listing input option
"B1N1Theta, B1N2Theta, B1N3Theta"
END of OutList section (the word "END" must appear in the first 3 columns of the 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. (-)
"All" BldNd_BlOutNd - Future feature will allow selecting a portion of the nodes to output. Not implemented yet. (-)
1 BldNd_BladesOut - Number of blades to output all node information at. Up to number of blades on turbine. (-)
"All" BldNd_BlOutNd - Future feature will allow selecting a portion of the nodes to output. Not implemented yet. (-)
OutList - The next line(s) contains a list of output parameters. See OutListParameters.xlsx for a listing of available output channels, (-)
"Fx, Fy"
"Vx, Vy"
Vrel
TnInd
AxInd
Theta
Phi
Vindx
Vindy
Alpha
"Fx, Fy"
"Vx, Vy"
"Vrel"
"TnInd"
"AxInd"
"Theta"
"Phi"
"Vindx"
"Vindy"
"Alpha"
END (the word "END" must appear in the first 3 columns of this last OutList line in the optional nodal output section)
2 changes: 1 addition & 1 deletion modules/aerodyn/src/AeroAcoustics_TNO.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ END FUNCTION f_int2
FUNCTION Pressure(k1_in)
! Variables
REAL(TNOKi) :: a,b,answer
REAL(TNOKi) :: omega
! REAL(TNOKi) :: omega
REAL(TNOKi) :: abserr,resabs,resasc
REAL(TNOKi) :: k1_in
real(TNOKi) :: Pressure
Expand Down
Loading

0 comments on commit 4d7f0ed

Please sign in to comment.