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

[BugFix] SrvD segfault if lidar used, but no SumPrint #1805

Merged
merged 1 commit into from
Oct 12, 2023
Merged

[BugFix] SrvD segfault if lidar used, but no SumPrint #1805

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
60 changes: 31 additions & 29 deletions modules/servodyn/src/BladedInterface_EX.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,35 +405,37 @@ subroutine InitLidarMeas()
u%MsrPositionsZ = InitInp%MsrPositionsZ
endif
! Write summary info to summary file
if (p%SensorType > 0) then ! Set these here rather than overwrite every loop step in SensorType 1 or 3
J=LidarMsr_StartIdx
call WrSumInfoRcvd( J+0, '','Lidar input: Sensor Type')
call WrSumInfoRcvd( J+1, '','Lidar input: Number of Beams')
call WrSumInfoRcvd( J+2, '','Lidar input: Number of Pulse Gates')
call WrSumInfoRcvd( J+3, '','Lidar input: Reference average wind speed for the lidar')
endif
if (p%SensorType == 1) THEN
do I=1,min(p%NumBeam,(LidarMsr_MaxChan-4)/4) ! Don't overstep the end for the lidar measure group
J=LidarMsr_StartIdx + 4 + (I-1)
call WrSumInfoRcvd( J+0, '','Lidar input: Measured Wind Speeds ('//trim(Num2LStr(I))//')')
call WrSumInfoRcvd( J+p%NumBeam*1, '','Lidar input: Measurement Points X ('//trim(Num2LStr(I))//')')
call WrSumInfoRcvd( J+p%NumBeam*2, '','Lidar input: Measurement Points Y ('//trim(Num2LStr(I))//')')
call WrSumInfoRcvd( J+p%NumBeam*3, '','Lidar input: Measurement Points Z ('//trim(Num2LStr(I))//')')
enddo
elseif (p%SensorType == 2) THEN
J=LidarMsr_StartIdx
call WrSumInfoRcvd( J+4, '','Lidar input: Measured Wind Speeds')
call WrSumInfoRcvd( J+5, '','Lidar input: Measurement Points X')
call WrSumInfoRcvd( J+6, '','Lidar input: Measurement Points Y')
call WrSumInfoRcvd( J+7, '','Lidar input: Measurement Points Z')
elseif (p%SensorType == 3) THEN
do I=1,min(p%NumPulseGate,(LidarMsr_MaxChan-4)/4) ! Don't overstep the end for the lidar measure group
J=LidarMsr_StartIdx + 4 + (I-1)
call WrSumInfoRcvd( J+0, '','Lidar input: Measured Wind Speeds ('//trim(Num2LStr(I))//')')
call WrSumInfoRcvd( J+p%NumPulseGate*1, '','Lidar input: Measurement Points X ('//trim(Num2LStr(I))//')')
call WrSumInfoRcvd( J+p%NumPulseGate*2, '','Lidar input: Measurement Points Y ('//trim(Num2LStr(I))//')')
call WrSumInfoRcvd( J+p%NumPulseGate*3, '','Lidar input: Measurement Points Z ('//trim(Num2LStr(I))//')')
enddo
if (UnSum > 0) then
if (p%SensorType > 0) then ! Set these here rather than overwrite every loop step in SensorType 1 or 3
J=LidarMsr_StartIdx
call WrSumInfoRcvd( J+0, '','Lidar input: Sensor Type')
call WrSumInfoRcvd( J+1, '','Lidar input: Number of Beams')
call WrSumInfoRcvd( J+2, '','Lidar input: Number of Pulse Gates')
call WrSumInfoRcvd( J+3, '','Lidar input: Reference average wind speed for the lidar')
endif
if (p%SensorType == 1) THEN
do I=1,min(p%NumBeam,(LidarMsr_MaxChan-4)/4) ! Don't overstep the end for the lidar measure group
J=LidarMsr_StartIdx + 4 + (I-1)
call WrSumInfoRcvd( J+0, '','Lidar input: Measured Wind Speeds ('//trim(Num2LStr(I))//')')
call WrSumInfoRcvd( J+p%NumBeam*1, '','Lidar input: Measurement Points X ('//trim(Num2LStr(I))//')')
call WrSumInfoRcvd( J+p%NumBeam*2, '','Lidar input: Measurement Points Y ('//trim(Num2LStr(I))//')')
call WrSumInfoRcvd( J+p%NumBeam*3, '','Lidar input: Measurement Points Z ('//trim(Num2LStr(I))//')')
enddo
elseif (p%SensorType == 2) THEN
J=LidarMsr_StartIdx
call WrSumInfoRcvd( J+4, '','Lidar input: Measured Wind Speeds')
call WrSumInfoRcvd( J+5, '','Lidar input: Measurement Points X')
call WrSumInfoRcvd( J+6, '','Lidar input: Measurement Points Y')
call WrSumInfoRcvd( J+7, '','Lidar input: Measurement Points Z')
elseif (p%SensorType == 3) THEN
do I=1,min(p%NumPulseGate,(LidarMsr_MaxChan-4)/4) ! Don't overstep the end for the lidar measure group
J=LidarMsr_StartIdx + 4 + (I-1)
call WrSumInfoRcvd( J+0, '','Lidar input: Measured Wind Speeds ('//trim(Num2LStr(I))//')')
call WrSumInfoRcvd( J+p%NumPulseGate*1, '','Lidar input: Measurement Points X ('//trim(Num2LStr(I))//')')
call WrSumInfoRcvd( J+p%NumPulseGate*2, '','Lidar input: Measurement Points Y ('//trim(Num2LStr(I))//')')
call WrSumInfoRcvd( J+p%NumPulseGate*3, '','Lidar input: Measurement Points Z ('//trim(Num2LStr(I))//')')
enddo
endif
endif
end subroutine InitLidarMeas

Expand Down
Loading