-
Notifications
You must be signed in to change notification settings - Fork 7
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.
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
add checks on snow states after application of LDAS increments; StieglitzSnow cleanup #834
Merged
sdrabenh
merged 48 commits into
develop
from
feature/rreichle/snow_check_after_apply_LDAS_incr
Oct 18, 2023
Merged
add checks on snow states after application of LDAS increments; StieglitzSnow cleanup #834
sdrabenh
merged 48 commits into
develop
from
feature/rreichle/snow_check_after_apply_LDAS_incr
Oct 18, 2023
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
…) lines of code, added documentation
…ch_incr.F90, StieglitzSnow.F90, GEOS_CatchGridComp.F90)
…now() (StieglitzSnow.F90)
…0-diff compatibility with LDAS) (catch_incr.F90)
Converting back to draft so I can finish the non-essential cleanup, now that we're not furloughed. |
…; added scalar version of StieglitzSnow_calc_asnow
…w.F90, catch_incr.F90); replaced hardwired N_snow value with parameter (GEOS_Catch*GridComp.F90)
… StieglitzSnow_calc_tpsnow[_vector] while maintaining existing differences between the two subroutines
…c_tpsnow() (formerly get_tf0d)
gmao-rreichle
commented
Oct 6, 2023
..._GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatchCN_GridComp/Shared/catchmentCN.F90
Outdated
Show resolved
Hide resolved
gmao-rreichle
commented
Oct 6, 2023
GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Shared/StieglitzSnow.F90
Outdated
Show resolved
Hide resolved
- changed interface and functionality of StieglitzSnow_relayer() - revised handling of snow layer target thickness for Catchment - renamed CATCH_SNWALB_* constants to CATCH_SNOW_* - renamed CATCH_MAXSNDEPTH to CATCH_SNOW_MAXDEPTH - removed obsolete CATCH_SCONST; commented out obsolete code block for ITYP==9 - added missing intent(out) for hcorr in snowrt() - added documentation in snowrt() - removed bad and commented-out subroutines calc_tsurf() and calc_etotl() from catchmentCN.F90
…S_LandIceGridComp.F90)
… comment (catch_incr.F90)
…eglitzSnow.F90, catchment[CN].F90, GEOS_LandIceGridComp.F90)
…ime (StieglitzSnow.F90)
biljanaorescanin
approved these changes
Oct 17, 2023
@sdrabenh this PR is ready for your review. |
lcandre2
approved these changes
Oct 17, 2023
sdrabenh
approved these changes
Oct 18, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
0 diff
The changes in this pull request have verified to be zero-diff with the target branch.
cleanup
documentation
Improvements or additions to documentation
enhancement
New feature or request
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.
Summary of changes:
Adds checks on snow states after application of LDAS increments from MODIS snow cover assimilation in coupled land-atm system (
catch_incr.F90
).Adds FICE[n] exports from Catchment (supersedes additional snow module exports from Catchment #814)
0-diff cleanup and documentation of
StieglitzSnow.F90
:GEOS_LandIceGridComp.F90
to avoid confusionGEOS_Catch[*]GridComp.F90
Fixes file permissions of
SurfParams.F90
andGEOS_SurfaceGridComp.rc
.Removes obsolete variables and use statements (catchment[CN].F90, GEOS_LandIceGridComp.F90, lsm_routines.F90)
Removes suspicious catchcn_calc_*() subroutines in catchmentCN.F90
Testing to date:
tested successfully for GEOSldas on Oct 6 (after 667edae) by @gmao-rreichle (requires eponymous GEOSldas add checks on snow states after application of LDAS increments GEOSldas#676); tests with aggressive compilation have round-off differences
retested successfully for GEOSldas Intel-only on Oct 15 (after 48ff3cf) by @gmao-rreichle
fully tested by @biljanaorescanin on 16/17 Oct 2023
@rdkoster @biljanaorescanin @weiyuan-jiang @lcandre2 @saraqzhang