Skip to content

Commit

Permalink
ADI c-bindings: remove AeroProjMod, add isHAWT option
Browse files Browse the repository at this point in the history
  • Loading branch information
@andrew-platt
andrew-platt committed Oct 10, 2023
1 parent 2a03dd2 commit 5868f14
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 18 deletions.
12 changes: 3 additions & 9 deletions modules/aerodyn/python-lib/aerodyn_inflow_library.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,12 +126,6 @@ def __init__(self, library_path):
# number of output channels
self.numChannels = 0 # Number of channels returned

# Aero calculation method -- AeroProjMod
# APM_BEM_NoSweepPitchTwist - 1 - "Original AeroDyn model where momentum balance is done in the WithoutSweepPitchTwist system"
# APM_BEM_Polar - 2 - "Use staggered polar grid for momentum balance in each annulus"
# APM_LiftingLine - 3 - "Use the blade lifting line (i.e. the structural) orientation (currently for OLAF with VAWT)"
self.AeroProjMod = 1

# Number of turbines
self.numTurbines = 1

Expand Down Expand Up @@ -176,6 +170,7 @@ def _initialize_routines(self):
# setup one rotor
self.ADI_C_SetupRotor.argtypes = [
POINTER(c_int), # iturb
POINTER(c_int), # isHAWT
POINTER(c_float), # Turb_RefPos
POINTER(c_float), # initHubPos
POINTER(c_double), # initHubOrient_flat
Expand Down Expand Up @@ -208,7 +203,6 @@ def _initialize_routines(self):
POINTER(c_float), # defPvap
POINTER(c_float), # WtrDpth
POINTER(c_float), # MSL2SWL
POINTER(c_int), # AeroProjMod
POINTER(c_int), # InterpOrder
POINTER(c_double), # dt
POINTER(c_double), # tmax
Expand Down Expand Up @@ -306,7 +300,7 @@ def adi_preinit(self):

self.check_error()

def adi_setuprotor(self,iturb,turbRefPos):
def adi_setuprotor(self,iturb,isHAWT,turbRefPos):
# setup one rotor with initial root/mesh info
self._initNumMeshPts = self.numMeshPts
self._initNumBlades = self.numBlades
Expand All @@ -331,6 +325,7 @@ def adi_setuprotor(self,iturb,turbRefPos):

self.ADI_C_SetupRotor(
c_int(iturb), # IN: iturb -- current turbine number
c_int(isHAWT), # IN: 1: is HAWT, 0: VAWT or cross-flow
_turbRefPos, # IN: turbine reference position
initHubPos_c, # IN: initHubPos -- initial hub position
initHubOrient_c, # IN: initHubOrient -- initial hub orientation DCM in flat array of 9 elements
Expand Down Expand Up @@ -389,7 +384,6 @@ def adi_init(self, AD_input_string_array, IfW_input_string_array):
byref(c_float(self.defPvap)), # IN: defPvap
byref(c_float(self.WtrDpth)), # IN: WtrDpth
byref(c_float(self.MSL2SWL)), # IN: MSL2SWL
byref(c_int(self.AeroProjMod)), # IN: AeroProjMod
byref(c_int(self.InterpOrder)), # IN: InterpOrder (1: linear, 2: quadratic)
byref(c_double(self.dt)), # IN: time step (dt)
byref(c_double(self.tmax)), # IN: tmax
Expand Down
37 changes: 29 additions & 8 deletions modules/aerodyn/src/AeroDyn_Inflow_C_Binding.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,6 @@ SUBROUTINE ADI_C_Init( ADinputFilePassed, ADinputFileString_C, ADinputFileString
IfWinputFilePassed, IfWinputFileString_C, IfWinputFileStringLength_C, OutRootName_C, &
gravity_C, defFldDens_C, defKinVisc_C, defSpdSound_C, &
defPatm_C, defPvap_C, WtrDpth_C, MSL2SWL_C, &
AeroProjMod_C, &
InterpOrder_C, DT_C, TMax_C, &
storeHHVel, &
WrVTK_in, WrVTK_inType, VTKNacDim_in, VTKHubRad_in, &
Expand Down Expand Up @@ -378,11 +377,6 @@ SUBROUTINE ADI_C_Init( ADinputFilePassed, ADinputFileString_C, ADinputFileString
real(c_float), intent(in ) :: defPvap_C !< Vapour pressure of working fluid (Pa) [used only for an MHK turbine cavitation check]
real(c_float), intent(in ) :: WtrDpth_C !< Water depth (m)
real(c_float), intent(in ) :: MSL2SWL_C !< Offset between still-water level and mean sea level (m) [positive upward]
! Aero calculation method -- AeroProjMod
! APM_BEM_NoSweepPitchTwist - 1 - "Original AeroDyn model where momentum balance is done in the WithoutSweepPitchTwist system"
! APM_BEM_Polar - 2 - "Use staggered polar grid for momentum balance in each annulus"
! APM_LiftingLine - 3 - "Use the blade lifting line (i.e. the structural) orientation (currently for OLAF with VAWT)"
integer(c_int), intent(in ) :: AeroProjMod_C !< Type of aerodynamic projection
! Interpolation
integer(c_int), intent(in ) :: InterpOrder_C !< Interpolation order to use (must be 1 or 2)
! Time
Expand Down Expand Up @@ -416,6 +410,7 @@ SUBROUTINE ADI_C_Init( ADinputFilePassed, ADinputFileString_C, ADinputFileString
character(ErrMsgLen) :: ErrMsg2 !< temporary error message from a call
integer(IntKi) :: i,j,k !< generic counters
integer(IntKi) :: iWT !< current turbine number (iterate through during setup for ADI_Init call)
integer(IntKi) :: AeroProjMod !< for checking that all turbines use the same AeroProjMod
character(*), parameter :: RoutineName = 'ADI_C_Init' !< for error handling

! Initialize error handling
Expand All @@ -440,6 +435,17 @@ SUBROUTINE ADI_C_Init( ADinputFilePassed, ADinputFileString_C, ADinputFileString
enddo
if (Failed()) return


! Check that all turbines are using the same AeroProjMod (mixing projection modes is not currently supported)
AeroProjMod = InitInp%AD%rotors(1)%AeroProjMod
do iWT = 2,Sim%NumTurbines
if(AeroProjMod /= InitInp%AD%rotors(iWT)%AeroProjMod) then
ErrStat2 = ErrID_Fatal
ErrMsg2 = "Different AeroProjMod values for each turbine (set from TurbineIsHAWT flag). Check that all turbines are of the same type (HAWT or not)."
if (Failed()) return
endif
enddo

! Setup temporary storage arrays for simpler transfers
call SetTempStorage(ErrStat2,ErrMsg2); if (Failed()) return

Expand Down Expand Up @@ -556,7 +562,6 @@ SUBROUTINE ADI_C_Init( ADinputFilePassed, ADinputFileString_C, ADinputFileString

! setup rotors for AD -- interface only supports one rotor at present
do iWT=1,Sim%NumTurbines
InitInp%AD%rotors(iWT)%AeroProjMod = int(AeroProjMod_C, IntKi)
InitInp%AD%rotors(iWT)%numBlades = Sim%WT(iWT)%NumBlades
enddo

Expand Down Expand Up @@ -1280,7 +1285,7 @@ END SUBROUTINE ADI_C_End
!--------------------------------------------- AeroDyn SetupRotor ----------------------------------------------
!===============================================================================================================
!> Setup the initial rotor root positions etc before initializing
subroutine ADI_C_SetupRotor(iWT_c, TurbOrigin_C, &
subroutine ADI_C_SetupRotor(iWT_c, TurbineIsHAWT_c, TurbOrigin_C, &
HubPos_C, HubOri_C, &
NacPos_C, NacOri_C, &
NumBlades_C, BldRootPos_C, BldRootOri_C, &
Expand All @@ -1292,6 +1297,7 @@ subroutine ADI_C_SetupRotor(iWT_c, TurbOrigin_C, &
!GCC$ ATTRIBUTES DLLEXPORT :: ADI_C_SetupRotor
#endif
integer(c_int), intent(in ) :: iWT_c !< Wind turbine / rotor number
integer(c_int), intent(in ) :: TurbineIsHAWT_c !< true for HAWT, false for VAWT
real(c_float), intent(in ) :: TurbOrigin_C(3) !< turbine origin (tower base). Gets added to all meshes to shift turbine position.
! Initial hub and blade root positions/orientations
real(c_float), intent(in ) :: HubPos_C( 3 ) !< Hub position
Expand All @@ -1310,6 +1316,7 @@ subroutine ADI_C_SetupRotor(iWT_c, TurbOrigin_C, &

! local vars
integer(IntKi) :: iWT !< current turbine
logical :: TurbineIsHAWT !< true for HAWT, false for VAWT
integer(IntKi) :: ErrStat !< aggregated error messagNumBlades_ee
character(ErrMsgLen) :: ErrMsg !< aggregated error message
integer(IntKi) :: ErrStat2 !< temporary error status from a call
Expand All @@ -1332,6 +1339,20 @@ subroutine ADI_C_SetupRotor(iWT_c, TurbOrigin_C, &
Sim%WT(iWT)%NumBlades = int(NumBlades_C, IntKi)
Sim%WT(iWT)%OriginInit(1:3) = real(TurbOrigin_C(1:3), ReKi)

! Aero calculation method -- AeroProjMod
! APM_BEM_NoSweepPitchTwist - 1 - "Original AeroDyn model where momentum balance is done in the WithoutSweepPitchTwist system"
! APM_BEM_Polar - 2 - "Use staggered polar grid for momentum balance in each annulus"
! APM_LiftingLine - 3 - "Use the blade lifting line (i.e. the structural) orientation (currently for OLAF with VAWT)"
! For now we will set (this may need to be changed later):
! HAWT --> AeroProjMod = 1
! VAWT --> AeroProjMod = 3
TurbineIsHAWT = TurbineIsHAWT_c==1_c_int
if (TurbineIsHAWT) then
InitInp%AD%rotors(iWT)%AeroProjMod = 1
else
InitInp%AD%rotors(iWT)%AeroProjMod = 3
endif


call AllocAry(InitInp%AD%rotors(iWT)%BladeRootPosition, 3, Sim%WT(iWT)%NumBlades, 'BldRootPos', errStat2, errMsg2 ); if (Failed()) return
call AllocAry(InitInp%AD%rotors(iWT)%BladeRootOrientation, 3, 3, Sim%WT(iWT)%NumBlades, 'BldRootOri', errStat2, errMsg2 ); if (Failed()) return
Expand Down
2 changes: 1 addition & 1 deletion reg_tests/r-test
Submodule r-test updated 2 files
+2 −6 modules/aerodyn/py_ad_5MW_OC4Semi_WSt_WavesWN/py_ad_driver.py
+2 −6 modules/aerodyn/py_ad_B1n2_OLAF/py_ad_driver.py

0 comments on commit 5868f14

Please sign in to comment.