Skip to content

Commit 5fb2494

Browse files
authored
Merge pull request #35 from cedadev/fix34
Fix34
2 parents 5e061e1 + c372680 commit 5fb2494

4 files changed

Lines changed: 117 additions & 90 deletions

File tree

cfapyx/backend.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
def open_cfa_dataset(
2222
filename_or_obj,
2323
drop_variables=None,
24-
mask_and_scale=None,
24+
mask_and_scale=True,
2525
decode_times=True,
2626
concat_characters=None,
2727
decode_coords=None,
@@ -87,7 +87,7 @@ def open_dataset(
8787
filename_or_obj,
8888
*,
8989
drop_variables=None,
90-
mask_and_scale=None,
90+
mask_and_scale=True,
9191
decode_times=True,
9292
concat_characters=None,
9393
decode_coords=None,

cfapyx/creator.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -532,10 +532,14 @@ def _accumulate_attrs(self, attrs: dict, ncattrs: dict) -> dict:
532532
if not np.array_equal(attrs[attr], ncattrs[attr]):
533533
attrs[attr] = self.concat_msg
534534
continue
535-
if attrs[attr] != ncattrs[attr]:
535+
try:
536+
if attrs.get(attr) != ncattrs.get(attr):
537+
attrs[attr] = self.concat_msg
538+
else:
539+
attrs[attr] = ncattrs[attr]
540+
except ValueError:
541+
# Typically numpy array comparisons fail here.
536542
attrs[attr] = self.concat_msg
537-
else:
538-
attrs[attr] = ncattrs[attr]
539543
return attrs
540544

541545
class CFAWriteMixin:

0 commit comments

Comments
 (0)