From c99428671fdf7c1837e567c8f268af76b801c1b5 Mon Sep 17 00:00:00 2001 From: Wuyin Lin Date: Sun, 12 Sep 2021 14:50:55 -0700 Subject: [PATCH] Revert "Revert "Merge branch 'wlin/atm/cleanup_v2compsets_for_tests' into next (PR #4488)"" This reverts commit c6b622012985df138fd83689479fc0aa2e62c750. --- cime_config/allactive/config_compsets.xml | 128 +---------- cime_config/tests.py | 210 +++++++++--------- .../use_cases/1850_cam5_av1c-04p2.xml | 152 ------------- .../use_cases/2000_cam5_av1c-04p2.xml | 123 ---------- .../use_cases/2000_cam5_av1c-04p2_bgc.xml | 123 ---------- .../use_cases/2000_cam5_av1c-04p2_gust.xml | 156 ------------- .../use_cases/2000_cam5_av1c-h01a.xml | 127 ----------- .../use_cases/20TR_cam5_av1c-04p2.xml | 151 ------------- .../eam/cime_config/config_component.xml | 9 - .../eam/cime_config/config_compsets.xml | 46 ++-- 10 files changed, 122 insertions(+), 1103 deletions(-) delete mode 100644 components/eam/bld/namelist_files/use_cases/1850_cam5_av1c-04p2.xml delete mode 100644 components/eam/bld/namelist_files/use_cases/2000_cam5_av1c-04p2.xml delete mode 100644 components/eam/bld/namelist_files/use_cases/2000_cam5_av1c-04p2_bgc.xml delete mode 100644 components/eam/bld/namelist_files/use_cases/2000_cam5_av1c-04p2_gust.xml delete mode 100644 components/eam/bld/namelist_files/use_cases/2000_cam5_av1c-h01a.xml delete mode 100644 components/eam/bld/namelist_files/use_cases/20TR_cam5_av1c-04p2.xml diff --git a/cime_config/allactive/config_compsets.xml b/cime_config/allactive/config_compsets.xml index 56579374003a..12b989036ce5 100644 --- a/cime_config/allactive/config_compsets.xml +++ b/cime_config/allactive/config_compsets.xml @@ -39,11 +39,6 @@ - - A_WCYCL1850S_CMIP6 - 1850SOI_EAM%CMIP6_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV - - WCYCL1850 1850SOI_EAM%CMIP6_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV @@ -64,18 +59,13 @@ 1950SOI_EAM%CMIP6_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV - - A_WCYCL20TRS_CMIP6 - 20TRSOI_EAM%CMIP6_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV - - WCYCL20TR 20TRSOI_EAM%CMIP6_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV - A_WCYCLSSP585_CMIP6 + WCYCLSSP585 SSP585SOI_EAM%CMIP6_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV @@ -91,74 +81,6 @@ 20TRSOI_EAM%AR5sf_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV - - A_WCYCL2000 - 2000_EAM%AV1C-L_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV - - - - A_WCYCL2000S - 2000SOI_EAM%AV1C-L_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV - - - - A_WCYCL1850 - 1850_EAM%AV1C-L_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV - - - - A_WCYCL1850S - 1850SOI_EAM%AV1C-L_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV - - - - A_WCYCL20TR - 20TR_EAM%AV1C-L_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV - - - - A_WCYCL20TRS - 20TRSOI_EAM%AV1C-L_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV - - - - A_CRYO - 2000_EAM%AV1C-L_ELM%SPBC_MPASSI_MPASO_MOSART_MALI_SWAV - - - - - - A_WCYCL2000_H01A - 2000_EAM%AV1C-H01A_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV - - - - A_WCYCL2000_H01AS - 2000SOI_EAM%AV1C-H01A_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV - - - - A_WCYCL1850_H01A - 1850_EAM%AV1C-H01A_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV - - - - A_WCYCL1850_H01AS - 1850SOI_EAM%AV1C-H01A_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV - - - - - A_WCYCL20TR_H01A - 20TR_EAM%AV1C-H01A_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV - - - - A_WCYCL20TR_H01AS - 20TRSOI_EAM%AV1C-H01A_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV - - @@ -354,26 +276,6 @@ 1950SOI_EAM%CMIP6_ELM%SPBC_MPASSI%DIB_MPASO%IBISMF_MOSART_SGLC_SWAV - - A_WCYCL1850-DIB - 1850_EAM%AV1C-L_ELM%SPBC_MPASSI%DIB_MPASO%IB_MOSART_SGLC_SWAV - - - - A_WCYCL1850-DIB-ISMF - 1850_EAM%AV1C-L_ELM%SPBC_MPASSI%DIB_MPASO%IBISMF_MOSART_SGLC_SWAV - - - - A_WCYCL1850-DIB_CMIP6 - 1850_EAM%CMIP6_ELM%SPBC_MPASSI%DIB_MPASO%IB_MOSART_SGLC_SWAV - - - - A_WCYCL1850-DIB-ISMF_CMIP6 - 1850_EAM%CMIP6_ELM%SPBC_MPASSI%DIB_MPASO%IBISMF_MOSART_SGLC_SWAV - - BGCEXP_BDRD_CNPECACNT_SSP585_CMIP6 SSP585_EAM%CMIP6_ELM%CNPECACNTBC_MPASSI%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BDRD @@ -389,38 +291,16 @@ SSP585SOI_EAM%CMIP6_ELM%CNPECACNTBC_MPASSI_MPASO_MOSART_SGLC_SWAV_BGC%BDRD - - - A_WCYCL1850_v0atm - 1850_EAM_ELM%SP_MPASSI_MPASO_MOSART_SGLC_SWAV - - - - A_WCYCL2000_v0atm - 2000_EAM_ELM%SP_MPASSI_MPASO_MOSART_SGLC_SWAVi - - - - A_WCYCL1850S_v0atm - 1850SOI_EAM_ELM%SP_MPASSI_MPASO_MOSART_SGLC_SWAV - - - - A_WCYCL2000S_v0atm - 2000SOI_EAM_ELM%SP_MPASSI_MPASO_MOSART_SGLC_SWAVi - - - - A_BG1850CN + BG1850CN 1850_EAM_ELM%CN_MPASSI_MPASO_MOSART_MALI%SIA_SWAV - A_BGWCYCL1850 - 1850_EAM%AV1C-L_ELM%SPBC_MPASSI_MPASO_MOSART_MALI%STATIC_SWAV + BGWCYCL1850 + 1850_EAM%CMIP6_ELM%SPBC_MPASSI_MPASO_MOSART_MALI%STATIC_SWAV diff --git a/cime_config/tests.py b/cime_config/tests.py index a77170cf1f48..468c7db8afec 100644 --- a/cime_config/tests.py +++ b/cime_config/tests.py @@ -46,12 +46,12 @@ "e3sm_atm_developer" : { "inherit" : ("eam_theta_pg2"), "tests" : ( - "ERP_Ln9.ne4_ne4.FC5AV1C-L", - "SMS_Ln9.ne4_ne4.FC5AV1C-L.eam-outfrq9s", - "SMS.ne4_ne4.FC5AV1C-L.eam-cosplite", + "ERP_Ln9.ne4_ne4.F2010", + "SMS_Ln9.ne4_ne4.F2010.eam-outfrq9s", + "SMS.ne4_ne4.F2010.eam-cosplite", "SMS_R_Ld5.ne4_ne4.FSCM5A97.eam-scm", - "SMS_D_Ln5.ne4_ne4.FC5AV1C-L", - "SMS_Ln5.ne4pg2_ne4pg2.FC5AV1C-L" + "SMS_D_Ln5.ne4_ne4.F2010", + "SMS_Ln5.ne4pg2_ne4pg2.F2010" ) }, @@ -61,54 +61,54 @@ "ERP_Ln9.ne4_ne4.F-EAM-AQP1", "SMS_Ld1.ne4_ne4.F-EAM-AQP1.eam-clubb_only", "ERP_Ln9.ne4_ne4.F-EAM-RCEMIP", - "PET_Ln5.ne4_ne4.FC5AV1C-L.allactive-mach-pet", - "PEM_Ln5.ne4_ne4.FC5AV1C-L", - "SMS_D_Ln5.ne4_ne4.FC5AV1C-L.eam-cosplite_nhtfrq5", - "SMS_Ln1.ne4_ne4.FC5AV1C-L.eam-chem_pp", - "SMS_D_Ln5.ne4_ne4.FC5AV1C-L.eam-clubb_sp", - "ERS_Ld5.ne4_ne4.FC5AV1C-L.eam-rrtmgp", - "ERS_Ld5.ne4_ne4.FC5AV1C-L.eam-gust_param", - "REP_Ln5.ne4_ne4.FC5AV1C-L", - "SMS_Ld9.ne4pg2_ne4pg2.FC5AV1C-L.eam-thetahy_sl_pg2_mass", + "PET_Ln5.ne4_ne4.F2010.allactive-mach-pet", + "PEM_Ln5.ne4_ne4.F2010", + "SMS_D_Ln5.ne4_ne4.F2010.eam-cosplite_nhtfrq5", + "SMS_Ln1.ne4_ne4.F2010.eam-chem_pp", + "SMS_D_Ln5.ne4_ne4.F2010.eam-clubb_sp", + "ERS_Ld5.ne4_ne4.F2010.eam-rrtmgp", + "ERS_Ld5.ne4_ne4.F2010.eam-gust_param", + "REP_Ln5.ne4_ne4.F2010", + "SMS_Ld9.ne4pg2_ne4pg2.F2010.eam-thetahy_sl_pg2_mass", ) }, #atmopheric tests for extra coverage "e3sm_atm_extra_coverage" : { "tests" : ( - "SMS_Lm1.ne4_ne4.FC5AV1C-L", - "ERS_Ld31.ne4_ne4.FC5AV1C-L", - "ERP_Lm3.ne4_ne4.FC5AV1C-L", - "SMS_D_Ln5.ne30_ne30.FC5AV1C-L", - "ERP_Ln7.ne30_ne30.FC5AV1C-L", - "SMS_Ly1.ne4_ne4.FC5AV1C-L", + "SMS_Lm1.ne4_ne4.F2010", + "ERS_Ld31.ne4_ne4.F2010", + "ERP_Lm3.ne4_ne4.F2010", + "SMS_D_Ln5.ne30_ne30.F2010", + "ERP_Ln7.ne30_ne30.F2010", + "SMS_Ly1.ne4_ne4.F2010", "SMS_D_Ln5.ne45pg2_ne45pg2.F-EAM-AQP1", - "SMS_Ln5.ne4_ne4.FC5AV1C-L.eam-gust_export", - "SMS_D_Ln5.ne4_ne4.FC5AV1C-L.eam-implicit_stress", - "ERS_Ld5.ne30_ne30.FC5AV1C-L.eam-implicit_stress", + "SMS_Ln5.ne4_ne4.F2010.eam-gust_export", + "SMS_D_Ln5.ne4_ne4.F2010.eam-implicit_stress", + "ERS_Ld5.ne30_ne30.F2010.eam-implicit_stress", ) }, #atmopheric tests for hi-res "e3sm_atm_hi_res" : { "time" : "01:30:00", - "tests" : "SMS.ne120_ne120.FC5AV1C-H01A" + "tests" : "SMS.ne120_ne120.F2010" }, #atmopheric tests to mimic low res production runs "e3sm_atm_prod" : { "tests" : ( - "SMS_Ln5.ne30pg2_r05_oECv3.F2010SC5-CMIP6.eam-wcprod", - "SMS.ne30pg2_r05_oECv3.F20TRC5-CMIP6.eam-wcprod", + "SMS_Ln5.ne30pg2_r05_oECv3.F2010.eam-wcprod", + "SMS.ne30pg2_r05_oECv3.F20TR.eam-wcprod", ) }, #atmopheric nbfb tests "e3sm_atm_nbfb" : { "tests" : ( - "PGN_P1x1.ne4_ne4.FC5AV1C-L", - "TSC.ne4_ne4.FC5AV1C-L", - "MVK_PS.ne4_ne4.FC5AV1C-L", + "PGN_P1x1.ne4_ne4.F2010", + "TSC.ne4_ne4.F2010", + "MVK_PS.ne4_ne4.F2010", ) }, @@ -134,7 +134,7 @@ "ERS.f09_g16_g.MALISIA", "SMS.T62_oQU120_ais20.MPAS_LISIO_TEST", "SMS.f09_g16_a.IGELM_MLI", - "SMS_P12x2.ne4_oQU240.A_WCYCL1850.allactive-mach_mods", + "SMS_P12x2.ne4_oQU240.WCYCL1850.allactive-mach_mods", "ERS_Ln9.ne4pg2_ne4pg2.F-MMF1.eam-mmf_crmout", "SMS_B.ne4_ne4.F-EAM-AQP1.eam-hommexx", ) @@ -152,21 +152,21 @@ "inherit" : ("e3sm_developer", "e3sm_atm_integration"), "time" : "03:00:00", "tests" : ( - "ERS.ne11_oQU240.A_WCYCL1850", + "ERS.ne11_oQU240.WCYCL1850", "SMS_D_Ld1.ne30pg2_EC30to60E2r2.WCYCL1850.allactive-wcprod", - "ERS_Ln9.ne4_ne4.FC5AV1C-L", + "ERS_Ln9.ne4_ne4.F2010", #"ERT_Ld31.ne16_g37.B1850C5",#add this line back in with the new correct compset - "NCK.ne11_oQU240.A_WCYCL1850", + "NCK.ne11_oQU240.WCYCL1850", "PET.f19_g16.X.allactive-mach-pet", "PET.f45_g37_rx1.A.allactive-mach-pet", "PET_Ln9_PS.ne30pg2_EC30to60E2r2.WCYCL1850.allactive-mach-pet", "PEM_Ln9.ne30pg2_EC30to60E2r2.WCYCL1850", "ERP_Ld3.ne30pg2_EC30to60E2r2.WCYCL1850.allactive-pioroot1", - "SMS_D_Ln5.conusx4v1_conusx4v1.FC5AV1C-L", + "SMS_D_Ln5.conusx4v1_conusx4v1.F2010", "SMS_Ld2.ne30_oECv3.BGCEXP_CNTL_CNPECACNT_1850.elm-bgcexp", "SMS_Ld2.ne30_oECv3.BGCEXP_CNTL_CNPRDCTC_1850.elm-bgcexp", "SMS_D_Ld1.T62_oEC60to30v3.DTESTM", - "SMS_D_Ld1.ne30pg2_r05_EC30to60E2r2.A_WCYCL1850S_CMIP6", + "SMS_D_Ld1.ne30pg2_r05_EC30to60E2r2.WCYCL1850", "ERP_Ln9.ne4pg2_ne4pg2.F-MMFXX.eam-mmf_fixed_subcycle", "ERS_Ln9.ne4pg2_ne4pg2.F-MMFXX.eam-mmf_use_VT", "ERS_Ln9_P96x1.ne4pg2_ne4pg2.F-MMFXX.eam-mmf_use_ESMT", @@ -180,8 +180,8 @@ "e3sm_extra_coverage" : { "inherit" : ("e3sm_atm_extra_coverage", "e3sm_ocnice_extra_coverage"), "tests" : ( - "SMS_D_Ln5.enax4v1_enax4v1.FC5AV1C-L", - "SMS_D_Ln5.twpx4v1_twpx4v1.FC5AV1C-L", + "SMS_D_Ln5.enax4v1_enax4v1.F2010", + "SMS_D_Ln5.twpx4v1_twpx4v1.F2010", ) }, @@ -189,7 +189,7 @@ "e3sm_hi_res" : { "inherit" : "e3sm_atm_hi_res", "tests" : ( - "SMS.ne120_oRRS18v3.A_WCYCL2000_H01AS.eam-cosplite", + "SMS.ne120_oRRS18v3.WCYCL1950.eam-cosplite", "SMS.T62_oRRS30to10v3wLI.GMPAS-IAF", ) }, @@ -197,9 +197,9 @@ #e3sm tests for RRM grids "e3sm_rrm" : { "tests" : ( - "SMS_D_Ln5.conusx4v1_conusx4v1.FC5AV1C-L", - "SMS_D_Ln5.enax4v1_enax4v1.FC5AV1C-L", - "SMS_D_Ln5.twpx4v1_twpx4v1.FC5AV1C-L", + "SMS_D_Ln5.conusx4v1_conusx4v1.F2010", + "SMS_D_Ln5.enax4v1_enax4v1.F2010", + "SMS_D_Ln5.twpx4v1_twpx4v1.F2010", ) }, @@ -218,7 +218,7 @@ "SMS_Ln5.ne4_ne4.F-MMF1-SCM-ARM97", "SMS_Ln5.ne4_ne4.F-MMFXX-SCM-ARM97", # non-MMF tests with RRTMGP - "ERP_Ln9.ne4pg2_ne4pg2.FC5AV1C-L.eam-rrtmgp", + "ERP_Ln9.ne4pg2_ne4pg2.F2010.eam-rrtmgp", ) }, @@ -226,9 +226,9 @@ "e3sm_prod" : { "inherit" : "e3sm_atm_prod", "tests" : ( - "SMS_Ld1.ne30pg2_r05_EC30to60E2r2.A_WCYCL1850S_CMIP6.allactive-wcprod", + "SMS_Ld1.ne30pg2_r05_EC30to60E2r2.WCYCL1850.allactive-wcprod", "SMS_Ld1.ne30pg2_EC30to60E2r2.WCYCL1850.allactive-wcprod", - "SMS_PS.northamericax4v1pg2_WC14to60E2r3.A_WCYCL1850S_CMIP6.allactive-wcprodrrm", + "SMS_PS.northamericax4v1pg2_WC14to60E2r3.WCYCL1850.allactive-wcprodrrm", ) }, @@ -269,35 +269,35 @@ "share" : True, "time" : "01:00:00", "tests" : ( - "SMS.ne4_ne4.FC5AV1C-L.eam-preqx_ftype0", - "SMS.ne4_ne4.FC5AV1C-L.eam-preqx_ftype1", - "SMS.ne4_ne4.FC5AV1C-L.eam-preqx_ftype4", + "SMS.ne4_ne4.F2010.eam-preqx_ftype0", + "SMS.ne4_ne4.F2010.eam-preqx_ftype1", + "SMS.ne4_ne4.F2010.eam-preqx_ftype4", ) }, "eam_theta" : { "share" : True, "time" : "02:00:00", "tests" : ( - "SMS.ne4_ne4.FC5AV1C-L.eam-thetahy_ftype0", - "SMS.ne4_ne4.FC5AV1C-L.eam-thetahy_ftype1", - "SMS.ne4_ne4.FC5AV1C-L.eam-thetahy_ftype2", - "SMS.ne4_ne4.FC5AV1C-L.eam-thetahy_ftype4", - "SMS.ne4_ne4.FC5AV1C-L.eam-thetanh_ftype0", - "SMS.ne4_ne4.FC5AV1C-L.eam-thetanh_ftype1", - "SMS.ne4_ne4.FC5AV1C-L.eam-thetanh_ftype2", - "SMS.ne4_ne4.FC5AV1C-L.eam-thetanh_ftype4", - "SMS.ne4_ne4.FC5AV1C-L.eam-thetahy_sl", - "ERS.ne4_ne4.FC5AV1C-L.eam-thetahy_ftype2", - "ERS.ne4_ne4.FC5AV1C-L.eam-thetanh_ftype2", + "SMS.ne4_ne4.F2010.eam-thetahy_ftype0", + "SMS.ne4_ne4.F2010.eam-thetahy_ftype1", + "SMS.ne4_ne4.F2010.eam-thetahy_ftype2", + "SMS.ne4_ne4.F2010.eam-thetahy_ftype4", + "SMS.ne4_ne4.F2010.eam-thetanh_ftype0", + "SMS.ne4_ne4.F2010.eam-thetanh_ftype1", + "SMS.ne4_ne4.F2010.eam-thetanh_ftype2", + "SMS.ne4_ne4.F2010.eam-thetanh_ftype4", + "SMS.ne4_ne4.F2010.eam-thetahy_sl", + "ERS.ne4_ne4.F2010.eam-thetahy_ftype2", + "ERS.ne4_ne4.F2010.eam-thetanh_ftype2", ) }, "eam_theta_pg2" : { "share" : True, "time" : "02:00:00", "tests" : ( - "SMS_Ln5.ne4pg2_ne4pg2.FC5AV1C-L.eam-thetahy_pg2", - "SMS_Ln5.ne4pg2_ne4pg2.FC5AV1C-L.eam-thetahy_sl_pg2", - "ERS_Ln5.ne4pg2_ne4pg2.FC5AV1C-L.eam-thetahy_sl_pg2" + "SMS_Ln5.ne4pg2_ne4pg2.F2010.eam-thetahy_pg2", + "SMS_Ln5.ne4pg2_ne4pg2.F2010.eam-thetahy_sl_pg2", + "ERS_Ln5.ne4pg2_ne4pg2.F2010.eam-thetahy_sl_pg2" ) }, "e3sm_bench_hires_g" : { @@ -341,22 +341,22 @@ "e3sm_bench_hires_f" : { "time" : "01:00:00", "tests" : ( - "PFS_P7200.ne120_ne120.FC5AV1C-H01A.eam-bench-noio", - "PFS_P8640.ne120_ne120.FC5AV1C-H01A.eam-bench-noio", - "PFS_P10800.ne120_ne120.FC5AV1C-H01A.eam-bench-noio", - "PFS_P14400.ne120_ne120.FC5AV1C-H01A.eam-bench-noio", - "PFS_P21600.ne120_ne120.FC5AV1C-H01A.eam-bench-noio", - "PFS_P43200.ne120_ne120.FC5AV1C-H01A.eam-bench-noio", - "PFS_P86400.ne120_ne120.FC5AV1C-H01A.eam-bench-noio", + "PFS_P7200.ne120_ne120.F2010.eam-bench-noio", + "PFS_P8640.ne120_ne120.F2010.eam-bench-noio", + "PFS_P10800.ne120_ne120.F2010.eam-bench-noio", + "PFS_P14400.ne120_ne120.F2010.eam-bench-noio", + "PFS_P21600.ne120_ne120.F2010.eam-bench-noio", + "PFS_P43200.ne120_ne120.F2010.eam-bench-noio", + "PFS_P86400.ne120_ne120.F2010.eam-bench-noio", ) }, "e3sm_bench_hires" : { "inherit" : ("e3sm_bench_hires_g", "e3sm_bench_hires_f"), "time" : "01:00:00", "tests" : ( - "PFS_PS.ne120_oRRS18v3.A_WCYCL1950S_CMIP6_HR.bench-wcycl-hires", - "PFS_PM.ne120_oRRS18v3.A_WCYCL1950S_CMIP6_HR.bench-wcycl-hires", - "PFS_PL.ne120_oRRS18v3.A_WCYCL1950S_CMIP6_HR.bench-wcycl-hires", + "PFS_PS.ne120_oRRS18v3.WCYCL1950.bench-wcycl-hires", + "PFS_PM.ne120_oRRS18v3.WCYCL1950.bench-wcycl-hires", + "PFS_PL.ne120_oRRS18v3.WCYCL1950.bench-wcycl-hires", ) }, "e3sm_bench_lores_g" : { @@ -373,18 +373,18 @@ "e3sm_bench_lores_f" : { "time" : "01:00:00", "tests" : ( - "PFS_P1350.ne30_ne30.FC5AV1C-L.eam-bench-noio", - "PFS_P2700.ne30_ne30.FC5AV1C-L.eam-bench-noio", - "PFS_P5400.ne30_ne30.FC5AV1C-L.eam-bench-noio", + "PFS_P1350.ne30_ne30.F2010.eam-bench-noio", + "PFS_P2700.ne30_ne30.F2010.eam-bench-noio", + "PFS_P5400.ne30_ne30.F2010.eam-bench-noio", ) }, "e3sm_bench_lores" : { "inherit" : ("e3sm_bench_lores_g", "e3sm_bench_lores_f"), "time" : "01:00:00", "tests" : ( - "PFS_PS.ne30_oECv3.A_WCYCL1850S_CMIP6.bench-wcycl-lores", - "PFS_PM.ne30_oECv3.A_WCYCL1850S_CMIP6.bench-wcycl-lores", - "PFS_PL.ne30_oECv3.A_WCYCL1850S_CMIP6.bench-wcycl-lores", + "PFS_PS.ne30_oECv3.WCYCL1850.bench-wcycl-lores", + "PFS_PM.ne30_oECv3.WCYCL1850.bench-wcycl-lores", + "PFS_PL.ne30_oECv3.WCYCL1850.bench-wcycl-lores", ) }, "e3sm_bench_all" : { @@ -402,34 +402,34 @@ "eam_nl" : { "tests" : ( - "SBN.ne4_ne4.FC5AV1C-L.eam-thetadycore", - "SBN.ne11_ne11.FC5AV1C-L.eam-thetadycore", - "SBN.ne16_ne16.FC5AV1C-L.eam-thetadycore", - "SBN.ne30_ne30.FC5AV1C-L.eam-thetadycore", - "SBN.ne45pg2_r05_oECv3.FC5AV1C-L.allactive-thetadycore", - "SBN.ne120_ne120.FC5AV1C-L.eam-thetadycore", - "SBN.ne240_ne240.FC5AV1C-L.eam-thetadycore", - "SBN.ne512np4_360x720cru_ne512np4.FC5AV1C-L.allactive-thetadycore", - "SBN.ne1024np4_360x720cru_ne1024np4.FC5AV1C-L.allactive-thetadycore", - "SBN.conusx4v1_conusx4v1.FC5AV1C-L.eam-thetadycore", - "SBN.enax4v1_enax4v1.FC5AV1C-L.eam-thetadycore", - "SBN.northamericax4v1_r0125_northamericax4v1.FC5AV1C-L.eam-thetadycore", - "SBN.antarcticax4v1_r0125_antarcticax4v1.FC5AV1C-L.allactive-thetadycore", - "SBN.antarcticax4v1pg2_r0125_antarcticax4v1pg2.FC5AV1C-L.allactive-thetadycore", - "SBN.ne4_ne4.FC5AV1C-L.eam-preqxdycore", - "SBN.ne11_ne11.FC5AV1C-L.eam-preqxdycore", - "SBN.ne16_ne16.FC5AV1C-L.eam-preqxdycore", - "SBN.ne30_ne30.FC5AV1C-L.eam-preqxdycore", - "SBN.ne45pg2_r05_oECv3.FC5AV1C-L.allactive-preqxdycore", - "SBN.ne120_ne120.FC5AV1C-L.eam-preqxdycore", - "SBN.ne240_ne240.FC5AV1C-L.eam-preqxdycore", - "SBN.ne512np4_360x720cru_ne512np4.FC5AV1C-L.allactive-preqxdycore", - "SBN.ne1024np4_360x720cru_ne1024np4.FC5AV1C-L.allactive-preqxdycore", - "SBN.conusx4v1_conusx4v1.FC5AV1C-L.eam-preqxdycore", - "SBN.enax4v1_enax4v1.FC5AV1C-L.eam-preqxdycore", - "SBN.northamericax4v1_r0125_northamericax4v1.FC5AV1C-L.eam-preqxdycore", - "SBN.antarcticax4v1_r0125_antarcticax4v1.FC5AV1C-L.allactive-preqxdycore", - "SBN.antarcticax4v1pg2_r0125_antarcticax4v1pg2.FC5AV1C-L.allactive-preqxdycore", + "SBN.ne4_ne4.F2010.eam-thetadycore", + "SBN.ne11_ne11.F2010.eam-thetadycore", + "SBN.ne16_ne16.F2010.eam-thetadycore", + "SBN.ne30_ne30.F2010.eam-thetadycore", + "SBN.ne45pg2_r05_oECv3.F2010.allactive-thetadycore", + "SBN.ne120_ne120.F2010.eam-thetadycore", + "SBN.ne240_ne240.F2010.eam-thetadycore", + "SBN.ne512np4_360x720cru_ne512np4.F2010.allactive-thetadycore", + "SBN.ne1024np4_360x720cru_ne1024np4.F2010.allactive-thetadycore", + "SBN.conusx4v1_conusx4v1.F2010.eam-thetadycore", + "SBN.enax4v1_enax4v1.F2010.eam-thetadycore", + "SBN.northamericax4v1_r0125_northamericax4v1.F2010.eam-thetadycore", + "SBN.antarcticax4v1_r0125_antarcticax4v1.F2010.allactive-thetadycore", + "SBN.antarcticax4v1pg2_r0125_antarcticax4v1pg2.F2010.allactive-thetadycore", + "SBN.ne4_ne4.F2010.eam-preqxdycore", + "SBN.ne11_ne11.F2010.eam-preqxdycore", + "SBN.ne16_ne16.F2010.eam-preqxdycore", + "SBN.ne30_ne30.F2010.eam-preqxdycore", + "SBN.ne45pg2_r05_oECv3.F2010.allactive-preqxdycore", + "SBN.ne120_ne120.F2010.eam-preqxdycore", + "SBN.ne240_ne240.F2010.eam-preqxdycore", + "SBN.ne512np4_360x720cru_ne512np4.F2010.allactive-preqxdycore", + "SBN.ne1024np4_360x720cru_ne1024np4.F2010.allactive-preqxdycore", + "SBN.conusx4v1_conusx4v1.F2010.eam-preqxdycore", + "SBN.enax4v1_enax4v1.F2010.eam-preqxdycore", + "SBN.northamericax4v1_r0125_northamericax4v1.F2010.eam-preqxdycore", + "SBN.antarcticax4v1_r0125_antarcticax4v1.F2010.allactive-preqxdycore", + "SBN.antarcticax4v1pg2_r0125_antarcticax4v1pg2.F2010.allactive-preqxdycore", ) }, diff --git a/components/eam/bld/namelist_files/use_cases/1850_cam5_av1c-04p2.xml b/components/eam/bld/namelist_files/use_cases/1850_cam5_av1c-04p2.xml deleted file mode 100644 index 48c4f73f2250..000000000000 --- a/components/eam/bld/namelist_files/use_cases/1850_cam5_av1c-04p2.xml +++ /dev/null @@ -1,152 +0,0 @@ - - - - -atm/cam/solar/spectral_irradiance_Lean_1850_cntl_c100407.nc -18500101 -FIXED - - - -790.9792e-9 -275.425e-9 -33.432e-12 -0.0 - - -.true. -.false. -.false. -.true. -1 - - -.true. -.true. -.false. -2 -.true. -.true. -.true. -.true. -1 - -.true. -.true. - - -.true. -.true. -.true. - - -lnd/clm2/snicardata/snicar_optics_5bnd_mam_c160322.nc - - -.true. - - - - 500.0 - 0.045D0 - 16.e-6 - 50.e-6 - 8.e-6 - 10.e-6 - 1.75D0 - 0.007 - 0.007 - -0.7e-3 - 1.5E-6 - 0.25 - 0.85 - 1.38D0 - 0.32 - 0.32 - 4.3 - 1.05D0 - 0.3 - 0.3 - 0.4 - .false. -0.075e-6 -8.0D0 -1.5D0 -0.8D0 -1 -2 -2.5D-3 -1.335 -1.335 -5.0D0 -30500.0D0 -3.19D0 --1.2D0 -1.3D0 -.true. -.true. -.true. - - - -atm/cam/ozone -ozone_1.9x2.5_L26_1850clim_c090420.nc -O3 -CYCLICAL -1850 - - -CYCLICAL -1850 -atm/cam/chem/trop_mozart_aero/emis/1850ar5/ar5_mam3_so2_elev_1850_c160310.nc -atm/cam/chem/trop_mozart_aero/emis/aces4bgc_nvsoa_soag_elev_1850_c160507.nc -atm/cam/chem/trop_mozart_aero/emis/1850ar5/ar5_mam3_bc_elev_1850_c160310.nc -atm/cam/chem/trop_mozart_aero/emis/1850ar5/ar5_mam4_num_a1_elev_1850_c160310.nc -atm/cam/chem/trop_mozart_aero/emis/1850ar5/ar5_mam3_num_a2_elev_1850_c160310.nc -atm/cam/chem/trop_mozart_aero/emis/1850ar5/ar5_mam4_num_a4_elev_1850_c160310.nc -atm/cam/chem/trop_mozart_aero/emis/1850ar5/ar5_mam3_pom_elev_1850_c160310.nc -atm/cam/chem/trop_mozart_aero/emis/1850ar5/ar5_mam3_so4_a1_elev_1850_c160310.nc -atm/cam/chem/trop_mozart_aero/emis/1850ar5/ar5_mam3_so4_a2_elev_1850_c160310.nc - - -CYCLICAL -1850 -atm/cam/chem/trop_mozart_aero/emis/DMSflux.1850.1deg_latlon_conserv.POPmonthlyClimFromACES4BGC_c20160416.nc -atm/cam/chem/trop_mozart_aero/emis/1850ar5/ar5_mam3_so2_surf_1850_c160310.nc -atm/cam/chem/trop_mozart_aero/emis/1850ar5/ar5_mam3_bc_surf_1850_c160310.nc -atm/cam/chem/trop_mozart_aero/emis/1850ar5/ar5_mam4_num_a1_surf_1850_c160310.nc -atm/cam/chem/trop_mozart_aero/emis/1850ar5/ar5_mam3_num_a2_surf_1850_c160310.nc -atm/cam/chem/trop_mozart_aero/emis/1850ar5/ar5_mam4_num_a4_surf_1850_c160310.nc -atm/cam/chem/trop_mozart_aero/emis/1850ar5/ar5_mam3_pom_surf_1850_c160310.nc -atm/cam/chem/trop_mozart_aero/emis/1850ar5/ar5_mam3_so4_a1_surf_1850_c160310.nc -atm/cam/chem/trop_mozart_aero/emis/1850ar5/ar5_mam3_so4_a2_surf_1850_c160310.nc - - -CYCLICAL -1855 -oxid_1.9x2.5_L26_1850-2005_c091123.nc - - - -3 -1 -'atm/cam/chem/trop_mam/marine_BGC/' -'CYCLICAL' -'monthly_macromolecules_0.1deg_bilinear_latlon_year01_merge_date.nc' -0 -0 -'chla:CHL1','mpoly:TRUEPOLYC','mprot:TRUEPROTC','mlip:TRUELIPC' - - -atm/cam/chem/trop_mozart/ub/EESC_1850-2100_c090603.nc -18500101 -FIXED -1850 -linoz1800-2100_2006jpl_climo_1.9x2.5_26L_extended.c160204.nc -atm/cam/chem/trop_mozart/ub -CYCLICAL - - -1850 - - diff --git a/components/eam/bld/namelist_files/use_cases/2000_cam5_av1c-04p2.xml b/components/eam/bld/namelist_files/use_cases/2000_cam5_av1c-04p2.xml deleted file mode 100644 index 1a8258ce96d4..000000000000 --- a/components/eam/bld/namelist_files/use_cases/2000_cam5_av1c-04p2.xml +++ /dev/null @@ -1,123 +0,0 @@ - - - - -atm/cam/solar/spectral_irradiance_Lean_1976-2007_ave_c20160517.nc -20000101 -FIXED - - - -1751.022e-9 -315.85e-9 -676.0526e-12 -537.05e-12 - - -.true. -.false. -.false. -.true. -1 - - -.true. -.true. -.false. -2 -.true. -.true. -.true. -.true. -1 - -.true. -.true. - - -.true. -.true. -.true. - - -lnd/clm2/snicardata/snicar_optics_5bnd_mam_c160322.nc - - -.true. - - - - 500.0 - 0.045D0 - 16.e-6 - 50.e-6 - 8.e-6 - 10.e-6 - 1.75D0 - 0.007 - 0.007 - -0.7e-3 - 1.5E-6 - 0.25 - 0.85 - 1.38D0 - 0.32 - 0.32 - 4.3 - 1.05D0 - 0.3 - 0.3 - 0.4 - .false. -0.075e-6 -8.0D0 -1.5D0 -0.8D0 -1 -2 -2.5D-3 -1.335 -1.335 -5.0D0 -30500.0D0 -3.19D0 --1.2D0 -1.3D0 -.true. -.true. -.true. - - - - -atm/cam/chem/trop_mozart_aero/emis/aces4bgc_nvsoa_soag_elev_2000_c160427.nc - - -atm/cam/chem/trop_mozart_aero/emis/DMSflux.2000.1deg_latlon_conserv.POPmonthlyClimFromACES4BGC_c20160226.nc - - -3 -1 -'atm/cam/chem/trop_mam/marine_BGC/' -'CYCLICAL' -'monthly_macromolecules_0.1deg_bilinear_latlon_year01_merge_date.nc' -0 -0 -'chla:CHL1','mpoly:TRUEPOLYC','mprot:TRUEPROTC','mlip:TRUELIPC' - - -atm/cam/chem/trop_mozart/ub/EESC_1850-2100_c090603.nc -20000101 -FIXED -2000 -linoz1800-2100_2006jpl_climo_1.9x2.5_26L_extended.c160204.nc -atm/cam/chem/trop_mozart/ub -CYCLICAL - - -'H2O2', 'H2SO4', 'SO2' - - -2000 - - diff --git a/components/eam/bld/namelist_files/use_cases/2000_cam5_av1c-04p2_bgc.xml b/components/eam/bld/namelist_files/use_cases/2000_cam5_av1c-04p2_bgc.xml deleted file mode 100644 index 819a62babcce..000000000000 --- a/components/eam/bld/namelist_files/use_cases/2000_cam5_av1c-04p2_bgc.xml +++ /dev/null @@ -1,123 +0,0 @@ - - - -1 -2 - - -atm/cam/solar/spectral_irradiance_Lean_1976-2007_ave_c20160517.nc -20000101 -FIXED - - - -1751.022e-9 -315.85e-9 -676.0526e-12 -537.05e-12 - - -.true. -.false. -.false. -.true. -1 - - -.true. -.true. -.false. -2 -.true. -.true. -.true. -.true. -1 - -.true. -.true. - - -.true. -.true. -.true. - - -lnd/clm2/snicardata/snicar_optics_5bnd_mam_c160322.nc - - -.true. - - - - 500.0 - 0.045D0 - 16.e-6 - 50.e-6 - 8.e-6 - 10.e-6 - 1.75D0 - 0.007 - 0.007 - -0.7e-3 - 1.5E-6 - 0.25 - 0.85 - 1.38D0 - 0.32 - 0.32 - 4.3 - 1.05D0 - 0.3 - 0.3 - 0.4 - .false. -0.075e-6 -8.0D0 -1.5D0 -0.8D0 -1 -2 -2.5D-3 -1.335 -1.335 -5.0D0 -30500.0D0 -3.19D0 --1.2D0 -1.3D0 -.true. -.true. -.true. - - - - -atm/cam/chem/trop_mozart_aero/emis/aces4bgc_nvsoa_soag_elev_2000_c160427.nc - - -atm/cam/chem/trop_mozart_aero/emis/DMSflux.2000.1deg_latlon_conserv.POPmonthlyClimFromACES4BGC_c20160226.nc - - -3 -1 -'atm/cam/chem/trop_mam/marine_BGC/' -'CYCLICAL' -'monthly_macromolecules_0.1deg_bilinear_latlon_year01_merge_date.nc' -0 -0 -'chla:CHL1','mpoly:TRUEPOLYC','mprot:TRUEPROTC','mlip:TRUELIPC' - - -atm/cam/chem/trop_mozart/ub/EESC_1850-2100_c090603.nc -20000101 -FIXED -2000 -linoz1800-2100_2006jpl_climo_1.9x2.5_26L_extended.c160204.nc -atm/cam/chem/trop_mozart/ub -CYCLICAL - - -2000 - - diff --git a/components/eam/bld/namelist_files/use_cases/2000_cam5_av1c-04p2_gust.xml b/components/eam/bld/namelist_files/use_cases/2000_cam5_av1c-04p2_gust.xml deleted file mode 100644 index e336e466d46c..000000000000 --- a/components/eam/bld/namelist_files/use_cases/2000_cam5_av1c-04p2_gust.xml +++ /dev/null @@ -1,156 +0,0 @@ - - - - -atm/cam/solar/spectral_irradiance_Lean_1976-2007_ave_c20160517.nc -20000101 -FIXED - - - -1751.022e-9 -315.85e-9 -676.0526e-12 -537.05e-12 - - -.true. -.false. -.false. -.true. -1 - - -.true. -.true. -.false. -2 -.true. -.true. -.true. -.true. -1 - -.true. -.true. - - -.true. -.true. -.true. - - -lnd/clm2/snicardata/snicar_optics_5bnd_mam_c160322.nc - - -.true. - - - - 1200.0 - 0.018D0 - 1.8D0 - 14.e-6 - 50.e-6 - 8.e-6 - 10.e-6 - 1.75D0 - .true. - 0.0020 - 0.0020 - -1.2e-3 - 5.0E-6 - 0.14D0 - 2.0D0 - 0.25 - 0.6 - 2.8D0 - 0.12D0 - 0.28D0 -1.2 - 5.2 - 1.05D0 - 0.35 - 0.35 - 0.4 - .false. -0.080e-6 -8.0D0 -1.75D0 -0.7D0 -0.001D0 -0.8D0 -1 -1 -2.5D-3 -2.4 -2.8 -0.75 -7.50 -0.50 -7.50 -0.50 -0.70 -0.20 -0.85 -0.0005 - 100.0D0 -5.0D0 -30500.0D0 -3.19D0 --1.40D0 -2.0D0 -.true. -.true. -.true. - - - - -atm/cam/chem/trop_mozart_aero/emis/DECK_ne30/cmip6_mam4_so2_elev_1850-2014_c180205.nc -atm/cam/chem/trop_mozart_aero/emis/DECK_ne30/cmip6_mam4_soag_elev_1850-2014_c180205.nc -atm/cam/chem/trop_mozart_aero/emis/DECK_ne30/cmip6_mam4_bc_a4_elev_1850-2014_c180205.nc -atm/cam/chem/trop_mozart_aero/emis/DECK_ne30/cmip6_mam4_num_a1_elev_1850-2014_c180205.nc -atm/cam/chem/trop_mozart_aero/emis/DECK_ne30/cmip6_mam4_num_a2_elev_1850-2014_c180205.nc -atm/cam/chem/trop_mozart_aero/emis/DECK_ne30/cmip6_mam4_num_a4_elev_1850-2014_c180205.nc -atm/cam/chem/trop_mozart_aero/emis/DECK_ne30/cmip6_mam4_pom_a4_elev_1850-2014_c180205.nc -atm/cam/chem/trop_mozart_aero/emis/DECK_ne30/cmip6_mam4_so4_a1_elev_1850-2014_c180205.nc -atm/cam/chem/trop_mozart_aero/emis/DECK_ne30/cmip6_mam4_so4_a2_elev_1850-2014_c180205.nc - - -atm/cam/chem/trop_mozart_aero/emis/DMSflux.2000.1deg_latlon_conserv.POPmonthlyClimFromACES4BGC_c20160226.nc -atm/cam/chem/trop_mozart_aero/emis/DECK_ne30/cmip6_mam4_so2_surf_1850-2014_c180205.nc -atm/cam/chem/trop_mozart_aero/emis/DECK_ne30/cmip6_mam4_bc_a4_surf_1850-2014_c180205.nc -atm/cam/chem/trop_mozart_aero/emis/DECK_ne30/cmip6_mam4_num_a1_surf_1850-2014_c180205.nc -atm/cam/chem/trop_mozart_aero/emis/DECK_ne30/cmip6_mam4_num_a2_surf_1850-2014_c180205.nc -atm/cam/chem/trop_mozart_aero/emis/DECK_ne30/cmip6_mam4_num_a4_surf_1850-2014_c180205.nc -atm/cam/chem/trop_mozart_aero/emis/DECK_ne30/cmip6_mam4_pom_a4_surf_1850-2014_c180205.nc -atm/cam/chem/trop_mozart_aero/emis/DECK_ne30/cmip6_mam4_so4_a1_surf_1850-2014_c180205.nc -atm/cam/chem/trop_mozart_aero/emis/DECK_ne30/cmip6_mam4_so4_a2_surf_1850-2014_c180205.nc - - -3 -1 -'atm/cam/chem/trop_mam/marine_BGC/' -'CYCLICAL' -'monthly_macromolecules_0.1deg_bilinear_latlon_year01_merge_date.nc' -0 -0 -'chla:CHL1','mpoly:TRUEPOLYC','mprot:TRUEPROTC','mlip:TRUELIPC' - - -atm/cam/chem/trop_mozart/ub/EESC_1850-2100_c090603.nc -20000101 -FIXED -2000 -linoz1800-2100_2006jpl_climo_1.9x2.5_26L_extended.c160204.nc -atm/cam/chem/trop_mozart/ub -CYCLICAL - - -'H2O2', 'H2SO4', 'SO2' - - -2000 - - diff --git a/components/eam/bld/namelist_files/use_cases/2000_cam5_av1c-h01a.xml b/components/eam/bld/namelist_files/use_cases/2000_cam5_av1c-h01a.xml deleted file mode 100644 index a15e0e3d96e9..000000000000 --- a/components/eam/bld/namelist_files/use_cases/2000_cam5_av1c-h01a.xml +++ /dev/null @@ -1,127 +0,0 @@ - - - - -atm/cam/solar/spectral_irradiance_Lean_1976-2007_ave_c20160517.nc -20000101 -FIXED - - - -1751.022e-9 -315.85e-9 -676.0526e-12 -537.05e-12 - - -.true. -.false. -.false. -.true. -1 - - -.true. -.true. -.false. -2 -.true. -.true. -.true. -.true. -1 - -.true. -.true. - - -.true. -.true. -.true. - - -lnd/clm2/snicardata/snicar_optics_5bnd_mam_c160322.nc - - -.true. - - - - 500.0 - 16.e-6 - 50.e-6 - 8.e-6 - 10.e-6 - 1.75D0 - 0.25 - 0.85 - 1.2D0 - 0.32 - 0.32 - 1.05D0 - 0.3 - 0.3 - 0.4 - .false. -0.075e-6 -8.0D0 -1.5D0 -0.8D0 -1 -2 -2.5D-3 -1.335 -1.335 -5.0D0 -30500.0D0 -3.19D0 --1.2D0 -.true. -.true. -.true. - - - - -0.2D0 -0.0035D0 -0.0043D0 --0.2e-3 -5.0E-6 -0.030D0 -4.73D0 -1.75D0 -6 -2 -1 -3 - - -atm/cam/chem/trop_mozart_aero/emis/aces4bgc_nvsoa_soag_elev_2000_c160427.nc - - -atm/cam/chem/trop_mozart_aero/emis/DMSflux.2000.1deg_latlon_conserv.POPmonthlyClimFromACES4BGC_c20160226.nc - - -3 -1 -'atm/cam/chem/trop_mam/marine_BGC/' -'CYCLICAL' -'monthly_macromolecules_0.1deg_bilinear_latlon_year01_merge_date.nc' -0 -0 -'chla:CHL1','mpoly:TRUEPOLYC','mprot:TRUEPROTC','mlip:TRUELIPC' - - -atm/cam/chem/trop_mozart/ub/EESC_1850-2100_c090603.nc -20000101 -FIXED -2000 -linoz1800-2100_2006jpl_climo_1.9x2.5_26L_extended.c160204.nc -atm/cam/chem/trop_mozart/ub -CYCLICAL - - -2000 - - diff --git a/components/eam/bld/namelist_files/use_cases/20TR_cam5_av1c-04p2.xml b/components/eam/bld/namelist_files/use_cases/20TR_cam5_av1c-04p2.xml deleted file mode 100644 index 42ff5b39f696..000000000000 --- a/components/eam/bld/namelist_files/use_cases/20TR_cam5_av1c-04p2.xml +++ /dev/null @@ -1,151 +0,0 @@ - - - - - -atm/cam/solar/spectral_irradiance_Lean_1610-2140_ann_c100408.nc -SERIAL - - - -atm/cam/ggas/ghg_hist_1765-2012_c130501.nc -RAMPED - - -'atm/cam/volc' - 'CCSM4_volcanic_1850-3009_prototype1.nc' - 'SERIAL' - - - - -.true. -.false. -.false. -.true. -1 - - -.true. -.true. -.false. -2 -.true. -.true. -.true. -.true. -1 - -.true. -.true. - - -.true. -.true. -.true. - - -lnd/clm2/snicardata/snicar_optics_5bnd_mam_c160322.nc - - -.true. - - - - 500.0 - 0.045D0 - 16.e-6 - 50.e-6 - 8.e-6 - 10.e-6 - 1.75D0 - 0.007 - 0.007 - -0.7e-3 - 1.5E-6 - 0.25 - 0.85 - 1.38D0 - 0.32 - 0.32 - 4.3 - 1.05D0 - 0.3 - 0.3 - 0.4 - .false. -0.075e-6 -8.0D0 -1.5D0 -0.8D0 -1 -2 -2.5D-3 -1.335 -1.335 -5.0D0 -30500.0D0 -3.19D0 --1.2D0 -1.3D0 -.true. -.true. -.true. - - - -atm/cam/ozone -ozone_1.9x2.5_L26_1850-2005_c090803.nc -O3 -INTERP_MISSING_MONTHS - - -INTERP_MISSING_MONTHS -atm/cam/chem/trop_mozart_aero/emis/ar5_mam3_so2_elev_1850-2005_c090804.nc -atm/cam/chem/trop_mozart_aero/emis/aces4bgc_nvsoa_soag_elev_1850-2000_c160727.nc -atm/cam/chem/trop_mozart_aero/emis/ar5_mam3_bc_elev_1850-2005_c090804.nc -atm/cam/chem/trop_mozart_aero/emis/ar5_mam4_num_a1_elev_1850-2005_c150205.nc -atm/cam/chem/trop_mozart_aero/emis/ar5_mam3_num_a2_elev_1850-2005_c090804.nc -atm/cam/chem/trop_mozart_aero/emis/ar5_mam4_num_a4_elev_1850-2005_c150205.nc -atm/cam/chem/trop_mozart_aero/emis/ar5_mam3_pom_elev_1850-2005_c130424.nc -atm/cam/chem/trop_mozart_aero/emis/ar5_mam3_so4_a1_elev_1850-2005_c090804.nc -atm/cam/chem/trop_mozart_aero/emis/ar5_mam3_so4_a2_elev_1850-2005_c090804.nc - - -INTERP_MISSING_MONTHS -atm/cam/chem/trop_mozart_aero/emis/DMSflux.1850-2100.1deg_latlon_conserv.POPmonthlyClimFromACES4BGC_c20160727.nc -atm/cam/chem/trop_mozart_aero/emis/ar5_mam3_so2_surf_1850-2005_c090804.nc -atm/cam/chem/trop_mozart_aero/emis/ar5_mam3_bc_surf_1850-2005_c090804.nc -atm/cam/chem/trop_mozart_aero/emis/ar5_mam4_num_a1_surf_1850-2005_c150205.nc -atm/cam/chem/trop_mozart_aero/emis/ar5_mam3_num_a2_surf_1850-2005_c090804.nc -atm/cam/chem/trop_mozart_aero/emis/ar5_mam4_num_a4_surf_1850-2005_c150205.nc -atm/cam/chem/trop_mozart_aero/emis/ar5_mam3_pom_surf_1850-2005_c130424.nc -atm/cam/chem/trop_mozart_aero/emis/ar5_mam3_so4_a1_surf_1850-2005_c090804.nc -atm/cam/chem/trop_mozart_aero/emis/ar5_mam3_so4_a2_surf_1850-2005_c090804.nc - - -INTERP_MISSING_MONTHS -oxid_1.9x2.5_L26_1850-2005_c091123.nc - - - -3 -1 -'atm/cam/chem/trop_mam/marine_BGC/' -'CYCLICAL' -'monthly_macromolecules_0.1deg_bilinear_latlon_year01_merge_date.nc' -0 -0 -'chla:CHL1','mpoly:TRUEPOLYC','mprot:TRUEPROTC','mlip:TRUELIPC' - - -atm/cam/chem/trop_mozart/ub/EESC_1850-2100_c090603.nc -SERIAL -linoz1800-2100_2006jpl_climo_1.9x2.5_26L_extended.c160204.nc -atm/cam/chem/trop_mozart/ub -INTERP_MISSING_MONTHS - - -1850-2000 - - diff --git a/components/eam/cime_config/config_component.xml b/components/eam/cime_config/config_component.xml index 1181c9cc8380..b1135eee3a18 100644 --- a/components/eam/cime_config/config_component.xml +++ b/components/eam/cime_config/config_component.xml @@ -43,8 +43,6 @@ -mach $MACH -phys default -chem trop_mam4 - -clubb_sgs -microphys mg2 -chem linoz_mam4_resus_mom_soag -rain_evap_to_coarse_aero -nlev 72 - -clubb_sgs -microphys mg2 -chem linoz_mam4_resus_mom_soag -rain_evap_to_coarse_aero -nlev 72 -clubb_sgs -microphys mg2 -chem linoz_mam4_resus_mom_soag -rain_evap_to_coarse_aero -nlev 72 -clubb_sgs -microphys mg2 -chem superfast_mam4_resus_mom_soag -rain_evap_to_coarse_aero -nlev 72 -chem trop_mozart_mam3 -age_of_air_trcs @@ -116,20 +114,13 @@ 2000_cam5_trop_moz_mam3 1850_cam5_pm 2000_cam5_plmod - 1850_cam5_av1c-04p2 1850_eam_CMIP6 1850_eam_CMIP6-1pctCO2 1950_eam_CMIP6 1850_cam5_CMIP6_bgc - 2010S_cam5_CMIP6 2010_eam_CMIP6 1850_E3SMv1_superfast_ar5-emis 1850S_E3SMv1_superfast_ar5-emis - 2000_cam5_av1c-04p2 - 2000_cam5_av1c-04p2_bgc - 2000_cam5_av1c-h01a - 20TR_cam5_av1c-04p2 - 20TR_cam5_av1c-04p2_bgc 20TR_eam_CMIP6 20TR_cam5_CMIP6_bgc SSP585_cam5_CMIP6 diff --git a/components/eam/cime_config/config_compsets.xml b/components/eam/cime_config/config_compsets.xml index 9ead54c96b89..7dda64422d08 100644 --- a/components/eam/cime_config/config_compsets.xml +++ b/components/eam/cime_config/config_compsets.xml @@ -12,10 +12,15 @@ - F1850 + F1850-CICE 1850_EAM%CMIP6_ELM%SPBC_CICE%PRES_DOCN%DOM_SROF_SGLC_SWAV + + F1850 + 1850_EAM%CMIP6_ELM%SPBC_MPASSI%PRES_DOCN%DOM_MOSART_SGLC_SWAV + + F1850S-AR5-superfast 1850S_EAM%AR5sf_ELM%SPBC_CICE%PRES_DOCN%DOM_SROF_SGLC_SWAV @@ -27,52 +32,32 @@ - F1950 + F1950-CICE 1950_EAM%CMIP6_ELM%SPBC_CICE%PRES_DOCN%DOM_SROF_SGLC_SWAV - FC5AV1C-L - 2000_EAM%AV1C-L_ELM%SPBC_CICE%PRES_DOCN%DOM_SROF_SGLC_SWAV - - - - FC5AV1C-H01A - 2000_EAM%AV1C-H01A_ELM%SPBC_CICE%PRES_DOCN%DOM_SROF_SGLC_SWAV - - - - F20TRC5AV1C-L - 20TR_EAM%AV1C-L_ELM%SPBC_CICE%PRES_DOCN%DOM_SROF_SGLC_SWAV + F1950 + 1950_EAM%CMIP6_ELM%SPBC_MPASSI%PRES_DOCN%DOM_MOSART_SGLC_SWAV - F20TRC5-CMIP6 - 20TR_EAM%CMIP6_ELM%SPBC_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV + F20TR-CICE + 20TR_EAM%CMIP6_ELM%SPBC_CICE%PRES_DOCN%DOM_SROF_SGLC_SWAV F20TR - 20TR_EAM%CMIP6_ELM%SPBC_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV - - - - F20TR-MPASSI 20TR_EAM%CMIP6_ELM%SPBC_MPASSI%PRES_DOCN%DOM_MOSART_SGLC_SWAV - F2010SC5-CMIP6 - 2010S_EAM%CMIP6_ELM%SPBC_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV + F2010-CICE + 2010_EAM%CMIP6_ELM%SPBC_CICE%PRES_DOCN%DOM_SROF_SGLC_SWAV F2010 - 2010_EAM%CMIP6_ELM%SPBC_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV - - - - F2010-MPASSI 2010_EAM%CMIP6_ELM%SPBC_MPASSI%PRES_DOCN%DOM_MOSART_SGLC_SWAV @@ -81,11 +66,6 @@ AR97_EAM%SCAM_ELM%SP_CICE%PRES_DOCN%DOM_SROF_SGLC_SWAV - - FC5AV1C-L-MPASSI - 2000_EAM%AV1C-L_ELM%SPBC_MPASSI%PRES_DOCN%DOM_SROF_SGLC_SWAV - -