Skip to content
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

Use pointers to couple InflowWind and AeroDyn #1596

Merged
merged 13 commits into from
Jun 8, 2023
Merged

Use pointers to couple InflowWind and AeroDyn #1596

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
529b13c
Port openfast-registry to C++ and change pointers
deslaughter May 24, 2023
dfa99b7
Make error plots on regression tests bigger
deslaughter May 26, 2023
3ba4a8d
Add pointers inside InflowWind
deslaughter May 26, 2023
e5a95a4
First cut at InflowWind pointers in AeroDyn
deslaughter May 26, 2023
494ddba
Recalculate wind in AD_CalcOutput
deslaughter May 30, 2023
d14e563
Reverted change to setting AD_Inflow WriteOutput
deslaughter May 31, 2023
76645db
Fixed node numbering in AD_CalcWind funcs
deslaughter May 31, 2023
efb4117
Renamed InflowWind_GetSpatialAverage
deslaughter May 31, 2023
cf00f00
Removed disabled code in FAST_Solver.f90
deslaughter May 31, 2023
0008133
Added OpenMP pragmas to IfW_FlowField
deslaughter May 31, 2023
b0d5635
Escaped " in AeroDyn & AeroAcoustics Registry
deslaughter Jun 6, 2023
b3b0fb8
Make Registry => NULL() pointers after dealloc
deslaughter Jun 7, 2023
59e82d7
Merge remote-tracking branch 'upstream/dev-unstable-pointers' into f/…
deslaughter Jun 8, 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
132 changes: 22 additions & 110 deletions glue-codes/fast-farm/src/FASTWrapper_Types.f90
View file
Open in desktop

Large diffs are not rendered by default.

240 changes: 88 additions & 152 deletions glue-codes/fast-farm/src/FAST_Farm_Types.f90
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion modules/aerodyn/src/AeroAcoustics_Registry.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ typedef ^ InitOutputType ReKi AirDens
#

# ..... Primary Input file data ...................................................................................................
typedef ^ AA_InputFile DbKi DT_AA - - - "Time interval for aerodynamic calculations {or "default"}" s
typedef ^ AA_InputFile DbKi DT_AA - - - "Time interval for aerodynamic calculations {or \"default\"}" s
typedef ^ AA_InputFile IntKi IBLUNT - - - "FLAG TO COMPUTE BLUNTNESS NOISE" -
typedef ^ AA_InputFile IntKi ILAM - - - "FLAG TO COMPUTE LBL NOISE {1=steady model, 2=Beddoes-Leishman unsteady model}" -
typedef ^ AA_InputFile IntKi ITIP - - - "FLAG TO COMPUTE TIP NOISE {0=none, 1=baseline potential flow, 2=potential flow with Bak correction}" -
Expand Down
156 changes: 26 additions & 130 deletions modules/aerodyn/src/AeroAcoustics_Types.f90
View file
Open in desktop

Large diffs are not rendered by default.

191 changes: 140 additions & 51 deletions modules/aerodyn/src/AeroDyn.f90
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 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 @@ -22,7 +22,6 @@ module AeroDyn_Driver_Subs
use AeroDyn_Inflow_Types
use AeroDyn_Inflow, only: ADI_Init, ADI_ReInit, ADI_End, ADI_CalcOutput, ADI_UpdateStates
use AeroDyn_Inflow, only: concatOutputHeaders
use AeroDyn_Inflow, only: ADI_ADIW_Solve ! TODO remove me
deslaughter marked this conversation as resolved.
Show resolved Hide resolved
use AeroDyn_Inflow, only: Init_MeshMap_For_ADI, Set_Inputs_For_ADI
use AeroDyn_IO, only: AD_WrVTK_Surfaces, AD_WrVTK_LinesPoints

