From 2fe181f1690631ec3f33621fe44cb66a91261b74 Mon Sep 17 00:00:00 2001
From: Maria Russo <mrr32@walker>
Date: Sat, 25 Jun 2022 14:34:27 +0100
Subject: [PATCH 1/2] Updates for writing string variables and increase
 resolution of coastlines

---
 bin/cis                       |  0
 bin/cis.lsf                   |  0
 cis/cis_main.py               |  0
 cis/data_io/hdf_sd.py         |  0
 cis/data_io/ungridded_data.py |  2 +-
 cis/data_io/write_netcdf.py   | 11 +++++++++--
 cis/plotting/plot.py          |  4 ++--
 7 files changed, 12 insertions(+), 5 deletions(-)
 mode change 100755 => 100644 bin/cis
 mode change 100755 => 100644 bin/cis.lsf
 mode change 100755 => 100644 cis/cis_main.py
 mode change 100755 => 100644 cis/data_io/hdf_sd.py

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..e4161379 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] == "<U":
+        out_type = 'S'+str(data.data.dtype)[2]
+    else:
+        out_type = types[str(data.data.dtype)]
+    #MRR commented 1 line below            
+###    out_type = types[str(data.data.dtype)]
     logging.info("Creating variable: {name}({index}) {type}".format(name=name, index=index_name, type=out_type))
     if name not in nc_file.variables:
         # Generate a warning if we have insufficient disk space
diff --git a/cis/plotting/plot.py b/cis/plotting/plot.py
index 36aac207..028be191 100644
--- a/cis/plotting/plot.py
+++ b/cis/plotting/plot.py
@@ -176,8 +176,8 @@ def drawcoastlines(ax, coastlinescolour):
     ext = _get_extent(ax)
 
     if _test_natural_earth_available():
-        coastline_res = coastline_scales[0][1]
-        for scale, res in coastline_scales[1:]:
+        coastline_res = coastline_scales[2][1]   #MRR: change default to highest res 
+        for scale, res in coastline_scales[0:]:
             if scale > ext:
                 coastline_res = res
 

From 5e9adce95577f9eaf091922356a6ca07ec2a9e75 Mon Sep 17 00:00:00 2001
From: Maria Russo <mrr32@celsius>
Date: Fri, 15 Jul 2022 13:31:30 +0100
Subject: [PATCH 2/2] change hashes number

---
 cis/data_io/write_netcdf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cis/data_io/write_netcdf.py b/cis/data_io/write_netcdf.py
index e4161379..46b6ce86 100644
--- a/cis/data_io/write_netcdf.py
+++ b/cis/data_io/write_netcdf.py
@@ -109,7 +109,7 @@ def __create_variable(nc_file, data, prefer_standard_name=False):
     else:
         out_type = types[str(data.data.dtype)]
     #MRR commented 1 line below            
-###    out_type = types[str(data.data.dtype)]
+#    out_type = types[str(data.data.dtype)]
     logging.info("Creating variable: {name}({index}) {type}".format(name=name, index=index_name, type=out_type))
     if name not in nc_file.variables:
         # Generate a warning if we have insufficient disk space