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.

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
merged 48 commits into from
Oct 18, 2023

Conversation

gmao-rreichle
Copy link
Contributor

@gmao-rreichle gmao-rreichle commented Sep 29, 2023

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:

    • adds missing "implicit none" to StieglitzSnow module
    • improves handling and naming of some public/private constants (CATCH_SNOW_*)
    • changed interface and functionality of StieglitzSnow_relayer() for use in LDAS
    • revises interface of snowrt() to group arguments with matching intent; add missing intent statement
    • fixes indentation (best to hide white-space differences when viewing changes!)
    • removes obsolete (commented-out) lines of code and constants
    • use StieglitzSnow_calc_asnow() instead of writing out equation each time
    • adds "module procedure" interface for StieglitzSnow_calc_asnow() to facilitate scalar and vector inputs and outputs
    • adds "module procedure" interface for StieglitzSnow_calc_tpsnow() for scalar/vector inputs [but maintains different if condition thresholds used in the original scalar (get_tf0d) and vector (get_tf_nd) subroutines for now
    • renames some public StieglitzSnow subroutines for clarity
    • cleanup of module use statements related to StieglitzSnow
    • adds documentation
    • removes commented-out and obsolete copy of StieglitzSnow subroutines from GEOS_LandIceGridComp.F90 to avoid confusion
    • replaces hard-wired number of snow layers ("3") with parameter in GEOS_Catch[*]GridComp.F90
  • Fixes file permissions of SurfParams.F90 and GEOS_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:


@rdkoster @biljanaorescanin @weiyuan-jiang @lcandre2 @saraqzhang

@gmao-rreichle gmao-rreichle added documentation Improvements or additions to documentation enhancement New feature or request 0 diff The changes in this pull request have verified to be zero-diff with the target branch. cleanup labels Sep 29, 2023
@gmao-rreichle gmao-rreichle self-assigned this Sep 29, 2023
@gmao-rreichle
Copy link
Contributor Author

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)
gmao-rreichle and others added 15 commits October 11, 2023 16:11
- 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
…eglitzSnow.F90, catchment[CN].F90, GEOS_LandIceGridComp.F90)
@gmao-rreichle gmao-rreichle marked this pull request as ready for review October 17, 2023 14:14
@biljanaorescanin
Copy link
Contributor

@sdrabenh this PR is ready for your review.
I did standard testing on it (amip, replay and zero increment replay) and all tests passed.

@sdrabenh sdrabenh merged commit b6b35eb into develop Oct 18, 2023
15 checks passed
@sdrabenh sdrabenh deleted the feature/rreichle/snow_check_after_apply_LDAS_incr branch October 18, 2023 13:33
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants