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

Irrigation clean-up: syntax error, derived nml packaging, protect against div by 0 #1149

Merged
merged 10 commits into from
Apr 6, 2020
Merged

Irrigation clean-up: syntax error, derived nml packaging, protect against div by 0 #1149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
dcccf7f
syntax error in irrigation
davegill Mar 26, 2020
dd1ce3e
fixes for hour=0
Mar 26, 2020
f02ee1b
conventionalize check_a_mundo using "oops" counter
davegill Mar 26, 2020
fd0c066
incremental mods
davegill Mar 26, 2020
23c0778
trigger jenkins
davegill Mar 30, 2020
ab07319
more triggering
davegill Mar 30, 2020
968bc0d
better description of derived namelist variable
davegill Mar 30, 2020
60742db
more comments
davegill Apr 1, 2020
811f75c
consistent spacing in IF test, for jenkins
davegill Apr 3, 2020
ead9501
fixes irrigation module
Apr 6, 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
25 changes: 13 additions & 12 deletions Registry/Registry.EM_COMMON
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2270,15 +2270,16 @@ rconfig integer ra_sw_physics namelist,physics max_domains -1
rconfig real radt namelist,physics max_domains 0 h "RADT" "" ""
rconfig real naer namelist,physics max_domains 1e9 rh "NAER" "" ""
rconfig integer sf_sfclay_physics namelist,physics max_domains -1 rh "sf_sfclay_physics" "" ""
rconfig integer sf_surf_irr_scheme namelist,physics max_domains 0 rh "sf_surf_irr_scheme" "ARI:: 0:no irr 1: drip 2:sprinkler 3:channel" ""
# IRRIGATION
rconfig real irr_daily_amount namelist,physics max_domains 0 rh "sf_surf_irr_scheme WATER AMOUNT [mm]" "" ""
rconfig integer irr_start_hour namelist,physics max_domains 0 rh "sf_surf_irr_scheme, local start" "Local start hour" ""
rconfig integer irr_num_hours namelist,physics max_domains 0 rh "sf_surf_irr_scheme" "Number of hours to irrigate" ""
rconfig integer irr_start_julianday namelist,physics max_domains 0 rh "sf_surf_irr_scheme" "Julian day to start irrigation (included)" ""
rconfig integer irr_end_julianday namelist,physics max_domains 0 rh "sf_surf_irr_scheme" "Julian day to end irrigation (not included)" ""
rconfig integer irr_freq namelist,physics max_domains 1 rh "sf_surf_irr_scheme" "frequency of irrigation in days" ""
rconfig integer irr_ph namelist,physics max_domains 0 rh "sf_surf_irr_scheme" "phase of irrigation, 0:in phase, 1: not in phase" ""
rconfig integer sf_surf_irr_scheme namelist,physics max_domains 0 rh "sf_surf_irr_scheme" "ARI: 0=no irr; 1=drip; 2=sprinkler; 3=channel" ""
rconfig integer sf_surf_irr_alloc derived 1 0 rh "sf_surf_irr_alloc" "sf_surf_irr_scheme, for packaging: 0=no irr; 1=drip; 2=sprinkler; 3=channel" ""
rconfig real irr_daily_amount namelist,physics max_domains 0 rh "irr_daily_amount" "sf_surf_irr_scheme WATER AMOUNT [mm]" ""
rconfig integer irr_start_hour namelist,physics max_domains 0 rh "irr_start_hour" "sf_surf_irr_scheme, local start hour" ""
rconfig integer irr_num_hours namelist,physics max_domains 0 rh "irr_num_hours" "sf_surf_irr_scheme, Number of hours to irrigate" ""
rconfig integer irr_start_julianday namelist,physics max_domains 0 rh "irr_start_julianday" "sf_surf_irr_scheme, Julian day to start irrigation (included)" ""
rconfig integer irr_end_julianday namelist,physics max_domains 0 rh "irr_end_julianday" "sf_surf_irr_scheme, Julian day to end irrigation (not included)" ""
rconfig integer irr_freq namelist,physics max_domains 1 rh "irr_freq" "sf_surf_irr_scheme, frequency of irrigation in days" ""
rconfig integer irr_ph namelist,physics max_domains 0 rh "irr_ph" "sf_surf_irr_scheme, phase of irrigation, 0=in phase; 1=not in phase; 2=not in phase, random" ""


