Check if STEPWTD==0 in NoahMP before mod(timestep,STEPWTD)#1101
Merged
davegill merged 6 commits intowrf-model:developfrom Feb 27, 2020
Merged
Check if STEPWTD==0 in NoahMP before mod(timestep,STEPWTD)#1101davegill merged 6 commits intowrf-model:developfrom
davegill merged 6 commits intowrf-model:developfrom
Conversation
TYPE: bug fix KEYWORDS: NoahMP, STEPWTD, mod SOURCE: internal DESCRIPTION OF CHANGES: Problem: There were two places in the WRF code that tested for mod(itimestep,STEPWTD). If STEPWTD==0, then this is an error. Solution: Around each if test, just verify that STEPWTD is not zero before proceeding. LIST OF MODIFIED FILES: modified: dyn_em/module_first_rk_step_part1.F modified: phys/module_surface_driver.F TESTS CONDUCTED: 1. All tests with NoahMP fail with STEPWTD==0 (the default) without fix. 2. All tests pass with this fix.
davegill
changed the title
Contributor
Author
|
@barlage @dudhia @weiwangncar |
barlage
reviewed
Feb 24, 2020
barlage
reviewed
Feb 24, 2020
barlage
reviewed
Feb 24, 2020
barlage
reviewed
Feb 24, 2020
Contributor
|
Looks good, @davegill |
modified: Registry/Registry.EM_COMMON modified: Registry/Registry.NMM
weiwangncar
approved these changes
Feb 25, 2020
smileMchen
added a commit
that referenced
this pull request
Mar 10, 2020
TYPE: bug fix KEYWORDS: NoahMP, opt_run option SOURCE: internal DESCRIPTION OF CHANGES: Problem: When running the NoahMP scheme with the ground water option (opt_run=5), the STEPWTD variable is initialized to a non-zero value. However when opt_run!=5, then the STEPWTD variable remains an uninitialized zero value. In the WRF source code, there are a couple of places where mod(x,STEPWTD) occurs. This causes an immediate "divide by zero" error in the first call to the surface driver. Solution: The IF test logic is re-arranged so that only when opt_run=5 (which means that STEPWTD is non-zero) is there a second IF test (using mod(x,STEPWTD)) to compute whether additional processing takes place. This modification was made separately to the develop branch after the branch release-v4.1.4 was released. See #1101. The purpose of this modification is to allow users access to the latest v4.1.* branch that works with NoahMP. As this will be a single issue release, the README and inc/version_decl are also modified in preparation for the release of WRF release-v4.1.5 with this PR. LIST OF MODIFIED FILES: M dyn_em/module_first_rk_step_part1.F M phys/module_surface_driver.F M README M inc/version_decl TESTS CONDUCTED: Jenkins test PASS (positively tests NoahMP) Regression test in NCAR-MMM classroom machine PASS.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
TYPE: bug fix
KEYWORDS: NoahMP, STEPWTD, mod
SOURCE: internal
DESCRIPTION OF CHANGES:
Problem:
There were two places in the WRF code that tested for mod(itimestep,STEPWTD).
If STEPWTD==0, then this is an error.
Solution:
The correct test order is defined as
LIST OF MODIFIED FILES:
modified: Registry/Registry.EM_COMMON
modified: Registry/Registry.NMM
modified: dyn_em/module_first_rk_step_part1.F
modified: phys/module_surface_driver.F
TESTS CONDUCTED: