Merge 4.1.5 #46
Merged
Merge 4.1.5 #46
Conversation
This file contains 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
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 wrf-model#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.
Finalize WRFV4.1.5 by merging bug fixes from release-v4.1.5 branch into master
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Note that the only code changes from upstream are compiler related and had already been applied in WRF-CMake, hence WRF-CMake 4.1.5 is equal to 4.1.4, modulo formatting and bumping of version number.