Skip to content

Commit

Permalink
Merge tag 'ctsm5.3.002' into add_timestamp_to_rpointers
Browse files Browse the repository at this point in the history
Same as ctsm5.3.001

I made an accidental merge and reverted it.
  • Loading branch information
jedwards4b committed Sep 30, 2024
2 parents 887ceb8 + 16cf4ac commit cddf7e7
Show file tree
Hide file tree
Showing 43 changed files with 473 additions and 757 deletions.
2 changes: 1 addition & 1 deletion bld/unit_testers/build-namelist_test.pl
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ sub cat_and_create_namelistinfile {
#
# Figure out number of tests that will run
#
my $ntests = 3994;
my $ntests = 3997;

if ( defined($opts{'compare'}) ) {
$ntests += 2437;
Expand Down
51 changes: 51 additions & 0 deletions cime_config/testdefs/ExpectedTestFails.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,50 @@
</test>

<!-- aux_clm test suite failures -->
<test name="SMS_Ld2_D_PS.f09_g17.I1850Clm50BgcCropCmip6.derecho_intel.clm-basic_interp">
<phase name="RUN">
<status>FAIL</status>
<issue>#2787</issue>
<comment>The issue shows how to fix it.</comment>
</phase>
</test>
<test name="ERS_Ly3.f10_f10_mg37.I1850Clm50BgcCropCmip6.derecho_intel.clm-basic">
<phase name="RUN">
<status>FAIL</status>
<issue>#2787</issue>
<comment>The issue shows how to fix it.</comment>
</phase>
</test>
<test name="SMS_Lm1.f10_f10_mg37.I1850Clm50BgcCropCmip6waccm.derecho_gnu.clm-basic">
<phase name="RUN">
<status>FAIL</status>
<issue>#2787</issue>
<comment>The issue shows how to fix it.</comment>
</phase>
</test>

<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>#2780</issue>
<comment>Crashes in the matrix solver.</comment>
</phase>
</test>
<test name="SMS_Ld10_D_Mmpi-serial.CLM_USRDAT.I1PtClm60Bgc.derecho_gnu.clm-default--clm-NEON-HARV--clm-matrixcnOn">
<phase name="RUN">
<status>FAIL</status>
<issue>#2780</issue>
<comment>Crashes in the matrix solver.</comment>
</phase>
</test>
<test name="SMS_D.1x1_brazil.I1850Clm60BgcCrop.derecho_gnu.clm-mimics_matrixcn">
<phase name="RUN">
<status>FAIL</status>
<issue>#2780</issue>
<comment>Crashes in the matrix solver.</comment>
</phase>
</test>

<test name="ERP_P64x2_Lm13.f10_f10_mg37.IHistClm60Bgc.derecho_intel.clm-monthly--clm-matrixcnOn_ignore_warnings">
<phase name="BASELINE">
<status>FAIL</status>
Expand All @@ -51,6 +95,13 @@
<comment>This failure relates to the preceding ERP failure.</comment>
</phase>
</test>
<test name="REP_P64x2_Lm13.f10_f10_mg37.IHistClm60Bgc.derecho_intel.clm-monthly--clm-matrixcnOn_ignore_warnings">
<phase name="BASELINE">
<status>FAIL</status>
<issue>#2619</issue>
<comment>This failure relates to the preceding ERP failure.</comment>
</phase>
</test>

<test name="PEM_D_Ld9.ne30pg3_t232.I1850Clm60BgcCropG.derecho_intel.clm-clm60cam7LndTuningMode">
<phase name="COMPARE_base_modpes">
Expand Down
85 changes: 85 additions & 0 deletions doc/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,4 +1,89 @@
===============================================================
Tag name: ctsm5.3.001
Originator(s): slevis (Samuel Levis,UCAR/TSS,303-665-1310)
Date: Thu 26 Sep 2024 03:10:40 PM MDT
One-line Summary: Merge b4b-dev

Purpose and description of changes
----------------------------------

- Keith fixed comments on urban thermal variables.
- Sam R removed references to PTCLM*.
- Sam R made updates to the documentation.
- Sam R made improvements to mesh_plotter.
- Matvey and Sam R worked on hillslope hydrology warnings.
- Matvey added a test and a warning.

Significant changes to scientifically-supported configurations
--------------------------------------------------------------

Does this tag change answers significantly for any of the following physics configurations?
(Details of any changes will be given in the "Answer changes" section below.)

[Put an [X] in the box for any configuration with significant answer changes.]

[ ] clm6_0

[ ] clm5_1

[ ] clm5_0

[ ] ctsm5_0-nwp

[ ] clm4_5


Bugs fixed
----------
List of CTSM issues fixed (include CTSM Issue # and description) [one per line]:
PR #2770 documentation fixes and improvements
PR #2772 mesh_plotter improvements
PR #2765 fix comments on urban thermal variables
PR #2703 add a namelist warning

Notes of particular relevance for users
---------------------------------------
Changes to documentation:
Yes, see "bugs fixed" above.


Notes of particular relevance for developers:
---------------------------------------------
Changes to tests or testing:
Test(s) added to bld/unit_testers/build-namelist_test.pl


Testing summary:
----------------

[PASS means all tests PASS; OK means tests PASS other than expected fails.]

build-namelist tests (if CLMBuildNamelist.pm has changed):

derecho - PASS

python testing (if python code has changed; see instructions in python/README.md; document testing done):

derecho - PASS

regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing):

derecho ----- OK
izumi ------- OK


Answer changes
--------------
Changes answers relative to baseline: No


Other details
-------------
Pull Requests that document the changes (include PR ids):
https://github.com/ESCOMP/ctsm/pull/2792

===============================================================
===============================================================
Tag name: ctsm5.3.0
Originator(s): multiple (see below)
Date: Wed 25 Sep 2024 01:22:06 AM MDT
Expand Down
1 change: 1 addition & 0 deletions doc/ChangeSum
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Tag Who Date Summary
============================================================================================================================
ctsm5.3.001 multiple 09/26/2024 Merge b4b-dev
ctsm5.3.0 multiple 09/24/2024 Update surface datasets, CN Matrix, CLM60: excess ice on, explicit A/C on, crop calendars, Sturm snow, Leung dust emissions, prigent roughness data
ctsm5.2.029 multiple 09/24/2024 New surface datasets: double tag of ctsm5.3.0
ctsm5.2.028 rgknox 09/05/2024 FATES history flushing update
Expand Down
98 changes: 0 additions & 98 deletions doc/source/how-to-make-mesh.md

This file was deleted.

Loading

0 comments on commit cddf7e7

Please sign in to comment.