Merge branch 'master' into reconnection

build/mkdeps.sh

@@ -14,7 +14,7 @@
 #
 files=`ls $1/*.F90`
 for src in $files; do
-  deps=`awk '/^\s*[Uu][Ss][Ee] / {gsub ( "[:,]","" ) ; print $2}' $src | sort | uniq`
+  deps=`awk '/^\s*[Uu][Ss][Ee] / {gsub ( "[:,]","" ) ; print tolower($2)}' $src | sort | uniq`
   fname=`basename $src .F90`
   output="$2/${fname}.o: $src"
   for dep in $deps; do

python/amunpy/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setuptools.setup(
     name="amunpy",
-    version="0.9.10",
+    version="0.9.11",
     author="Grzegorz Kowal",
     author_email="grzegorz@amuncode.org",
     description="Python Interface for the AMUN code's snapshots",

python/amunpy/src/amunpy/__init__.py

@@ -21,6 +21,6 @@ __all__ = [ 'AmunXML', 'AmunH5', 'WriteVTK', \
 
 __author__ = "Grzegorz Kowal"
 __copyright__ = "Copyright 2018-2023 Grzegorz Kowal <grzegorz@amuncode.org>"
-__version__ = "0.9.10"
+__version__ = "0.9.11"
 __maintainer__ = "Grzegorz Kowal"
 __email__ = "grzegorz@amuncode.org"

python/amunpy/src/amunpy/amunxml.py

@@ -272,14 +272,14 @@ class AmunXML(Amun):
                 else:
                     raise Exception("Binary file '{}' compressed in unsupported format {}!".format(fname, comp))
 
-                if 'data_filter' in self.binaries[dataset]:
-                    data_filter = self.binaries[dataset]['data_filter']
-                    if data_filter == 'bytedelta':
+                if 'data_encoder' in self.binaries[dataset]:
+                    data_encoder = self.binaries[dataset]['data_encoder']
+                    if data_encoder == 'bytedelta':
                         data = self.__bytedelta_decode(data, dtype=dtype)
-                    elif data_filter == 'shuffle':
+                    elif data_encoder == 'shuffle':
                         data = self.__shuffle_decode(data, dtype=dtype)
                     else:
-                        raise Exception("Binary file '{}' processed using unsupported filter {}!".format(fname, data_filter))
+                        raise Exception("Binary file '{}' processed using unsupported data encoder {}!".format(fname, data_encoder))
 
                 if 'digest' in self.binaries[dataset]:
                     htype = self.binaries[dataset]['digest_type']
@@ -329,14 +329,14 @@ class AmunXML(Amun):
                 else:
                     raise Exception("Binary file '{}' compressed in unsupported format {}!".format(fname, comp))
 
-                if 'data_filter' in self.chunks[chunk_number][dataset_name]:
-                    data_filter = self.chunks[chunk_number][dataset_name]['data_filter']
-                    if data_filter == 'bytedelta':
+                if 'data_encoder' in self.chunks[chunk_number][dataset_name]:
+                    data_encoder = self.chunks[chunk_number][dataset_name]['data_encoder']
+                    if data_encoder == 'bytedelta':
                         data = self.__bytedelta_decode(data, dtype=dtype)
-                    elif data_filter == 'shuffle':
+                    elif data_encoder == 'shuffle':
                         data = self.__shuffle_decode(data, dtype=dtype)
                     else:
-                        raise Exception("Binary file '{}' processed using unsupported filter {}!".format(fname, data_filter))
+                        raise Exception("Binary file '{}' processed using unsupported data encoder {}!".format(fname, data_encoder))
 
                 if 'digest' in self.chunks[chunk_number][dataset_name]:
                     htype = self.chunks[chunk_number][dataset_name]['digest_type']