Merge branch 'wlin/atm/fix_tests_with_L80' into next (PR #6054)

Fix tests incompatitle with L80 and restore tentative config options for SSP

The PR fixes two sets of tests.

. SSP tests with tentative fix from # 5965 stops working. The EAM%CMIP6
  generic pattern match needs to be removed to have it work. This is
  due to the -vbs option that would be set if having the generic pattern match.
  The additive style of EAM configure option would then have no mechansim to
  disable vbs once set.

. Update the vertical dimension for 3D variables that condidiag tests track.

[BFB] Only the above mentioned tests will diff; and the the differences for these tests
      following this fix are due to #5996, and other went in on the same day.

cime_config/testmods_dirs/allactive/wcprodssp/user_nl_eam

@@ -11,3 +11,6 @@
  fincl5 = 'PRECT','PRECC','TUQ','TVQ','QFLX','SHFLX','U90M','V90M'
  fincl6 = 'CLDTOT_ISCCP','MEANCLDALB_ISCCP','MEANTAU_ISCCP','MEANPTOP_ISCCP','MEANTB_ISCCP','CLDTOT_CAL','CLDTOT_CAL_LIQ','CLDTOT_CAL_ICE','CLDTOT_CAL_UN','CLDHGH_CAL','CLDHGH_CAL_LIQ','CLDHGH_CAL_ICE','CLDHGH_CAL_UN','CLDMED_CAL','CLDMED_CAL_LIQ','CLDMED_CAL_ICE','CLDMED_CAL_UN','CLDLOW_CAL','CLDLOW_CAL_LIQ','CLDLOW_CAL_ICE','CLDLOW_CAL_UN'
  fincl7 = 'O3', 'PS', 'TROP_P'
+
+! Specify an L80 IC to override eam.i from reference case, which is still for L72
+ ncdata = '$DIN_LOC_ROOT/atm/cam/inic/homme/eami_mam4_Linoz_ne30np4_L80_c20231010.nc'

cime_config/tests.py

@@ -289,12 +289,12 @@
         "inherit" : ("e3sm_developer", "e3sm_atm_integration", "e3sm_mmf_integration"),
         "time"    : "03:00:00",
         "tests"   : (
-            "ERS.ne11_oQU240.WCYCL1850NS",
+            "ERS.ne4pg2_oQU480.WCYCL1850NS",
             "SMS_D_Ld1.ne30pg2_EC30to60E2r2.WCYCL1850.allactive-wcprod",
             "SMS_D_Ld1.ne30pg2_EC30to60E2r2.WCYCLSSP370.allactive-wcprodssp",
             "ERS_Ld3.ne4_oQU240.F2010",
             #"ERT_Ld31.ne16_g37.B1850C5",#add this line back in with the new correct compset
-            "NCK.ne11_oQU240.WCYCL1850NS",
+            "NCK.ne4pg2_oQU480.WCYCL1850NS",
             "PET.f19_g16.X.allactive-mach-pet",
             "PET.f45_g37_rx1.A.allactive-mach-pet",
             "PET_Ln9_PS.ne30pg2_EC30to60E2r2.WCYCL1850.allactive-mach-pet",

components/eam/bld/namelist_files/namelist_defaults_eam.xml

@@ -55,6 +55,7 @@
 <ncdata dyn="se" hgrid="ne30np4"  nlev="128" ic_ymd="101" >atm/cam/inic/homme/cami_mam3_Linoz_ne30np4_SCREAM_L128_c160214.nc</ncdata>
 <ncdata dyn="se" hgrid="ne45np4"  nlev="72"  ic_ymd="101" >atm/cam/inic/homme/cami_mam3_Linoz_ne45np4_L72_c20200611.nc</ncdata>
 <ncdata dyn="se" hgrid="ne120np4" nlev="72"  ic_ymd="101" >atm/cam/inic/homme/cami_mam3_Linoz_0000-01-ne120np4_L72_c160318.nc</ncdata>
+<ncdata dyn="se" hgrid="ne120np4" nlev="80"  ic_ymd="101" >atm/cam/inic/homme/eami_mam4_Linoz_ne120np4_L80_c20231010.nc</ncdata>
 
 <!-- E3SMv3 Atmosphere Initial conditions -->
 <ncdata dyn="se" hgrid="ne4np4"   nlev="80"  ic_ymd="101" >atm/cam/inic/homme/eami_mam4_Linoz_ne4np4_L80_c20231010.nc</ncdata>

components/eam/cime_config/config_component.xml

@@ -51,7 +51,6 @@
 
       <value compset=""                        >-mach $MACH</value>
       <value compset="_EAM"                    >-phys default</value>
-      <value compset="_EAM%CMIP6_"             >&eamv3_phys_defaults; &eamv3_chem_defaults;</value>
       <value compset="_EAM%CMIP6-1pctCO2"      >&eamv3_phys_defaults; &eamv3_chem_defaults;</value>
       <value compset="_EAM%CMIP6-4xCO2"        >&eamv3_phys_defaults; &eamv3_chem_defaults;</value>
       <value compset="^((?!SSP).)*_EAM%CMIP6_" >&eamv3_phys_defaults; &eamv3_chem_defaults;</value>

components/eam/cime_config/testdefs/testmods_dirs/eam/condidiag_dcape/user_nl_eam

@@ -3,7 +3,7 @@
  qoi_chkpt = 'RAD', 'PACEND','DYNEND','DEEPCU', 'STCLD',
 
  qoi_name = 'CAPE','dCAPE'
- qoi_nver =  1,     72,
+ qoi_nver =  1,     -1,
 
  l_output_state = .true.
  l_output_incrm = .false.

components/eam/cime_config/testdefs/testmods_dirs/eam/condidiag_rhi/user_nl_eam

@@ -3,7 +3,7 @@
 !  - condition 2: all grid columns and time steps
 
  metric_name       = 'RHI',      'RHI',
- metric_nver       =  72,         72
+ metric_nver       =  -1,         -1
  metric_cmpr_type  =  1,          1
  metric_threshold  =  125,        -1
  cnd_eval_chkpt    =  'CLDMAC01', 'CLDMAC01'
@@ -18,7 +18,7 @@
                'CLDMAC06','CLDMIC06'
 
  qoi_name = 'RHI', 'Q', 'QSATI'
- qoi_nver =  72,    72,  72
+ qoi_nver =  -1,    -1,  -1
 
  l_output_state = .true.
  l_output_incrm = .true.

components/eam/src/physics/cam/conditional_diag.F90

@@ -316,6 +316,8 @@ subroutine cnd_diag_readnl(nlfile)
 
             end if
          end do
+         ! metric_nver = -1 read in from namelist should be interpreted as pver for flexible configuration
+         where ( metric_nver(1:ncnd) == -1 ) metric_nver(1:ncnd) = pver
 
          if (any( metric_nver     (1:ncnd) <= 0   )) call endrun(subname//' error: need positive metric_nver for each metric_name')
          if (any( metric_cmpr_type(1:ncnd) == -99 )) call endrun(subname//' error: need valid metric_cmpr_type for each metric_name')
@@ -335,6 +337,8 @@ subroutine cnd_diag_readnl(nlfile)
          end do
          nqoi = ii
 
+         ! qoi_nver = -1 read in from namelist should be interpreted as pver for flexible configuration
+         where ( qoi_nver(1:nqoi) == -1 ) qoi_nver(1:nqoi) = pver
          if (any(qoi_nver(1:nqoi)<=0)) call endrun(subname//'error: need positive qoi_nver for each qoi_name')
 
          !---------------------------------------------