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.

Sign up for GitHub

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

reading and passing the evaporation and precipitation is lake is activated in control file #119

Merged
merged 6 commits into from
Jul 20, 2020
Merged

reading and passing the evaporation and precipitation is lake is activated in control file #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6d28833
is_lake_sime and is is_wm_sim are added
Jul 16, 2020
cff6df7
multiple input
Jul 17, 2020
bb63879
passing evaporation and precipitation to processors if is lake simula…
Jul 17, 2020
d1753ed
small changes
Jul 17, 2020
59feac1
Update main_route.f90
ShervanGharari Jul 20, 2020
4ecbe66
Update get_basin_runoff.f90
ShervanGharari Jul 20, 2020
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: 2 additions & 0 deletions route/build/src/dataTypes.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,8 @@ MODULE dataTypes
integer(i4b) , allocatable :: hru_id(:) ! id of HM_HRUs or RN_HRUs at which runoff is stored (size: nSpace(1))
integer(i4b) , allocatable :: hru_ix(:) ! Index of RN_HRUs associated with river network (used only if HM_HRUs = RN_HRUs)
real(dp) , allocatable :: basinRunoff(:)! remapped river network catchment runoff (size: number of nHRU)
real(dp) , allocatable :: basinEvapo(:) ! remapped river network catchment runoff (size: number of nHRU)
real(dp) , allocatable :: basinPrecip(:)! remapped river network catchment runoff (size: number of nHRU)
end type runoff

! ---------- reach parameters ----------------------------------------------------------------------------
Expand Down
4 changes: 4 additions & 0 deletions route/build/src/globalData.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,10 @@ module globalData
type(runoff) , public :: runoff_data ! HRU runoff data structure for one time step for LSM HRUs and River network HRUs
real(dp) , allocatable , public :: basinRunoff_trib(:) ! HRU runoff array (m/s) for tributaries
real(dp) , allocatable , public :: basinRunoff_main(:) ! HRU runoff array (m/s) for mainstem
real(dp) , allocatable , public :: basinEvapo_trib(:) ! HRU evaporation array (m/s) for tributaries
real(dp) , allocatable , public :: basinEvapo_main(:) ! HRU evaporation array (m/s) for mainstem
real(dp) , allocatable , public :: basinPrecip_trib(:) ! HRU precipitation array (m/s) for tributaries
real(dp) , allocatable , public :: basinPrecip_main(:) ! HRU precipitation array (m/s) for mainstem

