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

Jump to bottom

Finalized implementation of new lake shape options in the levelpool simulations #508

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
Open

Finalized implementation of new lake shape options in the levelpool simulations #508

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c6b5070
new shape options were added to levelpool module. LAKEPARM.nc and hyd…
Jul 7, 2020
5a708d2
adjustments made to levelpool physics and also reading the new variab…
Jul 24, 2020
0a21b45
fix minor issue in levelpool code
Jul 24, 2020
314369b
Add default value of 0 for lake_shape_option
rcabell Jul 27, 2020
13f0f58
Update the code to read from old LAKEPARM file when lake_shape_option…
Jul 28, 2020
b2fdc1f
Switched back dh calculations in LP to old scheme to check for diffs …
Jul 29, 2020
d3815c4
Update LP to debug issues related to calculation of dh in shape option 0
Jul 29, 2020
a2e0636
Add Lake Shape arguments to READ_CHROUTING1 et al
rcabell Jul 30, 2020
79260ed
removed print statments used for testing lake shape option
Aug 18, 2020
2de7eff
fixed typo in lake shape options rectangular --> triangular
Sep 16, 2020
aef24cb
Update module_HYDRO_io.F
BahramKhazaei-NOAA Jun 17, 2021
bc67979
Update module_HYDRO_io.F
BahramKhazaei-NOAA Jun 17, 2021
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
14 changes: 10 additions & 4 deletions trunk/NDHMS/Data_Rec/module_namelist.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ subroutine read_rt_nlst(nlst)
GWBASESWCRT, GW_RESTART,RSTRT_SWC,TERADJ_SOLAR, &
sys_cpl, rst_typ, rst_bi_in, rst_bi_out, &
gwChanCondSw, GwPreCycles, GwSpinCycles, GwPreDiagInterval, gwsoilcpl, &
UDMP_OPT, io_form_outputs, bucket_loss
UDMP_OPT, io_form_outputs, bucket_loss, &
lake_shape_option
real:: DTRT_TER,DTRT_CH,dxrt, gwChanCondConstIn, gwChanCondConstOut, gwIhShift
character(len=256) :: route_topo_f=""
character(len=256) :: route_chan_f=""
Expand Down Expand Up @@ -138,8 +139,8 @@ subroutine read_rt_nlst(nlst)
CHRTOUT_DOMAIN,CHANOBS_DOMAIN,CHRTOUT_GRID,LSMOUT_DOMAIN,&
RTOUT_DOMAIN, output_gw, outlake, &
frxst_pts_out, udmap_file, UDMP_OPT, GWBUCKPARM_file, bucket_loss, &
io_config_outputs, io_form_outputs, hydrotbl_f, t0OutputFlag, output_channelBucket_influx

io_config_outputs, io_form_outputs, hydrotbl_f, t0OutputFlag, output_channelBucket_influx, &
lake_shape_option
#ifdef WRF_HYDRO_NUDGING
namelist /NUDGING_nlist/ nudgingParamFile, netwkReExFile, &
readTimesliceParallel, temporalPersistence, &
Expand Down Expand Up @@ -359,6 +360,7 @@ subroutine read_rt_nlst(nlst)
call mpp_land_bcast_int1(RTOUT_DOMAIN)
call mpp_land_bcast_int1(UDMP_OPT)
call mpp_land_bcast_int1(reservoir_data_ingest)
!call mpp_land_bcast_int1(lake_shape_option)
#ifdef WRF_HYDRO_NUDGING
call mpp_land_bcast_char(256, nudgingParamFile )
call mpp_land_bcast_char(256, netwkReExFile )
Expand Down Expand Up @@ -401,6 +403,7 @@ subroutine read_rt_nlst(nlst)
nlst%DTRT_TER = DTRT_TER
nlst%DTRT_CH = DTRT_CH
nlst%DTCT = DTRT_CH ! small time step for grid based channel routing
nlst%lake_shape_option = lake_shape_option

#ifdef MPP_LAND
if(my_id .eq. IO_id) then
Expand Down Expand Up @@ -519,6 +522,7 @@ subroutine read_rt_nlst(nlst)
write(6,*) " nlst%compound_channel ", compound_channel
write(6,*) " nlst%route_lake_f ",route_lake_f
write(6,*) " nlst%reservoir_parameter_file ", reservoir_parameter_file
write(6,*) " nlst%lake_shape_option ", lake_shape_option
write(6,*) " nlst%reservoir_usgs_timeslice_path ", reservoir_usgs_timeslice_path
write(6,*) " nlst%reservoir_usace_timeslice_path ", reservoir_usace_timeslice_path
write(6,*) " nlst%reservoir_observation_lookback_hours ", nlst%reservoir_observation_lookback_hours
Expand Down Expand Up @@ -803,7 +807,9 @@ subroutine rt_nlst_check(nlst)
if (.not. fileExists) call hydro_stop('hydro.namelist ERROR: reservoir_parameter_file not found.')
endif
end if

