From 303dfe12979dbfe9237e2fc2b70c63ded2bcacc6 Mon Sep 17 00:00:00 2001 From: Eric Kemp Date: Tue, 23 Jul 2024 08:52:03 -0400 Subject: [PATCH] Tweaks to continuation markers. No changes in results. --- .../nldas-2.0/get_netcdf4_filenames.F90 | 8 +-- lis/metforcing/nldas-2.0/get_nldas20.F90 | 2 +- .../nldas-2.0/nldas20_forcingMod.F90 | 34 ++++++------- .../nldas-2.0/read_nldas20_elev.F90 | 6 +-- lis/metforcing/nldas-2.0/read_nldas20a.F90 | 16 +++--- lis/metforcing/nldas-2.0/read_nldas20b.F90 | 4 +- .../nldas-2.0/read_orig_nldas20_elevdiff.F90 | 2 +- lis/metforcing/nldas-2.0/readcrd_nldas20.F90 | 8 +-- .../nldas-2.0/timeinterp_nldas20.F90 | 50 +++++++++---------- 9 files changed, 65 insertions(+), 65 deletions(-) diff --git a/lis/metforcing/nldas-2.0/get_netcdf4_filenames.F90 b/lis/metforcing/nldas-2.0/get_netcdf4_filenames.F90 index 9558ed31b..eb3b590aa 100644 --- a/lis/metforcing/nldas-2.0/get_netcdf4_filenames.F90 +++ b/lis/metforcing/nldas-2.0/get_netcdf4_filenames.F90 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/lis/metforcing/nldas-2.0/get_nldas20.F90 b/lis/metforcing/nldas-2.0/get_nldas20.F90 index cc43a5ecb..8d4a41c10 100644 --- a/lis/metforcing/nldas-2.0/get_nldas20.F90 +++ b/lis/metforcing/nldas-2.0/get_nldas20.F90 @@ -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 diff --git a/lis/metforcing/nldas-2.0/nldas20_forcingMod.F90 b/lis/metforcing/nldas-2.0/nldas20_forcingMod.F90 index 60e5cbd58..7dfd35f4a 100644 --- a/lis/metforcing/nldas-2.0/nldas20_forcingMod.F90 +++ b/lis/metforcing/nldas-2.0/nldas20_forcingMod.F90 @@ -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 @@ -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 @@ -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;" @@ -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") @@ -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)) @@ -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") @@ -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 diff --git a/lis/metforcing/nldas-2.0/read_nldas20_elev.F90 b/lis/metforcing/nldas-2.0/read_nldas20_elev.F90 index 25fc7b1cc..1e614c64e 100644 --- a/lis/metforcing/nldas-2.0/read_nldas20_elev.F90 +++ b/lis/metforcing/nldas-2.0/read_nldas20_elev.F90 @@ -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") @@ -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) diff --git a/lis/metforcing/nldas-2.0/read_nldas20a.F90 b/lis/metforcing/nldas-2.0/read_nldas20a.F90 index 159edf858..f1dd216f5 100644 --- a/lis/metforcing/nldas-2.0/read_nldas20a.F90 +++ b/lis/metforcing/nldas-2.0/read_nldas20a.F90 @@ -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 @@ -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) @@ -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, & @@ -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, & @@ -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, & @@ -330,7 +330,7 @@ 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) @@ -338,7 +338,7 @@ subroutine interp_nldas20(n,findex,month,pcp_flag,input_size, & 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 diff --git a/lis/metforcing/nldas-2.0/read_nldas20b.F90 b/lis/metforcing/nldas-2.0/read_nldas20b.F90 index a1cc53eb8..dbcc5357d 100644 --- a/lis/metforcing/nldas-2.0/read_nldas20b.F90 +++ b/lis/metforcing/nldas-2.0/read_nldas20b.F90 @@ -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) diff --git a/lis/metforcing/nldas-2.0/read_orig_nldas20_elevdiff.F90 b/lis/metforcing/nldas-2.0/read_orig_nldas20_elevdiff.F90 index 44b99987d..394cc39a0 100644 --- a/lis/metforcing/nldas-2.0/read_orig_nldas20_elevdiff.F90 +++ b/lis/metforcing/nldas-2.0/read_orig_nldas20_elevdiff.F90 @@ -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") diff --git a/lis/metforcing/nldas-2.0/readcrd_nldas20.F90 b/lis/metforcing/nldas-2.0/readcrd_nldas20.F90 index 46fb5e33b..2f599f52e 100644 --- a/lis/metforcing/nldas-2.0/readcrd_nldas20.F90 +++ b/lis/metforcing/nldas-2.0/readcrd_nldas20.F90 @@ -90,7 +90,7 @@ 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 @@ -98,8 +98,8 @@ subroutine readcrd_nldas20() 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) @@ -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 diff --git a/lis/metforcing/nldas-2.0/timeinterp_nldas20.F90 b/lis/metforcing/nldas-2.0/timeinterp_nldas20.F90 index e1be31d31..6d39a0cd9 100644 --- a/lis/metforcing/nldas-2.0/timeinterp_nldas20.F90 +++ b/lis/metforcing/nldas-2.0/timeinterp_nldas20.F90 @@ -89,7 +89,7 @@ subroutine timeinterp_nldas20(n,findex) tempbmn = bmn tempbss = 0 tempbts = 0 - call LIS_tick(newtime1,tempbdoy,tempgmt1,tempbyr,tempbmo,tempbda,& + call LIS_tick(newtime1,tempbdoy,tempgmt1,tempbyr,tempbmo,tempbda, & tempbhr,tempbmn,tempbss,tempbts) btime = nldas20_struc(n)%nldas20time2 @@ -104,7 +104,7 @@ subroutine timeinterp_nldas20(n,findex) tempbmn = bmn tempbss = 0 tempbts = 0 - call LIS_tick(newtime2,tempbdoy,tempgmt2,tempbyr,tempbmo,tempbda,& + call LIS_tick(newtime2,tempbdoy,tempgmt2,tempbyr,tempbmo,tempbda, & tempbhr,tempbmn,tempbss,tempbts) !=== Interpolate Data in time @@ -234,8 +234,8 @@ subroutine timeinterp_nldas20(n,findex) zdoy = LIS_rc%doy ! Compute and apply zenith angle weights call zterp(1,LIS_domain(n)%grid(index1)%lat, & - LIS_domain(n)%grid(index1)%lon, & - gmt1,gmt2,LIS_rc%gmt,zdoy,zw1,zw2, & + LIS_domain(n)%grid(index1)%lon, & + gmt1,gmt2,LIS_rc%gmt,zdoy,zw1,zw2, & czb,cze,czm,LIS_rc) kk = LIS_get_iteration_index(n,k,index1,mfactor) @@ -246,10 +246,10 @@ subroutine timeinterp_nldas20(n,findex) (nldas20_struc(n)%metdata2(kk,3,index1)*zw2) ! In cases of small cos(zenith) angles, use linear weighting ! to avoid overly large weights. - if ((swd(t).gt.nldas20_struc(n)%metdata1(kk,3,index1)).and.& - (swd(t).gt.nldas20_struc(n)%metdata2(kk,3,index1)).and.& + if ((swd(t).gt.nldas20_struc(n)%metdata1(kk,3,index1)).and. & + (swd(t).gt.nldas20_struc(n)%metdata2(kk,3,index1)).and. & ((czb.lt.0.1).or.(cze.lt.0.1))) then - swd(t) = (nldas20_struc(n)%metdata1(kk,3,index1)*swt1)+ & + swd(t) = (nldas20_struc(n)%metdata1(kk,3,index1)*swt1) + & (nldas20_struc(n)%metdata2(kk,3,index1)*swt2) endif endif @@ -316,7 +316,7 @@ subroutine timeinterp_nldas20(n,findex) t = m + (k-1)*mfactor index1 = LIS_domain(n)%tile(t)%index kk = LIS_get_iteration_index(n,k,index1,mfactor) - if ((nldas20_struc(n)%metdata1(kk,1,index1).ne.LIS_rc%udef).and.& + if ((nldas20_struc(n)%metdata1(kk,1,index1).ne.LIS_rc%udef).and. & (nldas20_struc(n)%metdata2(kk,1,index1).ne.LIS_rc%udef)) then tmp(t) = (nldas20_struc(n)%metdata1(kk,1,index1)*wt1) + & (nldas20_struc(n)%metdata2(kk,1,index1)*wt2) @@ -332,9 +332,9 @@ subroutine timeinterp_nldas20(n,findex) t = m + (k-1)*mfactor index1 = LIS_domain(n)%tile(t)%index kk = LIS_get_iteration_index(n,k,index1,mfactor) - if ((nldas20_struc(n)%metdata1(kk,2,index1).ne.LIS_rc%udef).and.& + if ((nldas20_struc(n)%metdata1(kk,2,index1).ne.LIS_rc%udef).and. & (nldas20_struc(n)%metdata2(kk,2,index1).ne.LIS_rc%udef)) then - q2(t) = (nldas20_struc(n)%metdata1(kk,2,index1)*wt1) + & + q2(t) = (nldas20_struc(n)%metdata1(kk,2,index1)*wt1) + & (nldas20_struc(n)%metdata2(kk,2,index1)*wt2) endif enddo @@ -348,7 +348,7 @@ subroutine timeinterp_nldas20(n,findex) t = m + (k-1)*mfactor index1 = LIS_domain(n)%tile(t)%index kk = LIS_get_iteration_index(n,k,index1,mfactor) - if ((nldas20_struc(n)%metdata1(kk,4,index1).ne.LIS_rc%udef).and.& + if ((nldas20_struc(n)%metdata1(kk,4,index1).ne.LIS_rc%udef).and. & (nldas20_struc(n)%metdata2(kk,4,index1).ne.LIS_rc%udef)) then lwd(t) = (nldas20_struc(n)%metdata1(kk,4,index1)*wt1) + & (nldas20_struc(n)%metdata2(kk,4,index1)*wt2) @@ -364,9 +364,9 @@ subroutine timeinterp_nldas20(n,findex) t = m + (k-1)*mfactor index1 = LIS_domain(n)%tile(t)%index kk = LIS_get_iteration_index(n,k,index1,mfactor) - if ((nldas20_struc(n)%metdata1(kk,5,index1).ne.LIS_rc%udef).and.& + if ((nldas20_struc(n)%metdata1(kk,5,index1).ne.LIS_rc%udef).and. & (nldas20_struc(n)%metdata2(kk,5,index1).ne.LIS_rc%udef)) then - uwind(t) = (nldas20_struc(n)%metdata1(kk,5,index1)*wt1)+& + uwind(t) = (nldas20_struc(n)%metdata1(kk,5,index1)*wt1) + & (nldas20_struc(n)%metdata2(kk,5,index1)*wt2) endif enddo @@ -380,9 +380,9 @@ subroutine timeinterp_nldas20(n,findex) t = m + (k-1)*mfactor index1 = LIS_domain(n)%tile(t)%index kk = LIS_get_iteration_index(n,k,index1,mfactor) - if ((nldas20_struc(n)%metdata1(kk,6,index1).ne.LIS_rc%udef).and.& + if ((nldas20_struc(n)%metdata1(kk,6,index1).ne.LIS_rc%udef).and. & (nldas20_struc(n)%metdata2(kk,6,index1).ne.LIS_rc%udef)) then - vwind(t) = (nldas20_struc(n)%metdata1(kk,6,index1)*wt1)+& + vwind(t) = (nldas20_struc(n)%metdata1(kk,6,index1)*wt1) + & (nldas20_struc(n)%metdata2(kk,6,index1)*wt2) endif enddo @@ -396,9 +396,9 @@ subroutine timeinterp_nldas20(n,findex) t = m + (k-1)*mfactor index1 = LIS_domain(n)%tile(t)%index kk = LIS_get_iteration_index(n,k,index1,mfactor) - if ((nldas20_struc(n)%metdata1(kk,7,index1).ne.LIS_rc%udef).and.& + if ((nldas20_struc(n)%metdata1(kk,7,index1).ne.LIS_rc%udef).and. & (nldas20_struc(n)%metdata2(kk,7,index1).ne.LIS_rc%udef)) then - psurf(t) = (nldas20_struc(n)%metdata1(kk,7,index1)*wt1)+& + psurf(t) = (nldas20_struc(n)%metdata1(kk,7,index1)*wt1) + & (nldas20_struc(n)%metdata2(kk,7,index1)*wt2) endif enddo @@ -413,9 +413,9 @@ subroutine timeinterp_nldas20(n,findex) t = m + (k-1)*mfactor index1 = LIS_domain(n)%tile(t)%index kk = LIS_get_iteration_index(n,k,index1,mfactor) - if ((nldas20_struc(n)%metdata1(kk,10,index1).ne.LIS_rc%udef).and.& + if ((nldas20_struc(n)%metdata1(kk,10,index1).ne.LIS_rc%udef).and. & (nldas20_struc(n)%metdata2(kk,10,index1).ne.LIS_rc%udef)) then - pet(t) = (nldas20_struc(n)%metdata1(kk,10,index1)*wt1)+& + pet(t) = (nldas20_struc(n)%metdata1(kk,10,index1)*wt1) + & (nldas20_struc(n)%metdata2(kk,10,index1)*wt2) ! Convert NLDAS-2 PET from kg/m^2 to kg/m^2/sec - dmm pet(t) = pet(t)/(60.0*60.0) @@ -433,9 +433,9 @@ subroutine timeinterp_nldas20(n,findex) t = m + (k-1)*mfactor index1 = LIS_domain(n)%tile(t)%index kk = LIS_get_iteration_index(n,k,index1,mfactor) - if ((nldas20_struc(n)%metdata1(kk,11,index1).ne.LIS_rc%udef).and.& + if ((nldas20_struc(n)%metdata1(kk,11,index1).ne.LIS_rc%udef) .and. & (nldas20_struc(n)%metdata2(kk,11,index1).ne.LIS_rc%udef)) then - cape(t) = (nldas20_struc(n)%metdata1(kk,11,index1)*wt1)+& + cape(t) = (nldas20_struc(n)%metdata1(kk,11,index1)*wt1) + & (nldas20_struc(n)%metdata2(kk,11,index1)*wt2) endif enddo @@ -451,9 +451,9 @@ subroutine timeinterp_nldas20(n,findex) t = m + (k-1)*mfactor index1 = LIS_domain(n)%tile(t)%index kk = LIS_get_iteration_index(n,k,index1,mfactor) - if ((nldas20_struc(n)%metdata1(kk,12,index1).ne.LIS_rc%udef).and.& + if ((nldas20_struc(n)%metdata1(kk,12,index1).ne.LIS_rc%udef).and. & (nldas20_struc(n)%metdata2(kk,12,index1).ne.LIS_rc%udef)) then - fheight(t) = (nldas20_struc(n)%metdata1(kk,12,index1)*wt1)+& + fheight(t) = (nldas20_struc(n)%metdata1(kk,12,index1)*wt1) + & (nldas20_struc(n)%metdata2(kk,12,index1)*wt2) endif enddo @@ -469,9 +469,9 @@ subroutine timeinterp_nldas20(n,findex) t = m + (k-1)*mfactor index1 = LIS_domain(n)%tile(t)%index kk = LIS_get_iteration_index(n,k,index1,mfactor) - if ((nldas20_struc(n)%metdata1(kk,13,index1).ne.LIS_rc%udef).and.& + if ((nldas20_struc(n)%metdata1(kk,13,index1).ne.LIS_rc%udef).and. & (nldas20_struc(n)%metdata2(kk,13,index1).ne.LIS_rc%udef)) then - acond(t) = (nldas20_struc(n)%metdata1(kk,13,index1)*wt1)+& + acond(t) = (nldas20_struc(n)%metdata1(kk,13,index1)*wt1) + & (nldas20_struc(n)%metdata2(kk,13,index1)*wt2) endif enddo