Skip to content

Commit 84bca92

Browse files
andrew-plattandrew-platt
authored
Merge pull request #3252 from andrew-platt/b/TC_lin_cleanup
Remove unused registry entries (leftover from old lin method)
2 parents faa6c00 + 0189cc6 commit 84bca92

5 files changed

Lines changed: 0 additions & 162 deletions

File tree

‎modules/elastodyn/src/ElastoDyn_Registry.txt‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -768,8 +768,6 @@ typedef ^ ParameterType R8Ki M_MCSMAX - - - "Maximum
768768
typedef ^ ParameterType R8Ki sig_v - - - "Linear viscous friction coefficient" N-m/(rad/s)
769769
typedef ^ ParameterType R8Ki sig_v2 - - - "Quadratic viscous friction coefficient" N-m/(rad/s)^2
770770
typedef ^ ParameterType R8Ki OmgCut - - - "Nacelle yaw angular velocity cutoff below which viscous friction is to be linearized" rad/s
771-
#typedef ^ ParameterType R8Ki thr_omg - - - "Yaw rate stiction threshold" rad/s
772-
#typedef ^ ParameterType R8Ki thr_omgdot - - - "Yaw acceleration stiction threshold" rad/s^2
773771

774772
# .... ED_AllBlNds option ........................................................................................................
775773
typedef ^ ParameterType IntKi BldNd_NumOuts - - - "Number of requested output channels per blade node (ED_AllBldNdOuts)" -
@@ -778,16 +776,7 @@ typedef ^ ParameterType OutParmType BldNd_OutParam {:} - - "Names and unit
778776
#typedef ^ ParameterType IntKi BldNd_BlOutNd {:} - - "The blade nodes to actually output (ED_AllBldNdOuts)" -
779777
typedef ^ ParameterType IntKi BldNd_BladesOut - - - "The blades to output (ED_AllBldNdOuts)" -
780778

781-
typedef ^ ParameterType Integer Jac_u_indx {:}{:} - - "matrix to help fill/pack the u vector in computing the jacobian" -
782-
typedef ^ ParameterType R8Ki du {:} - - "vector that determines size of perturbation for u (inputs)"
783-
typedef ^ ParameterType R8Ki dx {:} - - "vector that determines size of perturbation for x (continuous states)"
784-
typedef ^ ParameterType Integer Jac_ny - - - "number of outputs in jacobian matrix" -
785779
typedef ^ ParameterType Logical CompAeroMaps - - - "number of outputs in jacobian matrix" -
786-
typedef ^ ParameterType Integer NumExtendedInputs - - - "number of extended inputs for linearization" -
787-
typedef ^ ParameterType Integer NumBl_Lin - - - "number of blades in the jacobian" -
788-
typedef ^ ParameterType Integer NActvVelDOF_Lin - - - "number of velocity states in the jacobian" -
789-
typedef ^ ParameterType Integer NActvDOF_Lin - - - "number of active DOFs to use in the jacobian" -
790-
typedef ^ ParameterType Integer NActvDOF_Stride - - - "stride for active DOFs to use in the jacobian" -
791780

792781
# ..... Inputs ....................................................................................................................
793782
# Define inputs that are contained on the mesh here:

‎modules/elastodyn/src/ElastoDyn_Types.f90‎