rconfig integer sf_surface_physics namelist,physics max_domains -1 rh "sf_surface_physics" "" ""
Expand Down Expand Up @@ -2912,11 +2913,11 @@ package ssibscheme sf_surface_physics==8 - state:ssib_fm

package noahmpoptcrop2 opt_crop==2 - state:gecros_state

package noahmosaicscheme sf_surface_mosaic==1 - state:TSK_mosaic,QSFC_mosaic,TSLB_mosaic,SMOIS_mosaic,SH2O_mosaic,CANWAT_mosaic,SNOW_mosaic,SNOWH_mosaic,SNOWC_mosaic,ALBEDO_mosaic,ALBBCK_mosaic,EMISS_mosaic,EMBCK_mosaic,ZNT_mosaic,Z0_mosaic,HFX_mosaic,QFX_mosaic,LH_mosaic,GRDFLX_mosaic,SNOTIME_mosaic,TR_URB2D_mosaic,TB_URB2D_mosaic,TG_URB2D_mosaic,TC_URB2D_mosaic,TS_URB2D_mosaic,TS_RUL2D_mosaic,QC_URB2D_mosaic,UC_URB2D_mosaic,TRL_URB3D_mosaic,TBL_URB3D_mosaic,TGL_URB3D_mosaic,SH_URB2D_mosaic,LH_URB2D_mosaic,G_URB2D_mosaic,RN_URB2D_mosaic,mosaic_cat_index,landusef2,smcrel,RS_mosaic,LAI_mosaic
package noahmosaicscheme sf_surface_mosaic==1 - state:TSK_mosaic,QSFC_mosaic,TSLB_mosaic,SMOIS_mosaic,SH2O_mosaic,CANWAT_mosaic,SNOW_mosaic,SNOWH_mosaic,SNOWC_mosaic,ALBEDO_mosaic,ALBBCK_mosaic,EMISS_mosaic,EMBCK_mosaic,ZNT_mosaic,Z0_mosaic,HFX_mosaic,QFX_mosaic,LH_mosaic,GRDFLX_mosaic,SNOTIME_mosaic,TR_URB2D_mosaic,TB_URB2D_mosaic,TG_URB2D_mosaic,TC_URB2D_mosaic,TS_URB2D_mosaic,TS_RUL2D_mosaic,QC_URB2D_mosaic,UC_URB2D_mosaic,TRL_URB3D_mosaic,TBL_URB3D_mosaic,TGL_URB3D_mosaic,SH_URB2D_mosaic,LH_URB2D_mosaic,G_URB2D_mosaic,RN_URB2D_mosaic,mosaic_cat_index,landusef2,smcrel,RS_mosaic,LAI_mosaic
# IRRIGATION
package channel sf_surf_irr_scheme==1 - state:irrigation,irr_rand_field
package drip sf_surf_irr_scheme==2 - state:irrigation,irr_rand_field
package sprinkler sf_surf_irr_scheme==3 - state:irrigation,irr_rand_field
package channel sf_surf_irr_alloc==1 - state:irrigation,irr_rand_field
package drip sf_surf_irr_alloc==2 - state:irrigation,irr_rand_field
package sprinkler sf_surf_irr_alloc==3 - state:irrigation,irr_rand_field


