Skip to content

Commit 06161b0

Browse files
andrew-plattandrew-platt
committed
Remove DBG_OUTS from AD15
This will reduce merge conflicts with PR OpenFAST#373
1 parent 86dc893 commit 06161b0

File tree

2 files changed

+1
-330
lines changed

2 files changed

+1
-330
lines changed

‎modules/aerodyn/src/AeroDyn.f90‎

Lines changed: 1 addition & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,8 @@ subroutine AD_SetInitOut(p, InputFileData, InitOut, errStat, errMsg)
8383

8484
integer(IntKi) :: i, j, k, f
8585
integer(IntKi) :: NumCoords
86-
#ifdef DBG_OUTS
87-
integer(IntKi) :: m
88-
character(6) ::chanPrefix
89-
character(3) :: TmpChar
90-
#endif
91-
! Initialize variables for this routine
9286

87+
! Initialize variables for this routine
9388
errStat = ErrID_None
9489
errMsg = ""
9590

@@ -103,86 +98,10 @@ subroutine AD_SetInitOut(p, InputFileData, InitOut, errStat, errMsg)
10398

10499
if (ErrStat >= AbortErrLev) return
105100

106-
107-
#ifdef DBG_OUTS
108-
! Loop over blades and nodes to populate the output channel names and units
109-
110-
do k=1,p%numBlades
111-
do j=1, p%NumBlNds
112-
113-
m = (k-1)*p%NumBlNds*p%NBlOuts + (j-1)*p%NBlOuts
114-
115-
WRITE (TmpChar,'(I3.3)') j
116-
chanPrefix = "B"//trim(num2lstr(k))//"N"//TmpChar
117-
InitOut%WriteOutputHdr( m + 1 ) = trim(chanPrefix)//"Twst"
118-
InitOut%WriteOutputUnt( m + 1 ) = ' (deg) '
119-
InitOut%WriteOutputHdr( m + 2 ) = trim(chanPrefix)//"Psi"
120-
InitOut%WriteOutputUnt( m + 2 ) = ' (deg) '
121-
InitOut%WriteOutputHdr( m + 3 ) = trim(chanPrefix)//"Vx"
122-
InitOut%WriteOutputUnt( m + 3 ) = ' (m/s) '
123-
InitOut%WriteOutputHdr( m + 4 ) = trim(chanPrefix)//"Vy"
124-
InitOut%WriteOutputUnt( m + 4 ) = ' (m/s) '
125-
InitOut%WriteOutputHdr( m + 5 ) = ' '//trim(chanPrefix)//"AIn"
126-
InitOut%WriteOutputUnt( m + 5 ) = ' (-) '
127-
InitOut%WriteOutputHdr( m + 6 ) = ' '//trim(chanPrefix)//"ApIn"
128-
InitOut%WriteOutputUnt( m + 6 ) = ' (-) '
129-
InitOut%WriteOutputHdr( m + 7 ) = trim(chanPrefix)//"Vrel"
130-
InitOut%WriteOutputUnt( m + 7 ) = ' (m/s) '
131-
InitOut%WriteOutputHdr( m + 8 ) = ' '//trim(chanPrefix)//"Phi"
132-
InitOut%WriteOutputUnt( m + 8 ) = ' (deg) '
133-
InitOut%WriteOutputHdr( m + 9 ) = ' '//trim(chanPrefix)//"AOA"
134-
InitOut%WriteOutputUnt( m + 9 ) = ' (deg) '
135-
InitOut%WriteOutputHdr( m + 10 ) = ' '//trim(chanPrefix)//"Cl"
136-
InitOut%WriteOutputUnt( m + 10 ) = ' (-) '
137-
InitOut%WriteOutputHdr( m + 11 ) = ' '//trim(chanPrefix)//"Cd"
138-
InitOut%WriteOutputUnt( m + 11 ) = ' (-) '
139-
InitOut%WriteOutputHdr( m + 12 ) = ' '//trim(chanPrefix)//"Cm"
140-
InitOut%WriteOutputUnt( m + 12 ) = ' (-) '
141-
InitOut%WriteOutputHdr( m + 13 ) = ' '//trim(chanPrefix)//"Cx"
142-
InitOut%WriteOutputUnt( m + 13 ) = ' (-) '
143-
InitOut%WriteOutputHdr( m + 14 ) = ' '//trim(chanPrefix)//"Cy"
144-
InitOut%WriteOutputUnt( m + 14 ) = ' (-) '
145-
InitOut%WriteOutputHdr( m + 15 ) = ' '//trim(chanPrefix)//"Cn"
146-
InitOut%WriteOutputUnt( m + 15 ) = ' (-) '
147-
InitOut%WriteOutputHdr( m + 16 ) = ' '//trim(chanPrefix)//"Ct"
148-
InitOut%WriteOutputUnt( m + 16 ) = ' (-) '
149-
InitOut%WriteOutputHdr( m + 17 ) = ' '//trim(chanPrefix)//"Fl"
150-
InitOut%WriteOutputUnt( m + 17 ) = ' (N/m) '
151-
InitOut%WriteOutputHdr( m + 18 ) = ' '//trim(chanPrefix)//"Fd"
152-
InitOut%WriteOutputUnt( m + 18 ) = ' (N/m) '
153-
InitOut%WriteOutputHdr( m + 19 ) = ' '//trim(chanPrefix)//"M"
154-
InitOut%WriteOutputUnt( m + 19 ) = ' (N/m^2) '
155-
InitOut%WriteOutputHdr( m + 20 ) = ' '//trim(chanPrefix)//"Fx"
156-
InitOut%WriteOutputUnt( m + 20 ) = ' (N/m) '
157-
InitOut%WriteOutputHdr( m + 21 ) = ' '//trim(chanPrefix)//"Fy"
158-
InitOut%WriteOutputUnt( m + 21 ) = ' (N/m) '
159-
InitOut%WriteOutputHdr( m + 22 ) = ' '//trim(chanPrefix)//"Fn"
160-
InitOut%WriteOutputUnt( m + 22 ) = ' (N/m) '
161-
InitOut%WriteOutputHdr( m + 23 ) = ' '//trim(chanPrefix)//"Ft"
162-
InitOut%WriteOutputUnt( m + 23 ) = ' (N/m) '
163-
InitOut%WriteOutputHdr( m + 24 ) = ' '//trim(chanPrefix)//"Gam"
164-
InitOut%WriteOutputUnt( m + 24 ) = ' (m^2/s) '
165-
InitOut%WriteOutputHdr( m + 25 ) = ' '//trim(chanPrefix)//"Uin"
166-
InitOut%WriteOutputUnt( m + 25 ) = ' (m/s) '
167-
InitOut%WriteOutputHdr( m + 26 ) = ' '//trim(chanPrefix)//"Uit"
168-
InitOut%WriteOutputUnt( m + 26 ) = ' (m/s) '
169-
InitOut%WriteOutputHdr( m + 27 ) = ' '//trim(chanPrefix)//"Uir"
170-
InitOut%WriteOutputUnt( m + 27 ) = ' (m/s) '
171-
InitOut%WriteOutputHdr( m + 28 ) = ' '//trim(chanPrefix)//"Clst"
172-
InitOut%WriteOutputUnt( m + 28 ) = ' (-) '
173-
InitOut%WriteOutputHdr( m + 29 ) = ' '//trim(chanPrefix)//"Cdst"
174-
InitOut%WriteOutputUnt( m + 29 ) = ' (-) '
175-
InitOut%WriteOutputHdr( m + 30 ) = ' '//trim(chanPrefix)//"Cmst"
176-
InitOut%WriteOutputUnt( m + 30 ) = ' (-) '
177-
178-
end do
179-
end do
180-
#else
181101
do i=1,p%NumOuts
182102
InitOut%WriteOutputHdr(i) = p%OutParam(i)%Name
183103
InitOut%WriteOutputUnt(i) = p%OutParam(i)%Units
184104
end do
185-
#endif
186105