Lines changed: 0 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -777,16 +777,7 @@ MODULE ElastoDyn_Types
777777
INTEGER(IntKi) :: BldNd_TotNumOuts = 0_IntKi !< Total number of requested output channels of blade node information (BldNd_NumOuts * BldNd_BlOutNd * BldNd_BladesOut -- ED_AllBldNdOuts) [-]
778778
TYPE(OutParmType) , DIMENSION(:), ALLOCATABLE :: BldNd_OutParam !< Names and units (and other characteristics) of all requested output parameters [-]
779779
INTEGER(IntKi) :: BldNd_BladesOut = 0_IntKi !< The blades to output (ED_AllBldNdOuts) [-]
780-
INTEGER(IntKi) , DIMENSION(:,:), ALLOCATABLE :: Jac_u_indx !< matrix to help fill/pack the u vector in computing the jacobian [-]
781-
REAL(R8Ki) , DIMENSION(:), ALLOCATABLE :: du !< vector that determines size of perturbation for u (inputs) [-]
782-
REAL(R8Ki) , DIMENSION(:), ALLOCATABLE :: dx !< vector that determines size of perturbation for x (continuous states) [-]
783-
INTEGER(IntKi) :: Jac_ny = 0_IntKi !< number of outputs in jacobian matrix [-]
784780
LOGICAL :: CompAeroMaps = .false. !< number of outputs in jacobian matrix [-]
785-
INTEGER(IntKi) :: NumExtendedInputs = 0_IntKi !< number of extended inputs for linearization [-]
786-
INTEGER(IntKi) :: NumBl_Lin = 0_IntKi !< number of blades in the jacobian [-]
787-
INTEGER(IntKi) :: NActvVelDOF_Lin = 0_IntKi !< number of velocity states in the jacobian [-]
788-
INTEGER(IntKi) :: NActvDOF_Lin = 0_IntKi !< number of active DOFs to use in the jacobian [-]
789-
INTEGER(IntKi) :: NActvDOF_Stride = 0_IntKi !< stride for active DOFs to use in the jacobian [-]
790781
END TYPE ED_ParameterType
791782
! =======================
792783
! ========= ED_InputType =======
@@ -5669,49 +5660,7 @@ subroutine ED_CopyParam(SrcParamData, DstParamData, CtrlCode, ErrStat, ErrMsg)
56695660
end do
56705661
end if
56715662
DstParamData%BldNd_BladesOut = SrcParamData%BldNd_BladesOut
5672-
if (allocated(SrcParamData%Jac_u_indx)) then
5673-
LB(1:2) = lbound(SrcParamData%Jac_u_indx)
5674-
UB(1:2) = ubound(SrcParamData%Jac_u_indx)
5675-
if (.not. allocated(DstParamData%Jac_u_indx)) then
5676-
allocate(DstParamData%Jac_u_indx(LB(1):UB(1),LB(2):UB(2)), stat=ErrStat2)
5677-
if (ErrStat2 /= 0) then
5678-
call SetErrStat(ErrID_Fatal, 'Error allocating DstParamData%Jac_u_indx.', ErrStat, ErrMsg, RoutineName)
5679-
return
5680-
end if
5681-
end if
5682-
DstParamData%Jac_u_indx = SrcParamData%Jac_u_indx
5683-
end if
5684-
if (allocated(SrcParamData%du)) then
5685-
LB(1:1) = lbound(SrcParamData%du)
5686-
UB(1:1) = ubound(SrcParamData%du)
5687-
if (.not. allocated(DstParamData%du)) then
5688-
allocate(DstParamData%du(LB(1):UB(1)), stat=ErrStat2)
5689-
if (ErrStat2 /= 0) then
5690-
call SetErrStat(ErrID_Fatal, 'Error allocating DstParamData%du.', ErrStat, ErrMsg, RoutineName)
5691-
return
5692-
end if
5693-
end if
5694-
DstParamData%du = SrcParamData%du
5695-
end if
5696-
if (allocated(SrcParamData%dx)) then
5697-
LB(1:1) = lbound(SrcParamData%dx)
5698-
UB(1:1) = ubound(SrcParamData%dx)
5699-
if (.not. allocated(DstParamData%dx)) then
5700-
allocate(DstParamData%dx(LB(1):UB(1)), stat=ErrStat2)
5701-
if (ErrStat2 /= 0) then
5702-
call SetErrStat(ErrID_Fatal, 'Error allocating DstParamData%dx.', ErrStat, ErrMsg, RoutineName)
5703-
return
5704-
end if
5705-
end if
5706-
DstParamData%dx = SrcParamData%dx
5707-
end if
5708-
DstParamData%Jac_ny = SrcParamData%Jac_ny
57095663
DstParamData%CompAeroMaps = SrcParamData%CompAeroMaps
5710-
DstParamData%NumExtendedInputs = SrcParamData%NumExtendedInputs
5711-
DstParamData%NumBl_Lin = SrcParamData%NumBl_Lin
5712-
DstParamData%NActvVelDOF_Lin = SrcParamData%NActvVelDOF_Lin
5713-
DstParamData%NActvDOF_Lin = SrcParamData%NActvDOF_Lin
5714-
DstParamData%NActvDOF_Stride = SrcParamData%NActvDOF_Stride
57155664
end subroutine
57165665

