Skip to content

Commit

Permalink
updates for QPLT
Browse files Browse the repository at this point in the history
  • Loading branch information
brian-eaton committed Nov 27, 2024
1 parent 7aeabaf commit 69f53c0
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 8 deletions.
3 changes: 2 additions & 1 deletion bld/namelist_files/namelist_defaults_cam.xml
Original file line number Diff line number Diff line change
Expand Up @@ -264,11 +264,12 @@
<ncdata dyn="se" hgrid="ne120np4" nlev="30" aquaplanet="1" ic_ymd="101" >atm/cam/inic/se/ape_cam5_ne120np4_L30_c170419.nc</ncdata>

<ncdata dyn="se" hgrid="ne3np4" nlev="32" aquaplanet="1" ic_ymd="101" >atm/cam/inic/se/cam6_QPC6_aqua_ne3pg3_mg37_L32_01-01-31_c221214.nc</ncdata>
<ncdata dyn="se" hgrid="ne3np4" nlev="58" aquaplanet="1" ic_ymd="101" >atm/cam/inic/se/cam6_QPC6_aqua_ne3pg3_mg37_L58_01-01-31_c221214.nc</ncdata>
<ncdata dyn="se" hgrid="ne3np4" nlev="58" aquaplanet="1" >atm/cam/inic/se/QPLT_L58_ne3pg3_c241127.nc</ncdata>
<ncdata dyn="se" hgrid="ne3np4" nlev="93" aquaplanet="1" ic_ymd="101" >atm/cam/inic/se/cam6_QPC6_aqua_ne3pg3_mg37_L93_01_02_01_c240518.nc</ncdata>
<ncdata dyn="se" hgrid="ne5np4" nlev="32" aquaplanet="1" ic_ymd="101" >atm/cam/inic/se/ape_cam6_ne5np4_L32_c170517.nc</ncdata>
<ncdata dyn="se" hgrid="ne16np4" nlev="32" aquaplanet="1" ic_ymd="101" >atm/cam/inic/se/ape_cam6_ne16np4_L32_c170509.nc</ncdata>
<ncdata dyn="se" hgrid="ne30np4" nlev="32" aquaplanet="1" ic_ymd="101" >atm/cam/inic/se/ape_cam6_ne30np4_L32_c170509.nc</ncdata>
<ncdata dyn="se" hgrid="ne30np4" nlev="58" aquaplanet="1" >atm/cam/inic/se/QPLT_L58_ne30pg3_c241127.nc</ncdata>
<ncdata dyn="se" hgrid="ne120np4" nlev="32" aquaplanet="1" ic_ymd="101" >atm/cam/inic/se/ape_cam6_ne120np4_L32_c170908.nc</ncdata>
<ncdata dyn="se" hgrid="ne240np4" nlev="32" aquaplanet="1" ic_ymd="101" >atm/cam/inic/se/ape_cam6_ne240np4_L32_c170908.nc</ncdata>

Expand Down
1 change: 0 additions & 1 deletion cime_config/testdefs/testlist_cam.xml
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,6 @@
<machines>
<machine name="derecho" compiler="intel" category="aux_cime_baselines"/>
<machine name="derecho" compiler="intel" category="prealpha"/>
<machine name="derecho" compiler="intel" category="aux_cam"/>
</machines>
<options>
<option name="wallclock">00:10:00</option>
Expand Down
22 changes: 16 additions & 6 deletions doc/ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,12 @@ 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
- Analogous to compset names with FLT and FMT, create QPLT and QPMT compsets.
- Analogous to FLT and FMT compset names, create QPLT and QPMT compsets.
- Open new issue to address QPS7.
- The new aquaplanet configurations use '-chem none' to eliminate the
aerosols. This is much faster and requires much less memory than a
configuration that leaves the default chemistry in place and removes
aerosols by zeroing the initial concentrations and emission sources.

Issue #1159 - Prealpha tests exceeding wallclock
- increased time limit to 20 minutes for these prealpha tests:
Expand All @@ -21,15 +25,14 @@ Issue #670 - DAE test broken
- ChangeLog indicates that this test has never worked since it was added
in cam6_2_046 (2020-09-01). Test removed.



Describe any changes made to build system:
Describe any changes made to build system: none

Describe any changes made to the namelist:
. add spun up initial files for QPLT compset on ne3pg3 and ne30pg3 grids.

List any changes to the defaults for the boundary datasets:
List any changes to the defaults for the boundary datasets: none

Describe any substantial timing or memory changes:
Describe any substantial timing or memory changes: n/a

Code reviewed by:

Expand All @@ -45,6 +48,13 @@ List all files added and what they do:

List all existing files that have been modified, and describe the changes:

bld/namelist_files/namelist_defaults_cam.xml
. replace current entry for ne3np4 L58 aquaplanet with
QPLT_L58_ne3pg3_c241127.nc. Also remove the ic_ymd attribute since
aquaplanet does not have an annual cycle and that attribute interferes
with starting a run from an arbitrary time.
. add new file for ne30np4 L58 aquaplanet.

bld/namelist_files/use_cases/aquaplanet_cam7.xml
. use case file for QPLT and QPMT. Same as for QPC6 except:
- set f11vmr=f12vmr=0 to override the non-zero default values from
Expand Down

0 comments on commit 69f53c0

Please sign in to comment.