Expand Down Expand Up @@ -238,7 +237,6 @@ subroutine Dvr_InitCase(iCase, dvr, ADI, FED, errStat, errMsg )
DO j = 1-numInp, 0
call Shift_ADI_Inputs(j,dvr, ADI, errStat2, errMsg2); if(Failed()) return
call Set_Inputs_For_ADI(ADI%u(1), FED, errStat2, errMsg2); if(Failed()) return
call ADI_ADIW_Solve(ADI%inputTimes(1), ADI%p, ADI%u(1)%AD, ADI%OtherState(1)%AD, ADI%m%IW%u, ADI%m%IW, .true., errStat2, errMsg2); if(Failed()) return ! TODO TODO TODO remove me
END DO
! --- AeroDyn + Inflow at T=0
call ADI_CalcOutput(ADI%inputTimes(1), ADI%u(1), ADI%p, ADI%x(1), ADI%xd(1), ADI%z(1), ADI%OtherState(1), ADI%y, ADI%m, errStat2, errMsg2); if(Failed()) return
Expand Down Expand Up @@ -291,8 +289,7 @@ subroutine Dvr_TimeStep(nt, dvr, ADI, FED, errStat, errMsg)
! u(1) is at nt, u(2) is at nt-1. Set inputs for nt timestep
call Shift_ADI_Inputs(nt,dvr, ADI, errStat2, errMsg2); if(Failed()) return
call Set_Inputs_For_ADI(ADI%u(1), FED, errStat2, errMsg2); if(Failed()) return
call ADI_ADIW_Solve(ADI%inputTimes(1), ADI%p, ADI%u(1)%AD, ADI%OtherState(1)%AD, ADI%m%IW%u, ADI%m%IW, .true., errStat, errMsg)


time = ADI%inputTimes(2)

! Calculate outputs at nt - 1 (current time)
Expand Down Expand Up @@ -702,9 +699,12 @@ subroutine Set_Mesh_Motion(nt, dvr, ADI, FED, errStat, errMsg)
! Getting current time values by interpolation
! timestate = HWindSpeed, PLExp, RotSpeed, Pitch, yaw
call interpTimeValue(dvr%timeSeries, time, dvr%iTimeSeries, timeState)
! Set wind at this time
! Set wind at this time
ADI%m%IW%HWindSpeed = timeState(1)
ADI%m%IW%PLexp = timeState(2)
! Set values in flow field (not recommended)
ADI%m%IW%p%FlowField%Uniform%VelH = timeState(1)
ADI%m%IW%p%FlowField%Uniform%ShrV = timeState(2)
!! Set motion at this time
dvr%WT(1)%hub%rotSpeed = timeState(3) ! rad/s
do j=1,size(dvr%WT(1)%bld)
Expand Down
243 changes: 79 additions & 164 deletions modules/aerodyn/src/AeroDyn_Driver_Types.f90
View file
Open in desktop

Large diffs are not rendered by default.

236 changes: 83 additions & 153 deletions modules/aerodyn/src/AeroDyn_Inflow.f90
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 0 additions & 4 deletions modules/aerodyn/src/AeroDyn_Inflow_C_Binding.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1052,10 +1052,6 @@ SUBROUTINE AeroDyn_Inflow_C_CalcOutput(Time_C, &
ErrStat2, ErrMsg2 ) ! transfer input motion mesh to u(1) meshes
if (Failed()) return

! call IfW and set inputs for AD
call ADI_ADIW_Solve(Time, ADI%p, ADI%u(1)%AD, ADI%OtherState(STATE_CURR)%AD, ADI%m%IW%u, ADI%m%IW, .false., ErrStat2, ErrMsg2)
if (Failed()) return

! Call the main subroutine ADI_CalcOutput to get the resulting forces and moments at time T
CALL ADI_CalcOutput( Time, ADI%u(1), ADI%p, ADI%x(STATE_CURR), ADI%xd(STATE_CURR), ADI%z(STATE_CURR), ADI%OtherState(STATE_CURR), ADI%y, ADI%m, ErrStat2, ErrMsg2 )
if (Failed()) return
Expand Down
309 changes: 92 additions & 217 deletions modules/aerodyn/src/AeroDyn_Inflow_Types.f90
View file
Open in desktop

Large diffs are not rendered by default.

11 changes: 8 additions & 3 deletions modules/aerodyn/src/AeroDyn_Registry.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ usefrom BEMT_Registry.txt
usefrom FVW_Registry.txt
usefrom UnsteadyAero_Registry.txt
usefrom AeroAcoustics_Registry.txt
usefrom InflowWind.txt

param AeroDyn/AD - IntKi ModelUnknown - -1 - "" -
param ^ - IntKi WakeMod_none - 0 - "Wake model - none" -
Expand Down Expand Up @@ -160,7 +161,7 @@ typedef ^ RotInputFile CHARACTER(1024) TFinFile - - - "Input file
typedef ^ RotInputFile TFinInputFileType TFin - - - "Input file data for tail fin" -

