revert src changes for later merge with #1138 after testing

Author: mandresm

src/esm_environment/esm_environment.py

@@ -548,11 +548,8 @@ def write_dummy_script(self, include_set_e=True):
             print('WARNING: "sh_interpreter" not defined in the machine yaml')
         with open("dummy_script.sh", "w") as script_file:
             # Write the file headings
-            #script_file.write(
-            #    f'#!{self.config.get("sh_interpreter", "/bin/bash")} -l\n'
-            #)
             script_file.write(
-                f'#!{self.config.get("sh_interpreter", "/bin/bash")}\n'
+                f'#!{self.config.get("sh_interpreter", "/bin/bash")} -l\n'
             )
             script_file.write(
                 "# Dummy script generated by esm-tools, to be removed later: \n"

src/esm_runscripts/oasis.py

@@ -45,11 +45,8 @@ def __init__(
         self.namcouple += [" $NBMODEL", "            " + str(exec_entry), " $END"]
         self.namcouple += [" $RUNTIME", "           " + str(runtime), " $END"]
         if lucia:
-            # LUCIA (load balancing) is done differently in MCT 5.0
-            if mct_version >= (5,0):
-                # In MCT5 you set X Y Z, where X refers to verbosity, Y to timing info and Z to load balancing
-                # Here: Set X = debug_level, Y = 0 (no info), Z = 1 (activate load balancing)
-                self.namcouple += [" $NLOGPRT", "           " + str(debug_level) + " 0 1 ", " $END"]
+            if mct_version >= (5, 0):
+                self.namcouple += [" $NLOGPRT", "           " + str(debug_level) + " 0 1", " $END"]
             else:
                 self.namcouple += [" $NLOGPRT", "           " + "1 -1", " $END"]
         else:
@@ -543,9 +540,12 @@ def add_restart_files(self, restart_file_label, fconfig):
         config["restart_in_in_work"][restart_file_label] = restart_file
 
         # In case of a branch-off experiment -> use the correct oasis restart files:
-        # Not the rstas.nc soft link to the last, but the actual one for the
-        # branch-off date
-        if gconfig["run_number"] == 1 and config["lresume"] and gconfig["jobtype"] == "prepcompute" and config.get("norestart", "F") == "F":
+        # Not the soft link to the last, but the actual one for the branch-off date
+        if (
+            gconfig["run_number"] == 1
+            and config["lresume"]
+            and gconfig["jobtype"] == "prepcompute"
+        ):
             # If they do not exist, define ``ini_restart_date`` and ``ini_restart_dir``
             # based on ``ini_parent_date`` and ``ini_parent_dir``
             if "ini_parent_date" in config and "ini_restart_date" not in config:
@@ -561,7 +561,7 @@ def add_restart_files(self, restart_file_label, fconfig):
                 # check if restart file with ini_restart_date in filename is in the restart
                 # folder of the parent experiment to be branched off from:
                 glob_search_file = (
-                    f"{config['ini_restart_dir']}{restart_file}*"
+                    f"{restart_file_path}*"
                     f"{config['ini_restart_date'].year}"
                     f"{config['ini_restart_date'].month:02}"
                     f"{config['ini_restart_date'].day:02}"
@@ -577,13 +577,7 @@ def add_restart_files(self, restart_file_label, fconfig):
                     restart_file = os.path.basename(glob_restart_file[0])
                 elif len(glob_restart_file) == 0:
                     restart_file = restart_file_path
-                    # in case config["restart_in_sources"] are given explicitely 
-                    # AND are not absolute paths as e.g in FOCI
-                    # ini_parent_dir: "${general.ini_parent_dir}/oasis3mct/"
-                    #    restart_in_sources: sstocean_${parent_expid}_...
-                    # we need to check for the full path as well 
-                    # btw it was a nightmare to track this down
-                    if not os.path.isfile(restart_file) and not os.path.isfile(f"{config['ini_restart_dir']}/{restart_file}"):
+                    if not os.path.isfile(restart_file):
                         user_error(
                             "Restart file missing",
                             f"No OASIS restart file for ``{restart_file_label}`` found "