Merge pull request #359 from ContactEngineering/24_io_issues

BUG: Avoid always warning about unit
ContactEngineering · Mar 4, 2024 · fc29ab9 · fc29ab9
2 parents ed5cf40 + 5429814
commit fc29ab9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/SurfaceTopography/ChangeLog.md b/SurfaceTopography/ChangeLog.md
@@ -1,6 +1,11 @@
 Change log for SurfaceTopography
 ================================
 
+v1.1376 (05Mar24)
+-----------------
+
+- BUG: Avoid always warning about unit
+
 v1.13.6 (04Mar24)
 -----------------
 

diff --git a/SurfaceTopography/Container/IO/CE.py b/SurfaceTopography/Container/IO/CE.py
@@ -179,11 +179,11 @@ def __init__(self, fn, datafile_keys=['original', 'squeezed-netcdf'], ignore_fil
                 unit_from_file = reader.channels[data_source].unit
                 if unit_from_file is not None:
                     if unit is not None:
-                        # Need to set this to None to avoid collision
-                        unit = None
                         if unit_from_file != unit:
                             warnings.warn(f'Unit from data file (={unit_from_file}) and from meta.yml '
                                           f'(={unit}) differ for topography {datafiles[datafile_key]}')
+                        # Need to set this to None to avoid collision
+                        unit = None
 
                 readers += [
                     _ReadTopography(reader,