bug fix and new regions

valeriupredoi · Nov 21, 2024 · 4ff85c0 · 4ff85c0
1 parent b95efd6
commit 4ff85c0
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/bgcval2/bgcvaltools/makeMask.py b/bgcval2/bgcvaltools/makeMask.py
@@ -201,6 +201,8 @@ def makeMask(name, newSlice, xt, xz, xy, xx, xd, debug=False):
 
     if newSlice == 'AMM':
         return np.ma.masked_outside(bvt.makeLonSafeArr(xx), -20., 13.).mask + np.ma.masked_outside(xy, 40., 65.).mask
+
+    if newSlice == 'NorthEastAtlantic':
 
 
     if newSlice == 'SouthernOcean':
@@ -347,6 +349,14 @@ def makeMask(name, newSlice, xt, xz, xy, xx, xd, debug=False):
         mx = np.ma.masked_outside(xx, -15., 10.).mask
         mx += np.ma.masked_outside(xy, 67., 76.).mask
         return mx
+
+    if newSlice == 'NorthEastAtlantic':
+
+        mx = np.ma.masked_outside(xx, -25., -2.).mask 
+        mx += np.ma.masked_outside(xy, 53., 65.).mask
+        return mx
+        #65-75:20W-15E
+
 
 
     if newSlice == 'Cornwall':
@@ -417,6 +427,13 @@ def makeMask(name, newSlice, xt, xz, xy, xx, xd, debug=False):
         mx += np.ma.masked_outside(xy, 67., 76.).mask
         return mx
 
+    if newSlice == 'subpolar':  
+        #    subpolar North Atlantic (50–70° N and 70° W–0° E)
+        # from https://www.nature.com/articles/s41561-024-01568-1
+        mx = np.ma.masked_outside(xx, -70., 0.).mask
+        mx += np.ma.masked_outside(xy, 50., 70.).mask
+        return mx
+
     if newSlice == 'NorthernSubpolarPacific':
         mx = np.ma.masked_inside(xx, -100., 120.).mask
         mx += np.ma.masked_inside(xx, 260., 365.).mask

diff --git a/bgcval2/functions/circulation.py b/bgcval2/functions/circulation.py
@@ -352,7 +352,7 @@ def TwentySixNorth(nc, keys, lat='26N', return_max_depth=False, **kwargs):
             e1v_AMOC = e1v_AMOC55N
             alttmask_AMOC = alttmask_AMOC55N[:]
             tmask_AMOC = tmask_AMOC55N
-            e3v_AMOC = e3v_AMOC44N
+            e3v_AMOC = e3v_AMOC55N
 
         else:
             raise ValueError('Region not recognised', lat)

diff --git a/key_files/salinity.yml b/key_files/salinity.yml
@@ -20,4 +20,4 @@ data_convert    : NoChange
 data_tdict      : ZeroToZero
 
 layers          : Surface 500m
-regions         : Global ignoreInlandSeas SouthernOcean ArcticOcean Equator10 NorthPacificOcean SouthPacificOcean NorthAtlanticOcean  SouthAtlanticOcean SPNA STNA GINseas LabradorSea IrmingerSea LIGINseas EquatorialAtlanticOcean LIseas
+regions         : Global ignoreInlandSeas SouthernOcean ArcticOcean Equator10 NorthPacificOcean SouthPacificOcean NorthAtlanticOcean  SouthAtlanticOcean SPNA STNA GINseas LabradorSea IrmingerSea LIGINseas EquatorialAtlanticOcean LIseas subpolar
diff --git a/key_files/temperature.yml b/key_files/temperature.yml
@@ -21,7 +21,7 @@ data_convert    : NoChange
 data_tdict      : ZeroToZero
 
 layers          : Surface 500m
-regions         : Global ignoreInlandSeas SouthernOcean ArcticOcean Equator10 NorthPacificOcean SouthPacificOcean NorthAtlanticOcean  SouthAtlanticOcean SPNA STNA GINseas LabradorSea IrmingerSea LIGINseas LIseas EquatorialAtlanticOcean # NorthHemisphere SouthHemisphere
+regions         : Global ignoreInlandSeas SouthernOcean ArcticOcean Equator10 NorthPacificOcean SouthPacificOcean NorthAtlanticOcean  SouthAtlanticOcean SPNA STNA GINseas LabradorSea IrmingerSea LIGINseas LIseas EquatorialAtlanticOcean subpolar # NorthHemisphere SouthHemisphere