Merge remote-tracking branch 'escomp/ctsm5.2.mksurfdata' into ctsm5.2…

…_makefile Conflicts: bld/namelist_files/namelist_defaults_ctsm.xml tools/mksurfdata_esmf/gen_mksurfdata_jobscript_multi.py
ekluzek · Jul 26, 2023 · 08bfa90 · 08bfa90
2 parents 5797561 + e8dd1eb
commit 08bfa90
Show file tree

Hide file tree

Showing 15 changed files with 188 additions and 923 deletions.
diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml
diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml
@@ -70,7 +70,7 @@
       <option name="wallclock">00:60:00</option>
     </options>
   </test>
-  <test name="ERI_D_Ld9" grid="T31_g37" compset="I2000Clm50Sp" testmods="clm/SNICARFRC">
+  <test name="ERI_D_Ld9" grid="f10_f10_mg37" compset="I2000Clm50Sp" testmods="clm/SNICARFRC">
     <machines>
       <machine name="cheyenne" compiler="intel" category="aux_clm"/>
     </machines>
@@ -152,7 +152,7 @@
       <option name="wallclock">00:40:00</option>
     </options>
   </test>
-  <test name="ERI_D_Ld9_P48x1" grid="T31_g37" compset="I2000Clm50Sp" testmods="clm/reduceOutput">
+  <test name="ERI_D_Ld9_P48x1" grid="f10_f10_mg37" compset="I2000Clm50Sp" testmods="clm/reduceOutput">
     <machines>
       <machine name="izumi" compiler="nag" category="aux_clm"/>
     </machines>

diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdLandUse/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdLandUse/user_nl_clm
@@ -1,2 +1,2 @@
-flanduse_timeseries = '$DIN_LOC_ROOT/lnd/clm2/surfdata_map/landuse.timeseries_4x5_hist_simyr1850-2015_200311.nc'
+flanduse_timeseries = '$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_4x5_hist_16_CMIP6_1850-2015_c230620.nc'
 do_harvest = .true.
diff --git a/cime_config/testdefs/testmods_dirs/clm/collapse_pfts_78_to_16_decStart_f10/README b/cime_config/testdefs/testmods_dirs/clm/collapse_pfts_78_to_16_decStart_f10/README
@@ -5,19 +5,18 @@ exercising the collapse2gencrop branch ability to collapse the full crop data
 to clm's generic crops.
 
 According to the file
-/glade/work/slevis/git/collapse_pfts/bld/namelist_files/namelist_defaults_clm4_5.xml
+bld/namelist_files/namelist_defaults_ctsm.xml
 the following two files used in this test
 are default files for the following options:
 
-fsurdat = '/glade/p/cesmdata/cseg/inputdata/lnd/clm2/surfdata_map/surfdata_10x15_78pfts_CMIP6_simyr1850_c170824.nc'
+fsurdat = '$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_10x15_hist_78pfts_CMIP6_1850_c230517.nc'
+hgrid="10x15" sim_year="1850" use_crop=".false." irrigate=".true."
 hgrid="10x15" sim_year="1850" use_crop=".true."
 
-flanduse_timeseries = '/glade/p/cesmdata/cseg/inputdata/lnd/clm2/surfdata_map/landuse.timeseries_10x15_hist_78pfts_CMIP6_simyr1850-2015_c170824.nc'
-hgrid="10x15" sim_year_range="1850-2000" use_crop=".true."
-hgrid="10x15" rcp="8.5" sim_year_range="1850-2100" use_crop=".true."
-hgrid="10x15" rcp="6" sim_year_range="1850-2100" use_crop=".true."
-hgrid="10x15" rcp="4.5" sim_year_range="1850-2100" use_crop=".true."
-hgrid="10x15" rcp="2.6" sim_year_range="1850-2100" use_crop=".true."
+flanduse_timeseries = '$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_10x15_hist_78_CMIP6_1850-2015_c230601.nc'
+hgrid="10x15" sim_year_range="1850-2000" irrigate=".true." use_vichydro=".true."
+hgrid="10x15" sim_year_range="1850-2000" irrigate=".true."
+hgrid="10x15" sim_year_range="1850-2000" use_vichydro=".false."
 
 This test includes the settings of the decStart test so as to also test the
 end-of-year transition since it's an IHist case and transient vegetation gets