57175666
subroutine ED_DestroyParam(ParamData, ErrStat, ErrMsg)
@@ -5898,15 +5847,6 @@ subroutine ED_DestroyParam(ParamData, ErrStat, ErrMsg)
58985847
end do
58995848
deallocate(ParamData%BldNd_OutParam)
59005849
end if
5901-
if (allocated(ParamData%Jac_u_indx)) then
5902-
deallocate(ParamData%Jac_u_indx)
5903-
end if
5904-
if (allocated(ParamData%du)) then
5905-
deallocate(ParamData%du)
5906-
end if
5907-
if (allocated(ParamData%dx)) then
5908-
deallocate(ParamData%dx)
5909-
end if
59105850
end subroutine
59115851

59125852
subroutine ED_PackParam(RF, Indata)
@@ -6161,16 +6101,7 @@ subroutine ED_PackParam(RF, Indata)
61616101
end do
61626102
end if
61636103
call RegPack(RF, InData%BldNd_BladesOut)
6164-
call RegPackAlloc(RF, InData%Jac_u_indx)
6165-
call RegPackAlloc(RF, InData%du)
6166-
call RegPackAlloc(RF, InData%dx)
6167-
call RegPack(RF, InData%Jac_ny)
61686104
call RegPack(RF, InData%CompAeroMaps)
6169-
call RegPack(RF, InData%NumExtendedInputs)
6170-
call RegPack(RF, InData%NumBl_Lin)
6171-
call RegPack(RF, InData%NActvVelDOF_Lin)
6172-
call RegPack(RF, InData%NActvDOF_Lin)
6173-
call RegPack(RF, InData%NActvDOF_Stride)
61746105
if (RegCheckErr(RF, RoutineName)) return
61756106
end subroutine
61766107

@@ -6436,16 +6367,7 @@ subroutine ED_UnPackParam(RF, OutData)
64366367
end do
64376368
end if
64386369
call RegUnpack(RF, OutData%BldNd_BladesOut); if (RegCheckErr(RF, RoutineName)) return
6439-
call RegUnpackAlloc(RF, OutData%Jac_u_indx); if (RegCheckErr(RF, RoutineName)) return
6440-
call RegUnpackAlloc(RF, OutData%du); if (RegCheckErr(RF, RoutineName)) return
6441-
call RegUnpackAlloc(RF, OutData%dx); if (RegCheckErr(RF, RoutineName)) return
6442-
call RegUnpack(RF, OutData%Jac_ny); if (RegCheckErr(RF, RoutineName)) return
64436370
call RegUnpack(RF, OutData%CompAeroMaps); if (RegCheckErr(RF, RoutineName)) return
6444-
call RegUnpack(RF, OutData%NumExtendedInputs); if (RegCheckErr(RF, RoutineName)) return
6445-
call RegUnpack(RF, OutData%NumBl_Lin); if (RegCheckErr(RF, RoutineName)) return
6446-
call RegUnpack(RF, OutData%NActvVelDOF_Lin); if (RegCheckErr(RF, RoutineName)) return
6447-
call RegUnpack(RF, OutData%NActvDOF_Lin); if (RegCheckErr(RF, RoutineName)) return
6448-
call RegUnpack(RF, OutData%NActvDOF_Stride); if (RegCheckErr(RF, RoutineName)) return
64496371
end subroutine
64506372

64516373
subroutine ED_CopyInput(SrcInputData, DstInputData, CtrlCode, ErrStat, ErrMsg)

