Skip to content

Commit

Permalink
Merge branch 'b4b-dev' into reduce-log-noise-2736
Browse files Browse the repository at this point in the history
  • Loading branch information
@samsrabin
samsrabin committed Jan 27, 2025
2 parents 75c423b + 6b49dc2 commit 5190ee0
Show file tree
Hide file tree
Showing 23 changed files with 692 additions and 601 deletions.
1 change: 1 addition & 0 deletions .git-blame-ignore-revs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ d866510188d26d51bcd6d37239283db690af7e82
e096358c832ab292ddfd22dd5878826c7c788968
475831f0fb0e31e97f630eac4e078c886558b61c
fd5f177131d63d39e79a13918390bdfb642d781e
a51816e0de380300b69db9fc3e2c7fa83b267b64
# Ran SystemTests and python/ctsm through black python formatter
5364ad66eaceb55dde2d3d598fe4ce37ac83a93c
8056ae649c1b37f5e10aaaac79005d6e3a8b2380
Expand Down
4 changes: 2 additions & 2 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@ fxDONOTUSEurl = https://github.com/ESCOMP/CISM-wrapper
[submodule "rtm"]
path = components/rtm
url = https://github.com/ESCOMP/RTM
fxtag = rtm1_0_80
fxtag = rtm1_0_86
fxrequired = ToplevelRequired
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
fxDONOTUSEurl = https://github.com/ESCOMP/RTM

[submodule "mosart"]
path = components/mosart
url = https://github.com/ESCOMP/MOSART
fxtag = mosart1.1.02
fxtag = mosart1.1.07
fxrequired = ToplevelRequired
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
fxDONOTUSEurl = https://github.com/ESCOMP/MOSART
Expand Down
63 changes: 29 additions & 34 deletions WhatsNewInCTSM5.3.md
View file
Original file line number Diff line number Diff line change
@@ -1,53 +1,48 @@
Purpose and description of changes since ctsm5.2.005
----------------------------------------------------
# What's new in CTSM 5.3 (tag `ctsm5.3.0`)

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.
## Purpose and description of changes since CTSM 5.2 (tag `ctsm5.2.005`)
- Adds CN Matrix method to speed up spinup for the BGC model.
- Updates surface datasets.
- Brings in new Leung 2023 dust emissions.
- Adds explicit air conditioning for the urban model.
- Updates crop calendars.
- Updates fire model with various improvements, including default parameterization against climate reanalysis from CRU-JRA instead of GSWP.
- FATES compsets can now be run with transient land use.

Changes to CTSM Infrastructure:
===============================
These changes were needed ahead of the CESM3 capability/functionality "chill". For `clm6_0` physics these options are now turned on by default, in addition to Sturm snow and excess ice.

- manage_externals removed and replaced by git-fleximod
- Ability to handle CAM7 in LND_TUNING_MODE
## 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 CTSM answers

Changes to defaults for clm6_0 physics:
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
- Snow thermal conductivity method is now `Sturm_1997`
- New initial conditions file for f09 ("1-degree") 1850, with more in progress
- New crop calendars
- Dust emissions is now Leung_2023
- Dust emissions method is now `Leung_2023`
- Excess ice is turned on
- Updates to MEGAN for BVOC's
- Updates to MEGAN for BVOCs
- 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
- 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
- Add the option for using Matrix CN method for Carbon/Nitrogen BGC spinup

New surface datasets:
=====================
## 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
- 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.
- Fix an important bug on soil fields that was there since `ctsm5.2.0`. This has the side effect of `mksurfdata_esmf` now giving identical answers with a change in number of processors, as it should.
- Surface datasets now provided for the `ne0np4.POLARCAP.ne30x4` grid.
- Surface datasets now have their version number embedded to prevent mismatch of surface dataset and CTSM version.
- Remove the `--hires_pft` option from `mksurfdata_esmf` as we don't have the datasets for it.
- Remove `VIC` fields from surface datasets.
- Updates to input datasets in PFT/LAI/soil-color raw datasets (now from the TRENDY2024 timeseries that ends in 2023), as well as two fire datasets (crop fire peak month, peatland fraction), and the glacier behavior dataset.

