add timestamp to rpointer files #2757
Open
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
Merge b4b-dev Some fixes for run_neon that came up in ctsm5.1.dev172. Small bug fix for units of vector format hillslope hydrology. Start adding PLUMBER2 users-mods (NOT functional)
Update submodule tags to pass runoff from cism to rof - Update MOSART, CMEPS, and CISM so CISM runoff goes to ROF rather than CTSM - Update RTM with fix needed for Paleo LGM work Contributors: @mvertens, @jedwards4b, @billsacks, @Katetc, @ekluzek, @slevis-lmwg Fixes ESCOMP#2590 Update CMEPS/MOSART/CISM/RTM tags Fixes ESCOMP/RTM#50 Likely wrong RTM river flux to MOM6 within cesm2_3_beta17 Differences in namelist 'mosart_inparm': missing variable: 'do_rtmflood' missing variable: 'finidat_rtm' missing variable: 'frivinp_rtm' missing variable: 'rtmhist_fexcl1' missing variable: 'rtmhist_fexcl2' missing variable: 'rtmhist_fexcl3' missing variable: 'rtmhist_fincl1' missing variable: 'rtmhist_fincl2' missing variable: 'rtmhist_fincl3' missing variable: 'rtmhist_mfilt' missing variable: 'rtmhist_ndens' missing variable: 'rtmhist_nhtfrq' found extra variable: 'budget_frq' found extra variable: 'fexcl1' found extra variable: 'fexcl2' found extra variable: 'fexcl3' found extra variable: 'fincl1' found extra variable: 'fincl2' found extra variable: 'fincl3' found extra variable: 'finidat' found extra variable: 'frivinp' found extra variable: 'mfilt' found extra variable: 'mosart_euler_calc' found extra variable: 'mosart_tracers' found extra variable: 'ndens' found extra variable: 'nhtfrq' found extra variable: 'use_halo_option' Changes answers - what code configurations: mosart and rtm - what platforms/compilers: all - nature of change: mosart roundoff; rtm larger than roundoff due to bug fix; the latter also affects bgc variables We are ignoring strange diffs from baseline in two tests in variable FATES_TRANSITION_MATRIX_LULU as explained in issue ESCOMP#2656.
Update submodule tags to pass runoff from cism to rof - Update MOSART, CMEPS, and CISM so CISM runoff goes to ROF rather than CTSM - Update RTM with fix needed for Paleo LGM work Contributors: @mvertens, @jedwards4b, @billsacks, @Katetc, @ekluzek, @slevis-lmwg Fixes ESCOMP#2590 Update CMEPS/MOSART/CISM/RTM tags Fixes ESCOMP/RTM#50 Likely wrong RTM river flux to MOM6 within cesm2_3_beta17 Differences in namelist 'mosart_inparm': missing variable: 'do_rtmflood' missing variable: 'finidat_rtm' missing variable: 'frivinp_rtm' missing variable: 'rtmhist_fexcl1' missing variable: 'rtmhist_fexcl2' missing variable: 'rtmhist_fexcl3' missing variable: 'rtmhist_fincl1' missing variable: 'rtmhist_fincl2' missing variable: 'rtmhist_fincl3' missing variable: 'rtmhist_mfilt' missing variable: 'rtmhist_ndens' missing variable: 'rtmhist_nhtfrq' found extra variable: 'budget_frq' found extra variable: 'fexcl1' found extra variable: 'fexcl2' found extra variable: 'fexcl3' found extra variable: 'fincl1' found extra variable: 'fincl2' found extra variable: 'fincl3' found extra variable: 'finidat' found extra variable: 'frivinp' found extra variable: 'mfilt' found extra variable: 'mosart_euler_calc' found extra variable: 'mosart_tracers' found extra variable: 'ndens' found extra variable: 'nhtfrq' found extra variable: 'use_halo_option' Changes answers - what code configurations: mosart and rtm - what platforms/compilers: all - nature of change: mosart roundoff; rtm larger than roundoff due to bug fix; the latter also affects bgc variables We are ignoring strange diffs from baseline in two tests in variable FATES_TRANSITION_MATRIX_LULU as explained in issue ESCOMP#2656.
This moves the land use outputs from the baseline fates testmod into the LUH2 base testmod
This moves one of the FatesColdSatPhen tests to a gnu compiler to provide compiler coverage for issues like ESCOMP#2656. This also adds an nvhpc compiler test to the fates test suite.
This addresses ESCOMP#2656
Same as mksrf_GlacierRegion_10x10min_nomask_cd5_c220131.nc but with GLACIER_REGION=1 (Points outside Greenland itself but which might become ice-covered in an evolving Greenland simulation) merged into GLACIER_REGION 0, then 2 changed to 1 and 3 changed to 2. We are removing the old GLACIER_REGION=1 even though this means we cannot generate SMB in areas outside the initial CISM Greenland ice mask, because it created problematic non-physical behavior. See ESCOMP#423 for details.
We are removing the old second region (in CISM's Greenland domain but outside Greenland itself). So updating the namelist defaults to align with this removal.
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.
- 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
We should use the maximum existing index, without regards for the relative coverage of the different indices.
…region Fix regridding of glacier region
Turn on explicit AC, Leung_2023, and excess ice for clm6 Namelist defaults now turn on excess ice, explicit AC, Leung_2023 in clm6; they also pick up new finidat files for clm6. We use a f09 1850 finidat for all clm6 cases because that's all that we have generated for now.
…o changelog_readme_update
Updates to the ctsm5.3.0 ChangeLog and README files
CTSM5.3.0: New raw pft/lai/glc-behavior/soilcolor/fire datasets
Update surface datasets, CN Matrix, CLM60: excess ice on, explicit A/C on, crop calendars, Sturm snow, Leung dust emissions, prigent roughness data
Purpose and description of changes since ctsm5.2.005
----------------------------------------------------
Bring in updates needed for the CESM3.0 science capability/functionality "chill". Most importantly bringing
in: CN Matrix to speed up spinup for the BGC model, updated surface datasets, updated Leung 2023 dust emissions,
explicit Air Conditioning for the Urban model, updates to crop calendars. For clm6_0 physics these options are now
default turned on in addition to Sturm snow, and excess ice.
Changes to CTSM Infrastructure:
===============================
- manage_externals removed and replaced by git-fleximod
- Ability to handle CAM7 in LND_TUNING_MODE
Changes to CTSM Answers:
========================
Changes to defaults for clm6_0 physics:
- Urban explicit A/C turned on
- Snow thermal conductivity is now Sturm_1997
- New IC file for f09 1850
- New crop calendars
- Dust emissions is now Leung_2023
- Excess ice is turned on
- Updates to MEGAN for BVOC's
- Updates to BGC fire method
Changes for all physics versions:
- Parameter files updated
- FATES parameter file updated
- Glacier region 1 is now undefined
- Update in FATES transient Land use
- Pass active glacier (CISM) runoff directly to river model (MOSART)
- Add the option for using matrix for Carbon/Nitrogen BGC spinup
New surface datasets:
=====================
- With new surface datasets the following GLC fields have region "1" set to UNSET:
glacier_region_behavior, glacier_region_melt_behavior, glacier_region_ice_runoff_behavior
- Updates to allow creating transient landuse timeseries files going back to 1700.
- Fix an important bug on soil fields that was there since ctsm5.2.0. This results in mksurfdata_esmf now giving identical answers with a change in number of processors, as it should.
- Add in creation of ne0np4.POLARCAP.ne30x4 surface datasets.
- Add version to the surface datasets.
- Remove the --hires_pft option from mksurfdata_esmf as we don't have the datasets for it.
- Remove VIC fields from surface datasets.
New input datasets to mksurfdata_esmf:
======================================
- Updates in PFT/LAI/soil-color raw datasets (now from the TRENDY2024 timeseries that ends in 2023), as well as two fire datasets (AG fire, peatland), and the glacier behavior dataset.
slevis resolved 2 conflicts:
doc/source/users_guide/using-clm-tools/building-the-clm-tools.rst
doc/source/users_guide/using-clm-tools/what-are-the-clm-tools.rst
jedwards4b
force-pushed
the
add_timestamp_to_rpointers
branch
from
463bf55
to
25efa68
Compare
jedwards4b
force-pushed
the
add_timestamp_to_rpointers
branch
from
25efa68
to
9f07cf9
Compare
|
I have tested with ERS.ne30pg3_t232.BLT1850.derecho_intel.allactive-defaultio |
|
We discussed this at the CTSM SE meeting this morning and decided it would be in our cesm3_0_beta04 tag, which fits with @jedwards4b's timeline. |
Update surface datasets, CN Matrix, CLM60: excess ice on, explicit A/C on, crop calendars, Sturm snow, Leung dust emissions, prigent roughness data
Purpose and description of changes since ctsm5.2.005
----------------------------------------------------
Bring in updates needed for the CESM3.0 science capability/functionality "chill". Most importantly bringing
in: CN Matrix to speed up spinup for the BGC model, updated surface datasets, updated Leung 2023 dust emissions,
explicit Air Conditioning for the Urban model, updates to crop calendars. For clm6_0 physics these options are now
default turned on in addition to Sturm snow, and excess ice.
Changes to CTSM Infrastructure:
===============================
- manage_externals removed and replaced by git-fleximod
- Ability to handle CAM7 in LND_TUNING_MODE
Changes to CTSM Answers:
========================
Changes to defaults for clm6_0 physics:
- Urban explicit A/C turned on
- Snow thermal conductivity is now Sturm_1997
- New IC file for f09 1850
- New crop calendars
- Dust emissions is now Leung_2023
- Excess ice is turned on
- Updates to MEGAN for BVOC's
- Updates to BGC fire method
Changes for all physics versions:
- Parameter files updated
- FATES parameter file updated
- Glacier region 1 is now undefined
- Update in FATES transient Land use
- Pass active glacier (CISM) runoff directly to river model (MOSART)
- Add the option for using matrix for Carbon/Nitrogen BGC spinup
New surface datasets:
=====================
- With new surface datasets the following GLC fields have region "1" set to UNSET:
glacier_region_behavior, glacier_region_melt_behavior, glacier_region_ice_runoff_behavior
- Updates to allow creating transient landuse timeseries files going back to 1700.
- Fix an important bug on soil fields that was there since ctsm5.2.0. This results in mksurfdata_esmf now giving identical answers with a change in number of processors, as it should.
- Add in creation of ne0np4.POLARCAP.ne30x4 surface datasets.
- Add version to the surface datasets.
- Remove the --hires_pft option from mksurfdata_esmf as we don't have the datasets for it.
- Remove VIC fields from surface datasets.
New input datasets to mksurfdata_esmf:
======================================
- Updates in PFT/LAI/soil-color raw datasets (now from the TRENDY2024 timeseries that ends in 2023), as well as two fire datasets (AG fire, peatland), and the glacier behavior dataset.
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.
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.
Description of changes
Adds a timestamp to rpointer files in a backward compatible manor
Specific notes
Contributors other than yourself, if any:
CTSM Issues Fixed (include github issue #):
Are answers expected to change (and if so in what way)?
no
Any User Interface Changes (namelist or namelist defaults changes)?
Does this create a need to change or add documentation? Did you do so?
Testing performed, if any:
(List what testing you did to show your changes worked as expected)
(This can be manual testing or running of the different test suites)
(Documentation on system testing is here: https://github.com/ESCOMP/ctsm/wiki/System-Testing-Guide)
(aux_clm on derecho for intel/gnu and izumi for intel/gnu/nag/nvhpc is the standard for tags on master)
ERR_Ln9_C3.ne30pg3_ne30pg3_mg17.FLTHIST.derecho_intel.cam-outfrq9s
NOTE: Be sure to check your coding style against the standard
(https://github.com/ESCOMP/ctsm/wiki/CTSM-coding-guidelines) and review
the list of common problems to watch out for
(https://github.com/ESCOMP/CTSM/wiki/List-of-common-problems).