Skip to content

Commit

Permalink
Tweaks to continuation markers.
Browse files Browse the repository at this point in the history 
No changes in results.
  • Loading branch information
@emkemp
emkemp committed Jul 23, 2024
1 parent 0993d3c commit 303dfe1
Show file tree
Hide file tree
Showing 9 changed files with 65 additions and 65 deletions.
8 changes: 4 additions & 4 deletions lis/metforcing/nldas-2.0/get_netcdf4_filenames.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ subroutine netcdf4_nldas20filea(n,kk,findex,filename, &

!=== Assemble GES DISC NLDAS-2 netCDF-4 FORA filename:
filename = trim(nldas20dir)//"/"//fyr//"/"//fdoy// &
"/NLDAS_FORA0125_H.A"//fyr//fmo//fda//"."//fhr// &
"/NLDAS_FORA0125_H.A"//fyr//fmo//fda//"."//fhr// &
"00.020.nc"

else ! forecast mode
Expand Down Expand Up @@ -103,7 +103,7 @@ subroutine netcdf4_nldas20filea(n,kk,findex,filename, &

!=== Assemble GES DISC NLDAS-2 netCDF-4 FORA filename:
filename = trim(nldas20dir)//"/"//fyr//"/"//fdoy// &
"/NLDAS_FORA0125_H.A"//fyr//fmo//fda//"."//fhr// &
"/NLDAS_FORA0125_H.A"//fyr//fmo//fda//"."//fhr// &
"00.020.nc"
endif

Expand Down Expand Up @@ -173,7 +173,7 @@ subroutine netcdf4_nldas20fileb(n,kk,findex,filename, &

!=== Assemble GES DISC NLDAS-2 netCDF-4 FORB filename:
filename = trim(nldas20dir)//"/"//fyr//"/"//fdoy// &
"/NLDAS_FORB0125_H.A"//fyr//fmo//fda//"."//fhr// &
"/NLDAS_FORB0125_H.A"//fyr//fmo//fda//"."//fhr// &
"00.020.nc"

else !forecast mode
Expand Down Expand Up @@ -205,7 +205,7 @@ subroutine netcdf4_nldas20fileb(n,kk,findex,filename, &

!=== Assemble GES DISC NLDAS-2 netCDF-4 FORB filename:
filename = trim(nldas20dir)//"/"//fyr//"/"//fdoy// &
"/NLDAS_FORB0125_H.A"//fyr//fmo//fda//"."//fhr// &
"/NLDAS_FORB0125_H.A"//fyr//fmo//fda//"."//fhr// &
"00.020.nc"
endif

Expand Down
2 changes: 1 addition & 1 deletion lis/metforcing/nldas-2.0/get_nldas20.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ subroutine get_nldas20(n,findex)

!=== Check to see if b-file needs to be opened
readbfile = 0
if ((nldas20_struc(n)%model_level_data.gt.0).or. &
if ((nldas20_struc(n)%model_level_data.gt.0).or. &
(nldas20_struc(n)%model_dswrf_data.gt.0).or. &
(nldas20_struc(n)%model_level_press.gt.0).or. &
(nldas20_struc(n)%model_pcp_data.gt.0)) then
Expand Down
34 changes: 17 additions & 17 deletions lis/metforcing/nldas-2.0/nldas20_forcingMod.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,10 +200,10 @@ subroutine init_NLDAS20(findex)
endif

allocate(nldas20_struc(n)%metdata1( &
LIS_forecast_struc(1)%niterations, &
LIS_forecast_struc(1)%niterations, &
LIS_rc%met_nf(findex),LIS_rc%ngrid(n)))
allocate(nldas20_struc(n)%metdata2( &
LIS_forecast_struc(1)%niterations,&
LIS_forecast_struc(1)%niterations, &
LIS_rc%met_nf(findex),LIS_rc%ngrid(n)))

nldas20_struc(n)%st_iterid = LIS_forecast_struc(1)%st_iterId
Expand All @@ -212,9 +212,9 @@ subroutine init_NLDAS20(findex)

! Regular retrospective or non-forecast mode:
else
allocate(nldas20_struc(n)%metdata1(1,LIS_rc%met_nf(findex),&
allocate(nldas20_struc(n)%metdata1(1,LIS_rc%met_nf(findex), &
LIS_rc%ngrid(n)))
allocate(nldas20_struc(n)%metdata2(1,LIS_rc%met_nf(findex),&
allocate(nldas20_struc(n)%metdata2(1,LIS_rc%met_nf(findex), &
LIS_rc%ngrid(n)))

nldas20_struc(n)%st_iterid = 1
Expand All @@ -240,9 +240,9 @@ subroutine init_NLDAS20(findex)
nldas20_struc(n)%gridDesc(20) = 64

! Check for grid and interp option selected:
if ((nldas20_struc(n)%gridDesc(9).eq.LIS_rc%gridDesc(n,9)).and.&
(nldas20_struc(n)%gridDesc(10).eq.LIS_rc%gridDesc(n,10)).and.&
(LIS_rc%gridDesc(n,1).eq.proj_latlon).and. &
if ((nldas20_struc(n)%gridDesc(9).eq.LIS_rc%gridDesc(n,9)).and. &
(nldas20_struc(n)%gridDesc(10).eq.LIS_rc%gridDesc(n,10)).and. &
(LIS_rc%gridDesc(n,1).eq.proj_latlon).and. &
(LIS_rc%met_interp(findex).ne."neighbor")) then
write(LIS_logunit,*) &
"[ERR] The NLDAS grid was selected for the LIS run domain;"
Expand Down Expand Up @@ -274,9 +274,9 @@ subroutine init_NLDAS20(findex)
allocate(nldas20_struc(n)%w221(LIS_rc%lnc(n)*LIS_rc%lnr(n)))

call bilinear_interp_input(n,nldas20_struc(n)%gridDesc(:), &
nldas20_struc(n)%n111,nldas20_struc(n)%n121, &
nldas20_struc(n)%n211,nldas20_struc(n)%n221, &
nldas20_struc(n)%w111,nldas20_struc(n)%w121, &
nldas20_struc(n)%n111,nldas20_struc(n)%n121, &
nldas20_struc(n)%n211,nldas20_struc(n)%n221, &
nldas20_struc(n)%w111,nldas20_struc(n)%w121, &
nldas20_struc(n)%w211,nldas20_struc(n)%w221)

case ("budget-bilinear")
Expand All @@ -290,9 +290,9 @@ subroutine init_NLDAS20(findex)
allocate(nldas20_struc(n)%w221(LIS_rc%lnc(n)*LIS_rc%lnr(n)))

call bilinear_interp_input(n,nldas20_struc(n)%gridDesc(:), &
nldas20_struc(n)%n111,nldas20_struc(n)%n121, &
nldas20_struc(n)%n211,nldas20_struc(n)%n221, &
nldas20_struc(n)%w111,nldas20_struc(n)%w121, &
nldas20_struc(n)%n111,nldas20_struc(n)%n121, &
nldas20_struc(n)%n211,nldas20_struc(n)%n221, &
nldas20_struc(n)%w111,nldas20_struc(n)%w121, &
nldas20_struc(n)%w211,nldas20_struc(n)%w221)

allocate(nldas20_struc(n)%n112(LIS_rc%lnc(n)*LIS_rc%lnr(n),25))
Expand All @@ -305,9 +305,9 @@ subroutine init_NLDAS20(findex)
allocate(nldas20_struc(n)%w222(LIS_rc%lnc(n)*LIS_rc%lnr(n),25))

call conserv_interp_input(n,nldas20_struc(n)%gridDesc(:), &
nldas20_struc(n)%n112,nldas20_struc(n)%n122, &
nldas20_struc(n)%n212,nldas20_struc(n)%n222, &
nldas20_struc(n)%w112,nldas20_struc(n)%w122, &
nldas20_struc(n)%n112,nldas20_struc(n)%n122, &
nldas20_struc(n)%n212,nldas20_struc(n)%n222, &
nldas20_struc(n)%w112,nldas20_struc(n)%w122, &
nldas20_struc(n)%w212,nldas20_struc(n)%w222)

case ("neighbor")
Expand All @@ -333,7 +333,7 @@ subroutine init_NLDAS20(findex)
! Set up precipitation climate downscaling:
if (LIS_rc%pcp_downscale(findex).ne.0) then
call LIS_init_pcpclimo_native(n,findex, &
nint(nldas20_struc(n)%gridDesc(2)), &
nint(nldas20_struc(n)%gridDesc(2)), &
nint(nldas20_struc(n)%gridDesc(3)))
endif
enddo
Expand Down
6 changes: 3 additions & 3 deletions lis/metforcing/nldas-2.0/read_nldas20_elev.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ subroutine read_nldas20_elev(n,findex)
"[INFO] Reading NLDAS-2 elevation data ... "

call LIS_verify(nf90_open(path=LIS_rc%paramfile(n), &
mode=NF90_NOWRITE,ncid=nid), &
mode=NF90_NOWRITE,ncid=nid), &
"nf90_open failed in read_nldas20_elev")
call LIS_verify(nf90_inq_varid(nid,"ELEV_NLDAS2",elevId), &
"nf90_inq_varid failed in read_nldas20_elev")
Expand All @@ -74,8 +74,8 @@ subroutine read_nldas20_elev(n,findex)
call LIS_verify(nf90_close(nid))

elev_subset(:,:) = elev(LIS_ews_halo_ind(n,LIS_localPet+1): &
LIS_ewe_halo_ind(n,LIS_localPet+1), &
LIS_nss_halo_ind(n,LIS_localPet+1): &
LIS_ewe_halo_ind(n,LIS_localPet+1), &
LIS_nss_halo_ind(n,LIS_localPet+1): &
LIS_nse_halo_ind(n,LIS_localPet+1))

do r = 1,LIS_rc%lnr(n)
Expand Down
16 changes: 8 additions & 8 deletions lis/metforcing/nldas-2.0/read_nldas20a.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ subroutine read_nldas20a(n,kk,findex,order,month,name,ferror)
do t = 1,nldas20
if (lb(t)) then
call nldas20_ec_removal(n,t,nldas20_forcing(t,1), &
nldas20_forcing(t,2),nldas20_forcing(t,4), &
nldas20_forcing(t,2),nldas20_forcing(t,4), &
nldas20_forcing(t,7))
endif
enddo
Expand All @@ -163,8 +163,8 @@ subroutine read_nldas20a(n,kk,findex,order,month,name,ferror)
if ((iv.eq.8).or.(iv.eq.9)) pcp_flag = .true.

call interp_nldas20(n,findex,month,pcp_flag,nldas20, &
nldas20_forcing(:,iv), &
lb,LIS_rc%gridDesc(n,:), &
nldas20_forcing(:,iv), &
lb,LIS_rc%gridDesc(n,:), &
LIS_rc%lnc(n),LIS_rc%lnr(n),varfield)

do r = 1,LIS_rc%lnr(n)
Expand Down Expand Up @@ -298,7 +298,7 @@ subroutine interp_nldas20(n,findex,month,pcp_flag,input_size, &
select case(LIS_rc%met_interp(findex))

case("bilinear")
call bilinear_interp(lis_gds,input_bitmap,input_data, &
call bilinear_interp(lis_gds,input_bitmap,input_data, &
output_bitmap,output_data,nldas20_struc(n)%mi,mo, &
LIS_domain(n)%lat,LIS_domain(n)%lon, &
nldas20_struc(n)%w111,nldas20_struc(n)%w121, &
Expand All @@ -309,7 +309,7 @@ subroutine interp_nldas20(n,findex,month,pcp_flag,input_size, &

case("budget-bilinear")
if (pcp_flag) then
call conserv_interp(lis_gds,input_bitmap,input_data, &
call conserv_interp(lis_gds,input_bitmap,input_data, &
output_bitmap,output_data,nldas20_struc(n)%mi,mo, &
LIS_domain(n)%lat,LIS_domain(n)%lon, &
nldas20_struc(n)%w112,nldas20_struc(n)%w122, &
Expand All @@ -319,7 +319,7 @@ subroutine interp_nldas20(n,findex,month,pcp_flag,input_size, &
LIS_rc%udef,iret)

else
call bilinear_interp(lis_gds,input_bitmap,input_data, &
call bilinear_interp(lis_gds,input_bitmap,input_data, &
output_bitmap,output_data,nldas20_struc(n)%mi,mo, &
LIS_domain(n)%lat,LIS_domain(n)%lon, &
nldas20_struc(n)%w111,nldas20_struc(n)%w121, &
Expand All @@ -330,15 +330,15 @@ subroutine interp_nldas20(n,findex,month,pcp_flag,input_size, &
endif

case("neighbor")
call neighbor_interp(lis_gds,input_bitmap,input_data, &
call neighbor_interp(lis_gds,input_bitmap,input_data, &
output_bitmap,output_data,nldas20_struc(n)%mi,mo, &
LIS_domain(n)%lat,LIS_domain(n)%lon, &
nldas20_struc(n)%n113,LIS_rc%udef,iret)

end select

if (pcp_flag.and.(LIS_rc%pcp_downscale(findex).ne.0)) then
call LIS_pcpClimoDownscaling(n,findex,month,nc*nr, &
call LIS_pcpClimoDownscaling(n,findex,month,nc*nr, &
output_data,output_bitmap)
endif

Expand Down
4 changes: 2 additions & 2 deletions lis/metforcing/nldas-2.0/read_nldas20b.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ subroutine read_nldas20b(n,kk,findex,order,name,ferror)
if ((iv.eq.2).or.(iv.eq.3)) pcp_flag = .true.

call interp_nldas20(n,findex,LIS_rc%mo,pcp_flag,nldas20, &
nldas20_forcing(:,iv), &
lb,LIS_rc%gridDesc(n,:), &
nldas20_forcing(:,iv), &
lb,LIS_rc%gridDesc(n,:), &
LIS_rc%lnc(n),LIS_rc%lnr(n),varfield)

do r = 1,LIS_rc%lnr(n)
Expand Down
2 changes: 1 addition & 1 deletion lis/metforcing/nldas-2.0/read_orig_nldas20_elevdiff.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ subroutine read_orig_nldas20_elevdiff(n)
"[INFO] Reading NLDAS-2 original elevation difference file ..."

call LIS_verify(nf90_open(path=LIS_rc%paramfile(n), &
mode=NF90_NOWRITE,ncid=nid), &
mode=NF90_NOWRITE,ncid=nid), &
"nf90_open failed in read_orig_nldas20_elevdiff")
call LIS_verify(nf90_inq_varid(nid,"ELEVDIFF_NLDAS2",elevId), &
"nf90_inq_varid failed in read_orig_nldas20_elevdiff")
Expand Down
8 changes: 4 additions & 4 deletions lis/metforcing/nldas-2.0/readcrd_nldas20.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,16 +90,16 @@ subroutine readcrd_nldas20()

do n = 1,LIS_rc%nnest
write(unit=LIS_logunit,fmt=*) &
"[INFO] NLDAS-2.0 FORA forcing directory: ", &
"[INFO] NLDAS-2.0 FORA forcing directory: ", &
trim(nldas20_struc(n)%nldas20foradir)
nldas20_struc(n)%ncold = 464
nldas20_struc(n)%nrold = 224
nldas20_struc(n)%nldas20time1 = 3000.0
nldas20_struc(n)%nldas20time2 = 0.0

if ((nldas20_struc(n)%model_level_data.eq.1).or. &
(nldas20_struc(n)%model_dswrf_data.eq.1).or. &
(nldas20_struc(n)%model_pcp_data.eq.1).or. &
(nldas20_struc(n)%model_dswrf_data.eq.1).or. &
(nldas20_struc(n)%model_pcp_data.eq.1).or. &
(nldas20_struc(n)%model_level_press.eq.1)) then
call ESMF_ConfigFindLabel(LIS_config, &
"NLDAS-2.0 FORB forcing directory:",rc=rc)
Expand All @@ -108,7 +108,7 @@ subroutine readcrd_nldas20()
call ESMF_ConfigGetAttribute(LIS_config, &
nldas20_struc(n)%nldas20forbdir,rc=rc)
write(unit=LIS_logunit,fmt=*) &
"[INFO] NLDAS-2.0 FORB forcing directory: ", &
"[INFO] NLDAS-2.0 FORB forcing directory: ", &
trim(nldas20_struc(n)%nldas20forbdir)
endif
enddo
Expand Down
Loading

0 comments on commit 303dfe1

Please sign in to comment.