Skip to content

Commit dc04b70

Browse files
deslaughterdeslaughter
authored
Merge pull request #2519 from deslaughter/b/of_registry_B4Ki_bounds
Use B4Ki to store array bounds during pack/restore of TurbineType to file
2 parents c8ceb1e + 2e783a3 commit dc04b70

File tree

57 files changed

+9565
-9564
lines changed

Some content is hidden

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

57 files changed

+9565
-9564
lines changed

‎glue-codes/fast-farm/src/FASTWrapper_Types.f90‎

Lines changed: 60 additions & 60 deletions
Large diffs are not rendered by default.

‎glue-codes/fast-farm/src/FAST_Farm_Types.f90‎

Lines changed: 104 additions & 104 deletions
Large diffs are not rendered by default.

‎modules/aerodisk/src/AeroDisk_Types.f90‎

Lines changed: 65 additions & 65 deletions
Large diffs are not rendered by default.

‎modules/aerodyn/src/AeroAcoustics_Types.f90‎

Lines changed: 266 additions & 266 deletions
Large diffs are not rendered by default.

‎modules/aerodyn/src/AeroDyn_Driver_Types.f90‎

Lines changed: 89 additions & 89 deletions
Large diffs are not rendered by default.

‎modules/aerodyn/src/AeroDyn_Inflow_Types.f90‎

Lines changed: 125 additions & 125 deletions
Large diffs are not rendered by default.

‎modules/aerodyn/src/AeroDyn_Registry.txt‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -351,14 +351,6 @@ typedef ^ RotMiscVarType ReKi TFinSTV_i 3 - - "Structural velocity at the refer
351351
typedef ^ RotMiscVarType ReKi TFinF_i 3 - - "Forces at the reference point of the fin in the inertial system"
352352
typedef ^ RotMiscVarType ReKi TFinM_i 3 - - "Moments at the reference point of the fin in the inertial system"
353353

354-
typedef ^ MiscVarType RotMiscVarType rotors {:} - - "MiscVars for each rotor" -
355-
typedef ^ MiscVarType FVW_InputType FVW_u : - - "Inputs to the FVW module" -
356-
typedef ^ MiscVarType FVW_OutputType FVW_y - - - "Outputs from the FVW module" -
357-
typedef ^ MiscVarType FVW_MiscVarType FVW - - - "MiscVars from the FVW module" -
358-
typedef ^ MiscVarType ReKi WindPos {:}{:} - - "XYZ coordinates to query for wind velocity/acceleration" -
359-
typedef ^ MiscVarType ReKi WindVel {:}{:} - - "XYZ components of wind velocity" -
360-
typedef ^ MiscVarType ReKi WindAcc {:}{:} - - "XYZ components of wind acceleration" -
361-
362354
# Inflow data storage
363355
typedef ^ ElemInflowType ReKi InflowVel {:}{:} - - "U,V,W at nodes on element (note if we change the requirement that NumNodes is the same for each blade, this will need to change)" m/s
364356
typedef ^ ElemInflowType ReKi InflowAcc {:}{:} - - "Wind acceleration at nodes on element (blade or tower) (note if we change the requirement that NumNodes is the same for each blade, this will need to change)" m/s
@@ -368,8 +360,17 @@ typedef ^ RotInflowType ReKi InflowOnHub {3}{1} - - "U,V,W at hub" m/s
368360
typedef ^ RotInflowType ReKi InflowOnNacelle {3}{1} - - "U,V,W at nacelle" m/s
369361
typedef ^ RotInflowType ReKi InflowOnTailFin {3}{1} - - "U,V,W at tailfin" m/s
370362
typedef ^ RotInflowType ReKi AvgDiskVel {3} - 0.0 "disk-averaged U,V,W" m/s
363+
371364
typedef ^ AD_InflowType ReKi InflowWakeVel {:}{:} - - "U,V,W at wake points" m/s
372365
typedef ^ AD_InflowType RotInflowType RotInflow {:} - - "Inflow on rotor" -
366+
367+
typedef ^ MiscVarType RotMiscVarType rotors {:} - - "MiscVars for each rotor" -
368+
typedef ^ MiscVarType FVW_InputType FVW_u : - - "Inputs to the FVW module" -
369+
typedef ^ MiscVarType FVW_OutputType FVW_y - - - "Outputs from the FVW module" -
370+
typedef ^ MiscVarType FVW_MiscVarType FVW - - - "MiscVars from the FVW module" -
371+
typedef ^ MiscVarType ReKi WindPos {:}{:} - - "XYZ coordinates to query for wind velocity/acceleration" -
372+
typedef ^ MiscVarType ReKi WindVel {:}{:} - - "XYZ components of wind velocity" -
373+
typedef ^ MiscVarType ReKi WindAcc {:}{:} - - "XYZ components of wind acceleration" -
373374
typedef ^ MiscVarType AD_InflowType Inflow {:} - - "Inflow storage (size of u for history of inputs)" -
374375

