diff --git a/bin/cis b/bin/cis old mode 100755 new mode 100644 diff --git a/bin/cis.lsf b/bin/cis.lsf old mode 100755 new mode 100644 diff --git a/cis/cis_main.py b/cis/cis_main.py old mode 100755 new mode 100644 diff --git a/cis/data_io/hdf_sd.py b/cis/data_io/hdf_sd.py old mode 100755 new mode 100644 diff --git a/cis/data_io/ungridded_data.py b/cis/data_io/ungridded_data.py index b2c0ef07..066b1e81 100644 --- a/cis/data_io/ungridded_data.py +++ b/cis/data_io/ungridded_data.py @@ -402,7 +402,7 @@ def update_range(self, range=None): cis_standard_time_unit.num2date(self.data.max())) else: range = (self.data.min(), self.data.max()) - except ValueError as e: + except Exception as e: #MRR: ValueError fails with string variables, need Exception # If we can't set a range for some reason then just leave it blank range = () diff --git a/cis/data_io/write_netcdf.py b/cis/data_io/write_netcdf.py index c3a418ad..46b6ce86 100644 --- a/cis/data_io/write_netcdf.py +++ b/cis/data_io/write_netcdf.py @@ -13,7 +13,8 @@ 'uint32': "u4", 'uint64': "u8", 'float32': "f4", - 'float64': "f8"} + 'float64': "f8", #MRR + 'object': "S2"} #MRR index_name = 'obs' @@ -102,7 +103,13 @@ def __create_variable(nc_file, data, prefer_standard_name=False): if (name is None) or prefer_standard_name: if (data.metadata.standard_name is not None) and (len(data.metadata.standard_name) > 0): name = data.metadata.standard_name - out_type = types[str(data.data.dtype)] + #MRR added 4 lines below to deal with string type variables + if str(data.data.dtype)[0:2] == " ext: coastline_res = res