diff --git a/cime_config/testdefs/testmods_dirs/clm/collapse_pfts_78_to_16_decStart_f10/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/collapse_pfts_78_to_16_decStart_f10/user_nl_clm
@@ -1,2 +1,2 @@
-fsurdat = '/glade/p/cesmdata/cseg/inputdata/lnd/clm2/surfdata_map/surfdata_10x15_78pfts_CMIP6_simyr1850_c170824.nc'
-flanduse_timeseries = '/glade/p/cesmdata/cseg/inputdata/lnd/clm2/surfdata_map/landuse.timeseries_10x15_hist_78pfts_CMIP6_simyr1850-2015_c170824.nc'
+fsurdat = '$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_10x15_hist_78pfts_CMIP6_1850_c230517.nc'
+flanduse_timeseries = '$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_10x15_hist_78_CMIP6_1850-2015_c230601.nc'
diff --git a/cime_config/testdefs/testmods_dirs/clm/f09_dec1990Start_GU_LULCC/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/f09_dec1990Start_GU_LULCC/user_nl_clm
@@ -1,5 +1,5 @@
  ! Specify a dataset that has non-zero Gross Unrepresented Land Use change fields on it
  ! And turn it on
- flanduse_timeseries = '$DIN_LOC_ROOT/lnd/clm2/surfdata_map/ctsm5.1.dev052/landuse.timeseries_0.9x1.25_hist_78pfts_CMIP6_simyr1700-2021_c220825.nc'
- fsurdat = '$DIN_LOC_ROOT/lnd/clm2/surfdata_map/ctsm5.1.dev052/surfdata_0.9x1.25_hist_78pfts_CMIP6_simyr1700_c220825.nc'
+ flanduse_timeseries = '$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/ctsm5.2.0/landuse.timeseries_0.9x1.25_hist_78_CMIP6_1850-2015_c230601.nc'
+ fsurdat = '$DIN_LOC_ROOT/lnd/clm2/surfdata_esmf/ctsm5.2.0/surfdata_0.9x1.25_hist_78pfts_CMIP6_1850_c230517.nc'
  do_grossunrep = .true.
diff --git a/cime_config/testdefs/testmods_dirs/clm/mimicsFatesCold/README b/cime_config/testdefs/testmods_dirs/clm/mimicsFatesCold/README
@@ -0,0 +1,4 @@
+2023/6/22 slevis added:
+./xmlchange CLM_BLDNML_OPTS="-ignore_warnings" --append
+to get past this error in test:
+DON'T use the '-fire_emis' option when '-bgc fates' is activated
diff --git a/cime_config/testdefs/testmods_dirs/clm/mimicsFatesCold/shell_commands b/cime_config/testdefs/testmods_dirs/clm/mimicsFatesCold/shell_commands
@@ -1 +1,2 @@
 ./xmlchange CLM_FORCE_COLDSTART="on"
+./xmlchange CLM_BLDNML_OPTS="-ignore_warnings" --append
diff --git a/python/ctsm/modify_input_files/modify_fsurdat.py b/python/ctsm/modify_input_files/modify_fsurdat.py
@@ -414,7 +414,6 @@ def set_idealized(self):
         self.setvar_lev0("SLOPE", slope)
         self.setvar_lev0("zbedrock", zbedrock)
         self.setvar_lev0("SOIL_COLOR", soil_color)
-        self.setvar_lev0("PFTDATA_MASK", pftdata_mask)
         self.setvar_lev0("LANDFRAC_PFT", landfrac_pft)
         self.setvar_lev0("PCT_WETLAND", pct_not_nat_veg)
         self.setvar_lev0("PCT_CROP", pct_not_nat_veg)

diff --git a/python/ctsm/test/test_sys_fsurdat_modifier.py b/python/ctsm/test/test_sys_fsurdat_modifier.py
@@ -45,7 +45,7 @@ def setUp(self):
         self._testinputs_path = testinputs_path
         self._fsurdat_in = os.path.join(
             testinputs_path,
-            "surfdata_5x5_amazon_16pfts_Irrig_CMIP6_simyr2000_c171214.nc",
+            "surfdata_5x5_amazon_hist_78pfts_CMIP6_2000_c230517.nc",
         )
         self._tempdir = tempfile.mkdtemp()
         self._cfg_file_path = os.path.join(self._tempdir, "modify_fsurdat.cfg")
