Merge branch 'release' into fix/force_overwrite_in_file_movements

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 6.46.0
+current_version = 6.46.1
 commit = True
 tag = True
 

setup.py

@@ -117,6 +117,6 @@
     test_suite="tests",
     tests_require=test_requirements,
     url="https://github.com/esm-tools/esm_tools",
-    version="6.46.0",
+    version="6.46.1",
     zip_safe=False,
 )

src/esm_archiving/__init__.py

@@ -4,7 +4,7 @@
 
 __author__ = """Paul Gierz"""
 __email__ = "[email protected]"
-__version__ = "6.46.0"
+__version__ = "6.46.1"
 
 from .esm_archiving import (archive_mistral, check_tar_lists,
                             delete_original_data, determine_datestamp_location,

src/esm_calendar/__init__.py

@@ -2,6 +2,6 @@
 
 __author__ = """Dirk Barbi"""
 __email__ = "[email protected]"
-__version__ = "6.46.0"
+__version__ = "6.46.1"
 
 from .esm_calendar import *

src/esm_cleanup/__init__.py

@@ -2,4 +2,4 @@
 
 __author__ = """Dirk Barbi"""
 __email__ = "[email protected]"
-__version__ = "6.46.0"
+__version__ = "6.46.1"

src/esm_database/__init__.py

@@ -2,4 +2,4 @@
 
 __author__ = """Dirk Barbi"""
 __email__ = "[email protected]"
-__version__ = "6.46.0"
+__version__ = "6.46.1"

src/esm_environment/__init__.py

@@ -2,6 +2,6 @@
 
 __author__ = """Dirk Barbi"""
 __email__ = "[email protected]"
-__version__ = "6.46.0"
+__version__ = "6.46.1"
 
 from .esm_environment import *

src/esm_master/__init__.py

@@ -2,7 +2,7 @@
 
 __author__ = """Dirk Barbi"""
 __email__ = "[email protected]"
-__version__ = "6.46.0"
+__version__ = "6.46.1"
 
 
 from . import database

src/esm_motd/__init__.py

@@ -2,6 +2,6 @@
 
 __author__ = """Dirk Barbi"""
 __email__ = "[email protected]"
-__version__ = "6.46.0"
+__version__ = "6.46.1"
 
 from .esm_motd import *

src/esm_parser/__init__.py

@@ -2,7 +2,7 @@
 
 __author__ = """Dirk Barbi"""
 __email__ = "[email protected]"
-__version__ = "6.46.0"
+__version__ = "6.46.1"
 
 
 from .dict_to_yaml import *

src/esm_plugin_manager/__init__.py

@@ -2,6 +2,6 @@
 
 __author__ = """Dirk Barbi, Paul Gierz, Sebastian Wahl"""
 __email__ = "[email protected]"
-__version__ = "6.46.0"
+__version__ = "6.46.1"
 
 from .esm_plugin_manager import *

src/esm_profile/__init__.py

@@ -2,6 +2,6 @@
 
 __author__ = """Dirk Barbi"""
 __email__ = "[email protected]"
-__version__ = "6.46.0"
+__version__ = "6.46.1"
 
 from .esm_profile import *

src/esm_runscripts/__init__.py

@@ -2,7 +2,7 @@
 
 __author__ = """Dirk Barbi"""
 __email__ = "[email protected]"
-__version__ = "6.46.0"
+__version__ = "6.46.1"
 
 from .batch_system import *
 from .chunky_parts import *

src/esm_runscripts/oasis.py

@@ -664,8 +664,15 @@ def prepare_restarts(self, restart_file, all_fields, models, config):
         # before (i.e. when using LOCTRANS)
         if os.path.isfile(restart_file):
             logger.debug(f"{restart_file} already exits, overwriting")
-        logger.info("cdo -O merge " + filelist + " " + restart_file)
-        os.system("cdo -O merge " + filelist + " " + restart_file)  # + enddate)
+
+        cdo_merge_command = f"cdo -O -f nc4c merge {filelist} {restart_file}" # {enddate}"
+        logger.info(cdo_merge_command)
+        exit_code = os.system(cdo_merge_command)
+        if exit_code != 0:
+            cdo_merge_command = f"cdo -O merge {filelist} {restart_file}" # {enddate}"
+            logger.warning("nc4c merge failed, trying without it...")
+            logger.info(cdo_merge_command)
+            os.system(cdo_merge_command)
         rmlist = glob.glob("notimestep*")
         rmlist.append("onlyonetimestep.nc")
         for rmfile in rmlist:

src/esm_tests/__init__.py

@@ -2,7 +2,7 @@
 
 __author__ = """Miguel Andres-Martinez"""
 __email__ = "[email protected]"
-__version__ = "6.46.0"
+__version__ = "6.46.1"
 
 from .initialization import *
 from .read_shipped_data import *

src/esm_tools/__init__.py

@@ -23,7 +23,7 @@
 
 __author__ = """Dirk Barbi, Paul Gierz"""
 __email__ = "[email protected]"
-__version__ = "6.46.0"
+__version__ = "6.46.1"
 
 import functools
 import inspect

src/esm_utilities/__init__.py

@@ -2,6 +2,6 @@
 
 __author__ = """Paul Gierz"""
 __email__ = "[email protected]"
-__version__ = "6.46.0"
+__version__ = "6.46.1"
 
 from .utils import *