From b3142802856438894af0a6709dcf2106e0493543 Mon Sep 17 00:00:00 2001
From: Andrew Kiss <31054815+aekiss@users.noreply.github.com>
Date: Wed, 30 Sep 2020 19:42:13 +1000
Subject: [PATCH 1/2] fix corner array shape mismatch in write_scrip - closes
 #3

---
 grid.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/grid.py b/grid.py
index 0985f77..d6ec22b 100644
--- a/grid.py
+++ b/grid.py
@@ -187,12 +187,12 @@ def write_scrip(self, filename, mask=None, write_test_scrip=True, history=''):
         corner_lat = f.createVariable('grid_corner_lat', 'f8',
                                       ('grid_size', 'grid_corners'))
         corner_lat.units = 'degrees'
-        corner_lat[:] = clat[:].flatten()
+        corner_lat[:] = clat[:].reshape(-1,4)
 
         corner_lon = f.createVariable('grid_corner_lon', 'f8',
                                       ('grid_size', 'grid_corners'))
         corner_lon.units = 'degrees'
-        corner_lon[:] = clon[:].flatten()
+        corner_lon[:] = clon[:].reshape(-1,4)
 
         f.title = self.description
         f.history = history

From 1f2f1c9ca46e1ae9843040ef144c69f75604d51a Mon Sep 17 00:00:00 2001
From: Andrew Kiss <31054815+aekiss@users.noreply.github.com>
Date: Wed, 30 Sep 2020 19:52:13 +1000
Subject: [PATCH 2/2] support conservative temperature

---
 regrid.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/regrid.py b/regrid.py
index b21b217..3231579 100755
--- a/regrid.py
+++ b/regrid.py
@@ -259,7 +259,7 @@ def is_var_temp_or_salt(src_var, dest_var):
     for v in [src_var.lower(), dest_var.lower()]:
         if v == 'salt' or v == 'vosaline' or v == 'practical_salinity':
             return 'salt'
-        if v == 'temp' or v == 'votemper' or v == 'pottmp' or v == 'potential_temperature':
+        if v == 'temp' or v == 'votemper' or v == 'pottmp' or v == 'potential_temperature' or v == 'conservative_temperature':
             return 'temp'
 
 def check_src_data_ranges(src_data, temp_or_salt):