typedef ^ AD_InputFile Logical Echo - - - "Echo input file to echo file" -
typedef ^ AD_InputFile DbKi DTAero - - - "Time interval for aerodynamic calculations {or "default"}" s
typedef ^ AD_InputFile DbKi DTAero - - - "Time interval for aerodynamic calculations {or \"default\"}" s
typedef ^ AD_InputFile IntKi WakeMod - - - "Type of wake/induction model {0=none, 1=BEMT, 2=DBEMT, 3=FVW}" -
typedef ^ AD_InputFile IntKi AFAeroMod - - - "Type of blade airfoil aerodynamics model {1=steady model, 2=Beddoes-Leishman unsteady model}" -
typedef ^ AD_InputFile IntKi TwrPotent - - - "Type of tower influence on wind based on potential flow around the tower {0=none, 1=baseline potential flow, 2=potential flow with Bak correction}" -
Expand Down Expand Up @@ -199,7 +200,7 @@ typedef ^ AD_InputFile CHARACTER(1024) FVWFileName - - - "FVW input filename" "q
typedef ^ AD_InputFile CHARACTER(1024) AFNames {:} - - "Airfoil file names (NumAF lines)" "quoted strings"
typedef ^ AD_InputFile LOGICAL UseBlCm - - - "Include aerodynamic pitching moment in calculations?" flag
#typedef ^ AD_InputFile IntKi NumBlNds - - - "Number of blade nodes used in the analysis" -
typedef ^ AD_InputFile LOGICAL SumPrint - - - "Generate a summary file listing input options and interpolated properties to "<rootname>.AD.sum"?" flag
typedef ^ AD_InputFile LOGICAL SumPrint - - - "Generate a summary file listing input options and interpolated properties to \"<rootname>.AD.sum\"?" flag
typedef ^ AD_InputFile IntKi NBlOuts - - - "Number of blade node outputs [0 - 9]" -
typedef ^ AD_InputFile IntKi BlOutNd {9} - - "Blade nodes whose values will be output" -
typedef ^ AD_InputFile IntKi NTwOuts - - - "Number of tower node outputs [0 - 9]" -
Expand Down Expand Up @@ -316,10 +317,13 @@ typedef ^ RotMiscVarType ReKi TFinSTV_i 3 - - "Structural velocity at the refer
typedef ^ RotMiscVarType ReKi TFinF_i 3 - - "Forces at the reference point of the fin in the inertial system"
typedef ^ RotMiscVarType ReKi TFinM_i 3 - - "Moments at the reference point of the fin in the inertial system"

typedef ^ MiscVarType RotMiscVarType rotors {:}- - - "MiscVars for each rotor" -
typedef ^ MiscVarType RotMiscVarType rotors {:} - - "MiscVars for each rotor" -
typedef ^ MiscVarType FVW_InputType FVW_u : - - "Inputs to the FVW module" -
typedef ^ MiscVarType FVW_OutputType FVW_y - - - "Outputs from the FVW module" -
typedef ^ MiscVarType FVW_MiscVarType FVW - - - "MiscVars from the FVW module" -
typedef ^ MiscVarType ReKi WindPos {:}{:} - - "XYZ coordinates to query for wind velocity/acceleration" -
typedef ^ MiscVarType ReKi WindVel {:}{:} - - "XYZ components of wind velocity" -
typedef ^ MiscVarType ReKi WindAcc {:}{:} - - "XYZ components of wind acceleration" -

# ..... Parameters ................................................................................................................
# Define parameters here:
Expand Down Expand Up @@ -405,6 +409,7 @@ typedef ^ ParameterType IntKi WakeMod - - - "Type of wake/induction model {0=non
typedef ^ ParameterType FVW_ParameterType FVW - - - "Parameters for FVW module"
typedef ^ ParameterType LOGICAL CompAeroMaps - .FALSE. - "flag to determine if AeroDyn is computing aero maps (true) or running a normal simulation (false)" -
typedef ^ ParameterType LOGICAL UA_Flag - - - "logical flag indicating whether to use UnsteadyAero" -
typedef ^ ParameterType FlowFieldType *FlowField - - - "Pointer of InflowWinds flow field data type" -


# ..... Inputs ....................................................................................................................
Expand Down
Loading