From b95efd606af795e91bf940da7c937fef0cd6823a Mon Sep 17 00:00:00 2001
From: Lee de Mora <ledm@pml.ac.uk>
Date: Wed, 20 Nov 2024 12:03:13 +0000
Subject: [PATCH] Debugged new AMOCs

---
 bgcval2/functions/circulation.py | 25 ++++++++++++++-----------
 key_lists/debug.yml              |  2 +-
 key_lists/tfamoc.yml             |  4 +++-
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/bgcval2/functions/circulation.py b/bgcval2/functions/circulation.py
index e61b2d9..f013d92 100644
--- a/bgcval2/functions/circulation.py
+++ b/bgcval2/functions/circulation.py
@@ -144,7 +144,7 @@ def loadDataMask(gridfn, maskname, grid):
     global tmask_AMOC55N
     
     global loadedArea
-    global loadedAltMask
+#    global loadedAltMask
 
     if grid == 'eORCA1':
         LON = eORCA1_drake_LON
@@ -231,13 +231,15 @@ def loadAtlanticMask(altmaskfile, maskname='tmaskatl', grid = 'eORCA1'):
     global loadedAltMask
     if grid == 'eORCA1':
         latslice26Nnm = eORCA1_latslice26Nnm
+        latslice40N = eORCA1_latslice40N
+        latslice55N = eORCA1_latslice55N
+
     else:
         raise ValueError("Grid not recognised in this calculation: %s", grid)
     nc = dataset(altmaskfile, 'r')        
     alttmask_AMOC26N = nc.variables[maskname][latslice26Nnm, :]
     alttmask_AMOC40N = nc.variables[maskname][latslice40N, :]
     alttmask_AMOC55N = nc.variables[maskname][latslice55N, :]
-
     nc.close()
     loadedAltMask = True
 
@@ -326,34 +328,35 @@ def TwentySixNorth(nc, keys, lat='26N', return_max_depth=False, **kwargs):
     if not loadedArea:
         loadDataMask(areafile, maskname, grid)
 
+    altmaskfile = get_kwarg_file(kwargs, 'altmaskfile', default = 'bgcval2/data/basinlandmask_eORCA1.nc')
+    if not loadedAltMask:
+         loadAtlanticMask(altmaskfile, maskname='tmaskatl', grid=grid)
+
     if grid == 'eORCA1':
         if lat == '26N':
             latslice = eORCA1_latslice26Nnm
             e1v_AMOC = e1v_AMOC26N
-            alttmask_AMOC = alttmask_AMOC26N
+            alttmask_AMOC = alttmask_AMOC26N[:]
             tmask_AMOC = tmask_AMOC26N
             e3v_AMOC = e3v_AMOC26N
 
         elif lat == '40N':
             latslice = eORCA1_latslice40N
             e1v_AMOC = e1v_AMOC40N
-            alttmask_AMOC = alttmask_AMOC40N
+            alttmask_AMOC = alttmask_AMOC40N[:]
             tmask_AMOC = tmask_AMOC40N
             e3v_AMOC = e3v_AMOC40N
 
         elif lat == '55N':
             latslice = eORCA1_latslice55N
             e1v_AMOC = e1v_AMOC55N
-            alttmask_AMOC = alttmask_AMOC55N
+            alttmask_AMOC = alttmask_AMOC55N[:]
             tmask_AMOC = tmask_AMOC55N
             e3v_AMOC = e3v_AMOC44N
 
         else:
             raise ValueError('Region not recognised', lat)
 
-        altmaskfile = get_kwarg_file(kwargs, 'altmaskfile', default = 'bgcval2/data/basinlandmask_eORCA1.nc')
-        if not loadedAltMask:
-             loadAtlanticMask(altmaskfile, maskname='tmaskatl', grid=grid)
     elif grid == 'eORCA025':
         assert 0 
         latslice = eORCA025_latslice26Nnm
@@ -652,21 +655,21 @@ def AMOC26N(nc, keys, **kwargs):
     if kwargs.get('grid',None) == 'eORCA025':
         return twentysixnorth025(nc, keys, **kwargs)
     else:
-        atlmoc = TwentySixNorth(nc, keys, lat='26N' **kwargs)
+        atlmoc = TwentySixNorth(nc, keys, lat='26N', **kwargs)
     return atlmoc.max()
 
 def AMOC40N(nc, keys, **kwargs):
     if kwargs.get('grid',None) == 'eORCA025':
         return twentysixnorth025(nc, keys, **kwargs)
     else:
-        atlmoc = TwentySixNorth(nc, keys,lat='40N' **kwargs)
+        atlmoc = TwentySixNorth(nc, keys,lat='40N', **kwargs)
     return atlmoc.max()
 
 def AMOC55N(nc, keys, **kwargs):
     if kwargs.get('grid',None) == 'eORCA025':
         return twentysixnorth025(nc, keys, **kwargs)
     else:
-        atlmoc = TwentySixNorth(nc, keys, lat='55N' **kwargs)
+        atlmoc = TwentySixNorth(nc, keys, lat='55N', **kwargs)
     return atlmoc.max()
 
 
diff --git a/key_lists/debug.yml b/key_lists/debug.yml
index 2eb5e0d..bddafe7 100644
--- a/key_lists/debug.yml
+++ b/key_lists/debug.yml
@@ -19,7 +19,7 @@ keys:
 #    soicecov: True     
 #     hfds: True
 #     somesatr: True
-     hfy: True
+    hfy: True
 
 #    sosafldo: True
 
diff --git a/key_lists/tfamoc.yml b/key_lists/tfamoc.yml
index f195070..7c15d99 100644
--- a/key_lists/tfamoc.yml
+++ b/key_lists/tfamoc.yml
@@ -7,6 +7,8 @@ keys:
     SST: True
     DrakePassageTransport: True
     AMOC_26N: True
+    AMOC_40N: True
+    AMOC_55N: True
     AtmosCO2: True
     AtlanticSubtropicSalinity: True
     GINSalinity: True
@@ -22,9 +24,9 @@ keys:
     fsitherm: True
     sowaflup: True
     hfds: True
+    hfy: True
     sosafldo: True
     somesatr: True
-
     hfbasinatlantic: True
     sowindsp: True
     friver: True