ctsm5.4.000: Alpha ctsm5.4.cmip7 to master#3638
Conversation
Remove broken FTorch submodule
…minant_in_mksurfdata_esmf
slevis resolved conflicts: tools/mksurfdata_esmf/src/mkagfirepkmonthMod.F90
…k_ctsm54_datasets slevis resolved conflicts: tools/mksurfdata_esmf/gen_mksurfdata_namelist.xml
…esmf Include abm = 13 values when determining dominant abm in mksurfdata_esmf
Merge b4b-dev to master
Merge master to alpha-ctsm5.4.CMIP7
Merge b4b-dev to master slevis resolved conflicts: tools/mksurfdata_esmf/gen_mksurfdata_namelist.xml
Merge master to alpha-ctsm5.4.CMIP7 New tag alpha-ctsm5.4.CMIP7.03.ctsm5.3.063
Update everything needed to make ctsm54 datasets.
Urban mesh was pointing to a 3x3min instead of a 0.25x0.25 file
…duse Add ctsm54 ne30, f09, f19 fsurdat/landuse files to namelist defaults
alpha-ctsm5.4.CMIP7.20.ctsm5.3.085: WhatsNewInCTSM5.4.md
Introduce WhatsNewInCTSM5.4.md and update other documentation: PR #3364
alpha-ctsm5.4.CMIP7.21.ctsm5.3.085: Three user_nl_clm and two .cfg files with ctsm5.4 updates
|
Testing NOTE: I see us possibly renaming the baselines. For now, I named them by the tag that ran them.
I confused myself: Checking mosart with
|
|
@ekluzek testing has finished successfully. Let's look at this together in prep. for merging to master. |
|
ekluzek
left a comment
There was a problem hiding this comment.
Cool, it's really nice to be at this point!
I have a bunch of suggestions for the ChangeLog. We'll go over this together. And we should have you approve the PR since I created it.
….85-to-post-5.4 Update 3 user_nl_clm + 2 .cfg files used in testing plus clean-up PR ESCOMP#3637 resolves Issue ESCOMP#3495 An izumi test failure Issue ESCOMP#3642 Add H2OSNO to fincl1 in AD and SASU modes I did some python testing in this PR. I'm saving the full ctsm5.4 testing for PR ESCOMP#3638, which comes next and has no planned code changes.
slevis-lmwg
left a comment
There was a problem hiding this comment.
Had one last review meeting with @ekluzek and agreed that this is ready for approval.
Merge alpha-ctsm5.4.CMIP7 to master PR ESCOMP#3638 Issue ESCOMP#2851 Update to CMIP7 LULCC forcings (umbrella issue with the main ctsm5.4 checklist) Summary from the ChangeLog -------------------------- Merging alpha-ctsm5.4.CMIP7 to master in preparation for the official ctsm5.4 release. WhatsNewInCTSM5.4.md documents the updates from ctsm5.3.021 (the official ctsm5.3 release) to present and will be updated with the exact ctsm5.4 release tag in the near future, once we identify such tag. Here we summarize updates from ctsm5.3.085 (the most recent tag) to ctsm5.4.000 (the current tag): - Updating ALL the fsurdat/landuse files to version ctsm5.4, though this version is backwards compatible with ctsm5.3 datasets, so ctsm5.3 files can still be used. - Updating "agricultural fire peak month" raw dataset, as well as the algorithm determining this field's dominant values in mksurfdata_esmf - Future scenarios are done using the cmip6 ctsm5.3 surface datasets. The new XML variable CLM_CMIP_ERA controls this. - A few other updates come in as well for clm6_0: * New Initial Condition (IC) files * New parameter file * New crop calendar datasets * Changes to fire parameters along with new fire_method "li2024crujra" * New population density file Contributors: Sam Levis, Peter Lawrence, Erik Kluzek, Will Wieder, Keith Oleson, Sam Rabin, Fang Li See the ChangeLog for notes relevant to users and developers, for testing, for answer changes and pertinent simulations, and for submodule updates.
Merge alpha-ctsm5.4.CMIP7 to master PR ESCOMP#3638 Issue ESCOMP#2851 Update to CMIP7 LULCC forcings (umbrella issue with the main ctsm5.4 checklist) Summary from the ChangeLog -------------------------- Merging alpha-ctsm5.4.CMIP7 to master in preparation for the official ctsm5.4 release. WhatsNewInCTSM5.4.md documents the updates from ctsm5.3.021 (the official ctsm5.3 release) to present and will be updated with the exact ctsm5.4 release tag in the near future, once we identify such tag. Here we summarize updates from ctsm5.3.085 (the most recent tag) to ctsm5.4.000 (the current tag): - Updating ALL the fsurdat/landuse files to version ctsm5.4, though this version is backwards compatible with ctsm5.3 datasets, so ctsm5.3 files can still be used. - Updating "agricultural fire peak month" raw dataset, as well as the algorithm determining this field's dominant values in mksurfdata_esmf - Future scenarios are done using the cmip6 ctsm5.3 surface datasets. The new XML variable CLM_CMIP_ERA controls this. - A few other updates come in as well for clm6_0: * New Initial Condition (IC) files * New parameter file * New crop calendar datasets * Changes to fire parameters along with new fire_method "li2024crujra" * New population density file Contributors: Sam Levis, Peter Lawrence, Erik Kluzek, Will Wieder, Keith Oleson, Sam Rabin, Fang Li See the ChangeLog for notes relevant to users and developers, for testing, for answer changes and pertinent simulations, and for submodule updates. Conflicts: bld/unit_testers/build-namelist_test.pl
Description of changes
This brings the ctsm5.4 alpha branch to master.
This updates ALL of the surface and landuse timeseries datasets to version ctsm5.4
It's backwards compatible with ctsm5.3 datasets though, so older ctsm5.3 files can be used
Future scenarios are done using the cmip6 ctsm5.3 surface datasets. The new XML variable
CLM_CMIP_ERA controls this.
A few other updates come in as well for clm6_0:
Initial Condition (IC) files
New parameter file
New crop calendar datasets
Changes to fire parameters
New population density file
Specific notes
Contributors other than yourself, if any: @slevis-lmwg @wwieder @olyson @samsrabin @lawrencepj1 @lifang0209
@slevis-lmwg did the great bulk of the work here
CTSM Issues Fixed (include github issue #):
A list of issues apply here
Are answers expected to change (and if so in what way)? Yes! New surface datasets means everything will be different
Any User Interface Changes (namelist or namelist defaults changes)? Yes defaults updates
All fsurdat and flanduse_timeseries files updated
Fire parameters update: (li2024gswp3, and li2024crujra fire_method):
- defo_fire_precip_thresh_bet
- cli_scale
- cropfire_a1
IC files: clm6_0 finidat files
IC Interpolation: use_init_interp and init_interp_attributes, init_interp_fill_missing_urban_with_HD==TRUE
Parameter file update, clm6_0
Crop Calendar files updated: stream_fldfilename_cultivar_gdds
Population density updated:
New XML variable added: CLM_CMIP_ERA (cmip6 or cmip7)
SSP Future scenarios can only be run with cmip6 surface/landuse.timeseries datasets
Does this create a need to change or add documentation? Did you do so? Yes Yes at least some updates
Testing performed, if any: Previous alpha tags have had the following test lists run:
aux_clm ctsm_sci mosart rtm fates