‎modules/hydrodyn/src/HydroDyn.txt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,10 +153,6 @@ typedef ^ ^ CHARACTER(2
153153
typedef ^ ^ CHARACTER(ChanLen) Delim - - - "Delimiter string for outputs, defaults to tab-delimiters" -
154154
typedef ^ ^ INTEGER UnOutFile - - - "File unit for the HydroDyn outputs" -
155155
typedef ^ ^ INTEGER OutDec - - - "Write every OutDec time steps" -
156-
typedef ^ ^ Integer Jac_u_indx {:}{:} - - "matrix to help fill/pack the u vector in computing the jacobian" -
157-
typedef ^ ^ R8Ki du {:} - - "vector that determines size of perturbation for u (inputs)" -
158-
typedef ^ ^ R8Ki dx {:} - - "vector that determines size of perturbation for x (continuous states)" -
159-
typedef ^ ^ Integer Jac_ny - - - "number of outputs in jacobian matrix" -
160156
typedef ^ ^ logical VisMeshes - .false. - "Output visualization meshes" -
161157
typedef ^ ^ SeaSt_WaveFieldType *WaveField - - - "Pointer to SeaState wave field" -
162158
typedef ^ ^ INTEGER PtfmYMod - - - "Large yaw model" -

‎modules/hydrodyn/src/HydroDyn_Types.f90‎

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -170,10 +170,6 @@ MODULE HydroDyn_Types
170170
CHARACTER(ChanLen) :: Delim !< Delimiter string for outputs, defaults to tab-delimiters [-]
171171
INTEGER(IntKi) :: UnOutFile = 0_IntKi !< File unit for the HydroDyn outputs [-]
172172
INTEGER(IntKi) :: OutDec = 0_IntKi !< Write every OutDec time steps [-]
173-
INTEGER(IntKi) , DIMENSION(:,:), ALLOCATABLE :: Jac_u_indx !< matrix to help fill/pack the u vector in computing the jacobian [-]
174-
REAL(R8Ki) , DIMENSION(:), ALLOCATABLE :: du !< vector that determines size of perturbation for u (inputs) [-]
175-
REAL(R8Ki) , DIMENSION(:), ALLOCATABLE :: dx !< vector that determines size of perturbation for x (continuous states) [-]
176-
INTEGER(IntKi) :: Jac_ny = 0_IntKi !< number of outputs in jacobian matrix [-]
177173
LOGICAL :: VisMeshes = .false. !< Output visualization meshes [-]
178174
TYPE(SeaSt_WaveFieldType) , POINTER :: WaveField => NULL() !< Pointer to SeaState wave field [-]
179175
INTEGER(IntKi) :: PtfmYMod = 0_IntKi !< Large yaw model [-]
@@ -1384,43 +1380,6 @@ subroutine HydroDyn_CopyParam(SrcParamData, DstParamData, CtrlCode, ErrStat, Err
13841380
DstParamData%Delim = SrcParamData%Delim
13851381
DstParamData%UnOutFile = SrcParamData%UnOutFile
13861382
DstParamData%OutDec = SrcParamData%OutDec
1387-
if (allocated(SrcParamData%Jac_u_indx)) then
1388-
LB(1:2) = lbound(SrcParamData%Jac_u_indx)
1389-
UB(1:2) = ubound(SrcParamData%Jac_u_indx)
1390-
if (.not. allocated(DstParamData%Jac_u_indx)) then
1391-
allocate(DstParamData%Jac_u_indx(LB(1):UB(1),LB(2):UB(2)), stat=ErrStat2)
1392-
if (ErrStat2 /= 0) then
1393-
call SetErrStat(ErrID_Fatal, 'Error allocating DstParamData%Jac_u_indx.', ErrStat, ErrMsg, RoutineName)
1394-
return
1395-
end if
1396-
end if
1397-
DstParamData%Jac_u_indx = SrcParamData%Jac_u_indx
1398-
end if
1399-
if (allocated(SrcParamData%du)) then
1400-
LB(1:1) = lbound(SrcParamData%du)
1401-
UB(1:1) = ubound(SrcParamData%du)
1402-
if (.not. allocated(DstParamData%du)) then
1403-
allocate(DstParamData%du(LB(1):UB(1)), stat=ErrStat2)
1404-
if (ErrStat2 /= 0) then
1405-
call SetErrStat(ErrID_Fatal, 'Error allocating DstParamData%du.', ErrStat, ErrMsg, RoutineName)
1406-
return
1407-
end if
1408-
end if
1409-
DstParamData%du = SrcParamData%du
1410-
end if
1411-
if (allocated(SrcParamData%dx)) then
1412-
LB(1:1) = lbound(SrcParamData%dx)
1413-
UB(1:1) = ubound(SrcParamData%dx)
1414-
if (.not. allocated(DstParamData%dx)) then
1415-
allocate(DstParamData%dx(LB(1):UB(1)), stat=ErrStat2)
1416-
if (ErrStat2 /= 0) then
1417-
call SetErrStat(ErrID_Fatal, 'Error allocating DstParamData%dx.', ErrStat, ErrMsg, RoutineName)
1418-
return
1419-
end if
1420-
end if
1421-
DstParamData%dx = SrcParamData%dx
1422-
end if
1423-
DstParamData%Jac_ny = SrcParamData%Jac_ny
14241383
DstParamData%VisMeshes = SrcParamData%VisMeshes
14251384
DstParamData%WaveField => SrcParamData%WaveField
14261385
DstParamData%PtfmYMod = SrcParamData%PtfmYMod
@@ -1479,15 +1438,6 @@ subroutine HydroDyn_DestroyParam(ParamData, ErrStat, ErrMsg)
14791438
end do
14801439
deallocate(ParamData%OutParam)
14811440
end if
1482-
if (allocated(ParamData%Jac_u_indx)) then
1483-
deallocate(ParamData%Jac_u_indx)
1484-
end if
1485-
if (allocated(ParamData%du)) then
1486-
deallocate(ParamData%du)
1487-
end if
1488-
if (allocated(ParamData%dx)) then
1489-
deallocate(ParamData%dx)
1490-
end if
14911441
nullify(ParamData%WaveField)
14921442
end subroutine
14931443

@@ -1549,10 +1499,6 @@ subroutine HydroDyn_PackParam(RF, Indata)
15491499
call RegPack(RF, InData%Delim)
15501500
call RegPack(RF, InData%UnOutFile)
15511501
call RegPack(RF, InData%OutDec)
1552-
call RegPackAlloc(RF, InData%Jac_u_indx)
1553-
call RegPackAlloc(RF, InData%du)
1554-
call RegPackAlloc(RF, InData%dx)
1555-
call RegPack(RF, InData%Jac_ny)
15561502
call RegPack(RF, InData%VisMeshes)
15571503
call RegPack(RF, associated(InData%WaveField))
15581504
if (associated(InData%WaveField)) then
@@ -1639,10 +1585,6 @@ subroutine HydroDyn_UnPackParam(RF, OutData)
16391585
call RegUnpack(RF, OutData%Delim); if (RegCheckErr(RF, RoutineName)) return
16401586
call RegUnpack(RF, OutData%UnOutFile); if (RegCheckErr(RF, RoutineName)) return
16411587
call RegUnpack(RF, OutData%OutDec); if (RegCheckErr(RF, RoutineName)) return
1642-
call RegUnpackAlloc(RF, OutData%Jac_u_indx); if (RegCheckErr(RF, RoutineName)) return
1643-
call RegUnpackAlloc(RF, OutData%du); if (RegCheckErr(RF, RoutineName)) return
1644-
call RegUnpackAlloc(RF, OutData%dx); if (RegCheckErr(RF, RoutineName)) return
1645-
call RegUnpack(RF, OutData%Jac_ny); if (RegCheckErr(RF, RoutineName)) return
16461588
call RegUnpack(RF, OutData%VisMeshes); if (RegCheckErr(RF, RoutineName)) return
16471589
if (associated(OutData%WaveField)) deallocate(OutData%WaveField)
16481590
call RegUnpack(RF, IsAllocAssoc); if (RegCheckErr(RF, RoutineName)) return

‎modules/seastate/src/SeaState.txt‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -174,14 +174,3 @@ typedef ^ ^ GridInterp_MiscVarType
174174
typedef ^ ^ ModJacType Jac - - - "Values corresponding to module variables" -
175175
typedef ^ ^ SeaSt_InputType u_perturb - - - "Input type for linearization perturbation" -
176176
typedef ^ ^ SeaSt_OutputType y_lin - - - "Output type for linearization perturbation" -
177-
178-
# typedef ^ Jac_u_idxStarts IntKi Extended - 1 - "Index to first point in u jacobian for Extended" -
179-
# typedef ^ Jac_y_idxStarts IntKi Extended - 1 - "Index to first point in y jacobian for Extended" -
180-
# typedef ^ Jac_y_idxStarts IntKi WrOuts - 2 - "Index to first point in y jacobian for WrOuts" -
181-
# typedef ^ SeaSt_LinParams IntKi NumExtendedInputs - 1 - "number of extended inputs" -
182-
# typedef ^ ^ IntKi NumExtendedOutputs - 1 - "number of extended outputs" -
183-
# typedef ^ ^ Jac_u_idxStarts Jac_u_idxStartList - - - "Starting indices for all Jac_u components" -
184-
# typedef ^ ^ Jac_y_idxStarts Jac_y_idxStartList - - - "Starting indices for all Jac_y components" -
185-
# typedef ^ ^ ReKi du {:} - - "vector that determines size of perturbation for u (inputs)"
186-
# typedef ^ ^ IntKi Jac_nu - - - "number of inputs in jacobian matrix" -
187-
# typedef ^ ^ IntKi Jac_ny - - - "number of outputs in jacobian matrix" -

0 commit comments

Comments
 (0)