From b29356569fc98251ee0c7e4072da74703099ee95 Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Wed, 2 Oct 2024 11:07:49 -0400 Subject: [PATCH 01/20] fix issues #1159, #670 --- cime_config/testdefs/testlist_cam.xml | 14 +-- .../testmods_dirs/cam/dae/shell_commands | 6 -- .../testmods_dirs/cam/dae/user_nl_cam | 4 - .../testmods_dirs/cam/dae/user_nl_cpl | 2 - doc/ChangeLog | 70 ++++++++++++++ test/system/da_cam_no_data_mod.sh | 95 ------------------- 6 files changed, 73 insertions(+), 118 deletions(-) delete mode 100644 cime_config/testdefs/testmods_dirs/cam/dae/shell_commands delete mode 100644 cime_config/testdefs/testmods_dirs/cam/dae/user_nl_cam delete mode 100644 cime_config/testdefs/testmods_dirs/cam/dae/user_nl_cpl delete mode 100755 test/system/da_cam_no_data_mod.sh diff --git a/cime_config/testdefs/testlist_cam.xml b/cime_config/testdefs/testlist_cam.xml index b2c62fd5e7..20e283f0c8 100644 --- a/cime_config/testdefs/testlist_cam.xml +++ b/cime_config/testdefs/testlist_cam.xml @@ -57,7 +57,7 @@ - + @@ -67,7 +67,7 @@ - + @@ -2031,15 +2031,7 @@ - - - - - - - - - + diff --git a/cime_config/testdefs/testmods_dirs/cam/dae/shell_commands b/cime_config/testdefs/testmods_dirs/cam/dae/shell_commands deleted file mode 100644 index f091402c1d..0000000000 --- a/cime_config/testdefs/testmods_dirs/cam/dae/shell_commands +++ /dev/null @@ -1,6 +0,0 @@ -# Test CAM post-Data Assimilation handling -SRCROOT="`./xmlquery --value COMP_ROOT_DIR_ATM`" -DAFILE="${SRCROOT}/test/system/da_cam_no_data_mod.sh" -./xmlchange DATA_ASSIMILATION_SCRIPT=${DAFILE} -# Turn off any use case -./xmlchange CAM_NML_USE_CASE="UNSET" diff --git a/cime_config/testdefs/testmods_dirs/cam/dae/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/dae/user_nl_cam deleted file mode 100644 index f837808297..0000000000 --- a/cime_config/testdefs/testmods_dirs/cam/dae/user_nl_cam +++ /dev/null @@ -1,4 +0,0 @@ -! CAM history files have different names when DA is active so turn them off -nhtfrq = 0,-10000,-10000,-10000,-10000,-10000 -fexcl1 = 'OMEGA','OMEGAT','PHIS','PS','PSL','QRS','T','U','UU','V','VT','VU','VV','Z3' -fexcl2 = 'T','U','V' diff --git a/cime_config/testdefs/testmods_dirs/cam/dae/user_nl_cpl b/cime_config/testdefs/testmods_dirs/cam/dae/user_nl_cpl deleted file mode 100644 index 398535cf65..0000000000 --- a/cime_config/testdefs/testmods_dirs/cam/dae/user_nl_cpl +++ /dev/null @@ -1,2 +0,0 @@ -reprosum_diffmax=1.0e-14 -reprosum_recompute=.true. diff --git a/doc/ChangeLog b/doc/ChangeLog index c576afc24e..dd4edfeedb 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,73 @@ +=============================================================== + +Tag name: +Originator(s): eaton +Date: +One-line Summary: fix issues #1159, #670 +Github PR URL: + +Purpose of changes (include the issue number and title text for each relevant GitHub issue): + +Issue #1159 - Prealpha tests exceeding wallclock + - increased time limit to 20 minutes for these prealpha tests: + ERP_Ln9.f09_f09_mg17.FHIST_BGC.derecho_intel.cam-outfrq9s + ERP_Ln9.f09_f09_mg17.FHIST.derecho_intel.cam-outfrq9s + +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 the namelist: + +List any changes to the defaults for the boundary datasets: + +Describe any substantial timing or memory changes: + +Code reviewed by: + +List all files eliminated: + +cime_config/testdefs/testmods_dirs/cam/dae/shell_commands +cime_config/testdefs/testmods_dirs/cam/dae/user_nl_cam +cime_config/testdefs/testmods_dirs/cam/dae/user_nl_cpl +test/system/da_cam_no_data_mod.sh +. DAE test removed + +List all files added and what they do: + +List all existing files that have been modified, and describe the changes: + +cime_config/testdefs/testlist_cam.xml +. increase time limit to 20 minutes for these prealpha tests: + ERP_Ln9.f09_f09_mg17.FHIST_BGC.derecho_intel.cam-outfrq9s + ERP_Ln9.f09_f09_mg17.FHIST.derecho_intel.cam-outfrq9s +. remove non-working DAE test + +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: + +derecho/nvhpc/aux_cam: + +izumi/nag/aux_cam: + +izumi/gnu/aux_cam: + +CAM tag used for the baseline comparison tests if different than previous +tag: + +Summarize any changes to answers: + +=============================================================== + Tag name: cam6_4_038 Originator(s): lizziel Date: 1 Oct 2024 diff --git a/test/system/da_cam_no_data_mod.sh b/test/system/da_cam_no_data_mod.sh deleted file mode 100755 index ef5313d4cc..0000000000 --- a/test/system/da_cam_no_data_mod.sh +++ /dev/null @@ -1,95 +0,0 @@ -#! /bin/bash - -############################################################################## -### -### A stub data assimilation script that prints out information but makes -### no modifications to model data. -### Script checks for proper pre and post data assimilation output -### Tests using this script should be BFB with a non-data assimilation run -### -############################################################################## - -errcode=0 -if [ $# -ne 2 ]; then - echo "ERROR: Wrong number of arguments, $# (should be 2)" - errcode=$(( errcode + 1 )) -else - caseroot=$1 - cycle=$2 - echo "caseroot: ${caseroot}" - echo "cycle: ${cycle}" - cd ${caseroot} - res=$? - if [ $res -ne 0 ]; then - echo "ERROR: Unable to cd to caseroot, ${caseroot}" - errcode=$(( errcode + 1 )) - else - ./xmlchange DATA_ASSIMILATION_ATM=TRUE - res=$? - if [ $res -ne 0 ]; then - echo "ERROR: Unable to change DATA_ASSIMILATION_ATM to TRUE" - errcode=$(( errcode + 1 )) - fi - rundir="`./xmlquery --value RUNDIR`" - ninst=`./xmlquery --value NINST_ATM` - if [ -n "${rundir}" -a -d "${rundir}" ]; then - cd ${rundir} - res=$? - if [ $res -ne 0 ]; then - echo "ERROR: Unable to cd to rundir, ${rundir}" - errcode=$(( errcode + 1 )) - else - # Check the latest log file for a resume signal - if [ $ninst -eq 1 ]; then - lfiles="`ls -t atm.log.* 2> /dev/null | head -1`" - else - # Multi-instance, look for wav_nnnn.log* - for inst in `seq 1 $ninst`; do - ifilename="`printf "atm_%04d.log.*" $inst`" - ifile="`ls -t ${ifilename} 2> /dev/null | head -1`" - if [ -z "${ifile}" ]; then - echo "No log files for instance $ninst found" - errcode=$(( errcode + 1 )) - elif [ -z "${lfiles}" ]; then - lfiles="${ifile}" - else - lfiles="${lfiles} ${ifile}" - fi - done - fi - if [ -z "${lfiles}" ]; then - echo "ERROR: Unable to find atm log file in `pwd -P`" - errcode=$(( errcode + 1 )) - else - for atmfile in ${lfiles}; do - dasig="`zgrep '^[ ]*DART run using CAM initial mode$' ${atmfile} 2> /dev/null`" - initsig="`zgrep '^[ ]*Initial run$' ${atmfile} 2> /dev/null`" - if [ $cycle -gt 0 ]; then - if [ -n "${dasig}" ]; then - echo "Post-DA resume signal found for cycle ${cycle}" - else - echo "No post-DA resume signal for cycle ${cycle}" - fi - elif [ -n "${dasig}" ]; then - echo "Bad Post-DA resume signal found for cycle ${cycle}" - fi - if [ $cycle -eq 0 ]; then - if [ -n "${initsig}" ]; then - echo "Initial run signal found for cycle ${cycle}" - else - echo "No initial run signal found for cycle ${cycle}" - fi - elif [ -n "${initsig}" ]; then - echo "Bad initial run signal found for cycle ${cycle}" - fi - done - fi - fi - else - echo "ERROR: RUNDIR (${rundir}) is not a valid directory" - errcode=$(( errcode + 1 )) - fi - fi -fi - -exit $errcode From 9dd22853e4992dfd5f7b6ac0c0bdca682becd9c0 Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Tue, 29 Oct 2024 11:48:13 -0400 Subject: [PATCH 02/20] add test --- cime_config/testdefs/testlist_cam.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/cime_config/testdefs/testlist_cam.xml b/cime_config/testdefs/testlist_cam.xml index caf4a0ae37..dcb1652862 100644 --- a/cime_config/testdefs/testlist_cam.xml +++ b/cime_config/testdefs/testlist_cam.xml @@ -1752,6 +1752,15 @@ + + + + + + + + + From aa274e78633272bc60520ca6871fd0479a2a1621 Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Tue, 29 Oct 2024 18:21:55 -0400 Subject: [PATCH 03/20] add QPC7 --- .../use_cases/aquaplanet_cam7.xml | 48 +++++++++++++++++++ cime_config/config_component.xml | 1 + cime_config/config_compsets.xml | 5 ++ 3 files changed, 54 insertions(+) create mode 100644 bld/namelist_files/use_cases/aquaplanet_cam7.xml diff --git a/bld/namelist_files/use_cases/aquaplanet_cam7.xml b/bld/namelist_files/use_cases/aquaplanet_cam7.xml new file mode 100644 index 0000000000..a7be0ebf7b --- /dev/null +++ b/bld/namelist_files/use_cases/aquaplanet_cam7.xml @@ -0,0 +1,48 @@ + + + + + + +0. +0. +0. +fixed_parameters + + + false + + +1.650e-6 +0.306e-6 +348.0e-6 + + +atm/cam/solar/ape_solar_ave_tsi_1365.nc + + +apeozone_cam3_5_54.nc +atm/cam/ozone +OZONE +CYCLICAL +1990 + + +86164.10063718943 +6.37100e6 +9.79764 +28.96623324623746 +18.01618112892741 +1.846e3 + +.false. + +.true. +.true. + "" + "" + "" + + 0.0 + + diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml index 76fe7858db..a4fd3b11bf 100644 --- a/cime_config/config_component.xml +++ b/cime_config/config_component.xml @@ -255,6 +255,7 @@ aquaplanet_cam6 aquaplanet_cam6 aquaplanet_rce_cam6 + aquaplanet_cam7 aquaplanet_waccm_2000 2010_cam6 diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml index c04f925dda..917df56bc5 100644 --- a/cime_config/config_compsets.xml +++ b/cime_config/config_compsets.xml @@ -291,6 +291,11 @@ + + QPC7 + 2000_CAM70_SLND_SICE_DOCN%AQP3_SROF_SGLC_SWAV + + QPC2000climo 2000_CAM60%CT1S_SLND_SICE_DOCN%AQP3_SROF_SGLC_SWAV From 08abb12faba67214d87a3c7859f0ae826df4aaad Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Tue, 29 Oct 2024 18:41:11 -0400 Subject: [PATCH 04/20] add %LT to QPC7 spec --- cime_config/config_component.xml | 2 +- cime_config/config_compsets.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml index a4fd3b11bf..0b39ec4b08 100644 --- a/cime_config/config_component.xml +++ b/cime_config/config_component.xml @@ -255,7 +255,7 @@ aquaplanet_cam6 aquaplanet_cam6 aquaplanet_rce_cam6 - aquaplanet_cam7 + aquaplanet_cam7 aquaplanet_waccm_2000 2010_cam6 diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml index 917df56bc5..b351281e1d 100644 --- a/cime_config/config_compsets.xml +++ b/cime_config/config_compsets.xml @@ -293,7 +293,7 @@ QPC7 - 2000_CAM70_SLND_SICE_DOCN%AQP3_SROF_SGLC_SWAV + 2000_CAM70%LT_SLND_SICE_DOCN%AQP3_SROF_SGLC_SWAV From 93996fa59f3e8b79d6056ca1d5cbc93f76987096 Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Thu, 31 Oct 2024 11:19:12 -0400 Subject: [PATCH 05/20] only write drydep INFO messages from masterproc --- src/chemistry/mozart/mo_drydep.F90 | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/src/chemistry/mozart/mo_drydep.F90 b/src/chemistry/mozart/mo_drydep.F90 index 06b87797c4..12e1d3e0a9 100644 --- a/src/chemistry/mozart/mo_drydep.F90 +++ b/src/chemistry/mozart/mo_drydep.F90 @@ -520,11 +520,13 @@ subroutine get_landuse_and_soilw_from_file() logical :: lexist if (len_trim(drydep_srf_file) == 0) then - write(iulog,*)'**************************************' - write(iulog,*)' get_landuse_and_soilw_from_file: INFO:' - write(iulog,*)' drydep_srf_file not set:' - write(iulog,*)' setting fraction_landuse to zero' - write(iulog,*)'**************************************' + if (masterproc) then + write(iulog,*)'**************************************' + write(iulog,*)' get_landuse_and_soilw_from_file: INFO:' + write(iulog,*)' drydep_srf_file not set:' + write(iulog,*)' setting fraction_landuse to zero' + write(iulog,*)'**************************************' + end if fraction_landuse = 0._r8 return end if @@ -536,12 +538,14 @@ subroutine get_landuse_and_soilw_from_file() call infld('fraction_landuse', piofile, 'ncol','class',1,pcols,1,n_land_type, begchunk,endchunk, & fraction_landuse, readvar, gridname='physgrid') if (.not. readvar) then - write(iulog,*)'**************************************' - write(iulog,*)'get_landuse_and_soilw_from_file: INFO:' - write(iulog,*)' fraction_landuse not read from file: ' - write(iulog,*)' ', trim(locfn) - write(iulog,*)' setting all values to zero' - write(iulog,*)'**************************************' + if (masterproc) then + write(iulog,*)'**************************************' + write(iulog,*)'get_landuse_and_soilw_from_file: INFO:' + write(iulog,*)' fraction_landuse not read from file: ' + write(iulog,*)' ', trim(locfn) + write(iulog,*)' setting all values to zero' + write(iulog,*)'**************************************' + end if fraction_landuse = 0._r8 end if From fe03fe49dd1bac237b32abfa09b74c44aa65a566 Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Wed, 6 Nov 2024 10:32:26 -0500 Subject: [PATCH 06/20] only do modal aerosol calcs when modal aerosols are used --- src/physics/cam7/physpkg.F90 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/physics/cam7/physpkg.F90 b/src/physics/cam7/physpkg.F90 index 83d03c46d1..91dc3311df 100644 --- a/src/physics/cam7/physpkg.F90 +++ b/src/physics/cam7/physpkg.F90 @@ -2882,8 +2882,10 @@ subroutine tphysbc (ztodt, state, & ! Run wet deposition routines to intialize aerosols !=================================================== - call modal_aero_calcsize_diag(state, pbuf) - call modal_aero_wateruptake_dr(state, pbuf) + if (clim_modal_aero) then + call modal_aero_calcsize_diag(state, pbuf) + call modal_aero_wateruptake_dr(state, pbuf) + end if !=================================================== ! Radiation computations From cdafa1a19e74d70ba27c4862fc13f39abe7feef4 Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Fri, 8 Nov 2024 10:09:00 -0500 Subject: [PATCH 07/20] updates to QPC7 --- .../use_cases/aquaplanet_cam7.xml | 8 ++++ cime_config/config_component.xml | 1 + doc/ChangeLog | 41 +++++++++++++++++-- src/physics/cam/nucleate_ice_cam.F90 | 18 +++++--- 4 files changed, 59 insertions(+), 9 deletions(-) diff --git a/bld/namelist_files/use_cases/aquaplanet_cam7.xml b/bld/namelist_files/use_cases/aquaplanet_cam7.xml index a7be0ebf7b..d6766e2ff3 100644 --- a/bld/namelist_files/use_cases/aquaplanet_cam7.xml +++ b/bld/namelist_files/use_cases/aquaplanet_cam7.xml @@ -16,6 +16,8 @@ 1.650e-6 0.306e-6 348.0e-6 +0.0 +0.0 atm/cam/solar/ape_solar_ave_tsi_1365.nc @@ -42,7 +44,13 @@ "" "" "" + "" + "" 0.0 + + 'A:Q:H2O', 'N:O2:O2', 'N:CO2:CO2', 'N:ozone:O3', + 'N:N2O:N2O', 'N:CH4:CH4', 'N:CFC11:CFC11', 'N:CFC12:CFC12' + diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml index 0b39ec4b08..17bb9cf5a9 100644 --- a/cime_config/config_component.xml +++ b/cime_config/config_component.xml @@ -204,6 +204,7 @@ -aquaplanet -aquaplanet + -chem none -offline_drv rad diff --git a/doc/ChangeLog b/doc/ChangeLog index bdb7b78674..28260c5ddf 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -3,23 +3,25 @@ Tag name: Originator(s): eaton Date: -One-line Summary: fix issues #1159, #670 +One-line Summary: Add QPC7 compset, 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. + Issue #1159 - Prealpha tests exceeding wallclock - increased time limit to 20 minutes for these prealpha tests: ERP_Ln9.f09_f09_mg17.FHIST_BGC.derecho_intel.cam-outfrq9s ERP_Ln9.f09_f09_mg17.FHIST.derecho_intel.cam-outfrq9s Issue #670 - DAE test broken - . ChangeLog indicates that this test has never worked since it was added + - 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 the namelist: @@ -42,12 +44,45 @@ 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. + +cime_config/config_component.xml +. CAM_CONFIG_OPTS + - add match for _CAM70.*_SLND_SICE_DOCN%AQP to set '-chem none' +. CAM_NML_USE_CASE + - add match for 2000_CAM70.*_SLND_SICE_DOCN%AQP to use aquaplanet_cam7. + 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 + cime_config/testdefs/testlist_cam.xml . increase time limit to 20 minutes for these prealpha tests: ERP_Ln9.f09_f09_mg17.FHIST_BGC.derecho_intel.cam-outfrq9s ERP_Ln9.f09_f09_mg17.FHIST.derecho_intel.cam-outfrq9s . remove non-working DAE test +src/chemistry/mozart/mo_drydep.F90 +. get_landuse_and_soilw_from_file + - restrict the INFO messages to only print from masterproc + +src/physics/cam/nucleate_ice_cam.F90 +. nucleate_ice_cam_calc + - add conditionals so naer2 array not referenced when there are no + aerosols. + +src/physics/cam7/physpkg.F90 +. tphysbc + - add conditionals so modal aerosol calculations only called when modal + aerosols are present. + 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 diff --git a/src/physics/cam/nucleate_ice_cam.F90 b/src/physics/cam/nucleate_ice_cam.F90 index 7dff84f529..a247128c40 100644 --- a/src/physics/cam/nucleate_ice_cam.F90 +++ b/src/physics/cam/nucleate_ice_cam.F90 @@ -607,12 +607,18 @@ subroutine nucleate_ice_cam_calc( & else ! for bulk model - dust_num_col(:ncol,:) = naer2(:ncol,:,idxdst1)/25._r8 * per_cm3 & ! #/cm3 - + naer2(:ncol,:,idxdst2)/25._r8 * per_cm3 & - + naer2(:ncol,:,idxdst3)/25._r8 * per_cm3 & - + naer2(:ncol,:,idxdst4)/25._r8 * per_cm3 - sulf_num_col(:ncol,:) = naer2(:ncol,:,idxsul)/25._r8 * per_cm3 - soot_num_col(:ncol,:) = naer2(:ncol,:,idxbcphi)/25._r8 * per_cm3 + if (idxdst1 > 0 .and. idxdst2 > 0 .and. idxdst3 > 0 .and. idxdst4 > 0) then + dust_num_col(:ncol,:) = naer2(:ncol,:,idxdst1)/25._r8 * per_cm3 & ! #/cm3 + + naer2(:ncol,:,idxdst2)/25._r8 * per_cm3 & + + naer2(:ncol,:,idxdst3)/25._r8 * per_cm3 & + + naer2(:ncol,:,idxdst4)/25._r8 * per_cm3 + end if + if (idxsul > 0) then + sulf_num_col(:ncol,:) = naer2(:ncol,:,idxsul)/25._r8 * per_cm3 + end if + if (idxbcphi > 0) then + soot_num_col(:ncol,:) = naer2(:ncol,:,idxbcphi)/25._r8 * per_cm3 + end if endif kloop: do k = top_lev, pver From 7aeabafad18b1f729792eaad61e865c84acf6df6 Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Wed, 20 Nov 2024 17:00:17 -0500 Subject: [PATCH 08/20] change QPC7 to QPLT; add QPMT --- cime_config/config_compsets.xml | 7 ++++++- doc/ChangeLog | 22 ++++++++++++---------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml index b351281e1d..31eba44982 100644 --- a/cime_config/config_compsets.xml +++ b/cime_config/config_compsets.xml @@ -292,10 +292,15 @@ - QPC7 + QPLT 2000_CAM70%LT_SLND_SICE_DOCN%AQP3_SROF_SGLC_SWAV + + QPMT + 2000_CAM70%MT_SLND_SICE_DOCN%AQP3_SROF_SGLC_SWAV + + QPC2000climo 2000_CAM60%CT1S_SLND_SICE_DOCN%AQP3_SROF_SGLC_SWAV diff --git a/doc/ChangeLog b/doc/ChangeLog index 004d034792..b385aca2a2 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -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: @@ -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 @@ -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: From 69f53c02a3ce9823a23d8799e2a5b7501b0ac58b Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Wed, 27 Nov 2024 13:50:14 -0500 Subject: [PATCH 09/20] updates for QPLT --- bld/namelist_files/namelist_defaults_cam.xml | 3 ++- cime_config/testdefs/testlist_cam.xml | 1 - doc/ChangeLog | 22 ++++++++++++++------ 3 files changed, 18 insertions(+), 8 deletions(-) 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 From 453eea9fbbdef81faa133d53afad3e0bfa895d73 Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Fri, 29 Nov 2024 10:29:38 -0500 Subject: [PATCH 10/20] add regression tests for QPLT --- cime_config/testdefs/testlist_cam.xml | 13 +++++++++++-- doc/ChangeLog | 6 +++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/cime_config/testdefs/testlist_cam.xml b/cime_config/testdefs/testlist_cam.xml index bce9b11597..f4b76a14a0 100644 --- a/cime_config/testdefs/testlist_cam.xml +++ b/cime_config/testdefs/testlist_cam.xml @@ -190,13 +190,22 @@ - + - + + + + + + + + + + diff --git a/doc/ChangeLog b/doc/ChangeLog index a02e75661c..0b5e219e2f 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -44,7 +44,7 @@ cime_config/testdefs/testmods_dirs/cam/dae/user_nl_cpl test/system/da_cam_no_data_mod.sh . DAE test removed -List all files added and what they do: +List all files added and what they do: none List all existing files that have been modified, and describe the changes: @@ -80,6 +80,10 @@ cime_config/testdefs/testlist_cam.xml ERP_Ln9.f09_f09_mg17.FHIST_BGC.derecho_intel.cam-outfrq9s ERP_Ln9.f09_f09_mg17.FHIST.derecho_intel.cam-outfrq9s . remove non-working DAE test +. replace ERP_D_Ln9.f19_f19_mg17.QPC6.derecho_intel.cam-outfrq9s + by ERP_D_Ln9.ne30pg3_ne30pg3_mg17.QPLT.derecho_intel.cam-outfrq3s_cosp +. replace ERP_D_Ln9.ne3pg3_ne3pg3_mg37.QPC6.izumi_gnu.cam-outfrq9s_rrtmgp + by ERP_D_Ln9.ne3pg3_ne3pg3_mg37.QPLT.izumi_gnu.cam-outfrq9s src/chemistry/mozart/mo_drydep.F90 . get_landuse_and_soilw_from_file From 6330f1a3f2b0b6e3251c1b0d5fe68757a2a10d91 Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Fri, 29 Nov 2024 14:23:09 -0500 Subject: [PATCH 11/20] fixes for QPLT tests --- bld/namelist_files/namelist_defaults_cam.xml | 4 ++-- bld/namelist_files/use_cases/aquaplanet_cam7.xml | 10 +++++++--- doc/ChangeLog | 12 +++++++++--- src/physics/cam/microp_aero.F90 | 2 +- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml index 4b9722d66d..3d1643c4c8 100644 --- a/bld/namelist_files/namelist_defaults_cam.xml +++ b/bld/namelist_files/namelist_defaults_cam.xml @@ -264,12 +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/QPLT_L58_ne3pg3_c241127.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/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/bld/namelist_files/use_cases/aquaplanet_cam7.xml b/bld/namelist_files/use_cases/aquaplanet_cam7.xml index d6766e2ff3..405e14bbe0 100644 --- a/bld/namelist_files/use_cases/aquaplanet_cam7.xml +++ b/bld/namelist_files/use_cases/aquaplanet_cam7.xml @@ -1,8 +1,11 @@ - - + + +atm/cam/inic/se/QPLT_L58_ne3pg3_c241127.nc +atm/cam/inic/se/QPLT_L58_ne30pg3_c241127.nc + 0. 0. @@ -49,7 +52,8 @@ 0.0 - + 'A:Q:H2O', 'N:O2:O2', 'N:CO2:CO2', 'N:ozone:O3', 'N:N2O:N2O', 'N:CH4:CH4', 'N:CFC11:CFC11', 'N:CFC12:CFC12' diff --git a/doc/ChangeLog b/doc/ChangeLog index 6bb0bcedf7..0bd04f1a5e 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -50,9 +50,7 @@ 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. + QPLT_L58_ne3pg3_c241127.nc. . add new file for ne30np4 L58 aquaplanet. bld/namelist_files/use_cases/aquaplanet_cam7.xml @@ -63,6 +61,9 @@ bld/namelist_files/use_cases/aquaplanet_cam7.xml 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. + - Add spun-up IC files. This allows us to remove the ic_ymd attribute + which should not be needed for aquaplanet runs. Removing ic_ymd + enables testing with arbitrary start dates. cime_config/config_component.xml . CAM_CONFIG_OPTS @@ -89,6 +90,11 @@ src/chemistry/mozart/mo_drydep.F90 . get_landuse_and_soilw_from_file - restrict the INFO messages to only print from masterproc +src/physics/cam/microp_aero.F90 +. microp_aero_run + - add condition that number of bulk aerosols must be > 0 before calling + ndrop_bam_run. + src/physics/cam/nucleate_ice_cam.F90 . nucleate_ice_cam_calc - add conditionals so naer2 array not referenced when there are no diff --git a/src/physics/cam/microp_aero.F90 b/src/physics/cam/microp_aero.F90 index 4961a139a8..acf3287032 100644 --- a/src/physics/cam/microp_aero.F90 +++ b/src/physics/cam/microp_aero.F90 @@ -756,7 +756,7 @@ subroutine microp_aero_run ( & do k = top_lev, pver do i = 1, ncol - if (state1%q(i,k,cldliq_idx) >= qsmall) then + if (naer_all > 0 .and. state1%q(i,k,cldliq_idx) >= qsmall) then ! get droplet activation rate From 554ec1cce37769ee1373dda07bd81f134dc30daf Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Mon, 2 Dec 2024 12:14:12 -0500 Subject: [PATCH 12/20] fixes in outfrq3s_cosp tests --- .../testmods_dirs/cam/outfrq3s_cosp/shell_commands | 3 +-- .../testmods_dirs/cam/outfrq3s_cosp/user_nl_cam | 3 ++- doc/ChangeLog | 12 +++++++++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq3s_cosp/shell_commands b/cime_config/testdefs/testmods_dirs/cam/outfrq3s_cosp/shell_commands index 09a1939ddb..11a171a04e 100644 --- a/cime_config/testdefs/testmods_dirs/cam/outfrq3s_cosp/shell_commands +++ b/cime_config/testdefs/testmods_dirs/cam/outfrq3s_cosp/shell_commands @@ -1,8 +1,7 @@ CAM_CONFIG_OPTS=`./xmlquery CAM_CONFIG_OPTS --value` if [[ $CAM_CONFIG_OPTS != *"-cosp"* ]]; then - ./xmlchange -append CAM_CONFIG_OPTS="-cosp" + ./xmlchange --append CAM_CONFIG_OPTS="-cosp" fi ./xmlchange ROF_NCPL=\$ATM_NCPL ./xmlchange GLC_NCPL=\$ATM_NCPL -./xmlchange CAM_NML_USE_CASE=UNSET ./xmlchange RUN_STARTDATE="19950101" diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq3s_cosp/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/outfrq3s_cosp/user_nl_cam index ddff96685c..a2a8169e6f 100644 --- a/cime_config/testdefs/testmods_dirs/cam/outfrq3s_cosp/user_nl_cam +++ b/cime_config/testdefs/testmods_dirs/cam/outfrq3s_cosp/user_nl_cam @@ -2,4 +2,5 @@ mfilt=1,1,1,1,1,1 ndens=1,1,1,1,1,1 nhtfrq=3,3,3,3,3,3 inithist='ENDOFRUN' -fexcl1='CFAD_DBZE94_CS','CLDTOT_CALCS','CLD_CAL_NOTCS','CS_MIXCERT','CS_MIXPOSS','CS_NOPRECIP','CS_PIA','CS_RAINPOSS','CS_RAINPROB' +fexcl1='CFAD_DBZE94_CS','CLDTOT_CALCS','CLD_CAL_NOTCS','CS_MIXCERT','CS_MIXPOSS','CS_NOPRECIP','CS_PIA', + 'CS_RAINPOSS','CS_RAINPROB','CS_SNOWCERT','CS_SNOWPOSS' diff --git a/doc/ChangeLog b/doc/ChangeLog index 0bd04f1a5e..9e152b8e88 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -27,10 +27,10 @@ Issue #670 - DAE test broken 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. +Describe any changes made to the namelist: none -List any changes to the defaults for the boundary datasets: none +List any changes to the defaults for the boundary datasets: +. add spun up initial files for QPLT compset on ne3pg3 and ne30pg3 grids. Describe any substantial timing or memory changes: n/a @@ -86,6 +86,12 @@ cime_config/testdefs/testlist_cam.xml . replace ERP_D_Ln9.ne3pg3_ne3pg3_mg37.QPC6.izumi_gnu.cam-outfrq9s_rrtmgp by ERP_D_Ln9.ne3pg3_ne3pg3_mg37.QPLT.izumi_gnu.cam-outfrq9s +cime_config/testdefs/testmods_dirs/cam/outfrq3s_cosp/shell_commands +. remove "./xmlchange CAM_NML_USE_CASE=UNSET" + +cime_config/testdefs/testmods_dirs/cam/outfrq3s_cosp/user_nl_cam +. add CS_SNOWCERT and CS_SNOWPOSS to fexcl1 + src/chemistry/mozart/mo_drydep.F90 . get_landuse_and_soilw_from_file - restrict the INFO messages to only print from masterproc From 9d32d137223c07fc873aad2e5277a767d21687eb Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Fri, 6 Dec 2024 13:21:36 -0500 Subject: [PATCH 13/20] add UT and UQ to cam_diagnostics.F90 --- doc/ChangeLog | 17 +++++++++++++++++ src/physics/cam/cam_diagnostics.F90 | 14 +++++++++++--- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 9e152b8e88..ea4766c48d 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -25,6 +25,11 @@ 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. +Issue #807 - add UT and UQ to cam_diagnostics + - Add UT and UQ. Note that other possible fields mentioned in the issue, + i.e., OMEGA2, OMEGAQ, OMEGAU, and OMEGAV, are already implemented. + OMEGA2 is called OMGAOMGA. + Describe any changes made to build system: none Describe any changes made to the namelist: none @@ -96,6 +101,18 @@ src/chemistry/mozart/mo_drydep.F90 . get_landuse_and_soilw_from_file - restrict the INFO messages to only print from masterproc +src/physics/cam/cam_diagnostics.F90 +. diag_init_dry + - add addfld call for UT, and corresponding add_default for UT inside the + history_eddy conditional. +. diag_phys_writeout_dry + - add calculation and outfld call for UT +. diag_init_moist + - add addfld call for UQ, and corresponding add_default for UQ inside the + history_eddy conditional. +. diag_phys_writeout_moist + - add calculation and outfld call for UQ + src/physics/cam/microp_aero.F90 . microp_aero_run - add condition that number of bulk aerosols must be > 0 before calling diff --git a/src/physics/cam/cam_diagnostics.F90 b/src/physics/cam/cam_diagnostics.F90 index 97dad2ba01..3769d42953 100644 --- a/src/physics/cam/cam_diagnostics.F90 +++ b/src/physics/cam/cam_diagnostics.F90 @@ -253,6 +253,7 @@ subroutine diag_init_dry(pbuf2d) call addfld ('OMEGAV', (/ 'lev' /), 'A', 'm Pa/s2 ', 'Vertical flux of meridional momentum' ) call addfld ('OMGAOMGA', (/ 'lev' /), 'A', 'Pa2/s2', 'Vertical flux of vertical momentum' ) + call addfld ('UT', (/ 'lev' /), 'A', 'K m/s ', 'Zonal heat transport') call addfld ('UU', (/ 'lev' /), 'A', 'm2/s2', 'Zonal velocity squared' ) call addfld ('WSPEED', (/ 'lev' /), 'X', 'm/s', 'Horizontal total wind speed maximum' ) call addfld ('WSPDSRFMX', horiz_only, 'X', 'm/s', 'Horizontal total wind speed maximum at surface layer midpoint' ) @@ -339,6 +340,7 @@ subroutine diag_init_dry(pbuf2d) call add_default ('VT ', 1, ' ') call add_default ('VU ', 1, ' ') call add_default ('VV ', 1, ' ') + call add_default ('UT ', 1, ' ') call add_default ('UU ', 1, ' ') call add_default ('OMEGAT ', 1, ' ') call add_default ('OMEGAU ', 1, ' ') @@ -438,6 +440,7 @@ subroutine diag_init_moist(pbuf2d) ! outfld calls in diag_phys_writeout call addfld ('OMEGAQ', (/ 'lev' /), 'A', 'kgPa/kgs', 'Vertical water transport' ) + call addfld ('UQ', (/ 'lev' /), 'A', 'm/skg/kg', 'Zonal water transport') call addfld ('VQ', (/ 'lev' /), 'A', 'm/skg/kg', 'Meridional water transport') call addfld ('QQ', (/ 'lev' /), 'A', 'kg2/kg2', 'Eddy moisture variance') @@ -611,6 +614,7 @@ subroutine diag_init_moist(pbuf2d) end if if (history_eddy) then + call add_default ('UQ ', 1, ' ') call add_default ('VQ ', 1, ' ') endif @@ -1017,6 +1021,9 @@ subroutine diag_phys_writeout_dry(state, pbuf, p_surf_t) ! ! zonal advection ! + ftem(:ncol,:) = state%u(:ncol,:)*state%t(:ncol,:) + call outfld ('UT ',ftem ,pcols ,lchnk ) + ftem(:ncol,:) = state%u(:ncol,:)**2 call outfld ('UU ',ftem ,pcols ,lchnk ) @@ -1281,9 +1288,10 @@ subroutine diag_phys_writeout_moist(state, pbuf, p_surf_t) call outfld('PDELDRY', state%pdeldry, pcols, lchnk) call outfld('PDEL', state%pdel, pcols, lchnk) - ! - ! Meridional advection fields - ! + + ftem(:ncol,:) = state%u(:ncol,:)*state%q(:ncol,:,ixq) + call outfld ('UQ ',ftem ,pcols ,lchnk ) + ftem(:ncol,:) = state%v(:ncol,:)*state%q(:ncol,:,ixq) call outfld ('VQ ',ftem ,pcols ,lchnk ) From 45860703ae083b6e655507e2acc645577d133a19 Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Fri, 6 Dec 2024 14:07:06 -0500 Subject: [PATCH 14/20] fix for history_eddy option --- doc/ChangeLog | 5 +++++ src/physics/cam/vertical_diffusion.F90 | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index ea4766c48d..0766808971 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -123,6 +123,11 @@ src/physics/cam/nucleate_ice_cam.F90 - add conditionals so naer2 array not referenced when there are no aerosols. +src/physics/cam/vertical_diffusion.F90 +. vertical_diffusion_init + - fix conditional around add_default call for UFLX and VFLX so those + fields aren't added if they're not computed. + src/physics/cam7/physpkg.F90 . tphysbc - add conditionals so modal aerosol calculations only called when modal diff --git a/src/physics/cam/vertical_diffusion.F90 b/src/physics/cam/vertical_diffusion.F90 index 472b2a5501..e2d571a4de 100644 --- a/src/physics/cam/vertical_diffusion.F90 +++ b/src/physics/cam/vertical_diffusion.F90 @@ -619,8 +619,10 @@ subroutine vertical_diffusion_init(pbuf2d) endif if (history_eddy) then - call add_default( 'UFLX ', 1, ' ' ) - call add_default( 'VFLX ', 1, ' ' ) + if (.not. do_pbl_diags) then + call add_default( 'UFLX ', 1, ' ' ) + call add_default( 'VFLX ', 1, ' ' ) + end if endif if( history_budget ) then From d1736fce0e0f50400d45d66c36db01ac6e1a3ea5 Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Thu, 12 Dec 2024 11:36:44 -0500 Subject: [PATCH 15/20] add ozone for hightop aquaplanet configs --- bld/namelist_files/use_cases/aquaplanet_cam7.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bld/namelist_files/use_cases/aquaplanet_cam7.xml b/bld/namelist_files/use_cases/aquaplanet_cam7.xml index 405e14bbe0..efbfff14b1 100644 --- a/bld/namelist_files/use_cases/aquaplanet_cam7.xml +++ b/bld/namelist_files/use_cases/aquaplanet_cam7.xml @@ -26,7 +26,8 @@ atm/cam/solar/ape_solar_ave_tsi_1365.nc -apeozone_cam3_5_54.nc +apeozone_cam3_5_54.nc +aquaplanet_ozone_hightop_c20180412.nc atm/cam/ozone OZONE CYCLICAL From 454ce0a4c90b3be3899f03041015defb37d5c33c Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Wed, 1 Jan 2025 12:12:01 -0500 Subject: [PATCH 16/20] mods and tests for QPMT configuration --- .../use_cases/aquaplanet_cam7.xml | 2 ++ cime_config/testdefs/testlist_cam.xml | 18 ++++++++++++++++++ doc/ChangeLog | 14 +++++++++++++- 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/bld/namelist_files/use_cases/aquaplanet_cam7.xml b/bld/namelist_files/use_cases/aquaplanet_cam7.xml index efbfff14b1..8e1c9fba5a 100644 --- a/bld/namelist_files/use_cases/aquaplanet_cam7.xml +++ b/bld/namelist_files/use_cases/aquaplanet_cam7.xml @@ -5,6 +5,8 @@ atm/cam/inic/se/QPLT_L58_ne3pg3_c241127.nc atm/cam/inic/se/QPLT_L58_ne30pg3_c241127.nc +atm/cam/inic/se/QPMT_L93_ne3pg3_c241223.nc +atm/cam/inic/se/QPMT_L93_ne30pg3_c241223.nc 0. diff --git a/cime_config/testdefs/testlist_cam.xml b/cime_config/testdefs/testlist_cam.xml index f4b76a14a0..c26abe5512 100644 --- a/cime_config/testdefs/testlist_cam.xml +++ b/cime_config/testdefs/testlist_cam.xml @@ -208,6 +208,24 @@ + + + + + + + + + + + + + + + + + + diff --git a/doc/ChangeLog b/doc/ChangeLog index 0766808971..5452b8a48c 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -4,7 +4,7 @@ Tag name: Originator(s): eaton Date: One-line Summary: Add QPLT and QPMT compsets, plus misc. -Github PR URL: +Github PR URL: https://github.com/ESCOMP/CAM/pull/1203 Purpose of changes (include the issue number and title text for each relevant GitHub issue): @@ -36,6 +36,15 @@ Describe any changes made to the namelist: none List any changes to the defaults for the boundary datasets: . add spun up initial files for QPLT compset on ne3pg3 and ne30pg3 grids. + atm/cam/inic/se/QPLT_L58_ne3pg3_c241127.nc + atm/cam/inic/se/QPLT_L58_ne30pg3_c241127.nc + +. add spun up initial files for QPMT compset on ne3pg3 and ne30pg3 grids. + atm/cam/inic/se/QPMT_L93_ne3pg3_c241223.nc + atm/cam/inic/se/QPMT_L93_ne30pg3_c241223.nc + +. add ozone dataset for high top aquaplanet runs + atm/cam/ozone/aquaplanet_ozone_hightop_c20180412.nc Describe any substantial timing or memory changes: n/a @@ -69,6 +78,7 @@ bld/namelist_files/use_cases/aquaplanet_cam7.xml - Add spun-up IC files. This allows us to remove the ic_ymd attribute which should not be needed for aquaplanet runs. Removing ic_ymd enables testing with arbitrary start dates. + - Add ozone dataset for high top aquaplanet configuration cime_config/config_component.xml . CAM_CONFIG_OPTS @@ -88,8 +98,10 @@ cime_config/testdefs/testlist_cam.xml . remove non-working DAE test . replace ERP_D_Ln9.f19_f19_mg17.QPC6.derecho_intel.cam-outfrq9s by ERP_D_Ln9.ne30pg3_ne30pg3_mg17.QPLT.derecho_intel.cam-outfrq3s_cosp +. Add ERP_D_Ln9.ne30pg3_ne30pg3_mg17.QPMT.derecho_intel.cam-outfrq3s . replace ERP_D_Ln9.ne3pg3_ne3pg3_mg37.QPC6.izumi_gnu.cam-outfrq9s_rrtmgp by ERP_D_Ln9.ne3pg3_ne3pg3_mg37.QPLT.izumi_gnu.cam-outfrq9s +. Add ERP_D_Ln9.ne3pg3_ne3pg3_mg37.QPMT.izumi_gnu.cam-outfrq9s cime_config/testdefs/testmods_dirs/cam/outfrq3s_cosp/shell_commands . remove "./xmlchange CAM_NML_USE_CASE=UNSET" From 38a3091c56ab2ff4eacaf26376a2f2a06053f057 Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Wed, 1 Jan 2025 12:20:35 -0500 Subject: [PATCH 17/20] update ChangeLog --- doc/ChangeLog | 332 +++++++++++++++++++++++++------------------------- 1 file changed, 166 insertions(+), 166 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index f496cfcdb6..6ae50ee3d8 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,4 +1,170 @@ =============================================================== + +Tag name: +Originator(s): eaton +Date: +One-line Summary: Add QPLT and QPMT compsets, plus misc. +Github PR URL: https://github.com/ESCOMP/CAM/pull/1203 + +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 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: + ERP_Ln9.f09_f09_mg17.FHIST_BGC.derecho_intel.cam-outfrq9s + ERP_Ln9.f09_f09_mg17.FHIST.derecho_intel.cam-outfrq9s + +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. + +Issue #807 - add UT and UQ to cam_diagnostics + - Add UT and UQ. Note that other possible fields mentioned in the issue, + i.e., OMEGA2, OMEGAQ, OMEGAU, and OMEGAV, are already implemented. + OMEGA2 is called OMGAOMGA. + +Describe any changes made to build system: none + +Describe any changes made to the namelist: none + +List any changes to the defaults for the boundary datasets: +. add spun up initial files for QPLT compset on ne3pg3 and ne30pg3 grids. + atm/cam/inic/se/QPLT_L58_ne3pg3_c241127.nc + atm/cam/inic/se/QPLT_L58_ne30pg3_c241127.nc + +. add spun up initial files for QPMT compset on ne3pg3 and ne30pg3 grids. + atm/cam/inic/se/QPMT_L93_ne3pg3_c241223.nc + atm/cam/inic/se/QPMT_L93_ne30pg3_c241223.nc + +. add ozone dataset for high top aquaplanet runs + atm/cam/ozone/aquaplanet_ozone_hightop_c20180412.nc + +Describe any substantial timing or memory changes: n/a + +Code reviewed by: + +List all files eliminated: + +cime_config/testdefs/testmods_dirs/cam/dae/shell_commands +cime_config/testdefs/testmods_dirs/cam/dae/user_nl_cam +cime_config/testdefs/testmods_dirs/cam/dae/user_nl_cpl +test/system/da_cam_no_data_mod.sh +. DAE test removed + +List all files added and what they do: none + +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. +. 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 + 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. + - Add spun-up IC files. This allows us to remove the ic_ymd attribute + which should not be needed for aquaplanet runs. Removing ic_ymd + enables testing with arbitrary start dates. + - Add ozone dataset for high top aquaplanet configuration + +cime_config/config_component.xml +. CAM_CONFIG_OPTS + - add match for _CAM70.*_SLND_SICE_DOCN%AQP to set '-chem none' +. CAM_NML_USE_CASE + - add match for 2000_CAM70.*_SLND_SICE_DOCN%AQP to use aquaplanet_cam7. + This match will work for both %LT and %MT configs. + +cime_config/config_compsets.xml +. 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: + ERP_Ln9.f09_f09_mg17.FHIST_BGC.derecho_intel.cam-outfrq9s + ERP_Ln9.f09_f09_mg17.FHIST.derecho_intel.cam-outfrq9s +. remove non-working DAE test +. replace ERP_D_Ln9.f19_f19_mg17.QPC6.derecho_intel.cam-outfrq9s + by ERP_D_Ln9.ne30pg3_ne30pg3_mg17.QPLT.derecho_intel.cam-outfrq3s_cosp +. Add ERP_D_Ln9.ne30pg3_ne30pg3_mg17.QPMT.derecho_intel.cam-outfrq3s +. replace ERP_D_Ln9.ne3pg3_ne3pg3_mg37.QPC6.izumi_gnu.cam-outfrq9s_rrtmgp + by ERP_D_Ln9.ne3pg3_ne3pg3_mg37.QPLT.izumi_gnu.cam-outfrq9s +. Add ERP_D_Ln9.ne3pg3_ne3pg3_mg37.QPMT.izumi_gnu.cam-outfrq9s + +cime_config/testdefs/testmods_dirs/cam/outfrq3s_cosp/shell_commands +. remove "./xmlchange CAM_NML_USE_CASE=UNSET" + +cime_config/testdefs/testmods_dirs/cam/outfrq3s_cosp/user_nl_cam +. add CS_SNOWCERT and CS_SNOWPOSS to fexcl1 + +src/chemistry/mozart/mo_drydep.F90 +. get_landuse_and_soilw_from_file + - restrict the INFO messages to only print from masterproc + +src/physics/cam/cam_diagnostics.F90 +. diag_init_dry + - add addfld call for UT, and corresponding add_default for UT inside the + history_eddy conditional. +. diag_phys_writeout_dry + - add calculation and outfld call for UT +. diag_init_moist + - add addfld call for UQ, and corresponding add_default for UQ inside the + history_eddy conditional. +. diag_phys_writeout_moist + - add calculation and outfld call for UQ + +src/physics/cam/microp_aero.F90 +. microp_aero_run + - add condition that number of bulk aerosols must be > 0 before calling + ndrop_bam_run. + +src/physics/cam/nucleate_ice_cam.F90 +. nucleate_ice_cam_calc + - add conditionals so naer2 array not referenced when there are no + aerosols. + +src/physics/cam/vertical_diffusion.F90 +. vertical_diffusion_init + - fix conditional around add_default call for UFLX and VFLX so those + fields aren't added if they're not computed. + +src/physics/cam7/physpkg.F90 +. tphysbc + - add conditionals so modal aerosol calculations only called when modal + aerosols are present. + +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: + +derecho/nvhpc/aux_cam: + +izumi/nag/aux_cam: + +izumi/gnu/aux_cam: + +CAM tag used for the baseline comparison tests if different than previous +tag: + +Summarize any changes to answers: + +=============================================================== +=============================================================== Tag name: cam6_4_050 Originator(s): jimmielin Date: 31 Dec 2024 @@ -521,172 +687,6 @@ this tag and confirmed that there were no DIFFs =============================================================== -Tag name: -Originator(s): eaton -Date: -One-line Summary: Add QPLT and QPMT compsets, plus misc. -Github PR URL: https://github.com/ESCOMP/CAM/pull/1203 - -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 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: - ERP_Ln9.f09_f09_mg17.FHIST_BGC.derecho_intel.cam-outfrq9s - ERP_Ln9.f09_f09_mg17.FHIST.derecho_intel.cam-outfrq9s - -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. - -Issue #807 - add UT and UQ to cam_diagnostics - - Add UT and UQ. Note that other possible fields mentioned in the issue, - i.e., OMEGA2, OMEGAQ, OMEGAU, and OMEGAV, are already implemented. - OMEGA2 is called OMGAOMGA. - -Describe any changes made to build system: none - -Describe any changes made to the namelist: none - -List any changes to the defaults for the boundary datasets: -. add spun up initial files for QPLT compset on ne3pg3 and ne30pg3 grids. - atm/cam/inic/se/QPLT_L58_ne3pg3_c241127.nc - atm/cam/inic/se/QPLT_L58_ne30pg3_c241127.nc - -. add spun up initial files for QPMT compset on ne3pg3 and ne30pg3 grids. - atm/cam/inic/se/QPMT_L93_ne3pg3_c241223.nc - atm/cam/inic/se/QPMT_L93_ne30pg3_c241223.nc - -. add ozone dataset for high top aquaplanet runs - atm/cam/ozone/aquaplanet_ozone_hightop_c20180412.nc - -Describe any substantial timing or memory changes: n/a - -Code reviewed by: - -List all files eliminated: - -cime_config/testdefs/testmods_dirs/cam/dae/shell_commands -cime_config/testdefs/testmods_dirs/cam/dae/user_nl_cam -cime_config/testdefs/testmods_dirs/cam/dae/user_nl_cpl -test/system/da_cam_no_data_mod.sh -. DAE test removed - -List all files added and what they do: none - -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. -. 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 - 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. - - Add spun-up IC files. This allows us to remove the ic_ymd attribute - which should not be needed for aquaplanet runs. Removing ic_ymd - enables testing with arbitrary start dates. - - Add ozone dataset for high top aquaplanet configuration - -cime_config/config_component.xml -. CAM_CONFIG_OPTS - - add match for _CAM70.*_SLND_SICE_DOCN%AQP to set '-chem none' -. CAM_NML_USE_CASE - - add match for 2000_CAM70.*_SLND_SICE_DOCN%AQP to use aquaplanet_cam7. - This match will work for both %LT and %MT configs. - -cime_config/config_compsets.xml -. 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: - ERP_Ln9.f09_f09_mg17.FHIST_BGC.derecho_intel.cam-outfrq9s - ERP_Ln9.f09_f09_mg17.FHIST.derecho_intel.cam-outfrq9s -. remove non-working DAE test -. replace ERP_D_Ln9.f19_f19_mg17.QPC6.derecho_intel.cam-outfrq9s - by ERP_D_Ln9.ne30pg3_ne30pg3_mg17.QPLT.derecho_intel.cam-outfrq3s_cosp -. Add ERP_D_Ln9.ne30pg3_ne30pg3_mg17.QPMT.derecho_intel.cam-outfrq3s -. replace ERP_D_Ln9.ne3pg3_ne3pg3_mg37.QPC6.izumi_gnu.cam-outfrq9s_rrtmgp - by ERP_D_Ln9.ne3pg3_ne3pg3_mg37.QPLT.izumi_gnu.cam-outfrq9s -. Add ERP_D_Ln9.ne3pg3_ne3pg3_mg37.QPMT.izumi_gnu.cam-outfrq9s - -cime_config/testdefs/testmods_dirs/cam/outfrq3s_cosp/shell_commands -. remove "./xmlchange CAM_NML_USE_CASE=UNSET" - -cime_config/testdefs/testmods_dirs/cam/outfrq3s_cosp/user_nl_cam -. add CS_SNOWCERT and CS_SNOWPOSS to fexcl1 - -src/chemistry/mozart/mo_drydep.F90 -. get_landuse_and_soilw_from_file - - restrict the INFO messages to only print from masterproc - -src/physics/cam/cam_diagnostics.F90 -. diag_init_dry - - add addfld call for UT, and corresponding add_default for UT inside the - history_eddy conditional. -. diag_phys_writeout_dry - - add calculation and outfld call for UT -. diag_init_moist - - add addfld call for UQ, and corresponding add_default for UQ inside the - history_eddy conditional. -. diag_phys_writeout_moist - - add calculation and outfld call for UQ - -src/physics/cam/microp_aero.F90 -. microp_aero_run - - add condition that number of bulk aerosols must be > 0 before calling - ndrop_bam_run. - -src/physics/cam/nucleate_ice_cam.F90 -. nucleate_ice_cam_calc - - add conditionals so naer2 array not referenced when there are no - aerosols. - -src/physics/cam/vertical_diffusion.F90 -. vertical_diffusion_init - - fix conditional around add_default call for UFLX and VFLX so those - fields aren't added if they're not computed. - -src/physics/cam7/physpkg.F90 -. tphysbc - - add conditionals so modal aerosol calculations only called when modal - aerosols are present. - -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: - -derecho/nvhpc/aux_cam: - -izumi/nag/aux_cam: - -izumi/gnu/aux_cam: - -CAM tag used for the baseline comparison tests if different than previous -tag: - -Summarize any changes to answers: - -=============================================================== -=============================================================== - Tag name: cam6_4_047 Originator(s): jedwards4b, fvitt Date: 19 November 2024 From 529e386216efbf2206025c59d17fa4f8235d16e9 Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Fri, 3 Jan 2025 12:20:40 -0500 Subject: [PATCH 18/20] mods to namelist defaults and testlist --- bld/namelist_files/namelist_defaults_cam.xml | 3 --- cime_config/testdefs/testlist_cam.xml | 9 --------- doc/ChangeLog | 11 ++++++----- 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml index 3d1643c4c8..1ac3b4d3a6 100644 --- a/bld/namelist_files/namelist_defaults_cam.xml +++ b/bld/namelist_files/namelist_defaults_cam.xml @@ -264,12 +264,9 @@ 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/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 c26abe5512..fc0903685b 100644 --- a/cime_config/testdefs/testlist_cam.xml +++ b/cime_config/testdefs/testlist_cam.xml @@ -1778,15 +1778,6 @@ - - - - - - - - - diff --git a/doc/ChangeLog b/doc/ChangeLog index 6ae50ee3d8..609f354f7a 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -63,9 +63,8 @@ List all files added and what they do: none 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. -. add new file for ne30np4 L58 aquaplanet. +. Remove ncdata files for nlev=58 and nlev=93 aquaplanet. Those files are + specified in the aquaplanet_cam7.xml use case file. bld/namelist_files/use_cases/aquaplanet_cam7.xml . use case file for QPLT and QPMT. Same as for QPC6 except: @@ -98,7 +97,7 @@ cime_config/testdefs/testlist_cam.xml . remove non-working DAE test . replace ERP_D_Ln9.f19_f19_mg17.QPC6.derecho_intel.cam-outfrq9s by ERP_D_Ln9.ne30pg3_ne30pg3_mg17.QPLT.derecho_intel.cam-outfrq3s_cosp -. Add ERP_D_Ln9.ne30pg3_ne30pg3_mg17.QPMT.derecho_intel.cam-outfrq3s +. Add ERP_D_Ln9.ne30pg3_ne30pg3_mg17.QPMT.derecho_intel.cam-outfrq9s . replace ERP_D_Ln9.ne3pg3_ne3pg3_mg37.QPC6.izumi_gnu.cam-outfrq9s_rrtmgp by ERP_D_Ln9.ne3pg3_ne3pg3_mg37.QPLT.izumi_gnu.cam-outfrq9s . Add ERP_D_Ln9.ne3pg3_ne3pg3_mg37.QPMT.izumi_gnu.cam-outfrq9s @@ -161,7 +160,9 @@ izumi/gnu/aux_cam: CAM tag used for the baseline comparison tests if different than previous tag: -Summarize any changes to answers: +Summarize any changes to answers: BFB. Note however that a change in the + testmod definition for outfrq3s_cosp causes answer changes for tests + using that testmod. =============================================================== =============================================================== From 22e9efeed49ab397e63d3f007edd6693214dbb0b Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Fri, 10 Jan 2025 11:46:08 -0500 Subject: [PATCH 19/20] add QPLT and QPMT tests to prealpha category --- cime_config/testdefs/testlist_cam.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cime_config/testdefs/testlist_cam.xml b/cime_config/testdefs/testlist_cam.xml index 600436da24..d0789ac1f3 100644 --- a/cime_config/testdefs/testlist_cam.xml +++ b/cime_config/testdefs/testlist_cam.xml @@ -202,6 +202,7 @@ + @@ -220,6 +221,7 @@ + From 27f78e8f42a90894ddb97bd73dcd95d925d88707 Mon Sep 17 00:00:00 2001 From: Brian Eaton Date: Mon, 13 Jan 2025 10:30:39 -0500 Subject: [PATCH 20/20] update ChangeLog --- doc/ChangeLog | 38 ++++++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 59fa406cf4..625bc0dbbb 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,8 +1,8 @@ =============================================================== -Tag name: +Tag name: cam6_4_055 Originator(s): eaton -Date: +Date: 13 January 2025 One-line Summary: Add QPLT and QPMT compsets, plus misc. Github PR URL: https://github.com/ESCOMP/CAM/pull/1203 @@ -48,7 +48,7 @@ List any changes to the defaults for the boundary datasets: Describe any substantial timing or memory changes: n/a -Code reviewed by: +Code reviewed by: cacraig List all files eliminated: @@ -151,17 +151,47 @@ appropriate machine below. All failed tests must be justified. derecho/intel/aux_cam: +ERC_D_Ln9.f19_f19_mg17.QPC6.derecho_intel.cam-outfrq3s_cosp (Overall: DIFF) +- diffs due to changing the test definition (in outfrq3s_cosp) so that the use case file, + aquaplanet_cam6.xml, is no longer ignored. This changes answers. + +ERP_D_Ln9.ne30pg3_ne30pg3_mg17.QPLT.derecho_intel.cam-outfrq3s_cosp (Overall: DIFF) +ERP_D_Ln9.ne30pg3_ne30pg3_mg17.QPMT.derecho_intel.cam-outfrq9s (Overall: DIFF) +- There are no baselines for these new tests. + +ERP_Ln9.f09_f09_mg17.FCSD_HCO.derecho_intel.cam-outfrq9s (Overall: FAIL) +- pre-existing failure due to HEMCO not having reproducible results issues #1018 and #856 + +SMS_D_Ln9.f19_f19_mg17.FXHIST.derecho_intel.cam-outfrq9s_amie (Overall: FAIL) +SMS_D_Ln9_P1280x1.ne0CONUSne30x8_ne0CONUSne30x8_mt12.FCHIST.derecho_intel.cam-outfrq9s (Overall: FAIL) +- pre-existing failures due to build-namelist error requiring CLM/CTSM external update. + derecho/nvhpc/aux_cam: +ERS_Ln9.ne30pg3_ne30pg3_mg17.F2000dev.derecho_nvhpc.cam-outfrq9s_gpu_default (Overall: FAIL) +- pre-existing failure -- issue #1220 + izumi/nag/aux_cam: +ERC_D_Ln9.f10_f10_mg37.QPC5.izumi_nag.cam-outfrq3s_cosp (Overall: DIFF) details: +- diffs due to changing the test definition (in outfrq3s_cosp) so that the use case file, + aquaplanet_cam5.xml, is no longer ignored. This changes answers. + izumi/gnu/aux_cam: +ERC_D_Ln9.f10_f10_mg37.QPC4.izumi_gnu.cam-outfrq3s_diags (Overall: DIFF) +- Diff is due to the new diagnostic fields UT and UQ being included in the + test. Otherwise the run is identical with the baseline. + +ERP_D_Ln9.ne3pg3_ne3pg3_mg37.QPLT.izumi_gnu.cam-outfrq9s (Overall: DIFF) +ERP_D_Ln9.ne3pg3_ne3pg3_mg37.QPMT.izumi_gnu.cam-outfrq9s (Overall: DIFF) +- There are no baselines for these new tests. + CAM tag used for the baseline comparison tests if different than previous tag: Summarize any changes to answers: BFB. Note however that a change in the - testmod definition for outfrq3s_cosp causes answer changes for tests + test definition for outfrq3s_cosp causes answer changes for tests using that testmod. ===============================================================