diff --git a/cime_config/allactive/config_pesall.xml b/cime_config/allactive/config_pesall.xml index 67a74a3f60c0..babca58ccb15 100644 --- a/cime_config/allactive/config_pesall.xml +++ b/cime_config/allactive/config_pesall.xml @@ -1531,6 +1531,32 @@ + + + gcp12 --compset WCYCL* --res ne30pg2_r05_IcoswISC30E3r5 on 4 nodes + + -4 + -4 + -4 + -4 + -4 + -4 + + + + + + pm-cpu --compset WCYCL* --res ne30pg2_r05_IcoswISC30E3r5 on 4 nodes + + -4 + -4 + -4 + -4 + -4 + -4 + + + @@ -2450,5 +2476,26 @@ + + + pm-cpu, conus 2 nodes + + -2 + -2 + -2 + -2 + -2 + -2 + + + 1 + 1 + 1 + 1 + 1 + 1 + + + diff --git a/cime_config/config_grids.xml b/cime_config/config_grids.xml index 1894ef66fa5d..3002ebdbdbd8 100755 --- a/cime_config/config_grids.xml +++ b/cime_config/config_grids.xml @@ -963,6 +963,16 @@ oEC60to30v3 + + ne0np4_conus_x4v1_lowcon.pg2 + r05 + IcoswISC30E3r5 + r05 + null + null + IcoswISC30E3r5 + + ne0np4_northamericax4v1 r0125 @@ -2950,6 +2960,8 @@ 1 $DIN_LOC_ROOT/share/domains/domain.lnd.conusx4v1pg2_oEC60to30v3.200518.nc $DIN_LOC_ROOT/share/domains/domain.ocn.conusx4v1pg2_oEC60to30v3.200518.nc + $DIN_LOC_ROOT/share/domains/domain.lnd.conusx4v1pg2_IcoswISC30E3r5.240205.nc + $DIN_LOC_ROOT/share/domains/domain.ocn.conusx4v1pg2_IcoswISC30E3r5.240205.nc 1-deg with 1/4-deg over CONUS (version 1): @@ -3283,6 +3295,8 @@ cpl/gridmaps/ne30pg2/map_ne30pg2_to_IcoswISC30E3r5-nomask_trbilin.20231121.nc cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5_to_ne30pg2_traave.20231121.nc cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5_to_ne30pg2_traave.20231121.nc + cpl/gridmaps/ne30pg2/map_ne30pg2_to_IcoswISC30E3r5_trfvnp2.20231121.nc + cpl/gridmaps/ne30pg2/map_ne30pg2_to_IcoswISC30E3r5_trfvnp2.20231121.nc @@ -3340,6 +3354,7 @@ cpl/gridmaps/ne30pg2/map_ne30pg2_to_r05_traave.20231130.nc + cpl/gridmaps/ne30pg2/map_ne30pg2_to_r05_trfvnp2.230516.nc cpl/gridmaps/ne30pg2/map_ne30pg2_to_r05_trbilin.20231130.nc cpl/gridmaps/ne30pg2/map_r05_to_ne30pg2_traave.20231130.nc cpl/gridmaps/ne30pg2/map_r05_to_ne30pg2_traave.20231130.nc @@ -3674,15 +3689,22 @@ cpl/gridmaps/oEC60to30v3/map_oEC60to30v3_to_conusx4v1pg2_mono.200514.nc cpl/gridmaps/oEC60to30v3/map_oEC60to30v3_to_conusx4v1pg2_mono.200514.nc + + cpl/gridmaps/conusx4v1pg2/map_conusx4v1pg2_to_IcoswISC30E3r5_traave.20240205.nc + cpl/gridmaps/conusx4v1pg2/map_conusx4v1pg2_to_IcoswISC30E3r5_trbilin.20240205.nc + cpl/gridmaps/conusx4v1pg2/map_conusx4v1pg2_to_IcoswISC30E3r5-nomask_trbilin.20240205.nc + cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5_to_conusx4v1pg2_traave.20240205.nc + cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5_to_conusx4v1pg2_traave.20240205.nc + - cpl/gridmaps/conusx4v1pg2/map_conusx4v1pg2_to_r05_mono.200514.nc - cpl/gridmaps/conusx4v1pg2/map_conusx4v1pg2_to_r05_bilin.200514.nc - cpl/gridmaps/conusx4v1pg2/map_r05_to_conusx4v1pg2_mono.200514.nc - cpl/gridmaps/conusx4v1pg2/map_r05_to_conusx4v1pg2_mono.200514.nc + cpl/gridmaps/conusx4v1pg2/map_conusx4v1pg2_to_r05_traave.20240205.nc + cpl/gridmaps/conusx4v1pg2/map_conusx4v1pg2_to_r05_trbilin.20240205.nc + cpl/gridmaps/conusx4v1pg2/map_r05_to_conusx4v1pg2_traave.20240205.nc + cpl/gridmaps/conusx4v1pg2/map_r05_to_conusx4v1pg2_traave.20240205.nc - cpl/gridmaps/conusx4v1pg2/map_conusx4v1pg2_to_r05_mono.200514.nc - cpl/gridmaps/conusx4v1pg2/map_conusx4v1pg2_to_r05_bilin.200514.nc + cpl/gridmaps/conusx4v1pg2/map_conusx4v1pg2_to_r05_traave.20240205.nc + cpl/gridmaps/conusx4v1pg2/map_conusx4v1pg2_to_r05_trbilin.20240205.nc @@ -4184,7 +4206,8 @@ cpl/gridmaps/ne30pg2/map_ne30pg2_to_r05_traave.20231130.nc - cpl/gridmaps/ne30pg2/map_ne30pg2_to_r05_traave.20231130.nc + cpl/gridmaps/ne30pg2/map_ne30pg2_to_r05_trfvnp2.230516.nc + cpl/gridmaps/ne30pg2/map_ne30pg2_to_r05_trbilin.20231130.nc @@ -4454,6 +4477,10 @@ + + cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5_to_r05_traave.20231121.nc + + cpl/cpl6/map_EC30to60E2r2_to_r05_neareststod.220728.nc diff --git a/cime_config/testmods_dirs/allactive/nlmaps/shell_commands b/cime_config/testmods_dirs/allactive/nlmaps/shell_commands index 1d90d0938a66..637b4f3099b6 100644 --- a/cime_config/testmods_dirs/allactive/nlmaps/shell_commands +++ b/cime_config/testmods_dirs/allactive/nlmaps/shell_commands @@ -1,19 +1,15 @@ alg=trfvnp2 -# This line is separate from the nonlinear maps. It corrects an oversight in the -# existing default trigrid grid configuration. -./xmlchange ATM2ROF_SMAPNAME=cpl/gridmaps/ne30pg2/map_ne30pg2_to_r05_bilin.200220.nc - # We want these in v3. a2l=cpl/gridmaps/ne30pg2/map_ne30pg2_to_r05_trfvnp2.230516.nc -a2o=cpl/gridmaps/ne30pg2/map_ne30pg2_to_EC30to60E2r2_trfvnp2.230516.nc +a2o=cpl/gridmaps/ne30pg2/map_ne30pg2_to_IcoswISC30E3r5_trfvnp2.20231121.nc ./xmlchange ATM2LND_FMAPNAME_NONLINEAR=$a2l ./xmlchange ATM2ROF_FMAPNAME_NONLINEAR=$a2l ./xmlchange ATM2OCN_FMAPNAME_NONLINEAR=$a2o -# These surface->atm maps are not needed, but we want to test the capability. +# These surface->atm maps are not needed in v3, but we want to test the capability. l2a=cpl/gridmaps/ne30pg2/map_r05_to_ne30pg2_${alg}.230516.nc -o2a=cpl/gridmaps/EC30to60E2r2/map_EC30to60E2r2_to_ne30pg2_trfvnp2.230516.nc +o2a=cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5_to_ne30pg2_trfv2.20240222.nc ./xmlchange LND2ATM_FMAPNAME_NONLINEAR=$l2a ./xmlchange LND2ATM_SMAPNAME_NONLINEAR=$l2a ./xmlchange OCN2ATM_FMAPNAME_NONLINEAR=$o2a diff --git a/cime_config/testmods_dirs/allactive/wcprodssp/shell_commands b/cime_config/testmods_dirs/allactive/wcprodssp/shell_commands index 0ef3c8cc8efa..1cb8644c6170 100644 --- a/cime_config/testmods_dirs/allactive/wcprodssp/shell_commands +++ b/cime_config/testmods_dirs/allactive/wcprodssp/shell_commands @@ -6,9 +6,9 @@ ./xmlchange RUN_TYPE="hybrid" ./xmlchange GET_REFCASE="TRUE" - ./xmlchange RUN_REFCASE="v2.LR.historical_0101" - ./xmlchange RUN_REFDATE="2015-01-01" - ./xmlchange RUN_REFDIR=${INPUTDATA_ROOT}"/e3sm_init/V2.SSP370_SSP585.ne30pg2_EC30to60E2r2/v2.LR.historical_0101/2015-01-01-00000" + ./xmlchange RUN_REFCASE="20231209.v3.LR.piControl-spinup.chrysalis" + ./xmlchange RUN_REFDATE="1801-01-01" + ./xmlchange RUN_REFDIR=${INPUTDATA_ROOT}"/e3sm_init/V3.SSP370_SSP585.ne30pg2_r05_IcoswISC30E3r5/v3.LR.piControl-spinup/1801-01-01-00000" exit diff --git a/cime_config/testmods_dirs/allactive/wcprodssp/user_nl_elm b/cime_config/testmods_dirs/allactive/wcprodssp/user_nl_elm index ed03b5e2616d..80bd35a81f0c 100644 --- a/cime_config/testmods_dirs/allactive/wcprodssp/user_nl_elm +++ b/cime_config/testmods_dirs/allactive/wcprodssp/user_nl_elm @@ -1,8 +1,11 @@ -! fsurdat used is not the same file for the reference historical run (as recorded in elm.r's global attribute) +! fsurdat might be set to be not the same file for the reference historical run (as recorded in elm.r's global attribute) CHECK_FINIDAT_FSURDAT_CONSISTENCY = .false. -! Finidat to be updated, The one below not compatible with v3 lnd config (with TOP and BGC mode, new grid) -! finidat = "$DIN_LOC_ROOT/e3sm_init/V2.SSP370_SSP585.ne30pg2_EC30to60E2r2/v2.LR.historical_0101/2015-01-01-00000/v2.LR.historical_0101.elm.r.noNaN.2015-01-01-00000.nc" + +! flanduse_timeseries not ready for v3.LR.SSP production grid, set not to do transient_pft tentatively until SSP compset fully ready + + do_transient_pfts = .false. + hist_dov2xy = .true.,.true. hist_fincl2 = 'H2OSNO', 'FSNO', 'QRUNOFF', 'QSNOMELT', 'FSNO_EFF', 'SNORDSL', 'SNOW', 'FSDS', 'FSR', 'FLDS', 'FIRE', 'FIRA' hist_mfilt = 1,365 diff --git a/cime_config/testmods_dirs/config_pes_tests.xml b/cime_config/testmods_dirs/config_pes_tests.xml index 3301617b9bb4..96e8bee7c6ed 100644 --- a/cime_config/testmods_dirs/config_pes_tests.xml +++ b/cime_config/testmods_dirs/config_pes_tests.xml @@ -115,10 +115,10 @@ - + - tests+chrysalis: -compset WCYCL* -res ne30pg*EC30to60E2r2 on 4 nodes pure-MPI, ~2.38 sypd + tests+chrysalis: -compset WCYCL* -res ne30pg*IcoswISC30E3r5 on 4 nodes pure-MPI 192 192 @@ -132,7 +132,7 @@ - tests+chrysalis: --compset BGC* --res ne30pg2_r05_EC30to60E2r2 on 5 nodes pure-MPI, ~0.9 sypd + tests+chrysalis: --compset BGC* --res ne30pg2_r05_IcoswISC30E3r5 on 5 nodes pure-MPI 256 256 @@ -159,7 +159,7 @@ - tests+anvil: --compset WCYCL* --res ne30pg2_EC30to60E2r2 on 16 nodes pure-MPI, ~2.7 sypd + tests+anvil: --compset WCYCL* --res ne30pg2_IcoswISC30E3r5 on 16 nodes pure-MPI 396 396 @@ -173,7 +173,7 @@ - tests+anvil: --compset BGC* --res ne30pg2_r05_EC30to60E2r2 on 30 nodes pure-MPI, ~3 sypd + tests+anvil: --compset BGC* --res ne30pg2_r05_IcoswISC30E3r5 on 30 nodes pure-MPI 675 684 diff --git a/cime_config/tests.py b/cime_config/tests.py index db5ce113e6ed..0c2a1bd1eb14 100644 --- a/cime_config/tests.py +++ b/cime_config/tests.py @@ -25,7 +25,7 @@ "e3sm_mosart_exenoshare": { "time" : "0:45:00", "tests" : ( - "ERS.ne30pg2_r05_EC30to60E2r2.GPMPAS-JRA.mosart-rof_ocn_2way", + "ERS.ne30pg2_r05_IcoswISC30E3r5.GPMPAS-JRA.mosart-rof_ocn_2way", ) }, @@ -65,7 +65,7 @@ "tests" : ( "ERS_D.f19_f19.IELM.elm-ic_f19_f19_ielm", "ERS_D.f09_g16.I1850ELMCN", - "ERS_D.ne11_oQU240.I20TRELM", + "ERS_D.ne4pg2_oQU480.I20TRELM.elm-disableDynpftCheck", "SMS_Ly2_P1x1_D.1x1_smallvilleIA.IELMCNCROP.elm-lulcc_sville", "ERS_D.f19_g16.I1850GSWCNPRDCTCBC.elm-ctc_f19_g16_I1850GSWCNPRDCTCBC", "ERS_D.f09_f09.IELM.elm-solar_rad", @@ -100,20 +100,20 @@ "e3sm_atm_developer" : { "inherit" : ("eam_theta_pg2"), "tests" : ( - "ERP_Ln18.ne4_oQU240.F2010", - "SMS_Ln9.ne4_oQU240.F2010.eam-outfrq9s", - "SMS.ne4_oQU240.F2010.eam-cosplite", + "ERP_Ld3.ne4pg2_oQU480.F2010", + "SMS_Ln9.ne4pg2_oQU480.F2010.eam-outfrq9s", + "SMS.ne4pg2_oQU480.F2010.eam-cosplite", "SMS_R_Ld5.ne4_ne4.FSCM-ARM97.eam-scm", - "SMS_D_Ln5.ne4_oQU240.F2010", + "SMS_D_Ln5.ne4pg2_oQU480.F2010", "SMS_Ln5.ne4pg2_oQU480.F2010", - "ERS_D.ne4_oQU240.F2010.eam-hommexx", + "ERS_D.ne4pg2_oQU480.F2010.eam-hommexx", "SMS_Ln9_P24x1.ne4_ne4.FDPSCREAM-ARM97", ) }, "e3sm_ice_developer" : { "tests" : ( - "SMS_D_Ld1.TL319_EC30to60E2r2.DTESTM-JRA1p5.mpassi-jra_1958", + "SMS_D_Ld1.TL319_IcoswISC30E3r5.DTESTM-JRA1p5.mpassi-jra_1958", "ERS_Ld5.T62_oQU240.DTESTM", "PEM_Ln5.T62_oQU240wLI.DTESTM", "PET_Ln5.T62_oQU240.DTESTM", @@ -124,8 +124,8 @@ "tests" : ( "SMS_D_Ln5.ne4pg2_oQU480.F2010", "SMS_D_Ln5.ne4pg2_oQU480.F2010.eam-condidiag_dcape", - "ERP_Ln18.ne4_oQU240.F2010.eam-condidiag_dcape", - "ERP_Ln18.ne4_oQU240.F2010.eam-condidiag_rhi", + "ERP_Ld3.ne4pg2_oQU480.F2010.eam-condidiag_dcape", + "ERP_Ld3.ne4pg2_oQU480.F2010.eam-condidiag_rhi", ) }, @@ -167,38 +167,38 @@ "e3sm_atm_integration" : { "inherit" : ("eam_preqx", "eam_theta"), "tests" : ( - "ERP_Ln9.ne4_ne4.FAQP", - "SMS_Ld1.ne4_ne4.FAQP.eam-clubb_only", - "ERP_Ln9.ne4_ne4.FRCE", - "PET_Ln5.ne4_oQU240.F2010.allactive-mach-pet", - "PEM_Ln5.ne4_oQU240.F2010", - "SMS_D_Ln5.ne4_oQU240.F2010.eam-cosplite_nhtfrq5", - "SMS_Ln1.ne4_oQU240.F2010.eam-chem_pp", - "SMS_Ln5.ne30pg2_r05_EC30to60E2r2.BGCEXP_LNDATM_CNPRDCTC_20TR", - "SMS_Ln5.ne30pg2_r05_EC30to60E2r2.BGCEXP_LNDATM_CNPRDCTC_1850", - "SMS_D_Ln5.ne4_oQU240.F2010.eam-clubb_sp", - "ERS_Ld5.ne4_oQU240.F2010.eam-rrtmgp", - "ERS_Ld5.ne4_oQU240.F2010.eam-rrtmgpxx", - "REP_Ln5.ne4_oQU240.F2010", - "SMS_Ld9.ne4pg2_oQU480.F2010.eam-thetahy_sl_pg2_mass", - "ERP_Ld9.ne4_ne4.FIDEAL.allactive-pioroot1", + "ERP_Ln9.ne4pg2_ne4pg2.FAQP", + "SMS_Ld1.ne4pg2_ne4pg2.FAQP.eam-clubb_only", + "ERP_Ln9.ne4pg2_ne4pg2.FRCE", + "PET_Ln5.ne4pg2_oQU480.F2010.allactive-mach-pet", + "PEM_Ln5.ne4pg2_oQU480.F2010", + "SMS_D_Ln5.ne4pg2_oQU480.F2010.eam-cosplite_nhtfrq5", + "SMS_Ln1.ne4pg2_oQU480.F2010.eam-chem_pp", + "SMS_Ln5.ne30pg2_r05_IcoswISC30E3r5.BGCEXP_LNDATM_CNPRDCTC_20TR", + "SMS_Ln5.ne30pg2_r05_IcoswISC30E3r5.BGCEXP_LNDATM_CNPRDCTC_1850", + "SMS_D_Ln5.ne4pg2_oQU480.F2010.eam-clubb_sp", + "ERS_Ld5.ne4pg2_oQU480.F2010.eam-rrtmgp", + "ERS_Ld5.ne4pg2_oQU480.F2010.eam-rrtmgpxx", + "REP_Ln5.ne4pg2_oQU480.F2010", + "SMS_Ld3.ne4pg2_oQU480.F2010.eam-thetahy_sl_pg2_mass", + "ERP_Ld3.ne4pg2_ne4pg2.FIDEAL.allactive-pioroot1", ) }, #atmopheric tests for extra coverage "e3sm_atm_extra_coverage" : { "tests" : ( - "SMS_Lm1.ne4_oQU240.F2010", - "ERS_Ld31.ne4_oQU240.F2010", - "ERP_Lm3.ne4_oQU240.F2010", - "SMS_D_Ln5.ne30_oECv3.F2010", - "ERP_Ld3.ne30_oECv3.F2010.allactive-pioroot1", - "SMS_Ly1.ne4_oQU240.F2010", + "SMS_Lm1.ne4pg2_oQU480.F2010", + "ERS_Ld31.ne4pg2_oQU480.F2010", + "ERP_Lm3.ne4pg2_oQU480.F2010", + "SMS_D_Ln5.ne30pg2_r05_IcoswISC30E3r5.F2010", + "ERP_Ld3.ne30pg2_r05_IcoswISC30E3r5.F2010.allactive-pioroot1", + "SMS_Ly1.ne4pg2_oQU480.F2010", "SMS_D_Ln5.ne45pg2_ne45pg2.FAQP", - "SMS_D_Ln5.ne4_oQU240.F2010.eam-implicit_stress", - "ERS_Ld5.ne30_oECv3.F2010.eam-implicit_stress", - "ERP_Ln18.ne4_oQU240.F2010.eam-condidiag_dcape", - "ERP_Ln18.ne4_oQU240.F2010.eam-condidiag_rhi", + "SMS_D_Ln5.ne4pg2_oQU480.F2010.eam-implicit_stress", + "ERS_Ld5.ne30pg2_r05_IcoswISC30E3r5.F2010.eam-implicit_stress", + "ERP_Ld3.ne4pg2_oQU480.F2010.eam-condidiag_dcape", + "ERP_Ld3.ne4pg2_oQU480.F2010.eam-condidiag_rhi", ) }, @@ -236,8 +236,8 @@ "e3sm_ocnice_extra_coverage" : { "inherit" : ("e3sm_ocnice_stealth_features"), "tests" : ( - "ERS_P480_Ld5.T62_ECwISC30to60E2r1.GMPAS-DIB-IAF-PISMF", - "PEM_P480_Ld5.T62_ECwISC30to60E2r1.GMPAS-DIB-IAF-PISMF", + "ERS_P480_Ld5.TL319_IcoswISC30E3r5.GMPAS-JRA1p5-DIB-PISMF.mpaso-jra_1958", + "PEM_P480_Ld5.TL319_IcoswISC30E3r5.GMPAS-JRA1p5-DIB-PISMF.mpaso-jra_1958", "SMS.ne30_oECv3_gis.IGELM_MLI.elm-extrasnowlayers", ) }, @@ -247,7 +247,7 @@ "tests" : ( "ERP.ne4pg2_oQU480.F2010.eam-v3atm_dustemis", "REP.ne4pg2_oQU480.F2010.eam-v3atm_dustemis", - "SMS.ne30pg2_EC30to60E2r2.F2010.eam-v3atm_dustemis", + "SMS.ne30pg2_IcoswISC30E3r5.F2010.eam-v3atm_dustemis", "SMS_D_Ln5.ne4pg2_oQU480.F2010.eam-v3atm_dustemis", "PET_Ln5.ne4pg2_oQU480.F2010.eam-v3atm_dustemis", "PEM_Ln5.ne4pg2_oQU480.F2010.eam-v3atm_dustemis", @@ -270,7 +270,7 @@ "ERS.f09_g16_g.MALISIA", "SMS.T62_oQU120_ais20.MPAS_LISIO_TEST", "SMS.f09_g16_a.IGELM_MLI", - "SMS_P12x2.ne4_oQU240.WCYCL1850NS.allactive-mach_mods", + "SMS_P12x2.ne4pg2_oQU480.WCYCL1850NS.allactive-mach_mods", "ERS_Ln9.ne4pg2_ne4pg2.F2010-MMF1.eam-mmf_crmout", ) }, @@ -284,27 +284,26 @@ }, "e3sm_integration" : { - "inherit" : ("e3sm_developer", "e3sm_atm_integration", "e3sm_mmf_integration"), + "inherit" : ("e3sm_developer", "e3sm_atm_integration", "e3sm_mmf_integration", "e3sm_rrm"), "time" : "03:00:00", "tests" : ( "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", + "SMS_D_Ld1.ne30pg2_r05_IcoswISC30E3r5.WCYCL1850.allactive-wcprod", + "SMS_D_Ld1.ne30pg2_r05_IcoswISC30E3r5.WCYCLSSP370.allactive-wcprodssp", + "ERS_Ld3.ne4pg2_oQU480.F2010", #"ERT_Ld31.ne16_g37.B1850C5",#add this line back in with the new correct compset "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", - "PEM_Ln9.ne30pg2_EC30to60E2r2.WCYCL1850", - "ERP_Ld3.ne30pg2_EC30to60E2r2.WCYCL1850.allactive-pioroot1", - "SMS_D_Ln5.conusx4v1_r05_oECv3.F2010", - "SMS_Ld2.ne30pg2_r05_EC30to60E2r2.BGCEXP_CNTL_CNPECACNT_1850.elm-bgcexp", - "SMS_Ld2.ne30pg2_r05_EC30to60E2r2.BGCEXP_CNTL_CNPRDCTC_1850.elm-bgcexp", + "PET_Ln9_PS.ne30pg2_r05_IcoswISC30E3r5.WCYCL1850.allactive-mach-pet", + "PEM_Ln9.ne30pg2_r05_IcoswISC30E3r5.WCYCL1850", + "ERP_Ld3.ne30pg2_r05_IcoswISC30E3r5.WCYCL1850.allactive-pioroot1", + "SMS_Ld2.ne30pg2_r05_IcoswISC30E3r5.BGCEXP_CNTL_CNPECACNT_1850.elm-bgcexp", + "SMS_Ld2.ne30pg2_r05_IcoswISC30E3r5.BGCEXP_CNTL_CNPRDCTC_1850.elm-bgcexp", "SMS_D_Ld3.T62_oQU120.CMPASO-IAF", - "SMS_D_Ld1.ne30pg2_r05_EC30to60E2r2.WCYCL1850", + "SMS_D_Ld1.ne30pg2_r05_IcoswISC30E3r5.WCYCL1850", "SMS_Ln5.ne30pg2_ne30pg2.F2010-SCREAM-LR-DYAMOND2", - "ERS_Ld3.ne30pg2_r05_EC30to60E2r2.WCYCL1850.allactive-nlmaps", + "ERS_Ld3.ne30pg2_r05_IcoswISC30E3r5.WCYCL1850.allactive-nlmaps", "SMS_D_Ld1.ne30pg2_r05_IcoswISC30E3r5.CRYO1850-DISMF", ) }, @@ -329,7 +328,7 @@ #e3sm tests for RRM grids "e3sm_rrm" : { "tests" : ( - "SMS_D_Ln5.conusx4v1_r05_oECv3.F2010", + "SMS_D_Ln5.conusx4v1pg2_r05_IcoswISC30E3r5.F2010", ) }, @@ -351,8 +350,8 @@ "SMS_Ld1.ne30pg2_r05_IcoswISC30E3r5.WCYCL1850-1pctCO2.allactive-wcprod_1850_1pctCO2", "SMS_Ld1.ne30pg2_r05_IcoswISC30E3r5.WCYCL1850-4xCO2.allactive-wcprod_1850_4xCO2", "SMS_Ld1.ne30pg2_r05_IcoswISC30E3r5.WCYCL1850.allactive-wcprod_1850", - "SMS_Ld1.ne30pg2_EC30to60E2r2.WCYCLSSP370.allactive-wcprodssp", - "SMS_Ld1.ne30pg2_EC30to60E2r2.WCYCLSSP585.allactive-wcprodssp", + "SMS_Ld1.ne30pg2_r05_IcoswISC30E3r5.WCYCLSSP370.allactive-wcprodssp", + "SMS_Ld1.ne30pg2_r05_IcoswISC30E3r5.WCYCLSSP585.allactive-wcprodssp", "SMS_PS.northamericax4v1pg2_WC14to60E2r3.WCYCL1850.allactive-wcprodrrm_1850", "SMS_D_Ld1.ne30pg2_r05_IcoswISC30E3r5.CRYO1850", ) @@ -456,27 +455,27 @@ "share" : True, "time" : "01:00:00", "tests" : ( - "SMS.ne4_oQU240.F2010.eam-preqx_ftype0", - "SMS.ne4_oQU240.F2010.eam-preqx_ftype1", - "SMS.ne4_oQU240.F2010.eam-preqx_ftype4", + "SMS.ne4pg2_oQU480.F2010.eam-preqx_ftype0", + "SMS.ne4pg2_oQU480.F2010.eam-preqx_ftype1", + "SMS.ne4pg2_oQU480.F2010.eam-preqx_ftype4", ) }, "eam_theta" : { "share" : True, "time" : "02:00:00", "tests" : ( - "SMS.ne4_oQU240.F2010.eam-thetahy_ftype0", - "SMS.ne4_oQU240.F2010.eam-thetahy_ftype1", - "SMS.ne4_oQU240.F2010.eam-thetahy_ftype2", - "SMS.ne4_oQU240.F2010.eam-thetahy_ftype2_energy", - "SMS.ne4_oQU240.F2010.eam-thetahy_ftype4", - "SMS.ne4_oQU240.F2010.eam-thetanh_ftype0", - "SMS.ne4_oQU240.F2010.eam-thetanh_ftype1", - "SMS.ne4_oQU240.F2010.eam-thetanh_ftype2", - "SMS.ne4_oQU240.F2010.eam-thetanh_ftype4", - "SMS.ne4_oQU240.F2010.eam-thetahy_sl", - "ERS.ne4_oQU240.F2010.eam-thetahy_ftype2", - "ERS.ne4_oQU240.F2010.eam-thetanh_ftype2", + "SMS.ne4pg2_oQU480.F2010.eam-thetahy_ftype0", + "SMS.ne4pg2_oQU480.F2010.eam-thetahy_ftype1", + "SMS.ne4pg2_oQU480.F2010.eam-thetahy_ftype2", + "SMS.ne4pg2_oQU480.F2010.eam-thetahy_ftype2_energy", + "SMS.ne4pg2_oQU480.F2010.eam-thetahy_ftype4", + "SMS.ne4pg2_oQU480.F2010.eam-thetanh_ftype0", + "SMS.ne4pg2_oQU480.F2010.eam-thetanh_ftype1", + "SMS.ne4pg2_oQU480.F2010.eam-thetanh_ftype2", + "SMS.ne4pg2_oQU480.F2010.eam-thetanh_ftype4", + "SMS.ne4pg2_oQU480.F2010.eam-thetahy_sl", + "ERS.ne4pg2_oQU480.F2010.eam-thetahy_ftype2", + "ERS.ne4pg2_oQU480.F2010.eam-thetanh_ftype2", ) }, "eam_theta_pg2" : { diff --git a/components/eam/cime_config/config_pes.xml b/components/eam/cime_config/config_pes.xml index 79f0b1c0dfcd..5673aa2d7601 100644 --- a/components/eam/cime_config/config_pes.xml +++ b/components/eam/cime_config/config_pes.xml @@ -293,6 +293,21 @@ + + + pm-cpu: any compset on ne4pg2 grid + + 96 + 96 + 96 + 96 + 96 + 96 + 1 + 1 + + + @@ -774,7 +789,7 @@ - @@ -799,7 +814,7 @@ - @@ -840,6 +855,22 @@ + + + + + gcp12 eam F compset --res ne30pg2_IcoswISC30E3r5 on 4 nodes + + -4 + -4 + -4 + -4 + -4 + -4 + + + + diff --git a/components/eam/cime_config/testdefs/testmods_dirs/eam/thetahy_ftype0/user_nl_eam b/components/eam/cime_config/testdefs/testmods_dirs/eam/thetahy_ftype0/user_nl_eam index fa2b5daa6400..ae9a48579dfe 100644 --- a/components/eam/cime_config/testdefs/testmods_dirs/eam/thetahy_ftype0/user_nl_eam +++ b/components/eam/cime_config/testdefs/testmods_dirs/eam/thetahy_ftype0/user_nl_eam @@ -1,4 +1,4 @@ se_ftype=0 -cubed_sphere_map=0 +cubed_sphere_map=2 theta_hydrostatic_mode=.true. diff --git a/components/eam/cime_config/testdefs/testmods_dirs/eam/thetahy_ftype1/user_nl_eam b/components/eam/cime_config/testdefs/testmods_dirs/eam/thetahy_ftype1/user_nl_eam index 2f675809c25e..ad90db9711b8 100644 --- a/components/eam/cime_config/testdefs/testmods_dirs/eam/thetahy_ftype1/user_nl_eam +++ b/components/eam/cime_config/testdefs/testmods_dirs/eam/thetahy_ftype1/user_nl_eam @@ -1,5 +1,5 @@ se_ftype=1 -cubed_sphere_map=0 +cubed_sphere_map=2 theta_hydrostatic_mode=.true. diff --git a/components/eam/cime_config/testdefs/testmods_dirs/eam/thetahy_ftype2/user_nl_eam b/components/eam/cime_config/testdefs/testmods_dirs/eam/thetahy_ftype2/user_nl_eam index 601317baa1c8..03cda6cbf372 100644 --- a/components/eam/cime_config/testdefs/testmods_dirs/eam/thetahy_ftype2/user_nl_eam +++ b/components/eam/cime_config/testdefs/testmods_dirs/eam/thetahy_ftype2/user_nl_eam @@ -1,5 +1,5 @@ se_ftype=2 -cubed_sphere_map=0 +cubed_sphere_map=2 theta_hydrostatic_mode=.true. diff --git a/components/eam/cime_config/testdefs/testmods_dirs/eam/thetahy_ftype4/user_nl_eam b/components/eam/cime_config/testdefs/testmods_dirs/eam/thetahy_ftype4/user_nl_eam index 59083a775066..c05cebbabef9 100644 --- a/components/eam/cime_config/testdefs/testmods_dirs/eam/thetahy_ftype4/user_nl_eam +++ b/components/eam/cime_config/testdefs/testmods_dirs/eam/thetahy_ftype4/user_nl_eam @@ -1,5 +1,5 @@ se_ftype=4 -cubed_sphere_map=0 +cubed_sphere_map=2 theta_hydrostatic_mode=.true. diff --git a/components/eam/cime_config/testdefs/testmods_dirs/eam/thetahy_sl/user_nl_eam b/components/eam/cime_config/testdefs/testmods_dirs/eam/thetahy_sl/user_nl_eam index 2810cbd5a285..06a1bab6fca8 100644 --- a/components/eam/cime_config/testdefs/testmods_dirs/eam/thetahy_sl/user_nl_eam +++ b/components/eam/cime_config/testdefs/testmods_dirs/eam/thetahy_sl/user_nl_eam @@ -1,7 +1,7 @@ theta_hydrostatic_mode=.true. tstep_type=5 -cubed_sphere_map=0 +cubed_sphere_map=2 transport_alg=12 semi_lagrange_cdr_alg=20 diff --git a/components/eam/cime_config/testdefs/testmods_dirs/eam/thetanh_ftype0/user_nl_eam b/components/eam/cime_config/testdefs/testmods_dirs/eam/thetanh_ftype0/user_nl_eam index ed3e180931d5..ed5fffdd21cb 100644 --- a/components/eam/cime_config/testdefs/testmods_dirs/eam/thetanh_ftype0/user_nl_eam +++ b/components/eam/cime_config/testdefs/testmods_dirs/eam/thetanh_ftype0/user_nl_eam @@ -1,5 +1,5 @@ se_ftype=0 -cubed_sphere_map=0 +cubed_sphere_map=2 theta_hydrostatic_mode=.false. tstep_type=7 se_nsplit=10 diff --git a/components/eam/cime_config/testdefs/testmods_dirs/eam/thetanh_ftype1/user_nl_eam b/components/eam/cime_config/testdefs/testmods_dirs/eam/thetanh_ftype1/user_nl_eam index f9600e5abde0..d0d6c6b9edca 100644 --- a/components/eam/cime_config/testdefs/testmods_dirs/eam/thetanh_ftype1/user_nl_eam +++ b/components/eam/cime_config/testdefs/testmods_dirs/eam/thetanh_ftype1/user_nl_eam @@ -1,5 +1,5 @@ se_ftype=1 -cubed_sphere_map=0 +cubed_sphere_map=2 theta_hydrostatic_mode=.false. tstep_type=7 se_nsplit=10 diff --git a/components/eam/cime_config/testdefs/testmods_dirs/eam/thetanh_ftype2/user_nl_eam b/components/eam/cime_config/testdefs/testmods_dirs/eam/thetanh_ftype2/user_nl_eam index e147f00913c9..a380b60b76b3 100644 --- a/components/eam/cime_config/testdefs/testmods_dirs/eam/thetanh_ftype2/user_nl_eam +++ b/components/eam/cime_config/testdefs/testmods_dirs/eam/thetanh_ftype2/user_nl_eam @@ -1,5 +1,5 @@ se_ftype=2 -cubed_sphere_map=0 +cubed_sphere_map=2 theta_hydrostatic_mode=.false. tstep_type=7 transport_alg=0 diff --git a/components/eam/cime_config/testdefs/testmods_dirs/eam/thetanh_ftype4/user_nl_eam b/components/eam/cime_config/testdefs/testmods_dirs/eam/thetanh_ftype4/user_nl_eam index 455deb86d7f6..f1cc0ef1f330 100644 --- a/components/eam/cime_config/testdefs/testmods_dirs/eam/thetanh_ftype4/user_nl_eam +++ b/components/eam/cime_config/testdefs/testmods_dirs/eam/thetanh_ftype4/user_nl_eam @@ -1,5 +1,5 @@ se_ftype=4 -cubed_sphere_map=0 +cubed_sphere_map=2 theta_hydrostatic_mode=.false. tstep_type=7 se_nsplit=10 diff --git a/components/elm/bld/namelist_files/use_cases/2015-2100_SSP370_transient.xml b/components/elm/bld/namelist_files/use_cases/2015-2100_SSP370_transient.xml index a693410774c3..cc708a828c99 100755 --- a/components/elm/bld/namelist_files/use_cases/2015-2100_SSP370_transient.xml +++ b/components/elm/bld/namelist_files/use_cases/2015-2100_SSP370_transient.xml @@ -32,8 +32,12 @@ -lnd/clm2/surfdata_map/surfdata_ne30np4.pg2_SSP3_RCP70_simyr2015_c220420_with_TOP.nc -lnd/clm2/surfdata_map/landuse.timeseries_ne30pg2_SSP3_RCP70_simyr2015-2100_c211015.nc +lnd/clm2/surfdata_map/surfdata_ne30np4.pg2_SSP3_RCP70_simyr2015_c220420_with_TOP.nc + + +lnd/clm2/surfdata_map/landuse.timeseries_ne30pg2_SSP3_RCP70_simyr2015-2100_c211015.nc + +lnd/clm2/surfdata_map/landuse.timeseries_ne30pg2_SSP3_RCP70_simyr2015-2100_c211015.nc diff --git a/components/elm/bld/namelist_files/use_cases/2015-2100_SSP585_transient.xml b/components/elm/bld/namelist_files/use_cases/2015-2100_SSP585_transient.xml index e93f28195646..bd62af248589 100644 --- a/components/elm/bld/namelist_files/use_cases/2015-2100_SSP585_transient.xml +++ b/components/elm/bld/namelist_files/use_cases/2015-2100_SSP585_transient.xml @@ -32,8 +32,12 @@ -lnd/clm2/surfdata_map/surfdata_ne30np4.pg2_SSP5_RCP85_simyr2015_c220420_with_TOP.nc -lnd/clm2/surfdata_map/landuse.timeseries_ne30pg2_SSP5_RCP85_simyr2015-2100_c220310.nc +lnd/clm2/surfdata_map/surfdata_ne30np4.pg2_SSP5_RCP85_simyr2015_c220420_with_TOP.nc + + +lnd/clm2/surfdata_map/landuse.timeseries_ne30pg2_SSP5_RCP85_simyr2015-2100_c220310.nc + +lnd/clm2/surfdata_map/landuse.timeseries_ne30pg2_SSP3_RCP70_simyr2015-2100_c211015.nc diff --git a/components/elm/cime_config/testdefs/testmods_dirs/elm/disableDynpftCheck/user_nl_elm b/components/elm/cime_config/testdefs/testmods_dirs/elm/disableDynpftCheck/user_nl_elm new file mode 100644 index 000000000000..1ae7de276d44 --- /dev/null +++ b/components/elm/cime_config/testdefs/testmods_dirs/elm/disableDynpftCheck/user_nl_elm @@ -0,0 +1 @@ +check_dynpft_consistency = .false. diff --git a/components/mpas-ocean/cime_config/testdefs/testmods_dirs/mpaso/jra_1958/shell_commands b/components/mpas-ocean/cime_config/testdefs/testmods_dirs/mpaso/jra_1958/shell_commands new file mode 100644 index 000000000000..1d43ad8c5baf --- /dev/null +++ b/components/mpas-ocean/cime_config/testdefs/testmods_dirs/mpaso/jra_1958/shell_commands @@ -0,0 +1,4 @@ +./xmlchange DATM_CLMNCEP_YR_START=1958 +./xmlchange DATM_CLMNCEP_YR_END=1958 +./xmlchange DROF_STRM_YR_START=1958 +./xmlchange DROF_STRM_YR_END=1958 diff --git a/driver-mct/cime_config/config_component.xml b/driver-mct/cime_config/config_component.xml index 9ebfb78234b4..a76311dbfa7a 100644 --- a/driver-mct/cime_config/config_component.xml +++ b/driver-mct/cime_config/config_component.xml @@ -1375,6 +1375,14 @@ atm2ocn flux mapping file + + char + idmap_ignore + run_domain + env_run.xml + atm2ice flux mapping file + + char idmap