From 0d5c082ca8714295e69dc6772361f227c0832583 Mon Sep 17 00:00:00 2001 From: "Sujay V. Kumar" Date: Wed, 12 Jan 2022 13:26:39 -0500 Subject: [PATCH 1/4] Adds the H2 offline capability Allows HyMAP2 to run based on existing LIS outputs. Currently the capability only works if the LIS outputs are written in NetCDF format with a '2d gridspace' option Resolves #965 --- lis/core/LIS_routingMod.F90 | 14 +- lis/make/default.cfg | 3 +- lis/plugins/LIS_runoffdata_pluginMod.F90 | 74 ++++----- .../HYMAP2_router/HYMAP2_routing_run.F90 | 143 +++++++----------- .../runoffdata/LISoutput/LISrunoffdataMod.F90 | 6 +- .../LISoutput/readLISrunoffdata.F90 | 68 +++------ 6 files changed, 119 insertions(+), 189 deletions(-) diff --git a/lis/core/LIS_routingMod.F90 b/lis/core/LIS_routingMod.F90 index 7b6a697f3..a313f93af 100644 --- a/lis/core/LIS_routingMod.F90 +++ b/lis/core/LIS_routingMod.F90 @@ -290,17 +290,21 @@ subroutine LIS_routing_run(n) !EOP integer, intent(in) :: n - if(LIS_rc%routingmodel.ne."none") then - call lsmroutinggetrunoff(trim(LIS_rc%lsm)//"+"//& - trim(LIS_rc%routingmodel)//char(0),n) + if(LIS_rc%routingmodel.ne."none") then + if(LIS_rc%lsm.ne."none") then + call lsmroutinggetrunoff(trim(LIS_rc%lsm)//"+"//& + trim(LIS_rc%routingmodel)//char(0),n) + endif if(LIS_rc%glaciermodel.ne."none") then call glacierroutinggetrunoff(trim(LIS_rc%glaciermodel)//"+"//& trim(LIS_rc%routingmodel)//char(0),n) endif call routingrun(trim(LIS_rc%routingmodel)//char(0),n) - call lsmroutinggetsws(trim(LIS_rc%lsm)//"+"//& - trim(LIS_rc%routingmodel)//char(0),n) + if(LIS_rc%lsm.ne."none") then + call lsmroutinggetsws(trim(LIS_rc%lsm)//"+"//& + trim(LIS_rc%routingmodel)//char(0),n) + endif endif end subroutine LIS_routing_run diff --git a/lis/make/default.cfg b/lis/make/default.cfg index b7fa389ef..853fa504f 100644 --- a/lis/make/default.cfg +++ b/lis/make/default.cfg @@ -587,7 +587,8 @@ path: routing/HYMAP_router, [HYMAP2 router] enabled: True macro: ROUTE_HYMAP2_ROUTER -path: routing/HYMAP2_router +path: routing/HYMAP2_router, + routing/HYMAP2_router/runoffdata/LISoutput dependent_comps: virtual_da virtual_da path: routing/HYMAP2_router/da_WL diff --git a/lis/plugins/LIS_runoffdata_pluginMod.F90 b/lis/plugins/LIS_runoffdata_pluginMod.F90 index d52bd4d50..b43adb200 100644 --- a/lis/plugins/LIS_runoffdata_pluginMod.F90 +++ b/lis/plugins/LIS_runoffdata_pluginMod.F90 @@ -39,58 +39,58 @@ module LIS_runoffdata_pluginMod subroutine LIS_runoffdata_plugin !EOP -#if ( defined ROUTE_HYMAP_ROUTER ) +#if ( defined ROUTE_HYMAP2_ROUTER ) use LIS_pluginIndices use LISrunoffdataMod - use GLDAS1runoffdataMod - use GLDAS2runoffdataMod - use NLDAS2runoffdataMod - use MERRA2runoffdataMod - use ERAILandrunoffdataMod - use GWBMIPrunoffdataMod +! use GLDAS1runoffdataMod +! use GLDAS2runoffdataMod +! use NLDAS2runoffdataMod +! use MERRA2runoffdataMod +! use ERAILandrunoffdataMod +! use GWBMIPrunoffdataMod external readLISrunoffdata - external readGLDAS1runoffdata - external readGLDAS2runoffdata - external readNLDAS2runoffdata - external readMERRA2runoffdata - external readERAILandrunoffdata - external readGWBMIPrunoffdata +! external readGLDAS1runoffdata +! external readGLDAS2runoffdata +! external readNLDAS2runoffdata +! external readMERRA2runoffdata +! external readERAILandrunoffdata +! external readGWBMIPrunoffdata call registerinitrunoffdata(trim(LIS_LISrunoffdataId)//char(0), & LISrunoffdata_init) call registerreadrunoffdata(trim(LIS_LISrunoffdataId)//char(0), & readLISrunoffdata) - call registerinitrunoffdata(trim(LIS_GLDAS1runoffdataId)//char(0), & - GLDAS1runoffdata_init) - call registerreadrunoffdata(trim(LIS_GLDAS1runoffdataId)//char(0), & - readGLDAS1runoffdata) +! call registerinitrunoffdata(trim(LIS_GLDAS1runoffdataId)//char(0), & +! GLDAS1runoffdata_init) +! call registerreadrunoffdata(trim(LIS_GLDAS1runoffdataId)//char(0), & +! readGLDAS1runoffdata) - call registerinitrunoffdata(trim(LIS_GLDAS2runoffdataId)//char(0), & - GLDAS2runoffdata_init) - call registerreadrunoffdata(trim(LIS_GLDAS2runoffdataId)//char(0), & - readGLDAS2runoffdata) +! call registerinitrunoffdata(trim(LIS_GLDAS2runoffdataId)//char(0), & +! GLDAS2runoffdata_init) +! call registerreadrunoffdata(trim(LIS_GLDAS2runoffdataId)//char(0), & +! readGLDAS2runoffdata) - call registerinitrunoffdata(trim(LIS_NLDAS2runoffdataId)//char(0), & - NLDAS2runoffdata_init) - call registerreadrunoffdata(trim(LIS_NLDAS2runoffdataId)//char(0), & - readNLDAS2runoffdata) +! call registerinitrunoffdata(trim(LIS_NLDAS2runoffdataId)//char(0), & +! NLDAS2runoffdata_init) +! call registerreadrunoffdata(trim(LIS_NLDAS2runoffdataId)//char(0), & +! readNLDAS2runoffdata) - call registerinitrunoffdata(trim(LIS_MERRA2runoffdataId)//char(0), & - MERRA2runoffdata_init) - call registerreadrunoffdata(trim(LIS_MERRA2runoffdataId)//char(0), & - readMERRA2runoffdata) +! call registerinitrunoffdata(trim(LIS_MERRA2runoffdataId)//char(0), & +! MERRA2runoffdata_init) +! call registerreadrunoffdata(trim(LIS_MERRA2runoffdataId)//char(0), & +! readMERRA2runoffdata) - call registerinitrunoffdata(trim(LIS_ERAIlandrunoffdataId)//char(0), & - ERAILandrunoffdata_init) - call registerreadrunoffdata(trim(LIS_ERAIlandrunoffdataId)//char(0), & - readERAILandrunoffdata) +! call registerinitrunoffdata(trim(LIS_ERAIlandrunoffdataId)//char(0), & +! ERAILandrunoffdata_init) +! call registerreadrunoffdata(trim(LIS_ERAIlandrunoffdataId)//char(0), & +! readERAILandrunoffdata) - call registerinitrunoffdata(trim(LIS_GWBMIPrunoffdataId)//char(0), & - GWBMIPrunoffdata_init) - call registerreadrunoffdata(trim(LIS_GWBMIPrunoffdataId)//char(0), & - readGWBMIPrunoffdata) +! call registerinitrunoffdata(trim(LIS_GWBMIPrunoffdataId)//char(0), & +! GWBMIPrunoffdata_init) +! call registerreadrunoffdata(trim(LIS_GWBMIPrunoffdataId)//char(0), & +! readGWBMIPrunoffdata) #endif end subroutine LIS_runoffdata_plugin diff --git a/lis/routing/HYMAP2_router/HYMAP2_routing_run.F90 b/lis/routing/HYMAP2_router/HYMAP2_routing_run.F90 index d8bfcb1dc..b7c906b65 100644 --- a/lis/routing/HYMAP2_router/HYMAP2_routing_run.F90 +++ b/lis/routing/HYMAP2_router/HYMAP2_routing_run.F90 @@ -136,65 +136,6 @@ subroutine HYMAP2_routing_run(n) alarmCheck = LIS_isAlarmRinging(LIS_rc, "HYMAP2 router model alarm") if(alarmCheck) then -#if 0 - if(HYMAP2_routing_struc(n)%useens.eq.0) then - do i=1,HYMAP2_routing_struc(n)%nseqall - HYMAP2_routing_struc(n)%rivstomax(i,1) = HYMAP2_routing_struc(n)%rivlen(i)* & - HYMAP2_routing_struc(n)%rivwth(i,1) * HYMAP2_routing_struc(n)%rivhgt(i,1) - - HYMAP2_routing_struc(n)%rivelv(i) = HYMAP2_routing_struc(n)%elevtn(i) -& - HYMAP2_routing_struc(n)%rivhgt(i,1) - - if(HYMAP2_routing_struc(n)%rivwth(i,1)>0) then - HYMAP2_routing_struc(n)%rivare(i,1) =& - min(HYMAP2_routing_struc(n)%grarea(i), & - HYMAP2_routing_struc(n)%rivlen(i) *& - HYMAP2_routing_struc(n)%rivwth(i,1)) - - endif - enddo - call HYMAP2_set_fldstg(HYMAP2_routing_struc(n)%nz,& - HYMAP2_routing_struc(n)%nseqall,& - HYMAP2_routing_struc(n)%fldhgt,& - HYMAP2_routing_struc(n)%grarea,& - HYMAP2_routing_struc(n)%rivlen,& - HYMAP2_routing_struc(n)%rivwth(:,1),& - HYMAP2_routing_struc(n)%rivstomax(:,1),& - HYMAP2_routing_struc(n)%fldstomax(:,:,1),& - HYMAP2_routing_struc(n)%fldgrd(:,:,1),& - HYMAP2_routing_struc(n)%rivare(:,1)) - else - do i=1,HYMAP2_routing_struc(n)%nseqall - do m=1,LIS_rc%nensem(n) - HYMAP2_routing_struc(n)%rivstomax(i,m) = HYMAP2_routing_struc(n)%rivlen(i)* & - HYMAP2_routing_struc(n)%rivwth(i,m) * HYMAP2_routing_struc(n)%rivhgt(i,m) - - HYMAP2_routing_struc(n)%rivelv(i) = HYMAP2_routing_struc(n)%elevtn(i) -& - HYMAP2_routing_struc(n)%rivhgt(i,m) - if(HYMAP2_routing_struc(n)%rivwth(i,m)>0) then - HYMAP2_routing_struc(n)%rivare(i,m) =& - min(HYMAP2_routing_struc(n)%grarea(i), & - HYMAP2_routing_struc(n)%rivlen(i) *& - HYMAP2_routing_struc(n)%rivwth(i,m)) - endif - enddo - enddo - - do m=1,LIS_rc%nensem(n) - call HYMAP2_set_fldstg(HYMAP2_routing_struc(n)%nz,& - HYMAP2_routing_struc(n)%nseqall,& - HYMAP2_routing_struc(n)%fldhgt,& - HYMAP2_routing_struc(n)%grarea,& - HYMAP2_routing_struc(n)%rivlen,& - HYMAP2_routing_struc(n)%rivwth(:,m),& - HYMAP2_routing_struc(n)%rivstomax(:,m),& - HYMAP2_routing_struc(n)%fldstomax(:,:,m),& - HYMAP2_routing_struc(n)%fldgrd(:,:,m),& - HYMAP2_routing_struc(n)%rivare(:,m)) - enddo - endif -#endif - allocate(rivsto_lvec(LIS_rc%nroutinggrid(n)*LIS_rc%nensem(n))) allocate(rivdph_lvec(LIS_rc%nroutinggrid(n)*LIS_rc%nensem(n))) allocate(rivvel_lvec(LIS_rc%nroutinggrid(n)*LIS_rc%nensem(n))) @@ -566,41 +507,59 @@ subroutine HYMAP2_routing_run(n) else !single member run - tmpr=0. - tmpb=0. - - !import surface runoff and baseflow - call ESMF_StateGet(LIS_runoff_state(n),"Surface Runoff",sf_runoff_field,& - rc=status) - call LIS_verify(status, "ESMF_StateGet failed for Surface Runoff") - - call ESMF_StateGet(LIS_runoff_state(n),"Subsurface Runoff",& - baseflow_field, rc=status) - call LIS_verify(status, "ESMF_StateGet failed for Subsurface Runoff") - - call ESMF_FieldGet(sf_runoff_field,localDE=0,farrayPtr=surface_runoff_t,& - rc=status) - call LIS_verify(status, "ESMF_FieldGet failed for Surface Runoff") - - call ESMF_FieldGet(baseflow_field,localDE=0,farrayPtr=baseflow_t,& - rc=status) - call LIS_verify(status, "ESMF_FieldGet failed for Subsurface Runoff") + if(LIS_rc%lsm.ne."none") then + tmpr=0. + tmpb=0. + + !import surface runoff and baseflow + call ESMF_StateGet(LIS_runoff_state(n),"Surface Runoff",sf_runoff_field,& + rc=status) + call LIS_verify(status, "ESMF_StateGet failed for Surface Runoff") + + call ESMF_StateGet(LIS_runoff_state(n),"Subsurface Runoff",& + baseflow_field, rc=status) + call LIS_verify(status, "ESMF_StateGet failed for Subsurface Runoff") + + call ESMF_FieldGet(sf_runoff_field,localDE=0,farrayPtr=surface_runoff_t,& + rc=status) + call LIS_verify(status, "ESMF_FieldGet failed for Surface Runoff") + + call ESMF_FieldGet(baseflow_field,localDE=0,farrayPtr=baseflow_t,& + rc=status) + call LIS_verify(status, "ESMF_FieldGet failed for Subsurface Runoff") - !temporary solution - call LIS_tile2grid(n,tmpr,surface_runoff_t) - call LIS_tile2grid(n,tmpb,baseflow_t) + !temporary solution + call LIS_tile2grid(n,tmpr,surface_runoff_t) + call LIS_tile2grid(n,tmpb,baseflow_t) + + call HYMAP2_grid2vector(LIS_rc%lnc(n),LIS_rc%lnr(n),1,& + HYMAP2_routing_struc(n)%nseqall,& + HYMAP2_routing_struc(n)%imis,& + HYMAP2_routing_struc(n)%seqx,& + HYMAP2_routing_struc(n)%seqy,tmpr,surface_runoff) + call HYMAP2_grid2vector(LIS_rc%lnc(n),LIS_rc%lnr(n),1,& + HYMAP2_routing_struc(n)%nseqall,& + HYMAP2_routing_struc(n)%imis,& + HYMAP2_routing_struc(n)%seqx,& + HYMAP2_routing_struc(n)%seqy,tmpb,baseflow) + else + + call readrunoffdata(trim(LIS_rc%runoffdatasource)//char(0),& + n,tmpr,tmpb) + + call HYMAP2_grid2vector(LIS_rc%lnc(n),LIS_rc%lnr(n),1,& + HYMAP2_routing_struc(n)%nseqall,& + HYMAP2_routing_struc(n)%imis,& + HYMAP2_routing_struc(n)%seqx,& + HYMAP2_routing_struc(n)%seqy,tmpr,surface_runoff) + call HYMAP2_grid2vector(LIS_rc%lnc(n),LIS_rc%lnr(n),1,& + HYMAP2_routing_struc(n)%nseqall,& + HYMAP2_routing_struc(n)%imis,& + HYMAP2_routing_struc(n)%seqx,& + HYMAP2_routing_struc(n)%seqy,tmpb,baseflow) + + endif - call HYMAP2_grid2vector(LIS_rc%lnc(n),LIS_rc%lnr(n),1,& - HYMAP2_routing_struc(n)%nseqall,& - HYMAP2_routing_struc(n)%imis,& - HYMAP2_routing_struc(n)%seqx,& - HYMAP2_routing_struc(n)%seqy,tmpr,surface_runoff) - call HYMAP2_grid2vector(LIS_rc%lnc(n),LIS_rc%lnr(n),1,& - HYMAP2_routing_struc(n)%nseqall,& - HYMAP2_routing_struc(n)%imis,& - HYMAP2_routing_struc(n)%seqx,& - HYMAP2_routing_struc(n)%seqy,tmpb,baseflow) - call HYMAP2_model(n,real(HYMAP2_routing_struc(n)%imis),& LIS_rc%lnc(n),& LIS_rc%lnr(n),& diff --git a/lis/routing/HYMAP2_router/runoffdata/LISoutput/LISrunoffdataMod.F90 b/lis/routing/HYMAP2_router/runoffdata/LISoutput/LISrunoffdataMod.F90 index b9892f149..432a8ae16 100755 --- a/lis/routing/HYMAP2_router/runoffdata/LISoutput/LISrunoffdataMod.F90 +++ b/lis/routing/HYMAP2_router/runoffdata/LISoutput/LISrunoffdataMod.F90 @@ -89,9 +89,9 @@ subroutine LISrunoffdata_init !ag - 17Mar2016 do n=1, LIS_rc%nnest LISrunoffdata_struc(n)%previous_filename='none' - allocate(LISrunoffdata_struc(n)%qs(LIS_rc%gnc(n),LIS_rc%gnr(n))) - allocate(LISrunoffdata_struc(n)%qsb(LIS_rc%gnc(n),LIS_rc%gnr(n))) - allocate(LISrunoffdata_struc(n)%evap(LIS_rc%gnc(n),LIS_rc%gnr(n))) + allocate(LISrunoffdata_struc(n)%qs(LIS_rc%lnc(n),LIS_rc%lnr(n))) + allocate(LISrunoffdata_struc(n)%qsb(LIS_rc%lnc(n),LIS_rc%lnr(n))) + allocate(LISrunoffdata_struc(n)%evap(LIS_rc%lnc(n),LIS_rc%lnr(n))) LISrunoffdata_struc(n)%qs=LIS_rc%udef LISrunoffdata_struc(n)%qsb=LIS_rc%udef LISrunoffdata_struc(n)%evap=LIS_rc%udef diff --git a/lis/routing/HYMAP2_router/runoffdata/LISoutput/readLISrunoffdata.F90 b/lis/routing/HYMAP2_router/runoffdata/LISoutput/readLISrunoffdata.F90 index 299adf0ca..416b207cf 100755 --- a/lis/routing/HYMAP2_router/runoffdata/LISoutput/readLISrunoffdata.F90 +++ b/lis/routing/HYMAP2_router/runoffdata/LISoutput/readLISrunoffdata.F90 @@ -31,9 +31,9 @@ subroutine readLISrunoffdata(n,surface_runoff, baseflow) implicit none integer, intent(in) :: n - real :: surface_runoff(LIS_rc%gnc(n),LIS_rc%gnr(n)) - real :: baseflow(LIS_rc%gnc(n),LIS_rc%gnr(n)) - real :: total_evapotranspiration(LIS_rc%gnc(n),LIS_rc%gnr(n)) + real :: surface_runoff(LIS_rc%lnc(n),LIS_rc%lnr(n)) + real :: baseflow(LIS_rc%lnc(n),LIS_rc%lnr(n)) + real :: total_evapotranspiration(LIS_rc%lnc(n),LIS_rc%lnr(n)) !caveats ! 1) assumes the LIS outputs are the same output interval as that of @@ -77,8 +77,8 @@ subroutine readLISrunoffdata(n,surface_runoff, baseflow) if(file_exists) then write(LIS_logunit,*) 'Reading '//trim(filename) !ag - 17Mar2016 - !allocate(qs(LIS_rc%gnc(n),LIS_rc%gnr(n))) - !allocate(qsb(LIS_rc%gnc(n),LIS_rc%gnr(n))) + !allocate(qs(LIS_rc%lnc(n),LIS_rc%lnr(n))) + !allocate(qsb(LIS_rc%lnc(n),LIS_rc%lnr(n))) ios = nf90_open(path=filename,& mode=NF90_NOWRITE,ncid=nid) @@ -94,57 +94,23 @@ subroutine readLISrunoffdata(n,surface_runoff, baseflow) call LIS_verify(ios,'failed to read Evap_tavg field in readLISrunoffdata') if(LIS_rc%wopt.eq."2d gridspace") then - ios = nf90_get_var(nid,qsid,LISrunoffdata_struc(n)%qs) + ios = nf90_get_var(nid,qsid,LISrunoffdata_struc(n)%qs, & + start=(/LIS_ews_halo_ind(n,LIS_localPet+1),LIS_nss_halo_ind(n,LIS_localPet+1)/),& + count=(/LIS_rc%lnc(n),LIS_rc%lnr(n)/)) call LIS_verify(ios, 'failed to read Qs_tavg field in readLISrunoffdata') - ios = nf90_get_var(nid,qsbid,LISrunoffdata_struc(n)%qsb) + ios = nf90_get_var(nid,qsbid,LISrunoffdata_struc(n)%qsb,& + start=(/LIS_ews_halo_ind(n,LIS_localPet+1),LIS_nss_halo_ind(n,LIS_localPet+1)/),& + count=(/LIS_rc%lnc(n),LIS_rc%lnr(n)/)) call LIS_verify(ios, 'failed to read Qsb_tavg field in readLISrunoffdata') - ios = nf90_get_var(nid,evapid,LISrunoffdata_struc(n)%evap) + ios = nf90_get_var(nid,evapid,LISrunoffdata_struc(n)%evap,& + start=(/LIS_ews_halo_ind(n,LIS_localPet+1),LIS_nss_halo_ind(n,LIS_localPet+1)/),& + count=(/LIS_rc%lnc(n),LIS_rc%lnr(n)/)) call LIS_verify(ios, 'failed to read Evap_tavg field in readLISrunoffdata') - elseif(LIS_rc%wopt.eq."1d tilespace") then - - allocate(qs_t(LIS_rc%glbntiles(n))) - allocate(qsb_t(LIS_rc%glbntiles(n))) - allocate(evap_t(LIS_rc%glbntiles(n))) - allocate(nqs(LIS_rc%gnc(n),LIS_rc%gnr(n))) - - ios = nf90_get_var(nid,qsid,qs_t) - call LIS_verify(ios, 'failed to read Qs_tavg field in readLISrunoffdata') - - ios = nf90_get_var(nid,qsbid,qsb_t) - call LIS_verify(ios, 'failed to read Qsb_tavg field in readLISrunoffdata') - - ios = nf90_get_var(nid,evapid,evap_t) - call LIS_verify(ios, 'failed to read Evap_tavg field in readLISrunoffdata') - - do t=1,LIS_rc%glbntiles(n) - c = LIS_domain(n)%tile(t)%col - r = LIS_domain(n)%tile(t)%row - - LISrunoffdata_struc(n)%qs(c,r) = LISrunoffdata_struc(n)%qs(c,r) + qs_t(t) - LISrunoffdata_struc(n)%qsb(c,r) = LISrunoffdata_struc(n)%qsb(c,r) + qsb_t(t) - LISrunoffdata_struc(n)%evap(c,r) = LISrunoffdata_struc(n)%evap(c,r) + evap_t(t) - nqs(c,r) = nqs(c,r) + 1 - enddo - - do r=1,LIS_rc%gnr(n) - do c=1,LIS_rc%gnc(n) - if(nqs(c,r).gt.0) then - LISrunoffdata_struc(n)%qs(c,r) = LISrunoffdata_struc(n)%qs(c,r)/nqs(c,r) - LISrunoffdata_struc(n)%qsb(c,r) = LISrunoffdata_struc(n)%qsb(c,r)/nqs(c,r) - LISrunoffdata_struc(n)%evap(c,r) = LISrunoffdata_struc(n)%evap(c,r)/nqs(c,r) - else - LISrunoffdata_struc(n)%qs(c,r) = LIS_rc%udef - LISrunoffdata_struc(n)%qsb(c,r) = LIS_rc%udef - LISrunoffdata_struc(n)%evap(c,r) = LIS_rc%udef - endif - enddo - enddo - deallocate(qs_t) - deallocate(qsb_t) - deallocate(evap_t) - deallocate(nqs) + else + write(LIS_logunit,*) "Stand-alone HYMAP is only supported for '2d gridspace' outputs currently" + call LIS_endrun() endif call LIS_verify(nf90_close(nid)) From 1e3e476b79c7b09dff0c0ad31b2d22c439c01284 Mon Sep 17 00:00:00 2001 From: "Sujay V. Kumar" Date: Wed, 12 Jan 2022 15:51:33 -0500 Subject: [PATCH 2/4] Updates to the H2 offline capability HyMAP router (older version) is now turned off Related to #966 --- lis/make/default.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lis/make/default.cfg b/lis/make/default.cfg index 853fa504f..866cbb3d6 100644 --- a/lis/make/default.cfg +++ b/lis/make/default.cfg @@ -573,7 +573,7 @@ macro: ROUTE_NLDAS_ROUTER path: routing/NLDAS_router [HYMAP router] -enabled: True +enabled: False macro: ROUTE_HYMAP_ROUTER path: routing/HYMAP_router, routing/HYMAP_router/runoffdata/LISoutput, From ad3867a2f4edbc5a25b1bc0109652867e23a557f Mon Sep 17 00:00:00 2001 From: Brendan McAndrew Date: Thu, 13 Jan 2022 10:57:06 -0500 Subject: [PATCH 3/4] Change default state of HyMAP router to Off in docs --- docs/LIS_users_guide/user_cfg_table.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/LIS_users_guide/user_cfg_table.adoc b/docs/LIS_users_guide/user_cfg_table.adoc index b230bc463..9b2ba4dee 100644 --- a/docs/LIS_users_guide/user_cfg_table.adoc +++ b/docs/LIS_users_guide/user_cfg_table.adoc @@ -105,7 +105,7 @@ | Component name | Default state | NLDAS router | On -| HYMAP router | On +| HYMAP router | Off | HYMAP2 router | On |==== From b578b70ed55bbc96fe57059f586c809ce3ed262a Mon Sep 17 00:00:00 2001 From: Brendan McAndrew <19274445+bmcandr@users.noreply.github.com> Date: Thu, 13 Jan 2022 17:18:29 -0500 Subject: [PATCH 4/4] Mark external runoff sources as disabled --- docs/LIS_users_guide/intro.adoc | 7 +++++++ lis/configs/lis.config.adoc | 18 +++++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/docs/LIS_users_guide/intro.adoc b/docs/LIS_users_guide/intro.adoc index ae968aad0..7ecb9cd00 100644 --- a/docs/LIS_users_guide/intro.adoc +++ b/docs/LIS_users_guide/intro.adoc @@ -65,6 +65,13 @@ This document consists of 12 sections, described as follows: //* PILDAS //* NOAA OHD RDHM 3.5.6 forcing data (RDHM 3.5.6) //* Rhone AGG +//. Disables the following external runoff data sources +//* GLDAS1 runoff data +//* GLDAS2 runoff data +//* NLDAS2 runoff data +//* MERRA2 runoff data +//* ERA interim land runoff data +//* GWB MIP runoff data ==== LIS 7.3 diff --git a/lis/configs/lis.config.adoc b/lis/configs/lis.config.adoc index 9c26acb50..73eef718d 100644 --- a/lis/configs/lis.config.adoc +++ b/lis/configs/lis.config.adoc @@ -973,17 +973,17 @@ offline routing. Acceptable values are: |==== -|Value | Description +|Value | Description -|"`LIS runoff output`" | Use LIS outputs -|"`GLDAS1 runoff data`" | Use the GLDAS1 outputs -|"`GLDAS2 runoff data`" | Use the GLDAS2 outputs -|"`NLDAS2 runoff data`" | Use the NLDAS2 outputs -|"`MERRA2 runoff data`" | Use the MERR2 outputs -|"`ERA interim land runoff data`" | Use ERA-Interim-Land outputs -|"`GWB MIP runoff data`" | Use the Global Water Budget (GWB) model intercomparison project outputs +|"`LIS runoff output`" | Use LIS outputs +|[.line-through]#"`GLDAS1 runoff data`"# [red]#Disabled# | [.line-through]#Use the GLDAS1 outputs# +|[.line-through]#"`GLDAS2 runoff data`"# [red]#Disabled# | [.line-through]#Use the GLDAS2 outputs# +|[.line-through]#"`NLDAS2 runoff data`"# [red]#Disabled# | [.line-through]#Use the NLDAS2 outputs# +|[.line-through]#"`MERRA2 runoff data`"# [red]#Disabled# | [.line-through]#Use the MERR2 outputs# +|[.line-through]#"`ERA interim land runoff data`"# [red]#Disabled# | [.line-through]#Use ERA-Interim-Land outputs# +|[.line-through]#"`GWB MIP runoff data`"# [red]#Disabled# | [.line-through]#Use the Global Water Budget (GWB) model intercomparison project outputs# |==== - +// See pull request #966 for context about the disabled external runoff data sources listed above. `Number of application models:` specifies the number of application models to run.