Updates to the datasets generated by make all

slevis-lmwg · Aug 30, 2024 · 615dff4 · 615dff4
1 parent df36ab3
commit 615dff4
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/python/ctsm/toolchain/gen_mksurfdata_jobscript_multi.py b/python/ctsm/toolchain/gen_mksurfdata_jobscript_multi.py
@@ -42,6 +42,7 @@
     "crop-global-hist-low-res",
     "crop-global-hist-ne16",
     "crop-global-hist-ne30",
+    "crop-global-hist-f09",
     "crop-global-SSP1-1.9-f09",
     "crop-global-SSP1-2.6-f09",
     "crop-global-SSP2-4.5-f09",
@@ -198,6 +199,7 @@ def main():
         "low_res_no_crop": ["4x5", "10x15"],
         "ultra_hi_res_no_crop": ["mpasa15", "mpasa3p75"],
         "standard_res": ["360x720cru", "0.9x1.25", "1.9x2.5", "C96", "mpasa120"],
+        "standard_res_no_f09": ["360x720cru", "1.9x2.5", "C96", "mpasa120"],
         "low_res": ["4x5", "10x15", "ne3np4.pg3"],
         "mpasa480": ["mpasa480"],
         "nldas_res": ["0.125nldas2"],
@@ -209,11 +211,13 @@ def main():
             "ne0np4.ARCTICGRIS.ne30x8",
             "ne0np4.ARCTIC.ne30x4",
             "ne0np4CONUS.ne30x8",
+            "ne0np4.POLARCAP.ne30x4",
         ],
         "ne120": [
             "ne0np4.ARCTICGRIS.ne30x8",
             "ne0np4.ARCTIC.ne30x4",
             "ne0np4CONUS.ne30x8",
+            "ne0np4.POLARCAP.ne30x4",
             "ne120np4.pg3",
         ],
     }
@@ -295,21 +299,25 @@ def main():
             "mpasa480",
         ),
         "crop-global-hist": (
-            "--start-year 1850 --end-year 2015 --nosurfdata                    --res",
-            "standard_res",
+            "--start-year 1850 --end-year 2023 --nosurfdata                    --res",
+            "standard_res_no_f09",
         ),
         "crop-global-hist-low-res": (
-            "--start-year 1850 --end-year 2015 --nosurfdata                    --res",
+            "--start-year 1850 --end-year 2023 --nosurfdata                    --res",
             "low_res",
         ),
         "crop-global-hist-ne16": (
-            "--start-year 1850 --end-year 2015 --nosurfdata                    --res",
+            "--start-year 1850 --end-year 2023 --nosurfdata                    --res",
             "ne16",
         ),
         "crop-global-hist-ne30": (
-            "--start-year 1850 --end-year 2015 --nosurfdata                    --res",
+            "--start-year 1850 --end-year 2023 --nosurfdata                    --res",
             "ne30",
         ),
+        "crop-global-hist-f09": (
+            "--start-year 1700 --end-year 2023                                 --res",
+            "f09",
+        ),
         "crop-global-SSP1-1.9-f09": (
             "--start-year 1850 --end-year 2100 --nosurfdata --ssp-rcp SSP1-1.9 --res",
             "f09",

diff --git a/tools/mksurfdata_esmf/Makefile b/tools/mksurfdata_esmf/Makefile
@@ -92,6 +92,7 @@ CROP = \
 	crop-global-present-ne120 \
 	crop-global-present-mpasa480 \
 	crop-global-present-nldas \
+	crop-global-hist-f09 \
 	crop-global-1850 \
 	crop-global-1850-low-res \
 	crop-global-1850-ne16 \
@@ -227,6 +228,10 @@ crop-global-hist : FORCE
 	$(MKSURFDATA)  --number-of-nodes 72 --scenario $@ --jobscript-file $@.sh --walltime 12:00:00
 	$(BATCHJOBS) $@.sh
 
+crop-global-hist-f09 : FORCE
+	$(MKSURFDATA)  --number-of-nodes 9 --scenario $@ --jobscript-file $@.sh --walltime 12:00:00
+	$(BATCHJOBS) $@.sh
+
 crop-global-hist-low-res : FORCE
 	$(MKSURFDATA)  --number-of-nodes 14 --tasks-per-node 32 --scenario $@ --jobscript-file $@.sh --walltime 12:00:00
 	$(BATCHJOBS) $@.sh