375376

‎modules/aerodyn/src/AeroDyn_Types.f90‎

Lines changed: 869 additions & 869 deletions
Large diffs are not rendered by default.

‎modules/aerodyn/src/AirfoilInfo_Types.f90‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -522,15 +522,15 @@ subroutine AFI_CopyTable_Type(SrcTable_TypeData, DstTable_TypeData, CtrlCode, Er
522522
integer(IntKi), intent(in ) :: CtrlCode
523523
integer(IntKi), intent( out) :: ErrStat
524524
character(*), intent( out) :: ErrMsg
525-
integer(B8Ki) :: LB(3), UB(3)
525+
integer(B4Ki) :: LB(3), UB(3)
526526
integer(IntKi) :: ErrStat2
527527
character(ErrMsgLen) :: ErrMsg2
528528
character(*), parameter :: RoutineName = 'AFI_CopyTable_Type'
529529
ErrStat = ErrID_None
530530
ErrMsg = ''
531531
if (allocated(SrcTable_TypeData%Alpha)) then
532-
LB(1:1) = lbound(SrcTable_TypeData%Alpha, kind=B8Ki)
533-
UB(1:1) = ubound(SrcTable_TypeData%Alpha, kind=B8Ki)
532+
LB(1:1) = lbound(SrcTable_TypeData%Alpha)
533+
UB(1:1) = ubound(SrcTable_TypeData%Alpha)
534534
if (.not. allocated(DstTable_TypeData%Alpha)) then
535535
allocate(DstTable_TypeData%Alpha(LB(1):UB(1)), stat=ErrStat2)
536536
if (ErrStat2 /= 0) then
@@ -541,8 +541,8 @@ subroutine AFI_CopyTable_Type(SrcTable_TypeData, DstTable_TypeData, CtrlCode, Er
541541
DstTable_TypeData%Alpha = SrcTable_TypeData%Alpha
542542
end if
543543
if (allocated(SrcTable_TypeData%Coefs)) then
544-
LB(1:2) = lbound(SrcTable_TypeData%Coefs, kind=B8Ki)
545-
UB(1:2) = ubound(SrcTable_TypeData%Coefs, kind=B8Ki)
544+
LB(1:2) = lbound(SrcTable_TypeData%Coefs)
545+
UB(1:2) = ubound(SrcTable_TypeData%Coefs)
546546
if (.not. allocated(DstTable_TypeData%Coefs)) then
547547
allocate(DstTable_TypeData%Coefs(LB(1):UB(1),LB(2):UB(2)), stat=ErrStat2)
548548
if (ErrStat2 /= 0) then
@@ -553,8 +553,8 @@ subroutine AFI_CopyTable_Type(SrcTable_TypeData, DstTable_TypeData, CtrlCode, Er
553553
DstTable_TypeData%Coefs = SrcTable_TypeData%Coefs
554554
end if
555555
if (allocated(SrcTable_TypeData%SplineCoefs)) then
556-
LB(1:3) = lbound(SrcTable_TypeData%SplineCoefs, kind=B8Ki)
557-
UB(1:3) = ubound(SrcTable_TypeData%SplineCoefs, kind=B8Ki)
556+
LB(1:3) = lbound(SrcTable_TypeData%SplineCoefs)
557+
UB(1:3) = ubound(SrcTable_TypeData%SplineCoefs)
558558
if (.not. allocated(DstTable_TypeData%SplineCoefs)) then
559559
allocate(DstTable_TypeData%SplineCoefs(LB(1):UB(1),LB(2):UB(2),LB(3):UB(3)), stat=ErrStat2)
560560
if (ErrStat2 /= 0) then
@@ -617,7 +617,7 @@ subroutine AFI_UnPackTable_Type(RF, OutData)
617617
type(RegFile), intent(inout) :: RF
618618
type(AFI_Table_Type), intent(inout) :: OutData
619619
character(*), parameter :: RoutineName = 'AFI_UnPackTable_Type'
620-
integer(B8Ki) :: LB(3), UB(3)
620+
integer(B4Ki) :: LB(3), UB(3)
621621
integer(IntKi) :: stat
622622
logical :: IsAllocAssoc
623623
if (RF%ErrStat /= ErrID_None) return
@@ -743,8 +743,8 @@ subroutine AFI_CopyParam(SrcParamData, DstParamData, CtrlCode, ErrStat, ErrMsg)
743743
integer(IntKi), intent(in ) :: CtrlCode
744744
integer(IntKi), intent( out) :: ErrStat
745745
character(*), intent( out) :: ErrMsg
746-
integer(B8Ki) :: i1
747-
integer(B8Ki) :: LB(1), UB(1)
746+
integer(B4Ki) :: i1
747+
integer(B4Ki) :: LB(1), UB(1)
748748
integer(IntKi) :: ErrStat2
749749
character(ErrMsgLen) :: ErrMsg2
750750
character(*), parameter :: RoutineName = 'AFI_CopyParam'
@@ -757,8 +757,8 @@ subroutine AFI_CopyParam(SrcParamData, DstParamData, CtrlCode, ErrStat, ErrMsg)
757757
DstParamData%ColUAf = SrcParamData%ColUAf
758758
DstParamData%AFTabMod = SrcParamData%AFTabMod
759759
if (allocated(SrcParamData%secondVals)) then
760-
LB(1:1) = lbound(SrcParamData%secondVals, kind=B8Ki)
761-
UB(1:1) = ubound(SrcParamData%secondVals, kind=B8Ki)
760+
LB(1:1) = lbound(SrcParamData%secondVals)
761+
UB(1:1) = ubound(SrcParamData%secondVals)
762762
if (.not. allocated(DstParamData%secondVals)) then
763763
allocate(DstParamData%secondVals(LB(1):UB(1)), stat=ErrStat2)
764764
if (ErrStat2 /= 0) then
@@ -773,8 +773,8 @@ subroutine AFI_CopyParam(SrcParamData, DstParamData, CtrlCode, ErrStat, ErrMsg)
773773
DstParamData%NonDimArea = SrcParamData%NonDimArea
774774
DstParamData%NumCoords = SrcParamData%NumCoords
775775
if (allocated(SrcParamData%X_Coord)) then
776-
LB(1:1) = lbound(SrcParamData%X_Coord, kind=B8Ki)
777-
UB(1:1) = ubound(SrcParamData%X_Coord, kind=B8Ki)
776+
LB(1:1) = lbound(SrcParamData%X_Coord)
777+
UB(1:1) = ubound(SrcParamData%X_Coord)
778778
if (.not. allocated(DstParamData%X_Coord)) then
779779
allocate(DstParamData%X_Coord(LB(1):UB(1)), stat=ErrStat2)
780780
if (ErrStat2 /= 0) then
@@ -785,8 +785,8 @@ subroutine AFI_CopyParam(SrcParamData, DstParamData, CtrlCode, ErrStat, ErrMsg)
785785
DstParamData%X_Coord = SrcParamData%X_Coord
786786
end if
787787
if (allocated(SrcParamData%Y_Coord)) then
788-
LB(1:1) = lbound(SrcParamData%Y_Coord, kind=B8Ki)
789-
UB(1:1) = ubound(SrcParamData%Y_Coord, kind=B8Ki)
788+
LB(1:1) = lbound(SrcParamData%Y_Coord)
789+
UB(1:1) = ubound(SrcParamData%Y_Coord)
790790
if (.not. allocated(DstParamData%Y_Coord)) then
791791
allocate(DstParamData%Y_Coord(LB(1):UB(1)), stat=ErrStat2)
792792
if (ErrStat2 /= 0) then
@@ -798,8 +798,8 @@ subroutine AFI_CopyParam(SrcParamData, DstParamData, CtrlCode, ErrStat, ErrMsg)
798798
end if
799799
DstParamData%NumTabs = SrcParamData%NumTabs
800800
if (allocated(SrcParamData%Table)) then
801-
LB(1:1) = lbound(SrcParamData%Table, kind=B8Ki)
802-
UB(1:1) = ubound(SrcParamData%Table, kind=B8Ki)
801+
LB(1:1) = lbound(SrcParamData%Table)
802+
UB(1:1) = ubound(SrcParamData%Table)
803803
if (.not. allocated(DstParamData%Table)) then
804804
allocate(DstParamData%Table(LB(1):UB(1)), stat=ErrStat2)
805805
if (ErrStat2 /= 0) then
@@ -821,8 +821,8 @@ subroutine AFI_DestroyParam(ParamData, ErrStat, ErrMsg)
821821
type(AFI_ParameterType), intent(inout) :: ParamData
822822
integer(IntKi), intent( out) :: ErrStat
823823
character(*), intent( out) :: ErrMsg
824-
integer(B8Ki) :: i1
825-
integer(B8Ki) :: LB(1), UB(1)
824+
integer(B4Ki) :: i1
825+
integer(B4Ki) :: LB(1), UB(1)
826826
integer(IntKi) :: ErrStat2
827827
character(ErrMsgLen) :: ErrMsg2
828828
character(*), parameter :: RoutineName = 'AFI_DestroyParam'
@@ -838,8 +838,8 @@ subroutine AFI_DestroyParam(ParamData, ErrStat, ErrMsg)
838838
deallocate(ParamData%Y_Coord)
839839
end if
840840
if (allocated(ParamData%Table)) then
841-
LB(1:1) = lbound(ParamData%Table, kind=B8Ki)
842-
UB(1:1) = ubound(ParamData%Table, kind=B8Ki)
841+
LB(1:1) = lbound(ParamData%Table)
842+
UB(1:1) = ubound(ParamData%Table)
843843
do i1 = LB(1), UB(1)
844844
call AFI_DestroyTable_Type(ParamData%Table(i1), ErrStat2, ErrMsg2)
845845
call SetErrStat(ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName)
@@ -852,8 +852,8 @@ subroutine AFI_PackParam(RF, Indata)
852852
type(RegFile), intent(inout) :: RF
853853
type(AFI_ParameterType), intent(in) :: InData
854854
character(*), parameter :: RoutineName = 'AFI_PackParam'
855-
integer(B8Ki) :: i1
856-
integer(B8Ki) :: LB(1), UB(1)
855+
integer(B4Ki) :: i1
856+
integer(B4Ki) :: LB(1), UB(1)
857857
if (RF%ErrStat >= AbortErrLev) return
858858
call RegPack(RF, InData%ColCd)
859859
call RegPack(RF, InData%ColCl)
@@ -871,9 +871,9 @@ subroutine AFI_PackParam(RF, Indata)
871871
call RegPack(RF, InData%NumTabs)
872872
call RegPack(RF, allocated(InData%Table))
873873
if (allocated(InData%Table)) then
874-
call RegPackBounds(RF, 1, lbound(InData%Table, kind=B8Ki), ubound(InData%Table, kind=B8Ki))
875-
LB(1:1) = lbound(InData%Table, kind=B8Ki)
876-
UB(1:1) = ubound(InData%Table, kind=B8Ki)
874+
call RegPackBounds(RF, 1, lbound(InData%Table), ubound(InData%Table))
875+
LB(1:1) = lbound(InData%Table)
876+
UB(1:1) = ubound(InData%Table)
877877
do i1 = LB(1), UB(1)
878878
call AFI_PackTable_Type(RF, InData%Table(i1))
879879
end do
@@ -887,8 +887,8 @@ subroutine AFI_UnPackParam(RF, OutData)
887887
type(RegFile), intent(inout) :: RF
888888
type(AFI_ParameterType), intent(inout) :: OutData
889889
character(*), parameter :: RoutineName = 'AFI_UnPackParam'
890-
integer(B8Ki) :: i1
891-
integer(B8Ki) :: LB(1), UB(1)
890+
integer(B4Ki) :: i1
891+
integer(B4Ki) :: LB(1), UB(1)
892892
integer(IntKi) :: stat
893893
logical :: IsAllocAssoc
894894
if (RF%ErrStat /= ErrID_None) return

0 commit comments

Comments
 (0)