Reset reference case for v3 SSP tests

E3SM-Project · Feb 18, 2024 · fc3dc50 · fc3dc50
1 parent 2359ec2
commit fc3dc50
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 12 deletions.
diff --git 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
@@ -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/tests.py b/cime_config/tests.py
@@ -349,8 +349,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",
             )
         },

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
@@ -32,8 +32,12 @@
 
 <!-- CMIP6 DECK compsets -->
 
-<fsurdat>lnd/clm2/surfdata_map/surfdata_ne30np4.pg2_SSP3_RCP70_simyr2015_c220420_with_TOP.nc </fsurdat>
-<flanduse_timeseries>lnd/clm2/surfdata_map/landuse.timeseries_ne30pg2_SSP3_RCP70_simyr2015-2100_c211015.nc</flanduse_timeseries>
+<fsurdat hgrid="ne30np4.pg2">lnd/clm2/surfdata_map/surfdata_ne30np4.pg2_SSP3_RCP70_simyr2015_c220420_with_TOP.nc </fsurdat -->
+<!-- fsurdat needs to be updated to simyr2015. but ok to run with the simyr1850 one used from piControl then historical -->
+<fsurdat hgrid="r05>"lnd/clm2/surfdata_map/surfdata_0.5x0.5_simyr1850_c200609_with_TOP.nc</fsurdat -->
+<flanduse_timeseries hgrid="ne30np4.pg2">lnd/clm2/surfdata_map/landuse.timeseries_ne30pg2_SSP3_RCP70_simyr2015-2100_c211015.nc</flanduse_timeseries>
+<!-- flanduse_timeseries files is a place holder for r05 which is for historical. Disable transient_pfts tentatively as in wcprodssp testmod-->
+<flanduse_timeseries hgrid="r05">lnd/clm2/surfdata_map/landuse.timeseries_ne30pg2_SSP3_RCP70_simyr2015-2100_c211015.nc</flanduse_timeseries>
 
 <!-- Add following for hybrid run of SSP370 continuing from a historical simulation -->
 

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
@@ -32,8 +32,12 @@
 
 <!-- CMIP6 DECK compsets -->
 
-<fsurdat>lnd/clm2/surfdata_map/surfdata_ne30np4.pg2_SSP5_RCP85_simyr2015_c220420_with_TOP.nc </fsurdat>
-<flanduse_timeseries>lnd/clm2/surfdata_map/landuse.timeseries_ne30pg2_SSP5_RCP85_simyr2015-2100_c220310.nc</flanduse_timeseries>
+<fsurdat hgrid="ne30np4.pg2">lnd/clm2/surfdata_map/surfdata_ne30np4.pg2_SSP5_RCP85_simyr2015_c220420_with_TOP.nc </fsurdat>
+<!-- fsurdat needs to be updated to simyr2015. but ok to run with the simyr1850 one used from piControl then historical -->
+<fsurdat hgrid="r05>"lnd/clm2/surfdata_map/surfdata_0.5x0.5_simyr1850_c200609_with_TOP.nc</fsurdat -->
+<flanduse_timeseries hgrid="ne30np4.pg2">lnd/clm2/surfdata_map/landuse.timeseries_ne30pg2_SSP5_RCP85_simyr2015-2100_c220310.nc</flanduse_timeseries>
+<!-- flanduse_timeseries files is a place holder for r05 which is for historical. Disable transient_pfts tentatively as in wcprodssp testmod-->
+<flanduse_timeseries hgrid="r05">lnd/clm2/surfdata_map/landuse.timeseries_ne30pg2_SSP3_RCP70_simyr2015-2100_c211015.nc</flanduse_timeseries>
 
 <!-- Add following for hybrid run of SSP370 continuing from a historical simulation -->