229 changes: 8 additions & 221 deletions cime_config/testdefs/ExpectedTestFails.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,28 +126,7 @@
<issue>#2310</issue>
</phase>
</test>

<test name="ERP_P64x2_Ld765.f10_f10_mg37.I2000Clm60BgcCrop.derecho_intel.clm-monthly">
<phase name="RUN">
<status>FAIL</status>
<issue>#2914</issue>
</phase>
</test>

<test name="ERS_P128x1_Ld765.f10_f10_mg37.I2000Clm60Fates.derecho_intel.clm-FatesColdNoComp">
<phase name="RUN">
<status>FAIL</status>
<issue>#2914</issue>
</phase>
</test>

<test name="LILACSMOKE_D_Ld2.f10_f10_mg37.I2000Ctsm50NwpSpAsRs.derecho_intel.clm-lilac">
<phase name="MODEL_BUILD">
<status>FAIL</status>
<issue>#2905</issue>
</phase>
</test>


<test name="SMS_Ld10_D_Mmpi-serial.CLM_USRDAT.I1PtClm60Bgc.derecho_gnu.clm-NEON-MOAB--clm-PRISM">
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
Expand Down Expand Up @@ -187,212 +166,31 @@
</phase>
</test>

<test name="SMS_Ld10_D_Mmpi-serial.CLM_USRDAT.I1PtClm60Bgc.izumi_nag.clm-default--clm-NEON-HARV--clm-matrixcnOn">
<test name="SSP_Ld4.f09_g17.I1850Clm50BgcCrop.derecho_intel.clm-ciso_rtmColdSSP">
<phase name="RUN">
<status>FAIL</status>
<issue>#2310</issue>
<issue>#2913</issue>
</phase>
</test>

<test name="SMS_Ld10_D_Mmpi-serial.CLM_USRDAT.I1PtClm60Bgc.izumi_nag.clm-NEON-MOAB--clm-PRISM">
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2310</issue>
</phase>
<test name="SMS_Ld10_D_Mmpi-serial.CLM_USRDAT.I1PtClm60Bgc.izumi_nag.clm-default--clm-NEON-HARV--clm-matrixcnOn">
<phase name="RUN">
<status>FAIL</status>
<issue>#2310</issue>
</phase>
</test>


<!--- Izumi mpi-serial tests failing for me -->