! domain data
! MPI
Expand Down
8 changes: 8 additions & 0 deletions route/build/src/main_route.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ SUBROUTINE main_route(&
! input
iens, & ! ensemble index
basinRunoff_in, & ! basin (i.e.,HRU) runoff (m/s)
basinEvapo_in, & ! basin (i.e.,HRU) evaporation (m/s)
basinPrecip_in, & ! basin (i.e.,HRU) precipitation (m/s)
ixRchProcessed, & ! indices of reach to be routed
river_basin, & ! OMP basin decomposition
NETOPO_in, & ! reach topology data structure
Expand All @@ -64,12 +66,15 @@ SUBROUTINE main_route(&
USE public_var, ONLY: kinematicWaveEuler
USE public_var, ONLY: impulseResponseFunc
USE globalData, ONLY: TSEC ! beginning/ending of simulation time step [sec]
USE public_var, ONLY: is_lake_sim ! logical whether or not lake should be simulated

implicit none

! input
integer(i4b), intent(in) :: iens ! ensemble member
real(dp), allocatable, intent(in) :: basinRunoff_in(:) ! basin (i.e.,HRU) runoff (m/s)
real(dp), allocatable, intent(in) :: basinEvapo_in(:) ! basin (i.e.,HRU) evaporation (m/s)
real(dp), allocatable, intent(in) :: basinPrecip_in(:) ! basin (i.e.,HRU) precipitation (m/s)
integer(i4b), allocatable, intent(in) :: ixRchProcessed(:) ! indices of reach to be routed
type(subbasin_omp), allocatable, intent(in) :: river_basin(:) ! OMP basin decomposition
type(RCHTOPO), allocatable, intent(in) :: NETOPO_in(:) ! River Network topology
Expand All @@ -85,12 +90,15 @@ SUBROUTINE main_route(&
character(len=strLen) :: cmessage ! error message of downwind routine
real(dp) :: T0,T1 ! beginning/ending of simulation time step [sec]
real(dp), allocatable :: reachRunoff_local(:) ! reach runoff (m/s)
real(dp), allocatable :: reachEvapo_local(:) ! reach evaporation (m/s)
real(dp), allocatable :: reachPrecip_local(:) ! reach precipitation (m/s)
integer(i4b) :: nSeg ! number of reach to be processed
integer(i4b) :: iSeg ! index of reach

! initialize errors
ierr=0; message = "main_routing/"


! define the start and end of the time step
T0=TSEC(0); T1=TSEC(1)

Expand Down
79 changes: 76 additions & 3 deletions route/build/src/mpi_process.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,6 +705,10 @@ subroutine mpi_route(pid, & ! input: proc id
USE globalData, ONLY: nHRU_mainstem ! number of mainstem HRUs
USE globalData, ONLY: basinRunoff_main ! mainstem only HRU runoff
USE globalData, ONLY: basinRunoff_trib ! tributary only HRU runoff
USE globalData, ONLY: basinEvapo_main ! mainstem only HRU Evaporation
USE globalData, ONLY: basinEvapo_trib ! tributary only HRU Evaporation
USE globalData, ONLY: basinPrecip_main ! mainstem only HRU Precipitation
USE globalData, ONLY: basinPrecip_trib ! tributary only HRU Precipitation
USE globalData, ONLY: river_basin_trib ! tributary OMP domain data structure
USE globalData, ONLY: river_basin_main ! mainstem OMP domain data structure
USE globalData, ONLY: nRch_mainstem ! number of mainstem reaches
Expand Down Expand Up @@ -798,6 +802,8 @@ subroutine mpi_route(pid, & ! input: proc id
! Perform routing
call main_route(iens, & ! input: ensemble index
basinRunoff_trib, & ! input: basin (i.e.,HRU) runoff (m/s)
basinEvapo_trib, & ! input: basin (i.e. HRU) Evapo (m/s)
basinPrecip_trib, & ! input: basin (i.e. HRU) Precip (m/s)
ixRchProcessed, & ! input: indices of reach to be routed
river_basin_trib, & ! input: OMP basin decomposition
NETOPO_trib, & ! input: reach topology data structure
Expand Down Expand Up @@ -874,6 +880,8 @@ subroutine mpi_route(pid, & ! input: proc id

call main_route(iens, & ! input: ensemble index
basinRunoff_main, & ! input: basin (i.e.,HRU) runoff (m/s)
basinEvapo_main, & ! input: basin (i.e. HRU) Evapo (m/s)
basinPrecip_main, & ! input: basin (i.e. HRU) Precip (m/s)
ixRchProcessed, & ! input: indices of reach to be routed
river_basin_main, & ! input: OMP basin decomposition
NETOPO_main, & ! input: reach topology data structure
Expand Down Expand Up @@ -933,6 +941,12 @@ SUBROUTINE scatter_runoff(nNodes, comm, & ! mpi variables: number nodes, communi
USE globalData, ONLY: hru_per_proc ! number of hrus assigned to each proc (i.e., node)
USE globalData, ONLY: basinRunoff_main ! HRU runoff holder for mainstem
USE globalData, ONLY: basinRunoff_trib ! HRU runoff holder for tributary
USE globalData, ONLY: basinEvapo_main ! HRU evaporation holder for mainstem
USE globalData, ONLY: basinEvapo_trib ! HRU evaporation holder for tributary
USE globalData, ONLY: basinPrecip_main ! HRU precipitation holder for mainstem
USE globalData, ONLY: basinPrecip_trib ! HRU precipitation holder for tributary
USE public_var, ONLY: is_lake_sim ! logical whether or not lake should be simulated


! input variables
integer(i4b), intent(in) :: nNodes ! number of processes (MPI)
Expand All @@ -941,7 +955,10 @@ SUBROUTINE scatter_runoff(nNodes, comm, & ! mpi variables: number nodes, communi
integer(i4b), intent(out) :: ierr ! error code
character(len=strLen), intent(out) :: message ! error message
! local variables
integer(i4b) :: iHru,jHru ! loop indices
real(dp) :: basinRunoff_local(nHRU) ! temporal basin runoff (m/s) for whole domain
real(dp) :: basinEvapo_local(nHRU) ! temporal basin runoff (m/s) for whole domain
real(dp) :: basinPrecip_local(nHRU) ! temporal basin runoff (m/s) for whole domain
character(len=strLen) :: cmessage ! error message from a subroutine

ierr=0; message='scatter_runoff/'
Expand All @@ -955,21 +972,63 @@ SUBROUTINE scatter_runoff(nNodes, comm, & ! mpi variables: number nodes, communi
end if
basinRunoff_main(:) = runoff_data%basinRunoff(:)

if (is_lake_sim) then

! if only single proc is used, all evaporation is stored in mainstem evaporation array
if (.not. allocated(basinEvapo_main)) then
allocate(basinEvapo_main(nHRU), stat=ierr)
if(ierr/=0)then; message=trim(message)//'problem allocating array for [basinEvapo_main]'; return; endif
end if
basinEvapo_main(:) = runoff_data%basinEvapo(:)

! if only single proc is used, all precipitation is stored in mainstem precipitation array
if (.not. allocated(basinPrecip_main)) then
allocate(basinPrecip_main(nHRU), stat=ierr)
if(ierr/=0)then; message=trim(message)//'problem allocating array for [basinPrecip_main]'; return; endif
end if
basinPrecip_main(:) = runoff_data%basinPrecip(:)

end if

else

! sort the basin runoff in terms of nodes/domains
! sort the basin runoff, precipitation and evaporation in terms of nodes/domains
if (masterproc) then ! this is a root process

if (.not. allocated(basinRunoff_main)) then
allocate(basinRunoff_main(nHRU_mainstem), stat=ierr)
if(ierr/=0)then; message=trim(message)//'problem allocating array for [basinRunoff_main]'; return; endif
endif

! runoff at hru in mainstem
basinRunoff_local(1:nHRU) = runoff_data%basinRunoff(1:nHRU)
if (is_lake_sim) then

if (.not. allocated(basinEvapo_main)) then
allocate(basinEvapo_main(nHRU_mainstem), stat=ierr)
if(ierr/=0)then; message=trim(message)//'problem allocating array for [basinEvapo_main]'; return; endif

endif

if (.not. allocated(basinPrecip_main)) then
allocate(basinPrecip_main(nHRU_mainstem), stat=ierr)
if(ierr/=0)then; message=trim(message)//'problem allocating array for [basinPrecip_main]'; return; endif
endif

end if


! runoff at hru in mainstem and tributaries
basinRunoff_local(1:nHRU) = runoff_data%basinRunoff(1:nHRU)
basinRunoff_main(1:nHRU_mainstem) = basinRunoff_local(1:nHRU_mainstem)


! evaporation and precipitation at main channel and tributaries
if (is_lake_sim) then
basinEvapo_local (1:nHRU) = runoff_data%basinEvapo(1:nHRU)
basinPrecip_local(1:nHRU) = runoff_data%basinPrecip(1:nHRU)
basinEvapo_main (1:nHRU_mainstem) = basinEvapo_local (1:nHRU_mainstem)
basinPrecip_main(1:nHRU_mainstem) = basinPrecip_local(1:nHRU_mainstem)
end if

end if

call shr_mpi_barrier(comm, message)
Expand All @@ -981,6 +1040,20 @@ SUBROUTINE scatter_runoff(nNodes, comm, & ! mpi variables: number nodes, communi
ierr, cmessage)
if(ierr/=0)then; message=trim(message)//trim(cmessage); return; endif

if (is_lake_sim) then
call shr_mpi_scatterV(basinEvapo_local(nHRU_mainstem+1:nHRU), &
hru_per_proc(0:nNodes-1), &
basinEvapo_trib, &
ierr, cmessage)
if(ierr/=0)then; message=trim(message)//trim(cmessage); return; endif

call shr_mpi_scatterV(basinPrecip_local(nHRU_mainstem+1:nHRU), &
hru_per_proc(0:nNodes-1), &
basinPrecip_trib, &
ierr, cmessage)
if(ierr/=0)then; message=trim(message)//trim(cmessage); return; endif
end if

end if

END SUBROUTINE scatter_runoff
Expand Down
4 changes: 4 additions & 0 deletions route/build/src/public_var.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@ module public_var
integer(i4b) ,public :: routOpt = integerMissing ! routing scheme options 0-> both, 1->IRF, 2->KWT, otherwise error
integer(i4b) ,public :: doesBasinRoute = 1 ! basin routing options 0-> no, 1->IRF, otherwise error
integer(i4b) ,public :: doesAccumRunoff = 1 ! option to delayed runoff accumulation over all the upstream reaches
logical(lgt),public :: is_lake_sim = .false. ! logical whether or not lakes are activated in simulation
logical(lgt),public :: is_wm_sim = .false. ! logical whether or not water management componenets, abstraction, injections and target volums are provided and will be used in the simulation
! RIVER NETWORK TOPOLOGY
character(len=strLen),public :: fname_ntopOld = '' ! old filename containing stream network topology information
logical(lgt) ,public :: ntopAugmentMode = .false. ! option for river network augmentation mode. terminate the program after writing augmented ntopo.
Expand All @@ -104,6 +106,8 @@ module public_var
! RUNOFF FILE
character(len=strLen),public :: fname_qsim = '' ! simulated runoff netCDF name
character(len=strLen),public :: vname_qsim = '' ! variable name for simulated runoff
character(len=strLen),public :: vname_evapo = '' ! variable name for actual evapoartion
character(len=strLen),public :: vname_precip = '' ! variable name for precipitation
character(len=strLen),public :: vname_time = '' ! variable name for time
character(len=strLen),public :: vname_hruid = '' ! variable name for runoff hru id
character(len=strLen),public :: dname_time = '' ! dimension name for time
Expand Down
4 changes: 4 additions & 0 deletions route/build/src/read_control.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,8 @@ subroutine read_control(ctl_fname, err, message)
case('<doesBasinRoute>'); read(cData,*,iostat=io_error) doesBasinRoute ! basin routing options 0-> no, 1->IRF, otherwise error
case('<doesAccumRunoff>'); read(cData,*,iostat=io_error) doesAccumRunoff ! option to delayed runoff accumulation over all the upstream reaches. 0->no, 1->yes
case('<seg_outlet>' ); read(cData,*,iostat=io_error) idSegOut ! desired outlet reach id (if -9999 --> route over the entire network)
case('<is_lake_sim>'); read(cData,*,iostat=io_error) is_lake_sim ! logical whether or not lakes are simulated
case('<is_wm_sim>'); read(cData,*,iostat=io_error) is_wm_sim ! logical whether or not water balance components, abstraction, injection and target volumes should be used in simulation
! RIVER NETWORK TOPOLOGY
case('<fname_ntopOld>'); fname_ntopOld = trim(cData) ! name of file containing stream network topology information
case('<ntopAugmentMode>'); read(cData,*,iostat=io_error) ntopAugmentMode ! option for river network augmentation mode. terminate the program after writing augmented ntopo.
Expand All @@ -126,6 +128,8 @@ subroutine read_control(ctl_fname, err, message)
! RUNOFF FILE
case('<fname_qsim>'); fname_qsim = trim(cData) ! name of text file containing nc file names and their order for runoff
case('<vname_qsim>'); vname_qsim = trim(cData) ! name of runoff variable
case('<vname_evapo>'); vname_evapo = trim(cData) ! name of actual evapoartion variable
case('<vname_precip>'); vname_precip = trim(cData) ! name of precipitation variable
case('<vname_time>'); vname_time = trim(cData) ! name of time variable in the runoff file
case('<vname_hruid>'); vname_hruid = trim(cData) ! name of the HRU id
case('<dname_time>'); dname_time = trim(cData) ! name of time variable in the runoff file
Expand Down
Loading