package ysuscheme bl_pbl_physics==1 - -
Expand Down
9 changes: 6 additions & 3 deletions phys/module_irrigation.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,8 @@ SUBROUTINE sprinkler_irrigation( julian_in
INTENT(INOUT) :: &
qr_curr
REAL, INTENT(IN ) :: dt
!
constants_irrigation=irr_freq*irr_daily_amount/(irr_num_hours*3600*rho(a,kms,b)*dz8w(a,kms,b)*100)
end_hour=irr_start_hour+irr_num_hours

xt24=mod(xtime,1440.)
tloc=floor(gmt+xt24/60.)
if(tloc.lt.0) tloc=tloc+24
Expand All @@ -146,7 +146,10 @@ SUBROUTINE sprinkler_irrigation( julian_in
DO a=its, ite
DO b=jts,jte

IF ((tloc.GE.irr_start_hour .AND. tloc.LT.end_hour) .AND. (irrigation(a,b).GE.0.1) .AND. (julian_in.GE.irr_start_julianday .AND. julian_in.LT.irr_end_julianday )) THEN
constants_irrigation=irr_freq*irr_daily_amount/(irr_num_hours*3600*rho(a,kms,b)*dz8w(a,kms,b)*100)
IF ( (tloc.GE.irr_start_hour .AND. tloc.LT.end_hour) .AND. &
(irrigation(a,b).GE.0.1) .AND. &
(julian_in.GE.irr_start_julianday .AND. julian_in.LT.irr_end_julianday ) ) THEN
CALL irr_calc_phase(irr_ph,phase,irr_rand_field_val(a,b),a,b,irrigation(a,b),irr_freq)
IF(irr_ph.EQ.0) THEN
qr_curr(a,kms,b)=qr_curr(a,kms,b)+irrigation(a,b)*constants_irrigation*dt
Expand Down
42 changes: 42 additions & 0 deletions share/module_check_a_mundo.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,6 +441,48 @@ END FUNCTION bep_bem_nbui_max
END IF
ENDDO

!-----------------------------------------------------------------------
! Check that number of hours of daily irrigation is greater than zero.
! This value is used in the denominator to compute the amount of
! irrigated water per timestep, and the default value from the Registry
! is zero. This is a reminder to the user that this value needs to be
! manually set.
!-----------------------------------------------------------------------
oops = 0
DO i = 1, model_config_rec % max_dom
IF ( .NOT. model_config_rec % grid_allowed(i) ) CYCLE
IF ( ( ( model_config_rec % sf_surf_irr_scheme(i) .EQ. CHANNEL ) .OR. &
( model_config_rec % sf_surf_irr_scheme(i) .EQ. SPRINKLER ) .OR. &
( model_config_rec % sf_surf_irr_scheme(i) .EQ. DRIP ) ) .AND. &
( model_config_rec % irr_num_hours(i) .LE. 0 ) ) THEN
oops = oops + 1
END IF
ENDDO

IF ( oops .GT. 0 ) THEN
wrf_err_message = '--- ERROR: irr_num_hours must be greater than zero to work with irrigation'
CALL wrf_message ( wrf_err_message )
count_fatal_error = count_fatal_error + 1
END IF

!-----------------------------------------------------------------------
! Fix derived setting for irrigation. Since users may only want the irrigation
! to be active in the inner-most domain, we have a separate variable that is
! used to define packaging for the irrigation fields.
!-----------------------------------------------------------------------
DO i = 1, model_config_rec % max_dom
IF ( .NOT. model_config_rec % grid_allowed(i) ) CYCLE
IF ( model_config_rec % sf_surf_irr_scheme(i) .EQ. CHANNEL ) THEN
model_config_rec % sf_surf_irr_alloc = CHANNEL
END IF
IF ( model_config_rec % sf_surf_irr_scheme(i) .EQ. SPRINKLER ) THEN
model_config_rec % sf_surf_irr_alloc = SPRINKLER
END IF
IF ( model_config_rec % sf_surf_irr_scheme(i) .EQ. DRIP ) THEN
model_config_rec % sf_surf_irr_alloc = DRIP
END IF
ENDDO

!-----------------------------------------------------------------------
! Check that Deng Shallow Convection Must work with MYJ or MYNN PBL
!-----------------------------------------------------------------------
Expand Down