Merge branch 'wlin/atm/v3atm_tests' into NGD_v3atm (PR #7)

Test suites added are grouped by compsets used for v3atm integration. At this point, this repo can only run with F20TR_chemUCI-Linozv3. The tests for this compset use the production grid ne30pg2_EC30to60E2r2. Changes also made to enable ne4pg2_oQU480 for F cases, and add default fsurdat for ne4. These are to prepare for typical developer and integration tests at ne4 or ne4pg2 after the repo is made back compatible. [BFB]
E3SM-Project · Sep 19, 2022 · 3955a7a · 3955a7a
2 parents 409e6af + 5ad8e66
commit 3955a7a
Show file tree

Hide file tree

Showing 13 changed files with 117 additions and 3 deletions.
diff --git a/cime_config/config_grids.xml b/cime_config/config_grids.xml
@@ -954,7 +954,7 @@
       <mask>oQU480</mask>
     </model_grid>
 
-    <model_grid alias="ne4pg2_oQU480" compset="(EAM.+ELM.+MPASO)">
+    <model_grid alias="ne4pg2_oQU480">
       <grid name="atm">ne4np4.pg2</grid>
       <grid name="lnd">ne4np4.pg2</grid>
       <grid name="ocnice">oQU480</grid>

diff --git a/cime_config/tests.py b/cime_config/tests.py
@@ -54,6 +54,33 @@
             )
         },
 
+    "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.FSCM5A97.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"   : (
+            "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_Ln5.ne30pg2_EC30to60E2r2.F20TR_chemUCI-Linozv3.eam-20tr_v3atm_cosplite",
+            "REP_Ln5.ne30pg2_EC30to60E2r2.F20TR_chemUCI-Linozv3.eam-20tr_v3atm"
+            )
+        },
+
     "e3sm_atm_integration" : {
         "inherit" : ("eam_preqx", "eam_theta"),
         "tests" : (
@@ -72,6 +99,42 @@
             )
         },
 
+    "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_Ln9.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_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",
+            )
+        },
+
     #atmopheric tests for extra coverage
     "e3sm_atm_extra_coverage" : {
         "tests" : (

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
@@ -85,8 +85,8 @@
 <rad_climate>
   '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'
 </rad_climate>
 
 <!-- Marine organic aerosol namelist settings -->

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
@@ -0,0 +1,8 @@
+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. 
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
@@ -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_cosplite/README 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_cosplite/shell_commands b/components/eam/cime_config/testdefs/testmods_dirs/eam/20tr_v3atm_cosplite/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_cosplite/user_nl_eam b/components/eam/cime_config/testdefs/testmods_dirs/eam/20tr_v3atm_cosplite/user_nl_eam
@@ -0,0 +1,3 @@
+cosp_lite = .true.
+nhtfrq    = 5
+mfilt     = 1
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
@@ -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/README 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
@@ -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
@@ -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.
diff --git 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
 <finidat hgrid="ne0np4_twpx4v1" ic_ymd="101" sim_year="2000">lnd/clm2/initdata_map/clmi.ICRUCLM45SP.2000-01-01.twpx4v1_oRRS18to6v3_simyr2000_c180430.nc</finidat>
 
 <!-- for present day simulations - year 2010 -->
+<fsurdat hgrid="ne4np4"   sim_year="2010" use_crop=".false." >
+lnd/clm2/surfdata_map/surfdata_ne4np4_simyr2010_c210908.nc</fsurdat>
 <fsurdat hgrid="ne30np4"   sim_year="2010" use_crop=".false." >
 lnd/clm2/surfdata_map/surfdata_ne30np4_simyr2010_c20181025.nc</fsurdat>
 <fsurdat hgrid="r0125"   sim_year="2010" use_crop=".false." >