Skip to content

Commit

Permalink
change QPC7 to QPLT; add QPMT
Browse files Browse the repository at this point in the history
  • Loading branch information
brian-eaton committed Nov 20, 2024
1 parent b755e37 commit 7aeabaf
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 11 deletions.
7 changes: 6 additions & 1 deletion cime_config/config_compsets.xml
Original file line number Diff line number Diff line change
Expand Up @@ -292,10 +292,15 @@
</compset>

<compset>
<alias>QPC7</alias>
<alias>QPLT</alias>
<lname>2000_CAM70%LT_SLND_SICE_DOCN%AQP3_SROF_SGLC_SWAV</lname>
</compset>

<compset>
<alias>QPMT</alias>
<lname>2000_CAM70%MT_SLND_SICE_DOCN%AQP3_SROF_SGLC_SWAV</lname>
</compset>

<compset>
<alias>QPC2000climo</alias>
<lname>2000_CAM60%CT1S_SLND_SICE_DOCN%AQP3_SROF_SGLC_SWAV</lname>
Expand Down
22 changes: 12 additions & 10 deletions doc/ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@
Tag name:
Originator(s): eaton
Date:
One-line Summary: Add QPC7 compset, plus misc.
One-line Summary: Add QPLT and QPMT compsets, plus misc.
Github PR URL:

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

Issue #814 - Introduce QPC7 and possibly QPS7 aquaplanet compsets
- Create QPC7 compset. Open new issue to address QPS7.
- Analogous to compset names with FLT and FMT, create QPLT and QPMT compsets.
- Open new issue to address QPS7.

Issue #1159 - Prealpha tests exceeding wallclock
- increased time limit to 20 minutes for these prealpha tests:
Expand Down Expand Up @@ -45,13 +46,13 @@ List all files added and what they do:
List all existing files that have been modified, and describe the changes:

bld/namelist_files/use_cases/aquaplanet_cam7.xml
. use case file for QPC7. Same as for QPC6 except:
- set f11vmr=f12vmr=0. Otherwise defaults from namelist_defaults_cam.xml
are used.
- set prescribed_aero_file="" and prescribed_aero_specifier="".
By default build-namelist will provide a bulk aerosol specification.
- set rad_climate to just make the GHGs radiatively active.
By default build-namelist will add bulk aerosols.
. use case file for QPLT and QPMT. Same as for QPC6 except:
- set f11vmr=f12vmr=0 to override the non-zero default values from
namelist_defaults_cam.xml.
- set prescribed_aero_file="" and prescribed_aero_specifier="" to
override the default bulk aerosol settings from build-namelist.
- set rad_climate to just make the GHGs radiatively active to override
the default build-namelist setting which includes bulk aerosols.

cime_config/config_component.xml
. CAM_CONFIG_OPTS
Expand All @@ -61,7 +62,8 @@ cime_config/config_component.xml
This match will work for both %LT and %MT configs.

cime_config/config_compsets.xml
. QPC7 = 2000_CAM70%LT_SLND_SICE_DOCN%AQP3_SROF_SGLC_SWAV
. add QPLT = 2000_CAM70%LT_SLND_SICE_DOCN%AQP3_SROF_SGLC_SWAV
. add QPMT = 2000_CAM70%MT_SLND_SICE_DOCN%AQP3_SROF_SGLC_SWAV

cime_config/testdefs/testlist_cam.xml
. increase time limit to 20 minutes for these prealpha tests:
Expand Down

0 comments on commit 7aeabaf

Please sign in to comment.