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.

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

Format changes #773

Merged
merged 7 commits into from
Jul 31, 2024
Merged
Show file tree
Hide file tree
Changes from 5 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
2 changes: 1 addition & 1 deletion src/gsi/gsimod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -2320,7 +2320,7 @@ subroutine gsimain_initialize
endif
do i=1,ndat
write(6,401)dfile(i),dtype(i),dplat(i),dsis(i),dval(i),dthin(i),dsfcalc(i),time_window(i)
401 format(1x,a20,1x,a10,1x,a10,1x,a20,1x,f10.2,1x,I3,1x,I3,1x,f10.2)
401 format(1x,a20,1x,a10,1x,a11,1x,a20,1x,f10.2,1x,I3,1x,I3,1x,f10.2)
end do
write(6,superob_radar)
write(6,lag_data)
Expand Down
7 changes: 5 additions & 2 deletions src/gsi/mrmsmod.f90
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ subroutine load_mrms_data_info (mrms_listfile,nrows0,ntot_mrms,nrows_mrms,nrows,
integer(i_kind),parameter::nobstype_mrms=2 ! first for vr, and the second for ref
integer(i_kind),intent(in):: nrows0,ntot_mrms,nrows_mrms,nrows
character(len=*),intent(in),optional ::mrms_listfile, rcname ! input filename
character(10),intent(inout),dimension(nrows):: dtype,ditype,dplat
character(len=*),intent(inout),dimension(nrows):: dtype
character(len=*),intent(inout),dimension(nrows):: ditype
character(len=*),intent(inout),dimension(nrows):: dplat
character(20),intent(inout),dimension(nrows):: obsfile_all
character(*),intent(inout),dimension(nrows):: dfile
character(20),intent(inout),dimension(nrows):: dsis
Expand All @@ -42,7 +44,8 @@ subroutine load_mrms_data_info (mrms_listfile,nrows0,ntot_mrms,nrows_mrms,nrows,


real(r_kind),allocatable,dimension(:):: dmesh_mrms
character(10),allocatable,dimension(:):: dtype_mrms,ditype_mrms,dplat_mrms
character(10),allocatable,dimension(:):: dtype_mrms,ditype_mrms
character(11),allocatable,dimension(:):: dplat_mrms
character(120),allocatable,dimension(:):: dfile_mrms
character(20),allocatable,dimension(:):: dsis_mrms
real(r_kind) ,allocatable,dimension(:):: dval_mrms
Expand Down
3 changes: 2 additions & 1 deletion src/gsi/obsmod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,8 @@ module obsmod
character(128) dirname
character(128) obs_input_common
character(20),allocatable,dimension(:):: obsfile_all
character(10),allocatable,dimension(:):: dtype,ditype,dplat
character(10),allocatable,dimension(:):: dtype,ditype
character(11),allocatable,dimension(:):: dplat
character(120),allocatable,dimension(:):: dfile
character(20),allocatable,dimension(:):: dsis
real(r_kind) ,allocatable,dimension(:):: dval
Expand Down
2 changes: 1 addition & 1 deletion src/gsi/qcmod.f90
Original file line number Diff line number Diff line change
Expand Up @@ -4240,7 +4240,7 @@ subroutine qc_goesimg(nchanl,is,ndat,nsig,ich,dplat,sea,land,ice,snow,luse, &
real(r_kind),dimension(nsig,nchanl),intent(in ) :: temp,wmix
real(r_kind),dimension(nchanl), intent(in ) :: tb_obs,tb_obs_sdv,tbc,tnoise,emissivity_k,ts
real(r_kind),dimension(nchanl), intent(inout) :: errf,varinv
character(10), intent(in ) :: dplat
character(len=*), intent(in ) :: dplat

! Declare local parameters

Expand Down
4 changes: 2 additions & 2 deletions src/gsi/radinfo.f90
Original file line number Diff line number Diff line change
Expand Up @@ -805,10 +805,10 @@ subroutine radinfo_read
end do
close(lunin)
100 format(a1,a120)
110 format(i4,1x,a20,' chan= ',i4, &
110 format(i4,1x,a20,' chan= ',i5, &
' var= ',f7.3,' varch_cld=',f7.3,' use= ',i2,' ermax= ',F7.3, &
' b_rad= ',F7.2,' pg_rad=',F7.2,' icld_det=',I2,' icloud=',I2,' iaeros=',I2)
111 format(i4,1x,a20,' chan= ',i4, &
111 format(i4,1x,a20,' chan= ',i5, &
' var= ',f7.3,' varch_cld=',f7.3,' use= ',i2,' ermax= ',F7.3, &
' b_rad= ',F7.2,' pg_rad=',F7.2,' iextra_det=',I2, 'icloud=',I2,'iaeros=', I2)

Expand Down
2 changes: 1 addition & 1 deletion src/gsi/read_cris.f90
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ subroutine read_cris(mype,val_cris,ithin,isfcalc,rmesh,jsatid,gstime,&
integer(i_kind) ,intent(in ) :: npe_sub
integer(i_kind) ,intent(in ) :: mpi_comm_sub
character(len=*), intent(in ) :: infile
character(len=10),intent(in ) :: jsatid
character(len=*) ,intent(in ) :: jsatid
character(len=*), intent(in ) :: obstype
character(len=20),intent(in ) :: sis
real(r_kind) ,intent(in ) :: twind
Expand Down
8 changes: 5 additions & 3 deletions src/gsi/read_diag.f90
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ module read_diag
! Declare structures for radiance diagnostic file information
type diag_header_fix_list
character(len=20) :: isis ! sat and sensor type
character(len=10) :: id ! sat type
character(len=11) :: id ! sat type
character(len=10) :: obstype ! observation type
integer(i_kind) :: jiter ! outer loop counter
integer(i_kind) :: nchan ! number of channels in the sensor
Expand Down Expand Up @@ -414,7 +414,8 @@ subroutine read_radiag_header_nc(ftin,header_fix,header_chan,iflag)
real(r_kind),allocatable,dimension(:) :: r_var_stor
integer(i_kind),allocatable,dimension(:) :: i_var_stor
character(20) :: isis
character(10) :: id, obstype
character(11) :: id
character(10) :: obstype
! integer(i_kind),dimension(:),allocatable :: jiter, nchan_diag, npred, idate, &
integer(i_kind) :: jiter, nchan_diag, npred, idate, &
ireal, ipchan, iextra, jextra, &
Expand Down Expand Up @@ -515,7 +516,8 @@ subroutine read_radiag_header_bin(ftin,npred_radiag,retrieval,header_fix,header_

! Declare local variables
character(len=2):: string
character(len=10):: satid,sentype
character(len=11):: satid
character(len=10):: sentype
character(len=20):: sensat
integer(i_kind) :: i,ich
integer(i_kind):: jiter,nchanl,npred,ianldate,ireal,ipchan,iextra,jextra
Expand Down
2 changes: 1 addition & 1 deletion src/gsi/read_iasi.f90
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ subroutine read_iasi(mype,val_iasi,ithin,isfcalc,rmesh,jsatid,gstime,&
integer(i_kind) ,intent(in ) :: npe_sub
integer(i_kind) ,intent(in ) :: mpi_comm_sub
character(len=*), intent(in ) :: infile
character(len=10),intent(in ) :: jsatid
character(len=*) ,intent(in ) :: jsatid
character(len=*), intent(in ) :: obstype
character(len=20),intent(in ) :: sis
real(r_kind) ,intent(in ) :: twind
Expand Down
59 changes: 29 additions & 30 deletions src/gsi/read_obs.F90
Original file line number Diff line number Diff line change
Expand Up @@ -791,7 +791,7 @@ subroutine read_obs(ndata,mype)
logical,dimension(ndat):: belong,parallel_read,ears_possible,db_possible
logical :: modis,use_sfc_any
logical :: acft_profl_file
character(10):: obstype,platid
character(10):: obstype
character(22):: string
character(120):: infile
character(20):: sis
Expand Down Expand Up @@ -1415,7 +1415,6 @@ subroutine read_obs(ndata,mype)
task_belongs: &
if (i > 0 .and. belong(i)) then

platid=dplat(i) ! platid - satellites to read
obstype=dtype(i) ! obstype - observation types to process
infile=trim(dfile(i)) ! infile - units from which to read data
sis=dsis(i) ! sensor/instrument/satellite indicator
Expand Down Expand Up @@ -1553,12 +1552,12 @@ subroutine read_obs(ndata,mype)

! Process conventional SST (nsstbufr, at this moment) data
elseif ( obstype == 'sst' ) then
string="--"//trim(ditype(i))//":sst:"//trim(platid)
if ( platid == 'nsst') then
string="--"//trim(ditype(i))//":sst:"//trim(dplat(i))
if ( dplat(i) == 'nsst') then
call read_nsstbufr(nread,npuse,nouse,gstime,infile,obstype, &
lunout,twind,sis,nobs_sub1(1,i))
string='READ_NSSTBUFR'
elseif ( platid == 'mods') then
elseif ( dplat(i) == 'mods') then
call read_modsbufr(nread,npuse,nouse,gstime,infile,obstype, &
lunout,twind,sis,nobs_sub1(1,i))
string='READ_MODSBUFR'
Expand Down Expand Up @@ -1716,54 +1715,54 @@ subroutine read_obs(ndata,mype)

! Process TOVS 1b data
rad_obstype_select: &
if (platid /= 'aqua' .and. (obstype == 'amsua' .or. &
if (dplat(i) /= 'aqua' .and. (obstype == 'amsua' .or. &
obstype == 'amsub' .or. obstype == 'msu' .or. &
obstype == 'mhs' .or. obstype == 'hirs4' .or. &
obstype == 'hirs3' .or. obstype == 'hirs2' .or. &
obstype == 'ssu' )) then
call read_bufrtovs(mype,val_dat,ithin,isfcalc,rmesh,platid,gstime,&
call read_bufrtovs(mype,val_dat,ithin,isfcalc,rmesh,dplat(i),gstime,&
infile,lunout,obstype,nread,npuse,nouse,twind,sis, &
mype_root,mype_sub(mm1,i),npe_sub(i),mpi_comm_sub(i), nobs_sub1(1,i), &
read_rec(i),read_ears_rec(i),read_db_rec(i),dval_use,radmod)
string='READ_BUFRTOVS'

! Process atms data
else if (obstype == 'atms') then
call read_atms(mype,val_dat,ithin,isfcalc,rmesh,platid,gstime,&
call read_atms(mype,val_dat,ithin,isfcalc,rmesh,dplat(i),gstime,&
infile,lunout,obstype,nread,npuse,nouse,twind,sis, &
mype_root,mype_sub(mm1,i),npe_sub(i),mpi_comm_sub(i),nobs_sub1(1,i),&
read_rec(i),read_ears_rec(i),read_db_rec(i),dval_use,radmod)
string='READ_ATMS'

! Process saphir data
else if (obstype == 'saphir') then
call read_saphir(mype,val_dat,ithin,isfcalc,rmesh,platid,gstime,&
call read_saphir(mype,val_dat,ithin,isfcalc,rmesh,dplat(i),gstime,&
infile,lunout,obstype,nread,npuse,nouse,twind,sis, &
mype_root,mype_sub(mm1,i),npe_sub(i),mpi_comm_sub(i), &
nobs_sub1(1,i),dval_use)
string='READ_SAPHIR'


! Process airs data
else if(platid == 'aqua' .and. (obstype == 'airs' .or. &
else if(dplat(i) == 'aqua' .and. (obstype == 'airs' .or. &
obstype == 'amsua' .or. obstype == 'hsb' ))then
call read_airs(mype,val_dat,ithin,isfcalc,rmesh,platid,gstime,&
call read_airs(mype,val_dat,ithin,isfcalc,rmesh,dplat(i),gstime,&
infile,lunout,obstype,nread,npuse,nouse,twind,sis,&
mype_root,mype_sub(mm1,i),npe_sub(i),mpi_comm_sub(i), &
nobs_sub1(1,i),read_rec(i),dval_use)
string='READ_AIRS'

! Process iasi data
else if(obstype == 'iasi')then
call read_iasi(mype,val_dat,ithin,isfcalc,rmesh,platid,gstime,&
call read_iasi(mype,val_dat,ithin,isfcalc,rmesh,dplat(i),gstime,&
infile,lunout,obstype,nread,npuse,nouse,twind,sis,&
mype_root,mype_sub(mm1,i),npe_sub(i),mpi_comm_sub(i),nobs_sub1(1,i), &
read_rec(i),read_ears_rec(i),read_db_rec(i),dval_use)
string='READ_IASI'

! Process cris data
else if(obstype == 'cris' .or. obstype =='cris-fsr' )then
call read_cris(mype,val_dat,ithin,isfcalc,rmesh,platid,gstime,&
call read_cris(mype,val_dat,ithin,isfcalc,rmesh,dplat(i),gstime,&
infile,lunout,obstype,nread,npuse,nouse,twind,sis,&
mype_root,mype_sub(mm1,i),npe_sub(i),mpi_comm_sub(i),nobs_sub1(1,i), &
read_rec(i),read_ears_rec(i),read_db_rec(i),dval_use)
Expand All @@ -1774,15 +1773,15 @@ subroutine read_obs(ndata,mype)
else if (obstype == 'sndr' .or. &
obstype == 'sndrd1' .or. obstype == 'sndrd2' .or. &
obstype == 'sndrd3' .or. obstype == 'sndrd4') then
call read_goesndr(mype,val_dat,ithin,rmesh,platid,&
call read_goesndr(mype,val_dat,ithin,rmesh,dplat(i),&
infile,lunout,obstype,nread,npuse,nouse,twind,gstime,sis,&
mype_root,mype_sub(mm1,i),npe_sub(i),mpi_comm_sub(i), &
nobs_sub1(1,i),read_rec(i),dval_use)
string='READ_GOESNDR'

! Process ssmi data
else if (obstype == 'ssmi' ) then
call read_ssmi(mype,val_dat,ithin,rmesh,platid,gstime,&
call read_ssmi(mype,val_dat,ithin,rmesh,dplat(i),gstime,&
infile,lunout,obstype,nread,npuse,nouse,twind,sis,&
mype_root,mype_sub(mm1,i),npe_sub(i),mpi_comm_sub(i), &
nobs_sub1(1,i),read_rec(i),dval_use)
Expand All @@ -1791,7 +1790,7 @@ subroutine read_obs(ndata,mype)
! Process amsre data
else if ( obstype == 'amsre_low' .or. obstype == 'amsre_mid' .or. &
obstype == 'amsre_hig' ) then
call read_amsre(mype,val_dat,ithin,isfcalc,rmesh,platid,gstime,&
call read_amsre(mype,val_dat,ithin,isfcalc,rmesh,dplat(i),gstime,&
infile,lunout,obstype,nread,npuse,nouse,twind,sis,&
mype_root,mype_sub(mm1,i),npe_sub(i),mpi_comm_sub(i), &
nobs_sub1(1,i),read_rec(i),dval_use)
Expand All @@ -1801,54 +1800,54 @@ subroutine read_obs(ndata,mype)
else if (obstype == 'ssmis' .or. &
obstype == 'ssmis_las' .or. obstype == 'ssmis_uas' .or. &
obstype == 'ssmis_img' .or. obstype == 'ssmis_env' ) then
call read_ssmis(mype,val_dat,ithin,isfcalc,rmesh,platid,gstime,&
call read_ssmis(mype,val_dat,ithin,isfcalc,rmesh,dplat(i),gstime,&
infile,lunout,obstype,nread,npuse,nouse,twind,sis,&
mype_root,mype_sub(mm1,i),npe_sub(i),mpi_comm_sub(i), &
nobs_sub1(1,i),read_rec(i),dval_use)
string='READ_SSMIS'

! Process AMSR2 data
else if(obstype == 'amsr2')then
call read_amsr2(mype,val_dat,ithin,rmesh,platid,gstime,&
call read_amsr2(mype,val_dat,ithin,rmesh,dplat(i),gstime,&
infile,lunout,obstype,nread,npuse,nouse,twind,sis,&
mype_root,mype_sub(mm1,i),npe_sub(i),mpi_comm_sub(i), &
nobs_sub1(1,i))
string='READ_AMSR2'

! Process GOES IMAGER RADIANCE data
else if(obstype == 'goes_img') then
call read_goesimg(mype,val_dat,ithin,rmesh,platid,gstime,&
call read_goesimg(mype,val_dat,ithin,rmesh,dplat(i),gstime,&
infile,lunout,obstype,nread,npuse,nouse,twind,sis, &
mype_root,mype_sub(mm1,i),npe_sub(i),mpi_comm_sub(i), &
nobs_sub1(1,i),read_rec(i),dval_use)
string='READ_GOESMIMG'

! Process GMI data
else if (obstype == 'gmi') then
call read_gmi(mype,val_dat,ithin,rmesh,platid,gstime,&
call read_gmi(mype,val_dat,ithin,rmesh,dplat(i),gstime,&
infile,lunout,obstype,nread,npuse,nouse,twind,sis,&
mype_root,mype_sub(mm1,i),npe_sub(i),mpi_comm_sub(i), &
nobs_sub1(1,i),dval_use)
string='READ_GMI'

! Process Meteosat SEVIRI RADIANCE data
else if(obstype == 'seviri') then
call read_seviri(mype,val_dat,ithin,rmesh,platid,gstime,&
call read_seviri(mype,val_dat,ithin,rmesh,dplat(i),gstime,&
infile,lunout,obstype,nread,npuse,nouse,twind,sis, &
mype_root,mype_sub(mm1,i),npe_sub(i),mpi_comm_sub(i), &
nobs_sub1(1,i),read_rec(i),dval_use)
string='READ_SEVIRI'
! Process GOES-R ABI RADIANCE data
else if(obstype == 'abi') then
call read_abi(mype,val_dat,ithin,rmesh,platid,gstime,&
call read_abi(mype,val_dat,ithin,rmesh,dplat(i),gstime,&
infile,lunout,obstype,nread,npuse,nouse,twind,sis, &
mype_root,mype_sub(mm1,i),npe_sub(i),mpi_comm_sub(i), &
nobs_sub1(1,i),read_rec(i),dval_use)
string='READ_ABI'

! Process Himawari-8 AHI RADIANCE data
else if(obstype == 'ahi') then
call read_ahi(mype,val_dat,ithin,rmesh,platid,gstime,&
call read_ahi(mype,val_dat,ithin,rmesh,dplat(i),gstime,&
infile,lunout,obstype,nread,npuse,nouse,twind,sis, &
mype_root,mype_sub(mm1,i),npe_sub(i),mpi_comm_sub(i), &
nobs_sub1(1,i),read_rec(i),dval_use)
Expand All @@ -1857,22 +1856,22 @@ subroutine read_obs(ndata,mype)

! Process NAVY AVHRR RADIANCE data
else if(obstype == 'avhrr_navy') then
call read_avhrr_navy(mype,val_dat,ithin,rmesh,platid,gstime,&
call read_avhrr_navy(mype,val_dat,ithin,rmesh,dplat(i),gstime,&
infile,lunout,obstype,nread,npuse,nouse,twind,sis, &
mype_root,mype_sub(mm1,i),npe_sub(i),mpi_comm_sub(i), &
nobs_sub1(1,i),read_rec(i),dval_use)
string='READ_AVH_NAVY'

! Process NESDIS AVHRR RADIANCE data
else if(obstype == 'avhrr') then
call read_avhrr(mype,val_dat,ithin,rmesh,platid,gstime,&
call read_avhrr(mype,val_dat,ithin,rmesh,dplat(i),gstime,&
infile,lunout,obstype,nread,npuse,nouse,twind,sis, &
mype_root,mype_sub(mm1,i),npe_sub(i),mpi_comm_sub(i), &
nobs_sub1(1,i),read_rec(i),dval_use)
string='READ_AVHRR'
! Process SST VIIRS RADIANCE data
else if(obstype == 'viirs-m') then
call read_sst_viirs(mype,val_dat,ithin,rmesh,platid,gstime,&
call read_sst_viirs(mype,val_dat,ithin,rmesh,dplat(i),gstime,&
infile,lunout,obstype,nread,npuse,nouse,twind,sis, &
mype_root,mype_sub(mm1,i),npe_sub(i),mpi_comm_sub(i), &
nobs_sub1(1,i),read_rec(i),dval_use)
Expand All @@ -1885,7 +1884,7 @@ subroutine read_obs(ndata,mype)
if (is_extOzone(infile,obstype,dplat(i))) then

call extOzone_read(infile,obstype,dplat(i),dsis(i), &
iread,ipuse,iouse, platid,gstime,lunout,twind,ithin,rmesh, &
iread,ipuse,iouse, dplat(i),gstime,lunout,twind,ithin,rmesh, &
nobs_sub1(:,i))
string='extOzone_read'

Expand All @@ -1895,7 +1894,7 @@ subroutine read_obs(ndata,mype)

else
call read_ozone(nread,npuse,nouse,&
platid,infile,gstime,lunout,obstype,twind,sis,ithin,rmesh, &
dplat(i),infile,gstime,lunout,obstype,twind,sis,ithin,rmesh, &
nobs_sub1(1,i))
string='READ_OZONE'
endif ozone_obstype_select
Expand All @@ -1921,7 +1920,7 @@ subroutine read_obs(ndata,mype)
! Process aerosol data
else if (ditype(i) == 'aero' )then
call read_aerosol(nread,npuse,nouse,&
platid,infile,gstime,lunout,obstype,twind,sis,ithin,rmesh, &
dplat(i),infile,gstime,lunout,obstype,twind,sis,ithin,rmesh, &
mype_root,mype_sub(mm1,i),npe_sub(i),mpi_comm_sub(i), &
nobs_sub1(1,i))
string='READ_AEROSOL'
Expand All @@ -1947,7 +1946,7 @@ subroutine read_obs(ndata,mype)
call warn('read_obs',' infile =',trim(infile))
call warn('read_obs',' ditype(i) =',trim(ditype(i)))
call warn('read_obs',' obstype =',trim(obstype))
call warn('read_obs',' platid =',trim(platid))
call warn('read_obs',' dplat =',trim(dplat(i)))
call warn('read_obs',' string =',trim(string))
endif

Expand Down
2 changes: 1 addition & 1 deletion src/gsi/read_viirs.f90
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@ subroutine read_sst_viirs(mype,val_viirs,ithin,rmesh,jsatid,&
nele,itxmax,nread,ndata_mesh,data_mesh,score_crit,nrec)

if ( nread > 0 ) then
write(*,'(a,a10,I3,F6.1,3I10)') 'read_viirs,jsatid,imesh,amesh,itxmax,nread,ndata_mesh :',jsatid,imesh,amesh(imesh),itxmax,nread,ndata_mesh
write(*,'(a,a11,I3,F6.1,3I10)') 'read_viirs,jsatid,imesh,amesh,itxmax,nread,ndata_mesh :',jsatid,imesh,amesh(imesh),itxmax,nread,ndata_mesh
endif
!
! get data_all by combining data from all thinning box sizes
Expand Down
Loading
Loading