Skip to content

ne3np4 to namelist_defaults_ctsm.xml and Makefile for PTS mode and add ability for warm starts in PTS mode#2835

Merged
slevis-lmwg merged 215 commits intoESCOMP:cesm3_0_beta04_changesfrom
slevis-lmwg:ne3np4_to_defaults_and_makefile
Feb 4, 2025
Merged

ne3np4 to namelist_defaults_ctsm.xml and Makefile for PTS mode and add ability for warm starts in PTS mode#2835
slevis-lmwg merged 215 commits intoESCOMP:cesm3_0_beta04_changesfrom
slevis-lmwg:ne3np4_to_defaults_and_makefile

Conversation

@slevis-lmwg
Copy link
Contributor

@slevis-lmwg slevis-lmwg commented Oct 16, 2024

Description of changes

Same as title.

Specific notes

Contributors other than yourself, if any:
@jtruesdal

CTSM Issues Fixed (include github issue #):
Fixes #2768

Are answers expected to change (and if so in what way)?
No.

Any User Interface Changes (namelist or namelist defaults changes)?
New fsurdat/landuse files added to the defaults.

Does this create a need to change or add documentation? Did you do so?
No.

Testing performed, if any:
On derecho
PASS Test the addition of the new fsurdat/landuse files to the Makefile with

make crop-global-SSP2-4.5-ne3
make crop-global-1850-low-res
make crop-global-present-low-res

PASS ./build-namelist_test.pl (before and after adding ne3np4 tests)
PASS python testing
PASS clm_pymods

olyson and others added 27 commits June 1, 2023 11:02
Fix unit tests for nstep starting at 1 instead of 0
Add sowing window input files

Previously, one could run crops with either (a) sowing windows defined by the hemisphere-specific start and end dates on the paramfile or (b) prescribed sowing dates specified by input file stream_fldFileName_sdate. This PR replaces the latter with two new input files, stream_fldFileName_swindow_start and stream_fldFileName_swindow_end.
Fix RXCROPMATURITY test in zerothtstep branch
...and other mods that I'm preserving from closed PR ESCOMP#2019, such as
- changes to long_names and
- treating avgflag as a tape (not field) trait for 'I' and 'L' tapes
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.
Same as ctsm5.3.001

I made an accidental merge and reverted it.
@slevis-lmwg slevis-lmwg self-assigned this Oct 16, 2024
@slevis-lmwg
Copy link
Contributor Author

Update this PR to latest ctsm and run testing.

Copy link
Collaborator

@ekluzek ekluzek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@slevis-lmwg and I looked at this some. This has the changes from #2333 so that PR will likely become smaller when this comes in. There still might be something there, and I added a couple things to do there also.

I wasn't sure about all of the allow_scm logic with read and read_noscm and the like. But, I've come around to it. I think all of this is required. So the only thing might be changing the names. But, I think it's clear enough that SCM means Single Column Model, although I do think there might be places where some comments around this might be helpful.

I'm adding approve even with the request for a few comments, just so you don't have to have me reapprove. Anything needed to be addressed could go into #2333.

@slevis-lmwg
Copy link
Contributor Author

slevis-lmwg commented Jan 23, 2025

  • derecho
    OK make black and lint (the latter gives two warnings)
    PASS python
    PASS ./build-namelist_test.pl
    OK ./run_sys_tests -s aux_clm -c ctsm5.3.020 --skip-generate

  • izumi
    FAIL ./run_sys_tests -s aux_clm -c ctsm5.3.020 --skip-generate tests_0128-141113iz
    Resolving FAILs
    I had to submit the following with ./create_test

PASS ERP_D_Ld5.f10_f10_mg37.I1850Clm50Bgc.izumi_intel.clm-nlevgrnd_small--clm-matrixcnOn 
OK ERS_D_Ld20.f45_f45_mg37.I2000Clm50FatesRs.izumi_nag.clm-FatesColdTwoStream

@ekluzek ekluzek changed the title ne3np4 to namelist_defaults_ctsm.xml and Makefile for PTS mode ne3np4 to namelist_defaults_ctsm.xml and Makefile for PTS mode and CTSM warm start coupling with single column mode Feb 4, 2025
@ekluzek ekluzek changed the title ne3np4 to namelist_defaults_ctsm.xml and Makefile for PTS mode and CTSM warm start coupling with single column mode ne3np4 to namelist_defaults_ctsm.xml and Makefile for PTS mode and add ability for warm starts in PTS mode Feb 4, 2025
@slevis-lmwg
Copy link
Contributor Author

I found I had to merge the latest https://github.com/ESCOMP/CTSM/tree/cesm3_0_beta04_changes to this PR's branch. The diffs pertain to CONUS, POLARCAP, and ARCTIC* ctsm_sci tests. I see these as orthogonal to this PR's work, plus ctsm_sci was not part of this PR's testing to begin with. So I will proceed with the merge.

@slevis-lmwg slevis-lmwg merged commit bcaab45 into ESCOMP:cesm3_0_beta04_changes Feb 4, 2025
2 checks passed
@slevis-lmwg slevis-lmwg deleted the ne3np4_to_defaults_and_makefile branch February 4, 2025 22:36
@slevis-lmwg slevis-lmwg restored the ne3np4_to_defaults_and_makefile branch February 4, 2025 22:43
@slevis-lmwg slevis-lmwg deleted the ne3np4_to_defaults_and_makefile branch February 4, 2025 22:45
@slevis-lmwg
Copy link
Contributor Author

@ekluzek I wrapped this up just now. I tried git tag | grep cesm to see if I should make a tag of it, but it doesn't look as though we made any tags in the cesm3_0_beta04_changes branch previously.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bfb bit-for-bit blocker another issue/PR depends on this one size: small

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

Add ne3np4 to list of surface dataset resolutions

10 participants