187106

188107
InitOut%Ver = AD_Ver
@@ -320,9 +239,6 @@ subroutine AD_Init( InitInp, u, p, x, xd, z, OtherState, y, m, Interval, InitOut
320239
! Display the module information
321240

322241
call DispNVD( AD_Ver )
323-
#ifdef DBG_OUTS
324-
call WrScr(' - Compiled with DBG_OUTS')
325-
#endif
326242

327243

328244
p%NumBlades = InitInp%NumBlades ! need this before reading the AD input file so that we know how many blade files to read
@@ -564,11 +480,7 @@ subroutine Init_MiscVars(m, p, u, y, errStat, errMsg)
564480
m%SigmaCavitCrit = 0.0_ReKi
565481
m%CavitWarnSet = .false.
566482
! arrays for output
567-
#ifdef DBG_OUTS
568-
allocate( m%AllOuts(0:p%NumOuts), STAT=ErrStat2 ) ! allocate starting at zero to account for invalid output channels
569-
#else
570483
allocate( m%AllOuts(0:MaxOutPts), STAT=ErrStat2 ) ! allocate starting at zero to account for invalid output channels
571-
#endif
572484
if (ErrStat2 /= 0) then
573485
call SetErrStat( ErrID_Fatal, "Error allocating AllOuts.", errStat, errMsg, RoutineName )
574486
return
@@ -1026,12 +938,6 @@ subroutine SetParameters( InitInp, InputFileData, p, ErrStat, ErrMsg )
1026938

1027939
!p%RootName = TRIM(InitInp%RootName)//'.AD' ! set earlier to it could be used
1028940

1029-
#ifdef DBG_OUTS
1030-
p%NBlOuts = 30
1031-
p%numOuts = p%NumBlNds*p%NumBlades*p%NBlOuts
1032-
p%NTwOuts = 0
1033-
1034-
#else
1035941
p%numOuts = InputFileData%NumOuts
1036942
p%NBlOuts = InputFileData%NBlOuts
1037943
p%BlOutNd = InputFileData%BlOutNd
@@ -1047,7 +953,6 @@ subroutine SetParameters( InitInp, InputFileData, p, ErrStat, ErrMsg )
1047953
call setErrStat(ErrStat2,ErrMsg2,ErrStat,ErrMsg,RoutineName)
1048954
if (ErrStat >= AbortErrLev) return
1049955

1050-
#endif
1051956

1052957
end subroutine SetParameters
1053958
!----------------------------------------------------------------------------------------------------------------------------------
@@ -1296,24 +1201,15 @@ subroutine AD_CalcOutput( t, u, p, x, xd, z, OtherState, y, m, ErrStat, ErrMsg )
12961201
! get values to output to file:
12971202
!-------------------------------------------------------
12981203
if (p%NumOuts > 0) then
1299-
#ifdef DBG_OUTS
1300-
call Calc_WriteDbgOutput( p, u, m, y, OtherState, xd, ErrStat2, ErrMsg2 )
1301-
#else
13021204
call Calc_WriteOutput( p, u, m, y, OtherState, xd, indx, ErrStat2, ErrMsg2 )
1303-
#endif
13041205
call SetErrStat(ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName)
13051206

13061207
!...............................................................................................................................
13071208
! Place the selected output channels into the WriteOutput(:) array with the proper sign:
13081209
!...............................................................................................................................
13091210

13101211
do i = 1,p%NumOuts ! Loop through all selected output channels
1311-
#ifdef DBG_OUTS
1312-
y%WriteOutput(i) = m%AllOuts( i )
1313-
#else
13141212
y%WriteOutput(i) = p%OutParam(i)%SignM * m%AllOuts( p%OutParam(i)%Indx )
1315-
#endif
1316-
13171213
end do ! i - All selected output channels
13181214

13191215
end if
@@ -1586,9 +1482,7 @@ subroutine GeomWithoutSweepPitchTwist(p,u,m,thetaBladeNds,ErrStat,ErrMsg)
15861482
call LAPACK_gemm( 'n', 't', 1.0_R8Ki, u%BladeRootMotion(k)%Orientation(:,:,1), u%HubMotion%Orientation(:,:,1), 0.0_R8Ki, orientation, errStat2, errMsg2)
15871483
call SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName)
15881484
theta = EulerExtract( orientation ) !hub_theta_root(k)
1589-
#ifndef DBG_OUTS
15901485
m%AllOuts( BPitch( k) ) = -theta(3)*R2D ! save this value of pitch for potential output
1591-
#endif
15921486
theta(3) = 0.0_ReKi
15931487
m%hub_theta_x_root(k) = theta(1) ! save this value for FAST.Farm
15941488

0 commit comments

Comments
 (0)