@@ -77,7 +77,7 @@ def test_short_config(self):
         sys.argv = ["fsurdat_modifier", self._cfg_file_path]
         parser = fsurdat_modifier_arg_process()
         fsurdat_out = (
-            "ctsm/test/testinputs/surfdata_5x5_amazon_16pfts_Irrig_CMIP6_simyr2000_c171214_out.nc"
+            "ctsm/test/testinputs/surfdata_5x5_amazon_hist_78pfts_CMIP6_2000_c230517_out.nc"
         )
         if os.path.exists(fsurdat_out):
             os.remove(fsurdat_out)
@@ -134,14 +134,14 @@ def test_opt_sections(self):
         self._cfg_file_path = os.path.join(self._testinputs_path, "modify_fsurdat_opt_sections.cfg")
         outfile = os.path.join(
             self._tempdir,
-            "surfdata_5x5_amazon_16pfts_Irrig_CMIP6_simyr2000_c171214_output_urban.nc",
+            "surfdata_5x5_amazon_hist_78pfts_CMIP6_2000_c230517_output_urban.nc",
         )
         sys.argv = [
             "fsurdat_modifier",
             self._cfg_file_path,
             "-i",
             os.path.join(
-                self._testinputs_path, "surfdata_5x5_amazon_16pfts_Irrig_CMIP6_simyr2000_c171214.nc"
+                self._testinputs_path, "surfdata_5x5_amazon_hist_78pfts_CMIP6_2000_c230517.nc"
             ),
             "-o",
             outfile,

diff --git a/python/ctsm/test/testinputs/default_data.cfg b/python/ctsm/test/testinputs/default_data.cfg
@@ -15,14 +15,14 @@ precname = CLMGSWP3v1.Precip
 tpqwname = CLMGSWP3v1.TPQW
 
 [surfdat]
-dir = lnd/clm2/surfdata_map/release-clm5.0.18
-surfdat_16pft = surfdata_0.9x1.25_hist_16pfts_Irrig_CMIP6_simyr2000_c190214.nc
-surfdat_78pft = surfdata_0.9x1.25_hist_78pfts_CMIP6_simyr2000_c190214.nc
+dir = lnd/clm2/surfdata_esmf/ctsm5.2.0
+surfdat_16pft = surfdata_0.9x1.25_hist_16pfts_CMIP6_2000_c230517.nc
+surfdat_78pft = surfdata_0.9x1.25_hist_78pfts_CMIP6_2000_c230517.nc
 
 [landuse]
-dir = lnd/clm2/surfdata_map/release-clm5.0.18
-landuse_16pft = landuse.timeseries_0.9x1.25_hist_16pfts_Irrig_CMIP6_simyr1850-2015_c190214.nc
-landuse_78pft = landuse.timeseries_0.9x1.25_hist_78pfts_CMIP6_simyr1850-2015_c190214.nc
+dir = lnd/clm2/surfdata_esmf/ctsm5.2.0
+landuse_16pft = landuse.timeseries_0.9x1.25_hist_78_CMIP6_1850-2015_c230601.nc
+landuse_78pft = landuse.timeseries_0.9x1.25_hist_78_CMIP6_1850-2015_c230601.nc
 
 [domain]
 file = share/domains/domain.lnd.fv0.9x1.25_gx1v7.151020.nc
diff --git a/python/ctsm/test/testinputs/modify_fsurdat_short.cfg b/python/ctsm/test/testinputs/modify_fsurdat_short.cfg
@@ -1,7 +1,7 @@
 [modify_fsurdat_basic_options]
 
-fsurdat_in = ctsm/test/testinputs/surfdata_5x5_amazon_16pfts_Irrig_CMIP6_simyr2000_c171214.nc
-fsurdat_out = ctsm/test/testinputs/surfdata_5x5_amazon_16pfts_Irrig_CMIP6_simyr2000_c171214_out.nc
+fsurdat_in = ctsm/test/testinputs/surfdata_5x5_amazon_hist_78pfts_CMIP6_2000_c230517.nc
+fsurdat_out = ctsm/test/testinputs/surfdata_5x5_amazon_hist_78pfts_CMIP6_2000_c230517_out.nc
 
 idealized = False
 process_subgrid_section = False

diff --git a/src/biogeochem/CropType.F90 b/src/biogeochem/CropType.F90
@@ -628,7 +628,7 @@ subroutine CropUpdateAccVars(this, bounds, t_ref2m_patch, t_soisno_col)
     use accumulMod       , only : update_accum_field, extract_accum_field, accumResetVal
     use shr_const_mod    , only : SHR_CONST_CDAY, SHR_CONST_TKFRZ
     use clm_time_manager , only : get_step_size, get_nstep
-    use clm_varpar       , only : nlevsno, nlevgrnd
+    use clm_varpar       , only : nlevsno, nlevmaxurbgrnd
     use pftconMod        , only : nswheat, nirrig_swheat, pftcon
     use pftconMod        , only : nwwheat, nirrig_wwheat
     use pftconMod        , only : nsugarcane, nirrig_sugarcane
@@ -659,7 +659,7 @@ subroutine CropUpdateAccVars(this, bounds, t_ref2m_patch, t_soisno_col)
 
     ! Enforce expected array sizes
     SHR_ASSERT_ALL_FL((ubound(t_ref2m_patch)  == (/endp/))          , sourcefile, __LINE__)
-    SHR_ASSERT_ALL_FL((ubound(t_soisno_col)   == (/endc,nlevgrnd/)) , sourcefile, __LINE__)
+    SHR_ASSERT_ALL_FL((ubound(t_soisno_col)   == (/endc,nlevmaxurbgrnd/)) , sourcefile, __LINE__)
 
     dtime = get_step_size()
     nstep = get_nstep()

diff --git a/tools/mksurfdata_esmf/README b/tools/mksurfdata_esmf/README
@@ -69,7 +69,7 @@ Building the executable (working in tools/mksurfdata_esmf)
 =======================
 Running for a single submission:
 =======================
-# Work in the ctsm_py environment, which requires the following steps:
+# Work in the ctsm_pylib environment, which requires the following steps:
 > module unload python; module load conda
 > cd ../..; ./py_env_create
 > conda activate ctsm_py; cd tools/mksurfdata_esmf
@@ -93,10 +93,10 @@ Running for a single submission:
 =======================
 Running for the generation of multiple datasets
 =======================
-# Notes:
-# - gen_mksurfdata_jobscript_multi.py runs ./gen_mksurfdata_namelist.py for you
-# - The regional grid 5x5_amazon may fail with 24 nodes.
-#   Task geometry that worked: #PBS -l select=4:ncpus=36:mpiprocs=4
+# Work in the ctsm_pylib environment, as explained in earlier section.
+# gen_mksurfdata_jobscript_multi.py runs ./gen_mksurfdata_namelist.py for you
+# The regional grid 5x5_amazon may fail with 24 nodes.
+# Task geometry that worked: #PBS -l select=4:ncpus=36:mpiprocs=4
 > ./gen_mksurfdata_jobscript_multi.py --help
 > ./gen_mksurfdata_jobscript_multi.py --number-of-nodes 24 --scenario all
 > qsub mksurfdata_jobscript_multi

diff --git a/tools/mksurfdata_esmf/gen_mksurfdata_jobscript_multi.py b/tools/mksurfdata_esmf/gen_mksurfdata_jobscript_multi.py
@@ -14,22 +14,18 @@
                  "global-present",
                  "global-present-T42",
                  "global-present-nldas",
+                 "global-hist-4x5",
                  "tropics",
                  "crop-tropics-present",
-                 "crop-tropics-historical",
-                 "crop-tropics-transient",
                  "crop",
                  "crop-global-present",
                  "crop-global-present-ne16np4",
                  "crop-global-present-ne120np4",
                  "crop-global-present-0.125",
                  "crop-global-present-f05",
-                 "crop-global-historical",
-                 "crop-global-historical-f05",
-                 "crop-global-historical-ne120np4",
-                 "crop-global-transient",
-                 "crop-global-transient-ne120np4",
-                 "crop-global-transient-f05",
+                 "crop-global-1850",
+                 "crop-global-1850-ne120np4",
+                 "crop-global-hist",
                  "crop-global-future",
                  "crop-global-SSP1-2.6",
                  "crop-global-SSP3-7.0",
@@ -38,7 +34,8 @@
                  "crop-global-SSP1-1.9",
                  "crop-global-SSP4-3.4",
                  "crop-global-SSP4-6.0",
-                 "crop-global-SSP5-8.5"]
+                 "crop-global-SSP5-8.5",
+                 "crop-global-SSP5-8.5-other"]
 
 def get_parser():
     """
@@ -128,11 +125,12 @@ def main ():
         target_list = ["global-present",
                        "global-present-T42",
                        "global-present-nldas",
+                       "global-hist-4x5",
                        "crop-global-present",
                        "crop-global-present-ne16np4",
                        "crop-global-present-ne120np4",
-                       "crop-global-historical",
-                       "crop-global-transient",
+                       "crop-global-1850",
+                       "crop-global-hist",
                        "crop-tropics-present",
                        "crop-global-SSP1-2.6",
                        "crop-global-SSP3-7.0",
@@ -141,17 +139,19 @@ def main ():
                        "crop-global-SSP1-1.9",
                        "crop-global-SSP4-3.4",
                        "crop-global-SSP4-6.0",
-                       "crop-global-SSP5-8.5"]
+                       "crop-global-SSP5-8.5",
+                       "crop-global-SSP5-8.5-other"]
     elif scenario == 'standard':
         target_list = ["global-present",
                        "global-present-T42",
-                       "global-present-nldas"]
+                       "global-present-nldas",
+                       "global-hist-4x5"]
     elif scenario == "crop":
         target_list = ["crop-global-present",
                        "crop-global-present-ne16np4",
                        "crop-global-present-ne120np4",
-                       "crop-global-historical",
-                       "crop-global-transient"]
+                       "crop-global-1850",
+                       "crop-global-hist"]
     elif scenario == "crop-global-future":
         target_list = ["crop-global-SSP1-2.6",
                        "crop-global-SSP3-7.0",
@@ -160,7 +160,8 @@ def main ():
                        "crop-global-SSP1-1.9",
                        "crop-global-SSP4-3.4",
                        "crop-global-SSP4-6.0",
-                       "crop-global-SSP5-8.5"]
+                       "crop-global-SSP5-8.5",
+                       "crop-global-SSP5-8.5-other"]
     elif scenario == "tropics":
         target_list = ["crop-tropics-present"]
     else:
@@ -170,14 +171,15 @@ def main ():
     # Determine resolution sets that are referenced in commands
     # --------------------------
     resolution_dict = {
-        "standard_res_no_crop" : ["0.9x1.25","1.9x2.5","10x15"],
-        "standard_res"         : ['0.9x1.25','1.9x2.5','10x15','4x5','C96',
+        "standard_res_no_crop" : ["0.9x1.25","1.9x2.5","10x15","4x5"],
+        "most_res"             : ['0.9x1.25','1.9x2.5','10x15','4x5','C96',
             'ne30np4','ne30np4.pg2','ne30np4.pg3','ne30np4.pg4','ne120np4.pg3',
             'ne0np4.ARCTICGRIS.ne30x8','ne0np4.ARCTIC.ne30x4', 'ne0np4CONUS.ne30x8',
             'ne3np4.pg3','ne5np4.pg3','ne16np4.pg3','mpasa480','mpasa120'],
-        "future_res"           : ["0.9x1.25","1.9x2.5","10x15"],
-        "trans_res"            : ['0.9x1.25','1.9x2.5','10x15','ne30np4',
-            'ne0np4.ARCTICGRIS.ne30x8','ne0np4.ARCTIC.ne30x4','ne0np4CONUS.ne30x8','ne120np4'],
+        "standard_res"         : ["0.9x1.25","1.9x2.5","10x15"],
+        "ssp585_res"           : ['C96','ne30np4','ne0np4.ARCTICGRIS.ne30x8',
+            'ne0np4.ARCTIC.ne30x4','ne0np4CONUS.ne30x8','ne120np4'],
+        "4x5_res"              : ['4x5'],
         "T42_res"              : ['T42'],
         "nldas_res"            : ['0.125nldas2'],
         "5x5_amazon_res"       : ['5x5_amazon'],
@@ -191,23 +193,24 @@ def main ():
     dataset_dict={"global-present"                  : ("--start-year 2000 --end-year 2000 --nocrop --vic                  --res", "standard_res_no_crop"),
                   "global-present-T42"              : ("--start-year 2000 --end-year 2000 --nocrop --vic                  --res", "T42_res"),
                   "global-present-nldas"            : ("--start-year 2000 --end-year 2000 --nocrop --vic                  --res", "nldas_res"),
+                  "global-hist-4x5"                 : ("--start-year 1850 --end-year 2015 --nocrop                        --res", "4x5_res"),
                   "crop-tropics-present"            : ("--start-year 2000 --end-year 2000                                 --res", "5x5_amazon_res"),
-                  "crop-global-present"             : ("--start-year 2000 --end-year 2000                                 --res", "standard_res"),
+                  "crop-global-present"             : ("--start-year 2000 --end-year 2000                                 --res", "most_res"),
                   "crop-global-present-ne16np4"     : ("--start-year 2000 --end-year 2000                                 --res", "ne16np4_res"),
                   "crop-global-present-ne120np4"    : ("--start-year 2000 --end-year 2000                                 --res", "ne120np4_res"),
                   "crop-global-present-0.125"       : ("--start-year 2000 --end-year 2000 --hirespft                      --res", "nldas_res"),
-                  "crop-global-historical"          : ("--start-year 1850 --end-year 1850 --ssp-rcp SSP5-8.5              --res", "standard_res"),
-                  "crop-global-historical-ne120np4" : ("--start-year 1850 --end-year 1850 --ssp-rcp SSP5-8.5              --res", "ne120np4_res"),
-                  "crop-global-transient"           : ("--start-year 1850 --end-year 2000 --nosurfdata                    --res", "trans_res"),
-                  "crop-global-transient-ne120np4"  : ("--start-year 1850 --end-year 2000 --nosurfdata                    --res", "ne120np4_res"),
-                  "crop-global-SSP1-1.9"            : ("--start-year 1850 --end-year 2100 --nosurfdata --ssp-rcp SSP1-1.9 --res", "future_res"),
-                  "crop-global-SSP1-2.6"            : ("--start-year 1850 --end-year 2100 --nosurfdata --ssp-rcp SSP1-2.6 --res", "future_res"),
-                  "crop-global-SSP2-4.5"            : ("--start-year 1850 --end-year 2100 --nosurfdata --ssp-rcp SSP2-4.5 --res", "future_res"),
-                  "crop-global-SSP3-7.0"            : ("--start-year 1850 --end-year 2100 --nosurfdata --ssp-rcp SSP3-7.0 --res", "future_res"),
-                  "crop-global-SSP4-3.4"            : ("--start-year 1850 --end-year 2100 --nosurfdata --ssp-rcp SSP4-3.4 --res", "future_res"),
-                  "crop-global-SSP4-6.0"            : ("--start-year 1850 --end-year 2100 --nosurfdata --ssp-rcp SSP4-6.0 --res", "future_res"),
-                  "crop-global-SSP5-3.4"            : ("--start-year 1850 --end-year 2100 --nosurfdata --ssp-rcp SSP5-3.4 --res", "future_res"),
-                  "crop-global-SSP5-8.5"            : ("--start-year 1850 --end-year 2100 --nosurfdata --ssp-rcp SSP5-8.5 --res", "future_res")
+                  "crop-global-1850"                : ("--start-year 1850 --end-year 1850                                 --res", "most_res"),
+                  "crop-global-1850-ne120np4"       : ("--start-year 1850 --end-year 1850                                 --res", "ne120np4_res"),
+                  "crop-global-hist"                : ("--start-year 1850 --end-year 2015 --nosurfdata                    --res", "standard_res"),
+                  "crop-global-SSP1-1.9"            : ("--start-year 1850 --end-year 2100 --nosurfdata --ssp-rcp SSP1-1.9 --res", "standard_res"),
+                  "crop-global-SSP1-2.6"            : ("--start-year 1850 --end-year 2100 --nosurfdata --ssp-rcp SSP1-2.6 --res", "standard_res"),
+                  "crop-global-SSP2-4.5"            : ("--start-year 1850 --end-year 2100 --nosurfdata --ssp-rcp SSP2-4.5 --res", "standard_res"),
+                  "crop-global-SSP3-7.0"            : ("--start-year 1850 --end-year 2100 --nosurfdata --ssp-rcp SSP3-7.0 --res", "standard_res"),
+                  "crop-global-SSP4-3.4"            : ("--start-year 1850 --end-year 2100 --nosurfdata --ssp-rcp SSP4-3.4 --res", "standard_res"),
+                  "crop-global-SSP4-6.0"            : ("--start-year 1850 --end-year 2100 --nosurfdata --ssp-rcp SSP4-6.0 --res", "standard_res"),
+                  "crop-global-SSP5-3.4"            : ("--start-year 1850 --end-year 2100 --nosurfdata --ssp-rcp SSP5-3.4 --res", "standard_res"),
+                  "crop-global-SSP5-8.5"            : ("--start-year 1850 --end-year 2100 --nosurfdata --ssp-rcp SSP5-8.5 --res", "standard_res"),
+                  "crop-global-SSP5-8.5-other"      : ("--start-year 1850 --end-year 2100 --nosurfdata --ssp-rcp SSP5-8.5 --res", "ssp585_res")
                   }
 
     # --------------------------