From 336123b34b7509363c2b08e8a4ccb6abbe376ac4 Mon Sep 17 00:00:00 2001
From: Wuyin Lin <wlin@bnl.gov>
Date: Fri, 3 Nov 2023 16:05:43 -0700
Subject: [PATCH] Fix tests incompatitle with L80 and restore tentative config
 options for SSP

---
 cime_config/testmods_dirs/allactive/wcprodssp/user_nl_eam     | 3 +++
 components/eam/cime_config/config_component.xml               | 1 -
 .../testdefs/testmods_dirs/eam/condidiag_dcape/user_nl_eam    | 2 +-
 .../testdefs/testmods_dirs/eam/condidiag_rhi/user_nl_eam      | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/cime_config/testmods_dirs/allactive/wcprodssp/user_nl_eam b/cime_config/testmods_dirs/allactive/wcprodssp/user_nl_eam
index ed257c9975a1..b83a8c6ca22d 100644
--- a/cime_config/testmods_dirs/allactive/wcprodssp/user_nl_eam
+++ b/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'
diff --git a/components/eam/cime_config/config_component.xml b/components/eam/cime_config/config_component.xml
index d3d549072d68..27a3c338feb2 100755
--- a/components/eam/cime_config/config_component.xml
+++ b/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>
diff --git a/components/eam/cime_config/testdefs/testmods_dirs/eam/condidiag_dcape/user_nl_eam b/components/eam/cime_config/testdefs/testmods_dirs/eam/condidiag_dcape/user_nl_eam
index 627d0cbc8610..953394566fda 100644
--- a/components/eam/cime_config/testdefs/testmods_dirs/eam/condidiag_dcape/user_nl_eam
+++ b/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,     80,
 
  l_output_state = .true.
  l_output_incrm = .false.
diff --git a/components/eam/cime_config/testdefs/testmods_dirs/eam/condidiag_rhi/user_nl_eam b/components/eam/cime_config/testdefs/testmods_dirs/eam/condidiag_rhi/user_nl_eam
index 5cd446c2b751..6874a7b22e9e 100644
--- a/components/eam/cime_config/testdefs/testmods_dirs/eam/condidiag_rhi/user_nl_eam
+++ b/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       =  80,         80
  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 =  80,    80,  80
 
  l_output_state = .true.
  l_output_incrm = .true.