diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml index 462570da4a..4b9722d66d 100644 --- a/bld/namelist_files/namelist_defaults_cam.xml +++ b/bld/namelist_files/namelist_defaults_cam.xml @@ -264,11 +264,12 @@ atm/cam/inic/se/ape_cam5_ne120np4_L30_c170419.nc atm/cam/inic/se/cam6_QPC6_aqua_ne3pg3_mg37_L32_01-01-31_c221214.nc -atm/cam/inic/se/cam6_QPC6_aqua_ne3pg3_mg37_L58_01-01-31_c221214.nc +atm/cam/inic/se/QPLT_L58_ne3pg3_c241127.nc atm/cam/inic/se/cam6_QPC6_aqua_ne3pg3_mg37_L93_01_02_01_c240518.nc atm/cam/inic/se/ape_cam6_ne5np4_L32_c170517.nc atm/cam/inic/se/ape_cam6_ne16np4_L32_c170509.nc atm/cam/inic/se/ape_cam6_ne30np4_L32_c170509.nc +atm/cam/inic/se/QPLT_L58_ne30pg3_c241127.nc atm/cam/inic/se/ape_cam6_ne120np4_L32_c170908.nc atm/cam/inic/se/ape_cam6_ne240np4_L32_c170908.nc diff --git a/cime_config/testdefs/testlist_cam.xml b/cime_config/testdefs/testlist_cam.xml index e161286ea8..bce9b11597 100644 --- a/cime_config/testdefs/testlist_cam.xml +++ b/cime_config/testdefs/testlist_cam.xml @@ -161,7 +161,6 @@ - diff --git a/doc/ChangeLog b/doc/ChangeLog index b385aca2a2..a02e75661c 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -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: @@ -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: @@ -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