<test name='ERS_D_Ld5_Mmpi-serial.1x1_vancouverCAN.I1PtClm50SpRs.izumi_nag.clm-CLM1PTStartDate' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='ERS_D_Ld7_Mmpi-serial.1x1_smallvilleIA.IHistClm50BgcCropRs.izumi_intel.clm-decStart1851_noinitial' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='ERS_D_Mmpi-serial_Ld5.1x1_brazil.I2000Clm50FatesRs.izumi_nag.clm-FatesCold' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='ERS_Ld1200_Mmpi-serial.1x1_numaIA.I2000Clm50BgcCropQianRs.izumi_gnu.clm-cropMonthlyNoinitial' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='ERS_Ld1600_Mmpi-serial.1x1_numaIA.I2000Clm50BgcCropQianRs.izumi_intel.clm-cropMonthlyNoinitial' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='ERS_Ld600_Mmpi-serial.1x1_smallvilleIA.I1850Clm50BgcCrop.izumi_gnu.clm-cropMonthlyNoinitial' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='ERS_Ly20_Mmpi-serial.1x1_numaIA.I2000Clm50BgcCropQianRs.izumi_intel.clm-cropMonthlyNoinitial' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='ERS_Ly20_Mmpi-serial.1x1_numaIA.I2000Clm50BgcCropQianRs.izumi_intel.clm-cropMonthlyNoinitial--clm-matrixcnOn' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='ERS_Ly3_Mmpi-serial.1x1_smallvilleIA.IHistClm50BgcCropQianRs.izumi_gnu.clm-cropMonthOutput' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='ERS_Ly5_Mmpi-serial.1x1_smallvilleIA.I1850Clm50BgcCrop.izumi_gnu.clm-ciso_monthly' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='ERS_Ly5_Mmpi-serial.1x1_smallvilleIA.I1850Clm50BgcCrop.izumi_gnu.clm-ciso_monthly--clm-matrixcnOn' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='ERS_Ly6_Mmpi-serial.1x1_smallvilleIA.IHistClm50BgcCropQianRs.izumi_intel.clm-cropMonthOutput' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='ERS_Ly6_Mmpi-serial.1x1_smallvilleIA.IHistClm50BgcCropQianRs.izumi_intel.clm-cropMonthOutput--clm-matrixcnOn_ignore_warnings' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='SMS_D_Ld1_Mmpi-serial.f45_f45_mg37.I2000Clm50SpRs.izumi_gnu.clm-ptsRLA' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='SMS_D_Ld1_Mmpi-serial.f45_f45_mg37.I2000Clm50SpRs.izumi_gnu.clm-ptsROA' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='SMS_D_Ld1_Mmpi-serial.f45_f45_mg37.I2000Clm50SpRs.izumi_nag.clm-ptsRLA' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='SMS_D_Ly6_Mmpi-serial.1x1_smallvilleIA.IHistClm45BgcCropQianRs.izumi_intel.clm-cropMonthOutput' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='SMS_D_Mmpi-serial_Ld5.5x5_amazon.I2000Clm60FatesRs.izumi_nag.clm-FatesCold' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='SMS_Ld10_D_Mmpi-serial.CLM_USRDAT.I1PtClm60SpRs.izumi_nag.clm-default--clm-NEON-TOOL' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='SMS_Ld5_Mmpi-serial.1x1_brazil.IHistClm60Bgc.izumi_gnu.clm-mimics' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='SMS_Ly3_Mmpi-serial.1x1_numaIA.I2000Clm50BgcDvCropQianRs.izumi_gnu.clm-ignor_warn_cropMonthOutputColdStart' >
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
</phase>
</test>


<test name='SMS_Ly5_Mmpi-serial.1x1_brazil.IHistClm50BgcQianRs.izumi_intel.clm-newton_krylov_spinup' >
<test name="SMS_Ld10_D_Mmpi-serial.CLM_USRDAT.I1PtClm60Bgc.izumi_nag.clm-NEON-MOAB--clm-PRISM">
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2916</issue>
<issue>#2310</issue>
</phase>
</test>


<test name='SMS_Ly5_Mmpi-serial.1x1_smallvilleIA.IHistClm60BgcCropQianRs.izumi_gnu.clm-gregorian_cropMonthOutput' >
<phase name="SHAREDLIB_BUILD">
<phase name="RUN">
<status>FAIL</status>
<issue>#2916</issue>
<issue>#2310</issue>
</phase>
</test>

<!-- End of Izumi mpi-serial tests failing -->

<test name="SMS_Ld10_D_Mmpi-serial.CLM_USRDAT.I1PtClm60Fates.derecho_gnu.clm-FatesPRISM--clm-NEON-FATES-YELL">
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
Expand Down Expand Up @@ -423,23 +221,12 @@
</test>

<test name="ERS_D_Ld20.f45_f45_mg37.I2000Clm50FatesRs.izumi_nag.clm-FatesColdTwoStream">
<phase name="CREATE_NEWCASE">
<status>FAIL</status>
<issue>#2454</issue>
</phase>
<phase name="COMPARE_base_rest">
<status>FAIL</status>
<issue>#2325</issue>
</phase>
</test>

<test name="SMS_Lm3_D_Mmpi-serial.1x1_brazil.I2000Clm50FatesCruRsGs.izumi_intel.clm-FatesColdHydro">
<phase name="CREATE_NEWCASE">
<status>FAIL</status>
<issue>#2454</issue>
</phase>
</test>

<test name="ERS_Ld60.f45_f45_mg37.I2000Clm50FatesCruRsGs.derecho_intel.clm-FatesColdST3">
<phase name="RUN">
<status>FAIL</status>
Expand Down
Loading

0 comments on commit 5190ee0

Please sign in to comment.