Skip to content

Check if STEPWTD==0 in NoahMP before mod(timestep,STEPWTD) #1101

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

Merged
davegill merged 6 commits into from
Feb 27, 2020
Merged

Check if STEPWTD==0 in NoahMP before mod(timestep,STEPWTD) #1101

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
f8e9083
Check if STEPWTD==0 in NoahMP before mod(thing,STEPWTD)
davegill Feb 24, 2020
b34d23f
Clean up NoahMP logic for STEPWTD
davegill Feb 25, 2020
3e0d247
Put in STEPWTD mod for surface driver
davegill Feb 25, 2020
ecb7ee6
Add simple opt_run==5 info in two main Registry files
davegill Feb 25, 2020
a869c84
trigger Jenkins, add a comment
davegill Feb 25, 2020
03d84d3
Tweak IF test spaces for jenkins
davegill Feb 27, 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: 1 addition & 1 deletion Registry/Registry.EM_COMMON
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2457,7 +2457,7 @@ rconfig integer calc_clean_atm_diag derived 1 0
rconfig integer dveg namelist,noah_mp 1 4 h "dveg" "dynamic vegetation (1 -> off ; 2 -> on)" ""
rconfig integer opt_crs namelist,noah_mp 1 1 h "opt_crs" "canopy stomatal resistance (1-> Ball-Berry; 2->Jarvis)" ""
rconfig integer opt_btr namelist,noah_mp 1 1 h "opt_btr" "soil moisture factor for stomatal resistance (1-> Noah; 2-> CLM; 3-> SSiB)" ""
rconfig integer opt_run namelist,noah_mp 1 3 h "opt_run" "runoff and groundwater (1->SIMGM; 2->SIMTOP; 3->Schaake96; 4->BATS)" ""
rconfig integer opt_run namelist,noah_mp 1 3 h "opt_run" "runoff and groundwater (1->SIMGM; 2->SIMTOP; 3->Schaake96; 4->BATS; 5->Miguez-Macho & Fan)" ""
rconfig integer opt_sfc namelist,noah_mp 1 1 h "opt_sfc" "surface layer drag coeff (CH & CM) (1->M-O; 2->Chen97)" ""
rconfig integer opt_frz namelist,noah_mp 1 1 h "opt_frz" "supercooled liquid water (1-> NY06; 2->Koren99)" ""
rconfig integer opt_inf namelist,noah_mp 1 1 h "opt_inf" "frozen soil permeability (1-> NY06; 2->Koren99)" ""
Expand Down
2 changes: 1 addition & 1 deletion Registry/Registry.NMM
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1090,7 +1090,7 @@ state real rc_mf ikj misc 1 - r "R
rconfig integer dveg namelist,noah_mp 1 4 h "dveg" "dynamic vegetation (1 -> off ; 2 -> on)" ""
rconfig integer opt_crs namelist,noah_mp 1 1 h "opt_crs" "canopy stomatal resistance (1-> Ball-Berry; 2->Jarvis)" ""
rconfig integer opt_btr namelist,noah_mp 1 1 h "opt_btr" "soil moisture factor for stomatal resistance (1-> Noah; 2-> CLM; 3-> SSiB)" ""
rconfig integer opt_run namelist,noah_mp 1 1 h "opt_run" "runoff and groundwater (1->SIMGM; 2->SIMTOP; 3->Schaake96; 4->BATS)" ""
rconfig integer opt_run namelist,noah_mp 1 1 h "opt_run" "runoff and groundwater (1->SIMGM; 2->SIMTOP; 3->Schaake96; 4->BATS; 5->Miguez-Macho & Fan)" ""
rconfig integer opt_sfc namelist,noah_mp 1 1 h "opt_sfc" "surface layer drag coeff (CH & CM) (1->M-O; 2->Chen97)" ""
rconfig integer opt_frz namelist,noah_mp 1 1 h "opt_frz" "supercooled liquid water (1-> NY06; 2->Koren99)" ""
rconfig integer opt_inf namelist,noah_mp 1 1 h "opt_inf" "frozen soil permeability (1-> NY06; 2->Koren99)" ""
Expand Down
4 changes: 2 additions & 2 deletions dyn_em/module_first_rk_step_part1.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,8 +449,8 @@ SUBROUTINE first_rk_step_part1 ( grid , config_flags &

!gmm halo of wtd and riverflow for leafhydro
#ifdef DM_PARALLEL
IF ( config_flags%sf_surface_physics.eq.NOAHMPSCHEME ) THEN
IF ( config_flags%opt_run.eq.5.and.mod(grid%itimestep,grid%STEPWTD).eq.0 ) THEN
IF ( ( config_flags%sf_surface_physics.eq.NOAHMPSCHEME ) .and. ( config_flags%opt_run.eq.5 ) ) THEN
IF ( mod(grid%itimestep,grid%STEPWTD).eq.0 ) THEN
# include "HALO_EM_HYDRO_NOAHMP.inc"
ENDIF
ENDIF
Expand Down
6 changes: 4 additions & 2 deletions phys/module_surface_driver.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3100,7 +3100,8 @@ SUBROUTINE surface_driver( &

ENDIF

if(iopt_run.eq.5.and.mod(itimestep,STEPWTD).eq.0)then
IF ( iopt_run .EQ. 5 ) THEN
IF ( MOD(itimestep,STEPWTD) .EQ. 0 ) THEN ! STEPWTD always and only non-zero for iopt_run == 5
CALL wrf_debug( 100, 'calling WTABLE' )

!gmm update wtable from lateral flow and shed water to rivers
Expand All @@ -3115,7 +3116,8 @@ SUBROUTINE surface_driver( &
ims,ime, jms,jme, kms,kme, &
i_start(ij),i_end(ij), j_start(ij),j_end(ij), kts,kte )

endif
END IF
END IF

call seaice_noah( SEAICE_ALBEDO_OPT, SEAICE_ALBEDO_DEFAULT, SEAICE_THICKNESS_OPT, &
& SEAICE_THICKNESS_DEFAULT, SEAICE_SNOWDEPTH_OPT, &
Expand Down