From 801255958400a61ff1080a892bbb61f2ffe9f16f Mon Sep 17 00:00:00 2001 From: Wuyin Lin Date: Thu, 8 Sep 2022 20:56:48 -0700 Subject: [PATCH 1/5] Add test suites for NGD_v3atm --- cime_config/tests.py | 85 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/cime_config/tests.py b/cime_config/tests.py index bbaffaf8faef..9b559abfa34d 100644 --- a/cime_config/tests.py +++ b/cime_config/tests.py @@ -54,6 +54,40 @@ ) }, + "e3sm_v3atm_developer_base" : { + "tests" : ( + "ERP_Ln18.ne4_oQU240.F2010", + "SMS_Ln9.ne4_oQU240.F2010.eam-outfrq9s", + "SMS.ne4_oQU240.F2010.eam-cosplite", + "SMS_R_Ld5.ne4_ne4.FSCM-ARM97.eam-scm", + "SMS_D_Ln5.ne4_oQU240.F2010", + "SMS_Ln5.ne4pg2_oQU480.F2010", + "ERS.ne4_oQU240.F2010.eam-hommexx" + ) + }, + + "e3sm_v3atm_developer_f2010_chemmzt" : { + "tests" : ( + "ERP_Ln18.ne4_oQU240.F2010_chemMZT", + "SMS_Ln9.ne4_oQU240.F2010_chemMZT.eam-outfrq9s", + "SMS.ne4_oQU240.F2010_chemMZT.eam-cosplite", + "SMS_D_Ln5.ne4_oQU240.F2010_chemMZT", + "SMS_Ln5.ne4pg2_oQU480.F2010_chemMZT", + "ERS.ne4_oQU240.F2010_chemMZT.eam-hommexx" + ) + }, + + "e3sm_v3atm_developer_f20tr_chemuci_linozv3" : { + "tests" : ( + "ERP_Ln18.ne4_oQU240.F20tr_chemUCI-Linozv3", + "SMS_Ln9.ne4_oQU240.F20tr_chemUCI-Linozv3.eam-outfrq9s", + "SMS.ne4_oQU240.F20tr_chemUCI-Linozv3.eam-cosplite", + "SMS_D_Ln5.ne4_oQU240.F20tr_chemUCI-Linozv3", + "SMS_Ln5.ne4pg2_oQU480.F20tr_chemUCI-Linozv3", + "ERS.ne4_oQU240.F2010_chemUCI-Linozv3.eam-hommexx" + ) + }, + "e3sm_atm_integration" : { "inherit" : ("eam_preqx", "eam_theta"), "tests" : ( @@ -72,6 +106,57 @@ ) }, + "e3sm_v3atm_integration_base" : { + "tests" : ( + "ERP_Ln18.ne4_oQU240.F2010", + "PET_Ln5.ne4_oQU240.F2010.allactive-mach-pet", + "PEM_Ln5.ne4_oQU240.F2010", + "SMS.ne4_oQU240.F2010.eam-cosplite_nhtfrq5", + "SMS_Ln1.ne4_oQU240.F2010.eam-chem_pp", + "SMS_R_Ld5.ne4_ne4.FSCM-ARM97.eam-scm", + "SMS_Ln5.ne4pg2_oQU480.F2010", + "SMS_D_Ln5.ne4_oQU240.F2010.eam-clubb_sp", + "ERS_Ld5.ne4_oQU240.F2010.eam-rrtmgp", + "ERS_Ld5.ne4_oQU240.F2010.eam-rrtmgpxx", + "ERS.ne4_oQU240.F2010.eam-hommexx", + "SMS_Ln5.ne30pg2_r05_oECv3.F2010.eam-wcprod", + "SMS.ne30pg2_r05_oECv3.F20TR.eam-wcprod", + ) + }, + + "e3sm_v3atm_integration_f2010_chemmzt" : { + "tests" : ( + "ERP_Ln18.ne4_oQU240.F2010_chemMZT", + "PET_Ln5.ne4_oQU240.F2010_chemMZT.allactive-mach-pet", + "PEM_Ln5.ne4_oQU240.F2010_chemMZT", + "SMS.ne4_oQU240.F2010_chemMZT.eam-cosplite_nhtfrq5", + "SMS_Ln1.ne4_oQU240.F2010_chemMZT.eam-chem_pp", + "SMS_Ln5.ne4pg2_oQU480.F2010_chemMZT", + "SMS_D_Ln5.ne4_oQU240.F2010_chemMZT.eam-clubb_sp", + "ERS_Ld5.ne4_oQU240.F2010_chemMZT.eam-rrtmgp", + "ERS_Ld5.ne4_oQU240.F2010_chemMZT.eam-rrtmgpxx", + "ERS.ne4_oQU240.F2010_chemMZT.eam-hommexx", + "SMS_Ln5.ne30pg2_r05_oECv3.F2010_chemMZT.eam-wcprod", + "SMS.ne30pg2_r05_oECv3.F20TR_chemMZT.eam-wcprod", + ) + }, + + "e3sm_v3atm_integration_f20tr_chemuci_linozv3" : { + "tests" : ( + "ERP_Ln18.ne4_oQU240.F20TR_chemUCI-Linozv3", + "PET_Ln5.ne4_oQU240.F20TR_chemUCI-Linozv3.allactive-mach-pet", + "PEM_Ln5.ne4_oQU240.F20TR_chemUCI-Linozv3", + "SMS.ne4_oQU240.F20TR_chemUCI-Linozv3.eam-cosplite_nhtfrq5", + "SMS_Ln1.ne4_oQU240.F20TR_chemUCI-Linozv3.eam-chem_pp", + "SMS_Ln5.ne4pg2_oQU480.F20TR_chemUCI-Linozv3", + "SMS_D_Ln5.ne4_oQU240.F20TR_chemUCI-Linozv3.eam-clubb_sp", + "ERS_Ld5.ne4_oQU240.F20TR_chemUCI-Linozv3.eam-rrtmgp", + "ERS_Ld5.ne4_oQU240.F20TR_chemUCI-Linozv3.eam-rrtmgpxx", + "ERS.ne4_oQU240.F20TR_chemUCI-Linozv3.eam-hommexx", + "SMS.ne30pg2_r05_oECv3.F20TR_chemUCI-Linozv3.eam-wcprod", + ) + }, + #atmopheric tests for extra coverage "e3sm_atm_extra_coverage" : { "tests" : ( From fc42556c5516d354ef57c31139ee5ca8ef2fd610 Mon Sep 17 00:00:00 2001 From: Wuyin Lin Date: Fri, 16 Sep 2022 14:36:21 -0500 Subject: [PATCH 2/5] Changes to support the new tests --- cime_config/config_grids.xml | 2 +- cime_config/tests.py | 14 +++++++------- .../elm/bld/namelist_files/namelist_defaults.xml | 2 ++ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/cime_config/config_grids.xml b/cime_config/config_grids.xml index 9a2d3f3e8d5f..9ab3d2182973 100755 --- a/cime_config/config_grids.xml +++ b/cime_config/config_grids.xml @@ -954,7 +954,7 @@ oQU480 - + ne4np4.pg2 ne4np4.pg2 oQU480 diff --git a/cime_config/tests.py b/cime_config/tests.py index 9b559abfa34d..3b38f2bd786a 100644 --- a/cime_config/tests.py +++ b/cime_config/tests.py @@ -59,7 +59,7 @@ "ERP_Ln18.ne4_oQU240.F2010", "SMS_Ln9.ne4_oQU240.F2010.eam-outfrq9s", "SMS.ne4_oQU240.F2010.eam-cosplite", - "SMS_R_Ld5.ne4_ne4.FSCM-ARM97.eam-scm", + "SMS_R_Ld5.ne4_ne4.FSCM5A97.eam-scm", "SMS_D_Ln5.ne4_oQU240.F2010", "SMS_Ln5.ne4pg2_oQU480.F2010", "ERS.ne4_oQU240.F2010.eam-hommexx" @@ -79,12 +79,12 @@ "e3sm_v3atm_developer_f20tr_chemuci_linozv3" : { "tests" : ( - "ERP_Ln18.ne4_oQU240.F20tr_chemUCI-Linozv3", - "SMS_Ln9.ne4_oQU240.F20tr_chemUCI-Linozv3.eam-outfrq9s", - "SMS.ne4_oQU240.F20tr_chemUCI-Linozv3.eam-cosplite", - "SMS_D_Ln5.ne4_oQU240.F20tr_chemUCI-Linozv3", - "SMS_Ln5.ne4pg2_oQU480.F20tr_chemUCI-Linozv3", - "ERS.ne4_oQU240.F2010_chemUCI-Linozv3.eam-hommexx" + "ERP_Ln18.ne4_oQU240.F20TR_chemUCI-Linozv3", + "SMS_Ln9.ne4_oQU240.F20TR_chemUCI-Linozv3.eam-outfrq9s", + "SMS.ne4_oQU240.F20TR_chemUCI-Linozv3.eam-cosplite", + "SMS_D_Ln5.ne4_oQU240.F20TR_chemUCI-Linozv3", + "SMS_Ln5.ne4pg2_oQU480.F20TR_chemUCI-Linozv3", + "ERS.ne4_oQU240.F20TR_chemUCI-Linozv3.eam-hommexx" ) }, diff --git a/components/elm/bld/namelist_files/namelist_defaults.xml b/components/elm/bld/namelist_files/namelist_defaults.xml index 2d1bbc17a37b..7940c87c0b8a 100644 --- a/components/elm/bld/namelist_files/namelist_defaults.xml +++ b/components/elm/bld/namelist_files/namelist_defaults.xml @@ -235,6 +235,8 @@ ic_tod="0" sim_year="2000" glc_nec="0" use_crop=".true." irrigate=".true." nu_co lnd/clm2/initdata_map/clmi.ICRUCLM45SP.2000-01-01.twpx4v1_oRRS18to6v3_simyr2000_c180430.nc + +lnd/clm2/surfdata_map/surfdata_ne4np4_simyr2010_c210908.nc lnd/clm2/surfdata_map/surfdata_ne30np4_simyr2010_c20181025.nc From a5aebf25de97793763da6c83bf82c4805109376c Mon Sep 17 00:00:00 2001 From: Wuyin Lin Date: Sat, 17 Sep 2022 22:50:22 -0500 Subject: [PATCH 3/5] Trim the tests to use F20TR_chemUCI-Linozv3 only. --- cime_config/tests.py | 45 +++++-------------- .../use_cases/20TR_eam_chemUCI-Linoz.xml | 4 +- .../testmods_dirs/eam/20tr_v3atm/README | 9 ++++ .../eam/20tr_v3atm/shell_commands | 4 ++ .../testmods_dirs/eam/20tr_v3atm/user_nl_eam | 3 ++ .../testmods_dirs/eam/20tr_v3atm/user_nl_elm | 3 ++ 6 files changed, 31 insertions(+), 37 deletions(-) create mode 100644 components/eam/cime_config/testdefs/testmods_dirs/eam/20tr_v3atm/README create mode 100644 components/eam/cime_config/testdefs/testmods_dirs/eam/20tr_v3atm/shell_commands create mode 100644 components/eam/cime_config/testdefs/testmods_dirs/eam/20tr_v3atm/user_nl_eam create mode 100644 components/eam/cime_config/testdefs/testmods_dirs/eam/20tr_v3atm/user_nl_elm diff --git a/cime_config/tests.py b/cime_config/tests.py index 3b38f2bd786a..8506e239de31 100644 --- a/cime_config/tests.py +++ b/cime_config/tests.py @@ -68,23 +68,13 @@ "e3sm_v3atm_developer_f2010_chemmzt" : { "tests" : ( - "ERP_Ln18.ne4_oQU240.F2010_chemMZT", - "SMS_Ln9.ne4_oQU240.F2010_chemMZT.eam-outfrq9s", - "SMS.ne4_oQU240.F2010_chemMZT.eam-cosplite", - "SMS_D_Ln5.ne4_oQU240.F2010_chemMZT", - "SMS_Ln5.ne4pg2_oQU480.F2010_chemMZT", - "ERS.ne4_oQU240.F2010_chemMZT.eam-hommexx" + "SMS_Ln9.ne30pg2_EC30to60E2r2.F2010_chemMZT" ) }, "e3sm_v3atm_developer_f20tr_chemuci_linozv3" : { "tests" : ( - "ERP_Ln18.ne4_oQU240.F20TR_chemUCI-Linozv3", - "SMS_Ln9.ne4_oQU240.F20TR_chemUCI-Linozv3.eam-outfrq9s", - "SMS.ne4_oQU240.F20TR_chemUCI-Linozv3.eam-cosplite", - "SMS_D_Ln5.ne4_oQU240.F20TR_chemUCI-Linozv3", - "SMS_Ln5.ne4pg2_oQU480.F20TR_chemUCI-Linozv3", - "ERS.ne4_oQU240.F20TR_chemUCI-Linozv3.eam-hommexx" + "SMS_Ln9.ne30pg2_EC30to60E2r2.F20TR_chemUCI-Linozv3.eam-20tr_v3atm" ) }, @@ -126,34 +116,19 @@ "e3sm_v3atm_integration_f2010_chemmzt" : { "tests" : ( - "ERP_Ln18.ne4_oQU240.F2010_chemMZT", - "PET_Ln5.ne4_oQU240.F2010_chemMZT.allactive-mach-pet", - "PEM_Ln5.ne4_oQU240.F2010_chemMZT", - "SMS.ne4_oQU240.F2010_chemMZT.eam-cosplite_nhtfrq5", - "SMS_Ln1.ne4_oQU240.F2010_chemMZT.eam-chem_pp", - "SMS_Ln5.ne4pg2_oQU480.F2010_chemMZT", - "SMS_D_Ln5.ne4_oQU240.F2010_chemMZT.eam-clubb_sp", - "ERS_Ld5.ne4_oQU240.F2010_chemMZT.eam-rrtmgp", - "ERS_Ld5.ne4_oQU240.F2010_chemMZT.eam-rrtmgpxx", - "ERS.ne4_oQU240.F2010_chemMZT.eam-hommexx", - "SMS_Ln5.ne30pg2_r05_oECv3.F2010_chemMZT.eam-wcprod", - "SMS.ne30pg2_r05_oECv3.F20TR_chemMZT.eam-wcprod", + "ERP_Ln18.ne30pg2_EC30to60E2r2.F2010_chemUCI", + "PET_Ln5.ne30pg2_EC30to60E2r2.F2010_chemUCI", + "PEM_Ln5.ne30pg2_EC30to60E2r2.F2010_chemUCI", + "ERS_Ln9.ne30pg2_EC30to60E2r2.F2010_chemUCI", ) }, "e3sm_v3atm_integration_f20tr_chemuci_linozv3" : { "tests" : ( - "ERP_Ln18.ne4_oQU240.F20TR_chemUCI-Linozv3", - "PET_Ln5.ne4_oQU240.F20TR_chemUCI-Linozv3.allactive-mach-pet", - "PEM_Ln5.ne4_oQU240.F20TR_chemUCI-Linozv3", - "SMS.ne4_oQU240.F20TR_chemUCI-Linozv3.eam-cosplite_nhtfrq5", - "SMS_Ln1.ne4_oQU240.F20TR_chemUCI-Linozv3.eam-chem_pp", - "SMS_Ln5.ne4pg2_oQU480.F20TR_chemUCI-Linozv3", - "SMS_D_Ln5.ne4_oQU240.F20TR_chemUCI-Linozv3.eam-clubb_sp", - "ERS_Ld5.ne4_oQU240.F20TR_chemUCI-Linozv3.eam-rrtmgp", - "ERS_Ld5.ne4_oQU240.F20TR_chemUCI-Linozv3.eam-rrtmgpxx", - "ERS.ne4_oQU240.F20TR_chemUCI-Linozv3.eam-hommexx", - "SMS.ne30pg2_r05_oECv3.F20TR_chemUCI-Linozv3.eam-wcprod", + "ERP_Ln18.ne30pg2_EC30to60E2r2.F20TR_chemUCI-Linozv3.eam-20tr_v3atm", + "PET_Ln5.ne30pg2_EC30to60E2r2.F20TR_chemUCI-Linozv3.eam-20tr_v3atm", + "PEM_Ln5.ne30pg2_EC30to60E2r2.F20TR_chemUCI-Linozv3.eam-20tr_v3atm", + "ERS_Ln9.ne30pg2_EC30to60E2r2.F20TR_chemUCI-Linozv3.eam-20tr_v3atm", ) }, diff --git a/components/eam/bld/namelist_files/use_cases/20TR_eam_chemUCI-Linoz.xml b/components/eam/bld/namelist_files/use_cases/20TR_eam_chemUCI-Linoz.xml index 68158d5f8b74..8a01d805e4c1 100644 --- a/components/eam/bld/namelist_files/use_cases/20TR_eam_chemUCI-Linoz.xml +++ b/components/eam/bld/namelist_files/use_cases/20TR_eam_chemUCI-Linoz.xml @@ -85,8 +85,8 @@ 'A:Q:H2O', 'N:O2:O2', 'N:CO2:CO2', 'A:O3:O3', 'N:N2O:N2O', 'N:CH4:CH4', - 'N:CFC11:CFC11', 'N:CFC12:CFC12', 'M:mam4_mode1:/compyfs/inputdata/atm/cam/physprops/mam4_mode1_rrtmg_aeronetdust_c141106.nc', - 'M:mam4_mode2:/compyfs/inputdata/atm/cam/physprops/mam4_mode2_rrtmg_c130628.nc', 'M:mam4_mode3:/compyfs/inputdata/atm/cam/physprops/mam4_mode3_rrtmg_aeronetdust_c141106.nc', 'M:mam4_mode4:/compyfs/inputdata/atm/cam/physprops/mam4_mode4_rrtmg_c130628.nc' + 'N:CFC11:CFC11', 'N:CFC12:CFC12', 'M:mam4_mode1:$INPUTDATA_ROOT/atm/cam/physprops/mam4_mode1_rrtmg_aeronetdust_c141106.nc', + 'M:mam4_mode2:$INPUTDATA_ROOT/atm/cam/physprops/mam4_mode2_rrtmg_c130628.nc', 'M:mam4_mode3:$INPUTDATA_ROOT/atm/cam/physprops/mam4_mode3_rrtmg_aeronetdust_c141106.nc', 'M:mam4_mode4:$INPUTDATA_ROOT/atm/cam/physprops/mam4_mode4_rrtmg_c130628.nc' diff --git a/components/eam/cime_config/testdefs/testmods_dirs/eam/20tr_v3atm/README b/components/eam/cime_config/testdefs/testmods_dirs/eam/20tr_v3atm/README new file mode 100644 index 000000000000..1d8d273a034a --- /dev/null +++ b/components/eam/cime_config/testdefs/testmods_dirs/eam/20tr_v3atm/README @@ -0,0 +1,9 @@ +Repo v3atm's NGD_v3atm branch can only run F20TR_chemUCI-Linozv3 compset +because the changes brought in to enable chemUCI-Linozv3 are active, +cannot be switched off. The code base has not been made back compatible with +standard E3SM codes. As a result, E3SMv2 standard compset are not able to run. + +Therefore, to support developer and integration testings, the tests +set to use compset F20TR_chemUCI-Linozv3. cosp-lite is also enabled. +Settings specified in run script by v3atm developers may also be included +in this testmod. diff --git a/components/eam/cime_config/testdefs/testmods_dirs/eam/20tr_v3atm/shell_commands b/components/eam/cime_config/testdefs/testmods_dirs/eam/20tr_v3atm/shell_commands new file mode 100644 index 000000000000..62d0a5652abf --- /dev/null +++ b/components/eam/cime_config/testdefs/testmods_dirs/eam/20tr_v3atm/shell_commands @@ -0,0 +1,4 @@ +#!/bin/bash +./xmlchange --append CAM_CONFIG_OPTS='-cosp' +if [ `./xmlquery -value MACH` == cetus ]; then sed s/64M/128M/ env_mach_specific.xml >tmp && mv tmp env_mach_specific.xml; fi +if [ `./xmlquery --value MACH` == bebop ]; then ./xmlchange --id ATM_PIO_TYPENAME --val netcdf; fi diff --git a/components/eam/cime_config/testdefs/testmods_dirs/eam/20tr_v3atm/user_nl_eam b/components/eam/cime_config/testdefs/testmods_dirs/eam/20tr_v3atm/user_nl_eam new file mode 100644 index 000000000000..edd9ca20efb5 --- /dev/null +++ b/components/eam/cime_config/testdefs/testmods_dirs/eam/20tr_v3atm/user_nl_eam @@ -0,0 +1,3 @@ +cosp_lite = .true. +nhtfrq = 5 +mfilt = 1 \ No newline at end of file diff --git a/components/eam/cime_config/testdefs/testmods_dirs/eam/20tr_v3atm/user_nl_elm b/components/eam/cime_config/testdefs/testmods_dirs/eam/20tr_v3atm/user_nl_elm new file mode 100644 index 000000000000..ab7930f72c7b --- /dev/null +++ b/components/eam/cime_config/testdefs/testmods_dirs/eam/20tr_v3atm/user_nl_elm @@ -0,0 +1,3 @@ +! F20TR_chemUCI-Linozv3 production run set this in run script +! Here to allow the test to proceed. + check_dynpft_consistency = .false. From eaa419f57b168795265c898681ea50bcda9f4d87 Mon Sep 17 00:00:00 2001 From: Wuyin Lin Date: Sat, 17 Sep 2022 23:25:56 -0500 Subject: [PATCH 4/5] Changes to run cospi only for SMS.F20TR_chemUCI-Linozv3 test --- cime_config/tests.py | 2 +- .../testdefs/testmods_dirs/eam/20tr_v3atm/README | 5 ++--- .../testmods_dirs/eam/20tr_v3atm_cosplite/README | 9 +++++++++ .../{20tr_v3atm => 20tr_v3atm_cosplite}/shell_commands | 0 .../eam/{20tr_v3atm => 20tr_v3atm_cosplite}/user_nl_eam | 0 .../testmods_dirs/eam/20tr_v3atm_cosplite/user_nl_elm | 3 +++ 6 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 components/eam/cime_config/testdefs/testmods_dirs/eam/20tr_v3atm_cosplite/README rename components/eam/cime_config/testdefs/testmods_dirs/eam/{20tr_v3atm => 20tr_v3atm_cosplite}/shell_commands (100%) rename components/eam/cime_config/testdefs/testmods_dirs/eam/{20tr_v3atm => 20tr_v3atm_cosplite}/user_nl_eam (100%) create mode 100644 components/eam/cime_config/testdefs/testmods_dirs/eam/20tr_v3atm_cosplite/user_nl_elm diff --git a/cime_config/tests.py b/cime_config/tests.py index 8506e239de31..bd1b7e0f9806 100644 --- a/cime_config/tests.py +++ b/cime_config/tests.py @@ -74,7 +74,7 @@ "e3sm_v3atm_developer_f20tr_chemuci_linozv3" : { "tests" : ( - "SMS_Ln9.ne30pg2_EC30to60E2r2.F20TR_chemUCI-Linozv3.eam-20tr_v3atm" + "SMS_Ln9.ne30pg2_EC30to60E2r2.F20TR_chemUCI-Linozv3.eam-20tr_v3atm_cosplite" ) }, diff --git a/components/eam/cime_config/testdefs/testmods_dirs/eam/20tr_v3atm/README b/components/eam/cime_config/testdefs/testmods_dirs/eam/20tr_v3atm/README index 1d8d273a034a..07c0ed3d13f2 100644 --- a/components/eam/cime_config/testdefs/testmods_dirs/eam/20tr_v3atm/README +++ b/components/eam/cime_config/testdefs/testmods_dirs/eam/20tr_v3atm/README @@ -4,6 +4,5 @@ cannot be switched off. The code base has not been made back compatible with standard E3SM codes. As a result, E3SMv2 standard compset are not able to run. Therefore, to support developer and integration testings, the tests -set to use compset F20TR_chemUCI-Linozv3. cosp-lite is also enabled. -Settings specified in run script by v3atm developers may also be included -in this testmod. +set to use compset F20TR_chemUCI-Linozv3. Settings specified in run +script by v3atm developers may also be included in this testmod. diff --git a/components/eam/cime_config/testdefs/testmods_dirs/eam/20tr_v3atm_cosplite/README b/components/eam/cime_config/testdefs/testmods_dirs/eam/20tr_v3atm_cosplite/README new file mode 100644 index 000000000000..1d8d273a034a --- /dev/null +++ b/components/eam/cime_config/testdefs/testmods_dirs/eam/20tr_v3atm_cosplite/README @@ -0,0 +1,9 @@ +Repo v3atm's NGD_v3atm branch can only run F20TR_chemUCI-Linozv3 compset +because the changes brought in to enable chemUCI-Linozv3 are active, +cannot be switched off. The code base has not been made back compatible with +standard E3SM codes. As a result, E3SMv2 standard compset are not able to run. + +Therefore, to support developer and integration testings, the tests +set to use compset F20TR_chemUCI-Linozv3. cosp-lite is also enabled. +Settings specified in run script by v3atm developers may also be included +in this testmod. diff --git a/components/eam/cime_config/testdefs/testmods_dirs/eam/20tr_v3atm/shell_commands b/components/eam/cime_config/testdefs/testmods_dirs/eam/20tr_v3atm_cosplite/shell_commands similarity index 100% rename from components/eam/cime_config/testdefs/testmods_dirs/eam/20tr_v3atm/shell_commands rename to components/eam/cime_config/testdefs/testmods_dirs/eam/20tr_v3atm_cosplite/shell_commands diff --git a/components/eam/cime_config/testdefs/testmods_dirs/eam/20tr_v3atm/user_nl_eam b/components/eam/cime_config/testdefs/testmods_dirs/eam/20tr_v3atm_cosplite/user_nl_eam similarity index 100% rename from components/eam/cime_config/testdefs/testmods_dirs/eam/20tr_v3atm/user_nl_eam rename to components/eam/cime_config/testdefs/testmods_dirs/eam/20tr_v3atm_cosplite/user_nl_eam diff --git a/components/eam/cime_config/testdefs/testmods_dirs/eam/20tr_v3atm_cosplite/user_nl_elm b/components/eam/cime_config/testdefs/testmods_dirs/eam/20tr_v3atm_cosplite/user_nl_elm new file mode 100644 index 000000000000..ab7930f72c7b --- /dev/null +++ b/components/eam/cime_config/testdefs/testmods_dirs/eam/20tr_v3atm_cosplite/user_nl_elm @@ -0,0 +1,3 @@ +! F20TR_chemUCI-Linozv3 production run set this in run script +! Here to allow the test to proceed. + check_dynpft_consistency = .false. From 5ad8e664b5663ee3c8d80e7f661740c39f274e31 Mon Sep 17 00:00:00 2001 From: Wuyin Lin Date: Sun, 18 Sep 2022 20:56:43 -0500 Subject: [PATCH 5/5] Update test suites, add testmode to diatble rtm for ERS and ERP tests. --- cime_config/tests.py | 13 ++++++++----- .../testmods_dirs/eam/20tr_v3atm_rtmoff/README | 10 ++++++++++ .../testmods_dirs/eam/20tr_v3atm_rtmoff/user_nl_elm | 3 +++ .../eam/20tr_v3atm_rtmoff/user_nl_mosart | 6 ++++++ 4 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 components/eam/cime_config/testdefs/testmods_dirs/eam/20tr_v3atm_rtmoff/README create mode 100644 components/eam/cime_config/testdefs/testmods_dirs/eam/20tr_v3atm_rtmoff/user_nl_elm create mode 100644 components/eam/cime_config/testdefs/testmods_dirs/eam/20tr_v3atm_rtmoff/user_nl_mosart diff --git a/cime_config/tests.py b/cime_config/tests.py index bd1b7e0f9806..357f5c4d0b62 100644 --- a/cime_config/tests.py +++ b/cime_config/tests.py @@ -68,13 +68,16 @@ "e3sm_v3atm_developer_f2010_chemmzt" : { "tests" : ( - "SMS_Ln9.ne30pg2_EC30to60E2r2.F2010_chemMZT" + "SMS_Ln5.ne30pg2_EC30to60E2r2.F2010_chemMZT", + "REP_Ln5.ne30pg2_EC30to60E2r2.F2010_chemMZT", + "REP_Ln5.ne30pg2_EC30to60E2r2.F20TR_chemMZT.eam-20tr_v3atm", ) }, "e3sm_v3atm_developer_f20tr_chemuci_linozv3" : { "tests" : ( - "SMS_Ln9.ne30pg2_EC30to60E2r2.F20TR_chemUCI-Linozv3.eam-20tr_v3atm_cosplite" + "SMS_Ln5.ne30pg2_EC30to60E2r2.F20TR_chemUCI-Linozv3.eam-20tr_v3atm_cosplite", + "REP_Ln5.ne30pg2_EC30to60E2r2.F20TR_chemUCI-Linozv3.eam-20tr_v3atm" ) }, @@ -116,7 +119,7 @@ "e3sm_v3atm_integration_f2010_chemmzt" : { "tests" : ( - "ERP_Ln18.ne30pg2_EC30to60E2r2.F2010_chemUCI", + "ERP_Ln9.ne30pg2_EC30to60E2r2.F2010_chemUCI", "PET_Ln5.ne30pg2_EC30to60E2r2.F2010_chemUCI", "PEM_Ln5.ne30pg2_EC30to60E2r2.F2010_chemUCI", "ERS_Ln9.ne30pg2_EC30to60E2r2.F2010_chemUCI", @@ -125,10 +128,10 @@ "e3sm_v3atm_integration_f20tr_chemuci_linozv3" : { "tests" : ( - "ERP_Ln18.ne30pg2_EC30to60E2r2.F20TR_chemUCI-Linozv3.eam-20tr_v3atm", + "ERP_Ln9.ne30pg2_EC30to60E2r2.F20TR_chemUCI-Linozv3.eam-20tr_v3atm_rtmoff", + "ERS_Ln9.ne30pg2_EC30to60E2r2.F20TR_chemUCI-Linozv3.eam-20tr_v3atm_rtmoff", "PET_Ln5.ne30pg2_EC30to60E2r2.F20TR_chemUCI-Linozv3.eam-20tr_v3atm", "PEM_Ln5.ne30pg2_EC30to60E2r2.F20TR_chemUCI-Linozv3.eam-20tr_v3atm", - "ERS_Ln9.ne30pg2_EC30to60E2r2.F20TR_chemUCI-Linozv3.eam-20tr_v3atm", ) }, diff --git a/components/eam/cime_config/testdefs/testmods_dirs/eam/20tr_v3atm_rtmoff/README b/components/eam/cime_config/testdefs/testmods_dirs/eam/20tr_v3atm_rtmoff/README new file mode 100644 index 000000000000..a19f3421bd37 --- /dev/null +++ b/components/eam/cime_config/testdefs/testmods_dirs/eam/20tr_v3atm_rtmoff/README @@ -0,0 +1,10 @@ +Repo v3atm's NGD_v3atm branch can only run F20TR_chemUCI-Linozv3 compset +because the changes brought in to enable chemUCI-Linozv3 are active, +cannot be switched off. The code base has not been made back compatible with +standard E3SM codes. As a result, E3SMv2 standard compset are not able to run. + +Therefore, to support developer and integration testings, the tests +set to use compset F20TR_chemUCI-Linozv3. Settings specified in run +script by v3atm developers may also be included in this testmod. + +Turn off RTM, typically for use with ERS and ERP tests. diff --git a/components/eam/cime_config/testdefs/testmods_dirs/eam/20tr_v3atm_rtmoff/user_nl_elm b/components/eam/cime_config/testdefs/testmods_dirs/eam/20tr_v3atm_rtmoff/user_nl_elm new file mode 100644 index 000000000000..ab7930f72c7b --- /dev/null +++ b/components/eam/cime_config/testdefs/testmods_dirs/eam/20tr_v3atm_rtmoff/user_nl_elm @@ -0,0 +1,3 @@ +! F20TR_chemUCI-Linozv3 production run set this in run script +! Here to allow the test to proceed. + check_dynpft_consistency = .false. diff --git a/components/eam/cime_config/testdefs/testmods_dirs/eam/20tr_v3atm_rtmoff/user_nl_mosart b/components/eam/cime_config/testdefs/testmods_dirs/eam/20tr_v3atm_rtmoff/user_nl_mosart new file mode 100644 index 000000000000..187c409c4677 --- /dev/null +++ b/components/eam/cime_config/testdefs/testmods_dirs/eam/20tr_v3atm_rtmoff/user_nl_mosart @@ -0,0 +1,6 @@ +! disable rtm to allow short ERS and ERP run to complete. +! If rtm active, due to large rtm time step, restart pointer for ROF +! is always ahead of that for atm at the end of the first run. And in +! restart run, the restart point for ROF becomes later than the run stop time + + do_rtm =.false.