if( (nlst%lake_shape_option .lt. 0 ) .or. (nlst%lake_shape_option .gt. 3) ) then
call hydro_stop('hydro.namelist ERROR: Invalid lake_shape_option specified')
endif
if(nlst%reservoir_persistence_usgs) then
if(len(trim(nlst%reservoir_usgs_timeslice_path)) .eq. 0) then
call hydro_stop('hydro.namelist ERROR: You MUST specify a reservoir_usgs timeslice_path for reservoir USGS persistence capability.')
Expand Down
3 changes: 2 additions & 1 deletion trunk/NDHMS/Data_Rec/namelist.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@
SUBRTSWCRT, OVRTSWCRT, AGGFACTRT, &
GWBASESWCRT, GW_RESTART,RSTRT_SWC,TERADJ_SOLAR, &
sys_cpl, gwChanCondSw, GwPreCycles, GwSpinCycles, GwPreDiagInterval, &
gwsoilcpl, UDMP_OPT, bucket_loss
gwsoilcpl, UDMP_OPT, bucket_loss, &
lake_shape_option
logical:: GwPreDiag, GwSpinUp
real:: DTRT_TER,DTRT_CH, DTCT, dxrt0, gwChanCondConstIn, gwChanCondConstOut, gwIhShift
character(len=256) :: route_topo_f=""
Expand Down
7 changes: 4 additions & 3 deletions trunk/NDHMS/Data_Rec/rt_include.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,9 +229,10 @@
REAL, allocatable, DIMENSION(:) :: LAKEMAXH !maximum depth (m)
REAL, allocatable, DIMENSION(:) :: WEIRC !coeff of overtop weir
REAL, allocatable, DIMENSION(:) :: WEIRH !depth of Lake coef



REAL, allocatable, DIMENSION(:) :: LAKEMAXDEPTH !max depth (m) based on actual depth
REAL, allocatable, DIMENSION(:) :: LAKEVOL !volume of lake based on bathymetry (km^3)
REAL, allocatable, DIMENSION(:) :: LAKEPOLYA !coefficient a in polynomial function V=a*h^b
REAL, allocatable, DIMENSION(:) :: LAKEPOLYB !coefficient b in polynomial function V=a*h^b

!DJG Modified namelist for routing and agg. variables
real Z_tmp
Expand Down
14 changes: 11 additions & 3 deletions trunk/NDHMS/OrchestratorLayer/config.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,8 @@ module config_base
SUBRTSWCRT,OVRTSWCRT,AGGFACTRT, &
GWBASESWCRT, GW_RESTART,RSTRT_SWC,TERADJ_SOLAR, &
sys_cpl, gwChanCondSw, GwPreCycles, GwSpinCycles, GwPreDiagInterval, &
gwsoilcpl, UDMP_OPT
gwsoilcpl, UDMP_OPT, &
lake_shape_option
logical:: GwPreDiag, GwSpinUp
real:: DTRT_TER,DTRT_CH, DTCT, dxrt0, gwChanCondConstIn, gwChanCondConstOut, gwIhShift
character(len=256) :: route_topo_f=""
Expand Down Expand Up @@ -413,7 +414,9 @@ subroutine rt_nlst_check(self)
if (.not. fileExists) call hydro_stop('hydro.namelist ERROR: reservoir_parameter_file not found.')
endif
end if

if( (self%lake_shape_option .lt. 0 ) .or. (self%lake_shape_option .gt. 3) ) then
call hydro_stop('hydro.namelist ERROR: Invalid lake_shape_option specified')
endif
if(self%reservoir_persistence_usgs) then
if(len(trim(self%reservoir_usgs_timeslice_path)) .eq. 0) then
call hydro_stop('hydro.namelist ERROR: You MUST specify a reservoir_usgs_timeslice_path for &
Expand Down Expand Up @@ -463,6 +466,7 @@ subroutine init_namelist_rt_field(did)
sys_cpl, rst_typ, rst_bi_in, rst_bi_out, &
gwChanCondSw, GwPreCycles, GwSpinCycles, GwPreDiagInterval, gwsoilcpl, &
UDMP_OPT, io_form_outputs, bucket_loss
integer :: lake_shape_option = 0
real:: DTRT_TER,DTRT_CH,dxrt, gwChanCondConstIn, gwChanCondConstOut, gwIhShift
character(len=256) :: route_topo_f=""
character(len=256) :: route_chan_f=""
Expand Down Expand Up @@ -552,7 +556,8 @@ subroutine init_namelist_rt_field(did)
CHRTOUT_DOMAIN,CHANOBS_DOMAIN,CHRTOUT_GRID,LSMOUT_DOMAIN,&
RTOUT_DOMAIN, output_gw, outlake, &
frxst_pts_out, udmap_file, UDMP_OPT, GWBUCKPARM_file, bucket_loss, &
io_config_outputs, io_form_outputs, hydrotbl_f, t0OutputFlag, output_channelBucket_influx
io_config_outputs, io_form_outputs, hydrotbl_f, t0OutputFlag, output_channelBucket_influx, &
lake_shape_option

#ifdef WRF_HYDRO_NUDGING
namelist /NUDGING_nlist/ nudgingParamFile, netwkReExFile, &
Expand Down Expand Up @@ -587,6 +592,7 @@ subroutine init_namelist_rt_field(did)
reservoir_rfc_forecasts = .FALSE.
reservoir_rfc_forecasts_lookback_hours = 24
reservoir_type_specified = .FALSE.
lake_shape_option = 0

#ifdef WRF_HYDRO_NUDGING
! Default values for NUDGING_nlist
Expand Down Expand Up @@ -713,6 +719,7 @@ subroutine init_namelist_rt_field(did)
nlst(did)%DTRT_TER = DTRT_TER
nlst(did)%DTRT_CH = DTRT_CH
nlst(did)%DTCT = DTRT_CH ! small time step for grid based channel routing
nlst(did)%lake_shape_option = lake_shape_option

! Some fields haven't been initialized yet (e.g. DT)

Expand All @@ -735,6 +742,7 @@ subroutine init_namelist_rt_field(did)
call hydro_stop("module_namelist: DT not a multiple of DTRT_CH")
endif


nlst(did)%SUBRTSWCRT = SUBRTSWCRT
nlst(did)%OVRTSWCRT = OVRTSWCRT
nlst(did)%dxrt0 = dxrt
Expand Down
Loading