Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions regression/regression_param.sh
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ case $regtest in
topts[1]="0:10:00" ; popts[1]="12/8/" ; ropts[1]="/1"
topts[2]="0:10:00" ; popts[2]="12/10/" ; ropts[2]="/2"
elif [[ "$machine" = "Orion" ]]; then
topts[1]="0:10:00" ; popts[1]="12/8/" ; ropts[1]="/1"
topts[2]="0:10:00" ; popts[2]="12/12/" ; ropts[2]="/2"
topts[1]="0:20:00" ; popts[1]="12/8/" ; ropts[1]="/1"
topts[2]="0:20:00" ; popts[2]="12/12/" ; ropts[2]="/2"
elif [[ "$machine" = "Hercules" ]]; then
topts[1]="0:10:00" ; popts[1]="12/8/" ; ropts[1]="/1"
topts[2]="0:10:00" ; popts[2]="12/12/" ; ropts[2]="/2"
Expand Down
19 changes: 12 additions & 7 deletions src/gsi/read_iasing.f90
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ subroutine read_iasing(mype,val_iasing,ithin,isfcalc,rmesh,jsatid,gstime,&
logical :: outside,iuse,assim,valid
logical :: quiet,cloud_info

integer(i_kind) :: ifov, ifor, istep, ipos, instr, iscn, ioff, sensorindex_iasing
integer(i_kind) :: ifov, ifov2, ifor, istep, ipos, instr, iscn, ioff, sensorindex_iasing
integer(i_kind) :: i, j, l, iskip, ifovn, ksatid, kidsat, llll
integer(i_kind) :: nreal, isflg
integer(i_kind) :: itx, k, nele, itt, n
Expand Down Expand Up @@ -424,7 +424,7 @@ subroutine read_iasing(mype,val_iasing,ithin,isfcalc,rmesh,jsatid,gstime,&

! Get the size of the channels and radiance (allchan) array
! This is a delayed replication. crchn_reps is the number of IASI-NG replications (channel and radiance)
call ufbint(lnbufr,crchn_reps,1,1,iret,'(RPSEQ001)')
call ufbint(lnbufr,crchn_reps,1,1,iret,'(I1CRSQ)')
bufr_nchan = int(crchn_reps)

bufr_size = size(temperature,1)
Expand Down Expand Up @@ -568,7 +568,12 @@ subroutine read_iasing(mype,val_iasing,ithin,isfcalc,rmesh,jsatid,gstime,&
! To determine the scan position:
ifor = (ifov-1) / 16 ! Determine field-of-regard
istep = ifov - ((ifor) * 16) ! Determine field-of-view within field-of-regard
ipos = (ifor * 4) + mod(istep,4) ! Determine position of field-of-view within scan line
ifov2 = mod(istep,4) ! Determine position of field-of-view within scan line
if ( ifov2 /= 0 ) then
ipos = (ifor * 4) + ifov2
else
ipos = (ifor * 4) + 4
endif

! Remove data on edges
if (.not. use_edges .and. &
Expand Down Expand Up @@ -622,7 +627,7 @@ subroutine read_iasing(mype,val_iasing,ithin,isfcalc,rmesh,jsatid,gstime,&
call checkob(one,crit1,itx,iuse)
if(.not. iuse)cycle read_loop

call ufbseq(lnbufr,cscale,3,4,iret,'RPSEQ004')
call ufbseq(lnbufr,cscale,3,4,iret,'IAS1CBSQ')
if(iret /= 4) then
write(6,*) 'READ_IASI-NG read scale error ',iret
cycle read_loop
Expand All @@ -643,7 +648,7 @@ subroutine read_iasing(mype,val_iasing,ithin,isfcalc,rmesh,jsatid,gstime,&
end do

! Read IASI-NG channel number(CHNM) and radiance (SCRA).
call ufbseq(lnbufr,allchan,2,bufr_nchan,iret,'RPSEQ001')
call ufbseq(lnbufr,allchan,2,bufr_nchan,iret,'I1CRSQ')
jstart=1
scalef=one

Expand Down Expand Up @@ -739,7 +744,7 @@ subroutine read_iasing(mype,val_iasing,ithin,isfcalc,rmesh,jsatid,gstime,&
! Only channels 18 and 19 are used.

if ( iasing_cads ) then
call ufbseq(lnbufr,imager_info,123,7,iret,'RPSEQ002')
call ufbseq(lnbufr,imager_info,123,7,iret,'IASICSSQ')
if (iret == 7 .and. imager_info(3,1) <= 100.0_r_kind .and. &
sum(imager_info(3,:)) > zero .and. imager_coeff ) then ! if imager cluster info exists
imager_mean = zero
Expand Down Expand Up @@ -839,7 +844,7 @@ subroutine read_iasing(mype,val_iasing,ithin,isfcalc,rmesh,jsatid,gstime,&
data_all(4,itx) = dlat ! grid relative latitude
data_all(5,itx) = sat_zenang*deg2rad ! satellite zenith angle (rad)
data_all(6,itx) = allspot(11) ! satellite azimuth angle (deg)
data_all(7,itx) = sat_zenang*deg2rad ! look angle (rad)
data_all(7,itx) = sat_zenang*deg2rad ! satellite zenith angle (rad)
data_all(8,itx) = ifov ! fov number
data_all(9,itx) = allspot(12) ! solar zenith angle (deg)
data_all(10,itx)= allspot(13) ! solar azimuth angle (deg)
Expand Down