Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cime_config/config_compsets.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
Where for the CAM specific compsets below the following is supported
TIME = Time period (e.g. 2000, HIST, RCP8...)
ATM = [CAM40, CAM50, CAM60, CAM70]
LND = [CLM45, CLM50, CLM60, SLND]
LND = [CLM50, CLM60, SLND]
ICE = [CICE, DICE, SICE]
OCN = [DOCN, ,AQUAP, SOCN]
ROF = [RTM, SROF]
Expand Down Expand Up @@ -525,7 +525,7 @@

<compset>
<alias>FMOZ</alias>
<lname>2000_CAM40%TMOZ_CLM45%SP_CICE%PRES_DOCN%DOM_RTM_SGLC_SWAV</lname>
<lname>2000_CAM40%TMOZ_CLM50%SP_CICE%PRES_DOCN%DOM_RTM_SGLC_SWAV</lname>
</compset>

<compset>
Expand Down
5 changes: 2 additions & 3 deletions cime_config/testdefs/testlist_cam.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1062,14 +1062,13 @@
<option name="wallclock">00:30:00</option>
</options>
</test>
<!-- 471 -->
<test compset="QPWmaC6" grid="f10_f10_mg37" name="ERC_D_Ln9" testmods="cam/outfrq3s" supported="false">
<test compset="QPWmaC6" grid="f10_f10_mg37" name="ERC_D_Ln9" testmods="cam/outfrq9s_tuvx_waccm_ma_mam5" supported="false">
<machines>
<machine name="izumi" compiler="nag" category="aux_cam"/>
<machine name="izumi" compiler="nag" category="waccm"/>
</machines>
<options>
<option name="comment" >471 tsm, ter</option>
<option name="comment" >TUVx in WACCM</option>
<option name="wallclock">00:30:00</option>
</options>
</test>
Expand Down
64 changes: 64 additions & 0 deletions doc/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,5 +1,69 @@
===============================================================

Tag name: cam6_4_189
Originator(s): fvitt
Date: 21 Jul 2026
One-line Summary: Fix TUVx bug; Use CLM50 in FMOZ compset
Github PR URL: https://github.com/ESCOMP/CAM/pull/1621

Purpose of changes (include the issue number and title text for each relevant GitHub issue):

Fix TUVx cloud optical depth bug (issue #1619)
Update the FMOZ compset to use CLM50 rather than CLM45 (issue #1613)
Remove unused mo_setaer module (issue #1582)

Describe any changes made to build system: N/A

Describe any changes made to the namelist: N/A

List any changes to the defaults for the boundary datasets: N/A

Describe any substantial timing or memory changes: N/A

Code reviewed by: jimmielin ekluzek

List all files eliminated:
D src/chemistry/mozart/mo_setaer.F90
- remove dead code

List all files added and what they do: N/A

List all existing files that have been modified, and describe the changes:
M cime_config/config_compsets.xml
- use CLM50 in FMOZ compset

M cime_config/testdefs/testlist_cam.xml
- change QPWmaC6 NAG test to include TUVx photolysis

M doc/ChangeLog
M src/chemistry/mozart/mo_tuvx.F90
- scale cloud optical depth by cloud fraction

If there were any failures reported from running test_driver.sh on any test
platform, and checkin with these failures has been OK'd by the gatekeeper,
then copy the lines from the td.*.status files for the failed tests to the
appropriate machine below. All failed tests must be justified.

derecho/intel/aux_cam:
DIFF SMS_D_Ln9.f19_f19_mg17.FWma2000climo.derecho_intel.cam-outfrq9s_waccm_ma_mam4
- expected baseline failure due to TUVx bug fix

derecho/nvhpc/aux_cam: All PASS

izumi/nag/aux_cam:
DIFF ERC_D_Ln9.f10_f10_mg37.QPWmaC6.izumi_nag.cam-outfrq9s_tuvx_waccm_ma_mam5
- new TUVx test -- no baseline to compare against

FAIL ERC_D_Ln9.f10_f10_mt232.FHIST_C5.izumi_nag.cam-outfrq3s_subcol COMPARE_base_rest
- pre-existing failure -- see https://github.com/ESCOMP/CAM/issues/1514

izumi/gnu/aux_cam: All PASS

Summarize any changes to answers: bit-for-bit unchanged

===============================================================
===============================================================

Tag name: cam6_4_188
Originator(s): jimmielin
Date: July 20, 2026
Expand Down
Loading
Loading