Merge CTSM/b4b-dev into shr_file_to_shr_log #2
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
Get it working with bringing in the CAM drv_flds_in file. And make it not matter on the --megan --drydep --fire_emis options. Also do dust_emis before the other drv_flds_in namelists, so the CAM namelist is loaded.
Plumber.5.2
[Fang summer '24 PR 2.1] More improvements to fire model
We realized that the renumbering of regions could cause silent wrong behavior if a user was using an old user_nl_clm file that specified behaviors for the old 4 regions. So instead, we're keeping the old numbering for the Greenland and Antarctica regions and keeping GLACIER_REGION=1 unused for now.
… issue regarding it
…r clm6_0_cam6.0, that came about due to XML code duplication
- Weaken the consistency checks between icemask and glc_behavior: We no longer require has_virtual_columns and melt_replaced_by_ice - we now only require that we do NOT have (melt_replaced_by_ice_grc .and. .not. has_virtual_columns_grc). - Prevent users from setting the combination of glacier_region_melt_behavior = "replaced_by_ice" with glacier_region_ice_runoff_behavior = "melted". (While there is nothing fundamentally wrong with this combination, it can result in problematic, non-physical fluxes - particularly, a large positive sensible heat flux during glacial melt in regions where the icesheet is not fully dynamic and two-way-coupled; see ESCOMP#423 for details.) - Only update glacier areas and topo values where the glacier region behavior is 'virtual', because that's the only region where we are guaranteed to have all of the elevation classes we need in order to remain in sync. (Note that, for conservation purposes, it's important that we update areas in all regions where we're fully-two-way-coupled to the icesheet and we're computing SMB; this requirement is checked in check_glc2lnd_icemask.) This change is needed now that we no longer require grid cells within the ice mask to have the 'virtual' behavior. - Ensure that glc_dyn_runoff_routing is 0 wherever we're not computing SMB. This change isn't strictly necessary with the current code, because it appears that glc_dyn_runoff_routing is only used within the do_smb filter. However, this change makes the code more robust to future changes. This change is needed now that we no longer require grid cells within the ice mask to have the melt_replaced_by_ice behavior. Also fixes / adds unit tests covering these behavior changes
Merge b4bdev 20240926
Merging b4b-dev to master.
Merge tag 'ctsm5.3.001' into b4b-dev
…0240927 Revert "Merge tag 'ctsm5.3.001' into b4b-dev"
Same as ctsm5.3.001 I made an accidental merge and reverted it.
Merge ctsm5.3.002 to b4b-dev
Fix clm-basic tests
Change testlist_clm ne30pg3_t061 tests to ne30pg3_t232
Remove unused variable elevclass_o in mkglcmecMod.F90
…o fix-namelist-tester
…e all set in fail, warn, and finidat tests
Add check in build-namelist_test.pl
samsrabin
added a commit
that referenced
this pull request
Oct 8, 2024
…ation Remove fates dependency on `do_harvest`
samsrabin
pushed a commit
that referenced
this pull request
Oct 8, 2024
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.
All tested! Once you merge this I should be able to merge ESCOMP#2627.