Make tasks-per-node not required as multi script was setup, and allow…

… default jobscript name to change
ekluzek · Mar 28, 2024 · 91d880a · 91d880a
1 parent d37213a
commit 91d880a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/python/ctsm/toolchain/gen_mksurfdata_jobscript_multi.py b/python/ctsm/toolchain/gen_mksurfdata_jobscript_multi.py
@@ -66,7 +66,7 @@ def get_parser():
     """
     Get parser object for this script.
     """
-    parser = base_get_parser()
+    parser = base_get_parser(default_js_name="mksurfdata_jobscript_multi")
 
     parser.add_argument(
         "--scenario",

diff --git a/python/ctsm/toolchain/gen_mksurfdata_jobscript_single.py b/python/ctsm/toolchain/gen_mksurfdata_jobscript_single.py
@@ -7,6 +7,7 @@
 import argparse
 import logging
 
+
 from ctsm import add_cime_to_path  # pylint: disable=unused-import
 from ctsm.ctsm_logging import setup_logging_pre_config, add_logging_args, process_logging_args
 from ctsm.utils import abort
@@ -19,7 +20,7 @@
 logger = logging.getLogger(__name__)
 
 
-def base_get_parser():
+def base_get_parser(default_js_name="mksurfdata_jobscript_single"):
     """
     Get parser object for the gen_mksurfdata_jobscript scripts
     """
@@ -62,7 +63,8 @@ def base_get_parser():
         action="store",
         dest="tasks_per_node",
         type=int,
-        required=True,
+        required=False,
+        default="128",
     )
     parser.add_argument(
         "--machine",
@@ -82,7 +84,7 @@ def base_get_parser():
         action="store",
         dest="jobscript_file",
         required=False,
-        default="mksurfdata_jobscript_single",
+        default=default_js_name,
     )
     parser.add_argument(
         "--walltime",