added 55N to heat flux

valeriupredoi · Oct 10, 2024 · 1a801a3 · 1a801a3
1 parent 00c9be2
commit 1a801a3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/bgcval2/bgcvaltools/makeMask.py b/bgcval2/bgcvaltools/makeMask.py
@@ -269,6 +269,11 @@ def makeMask(name, newSlice, xt, xz, xy, xx, xd, debug=False):
         mx = np.ma.masked_outside(
             xy, 38., 42.).mask
         return mx
+    if newSlice in ['55N', ]:
+        mx = np.ma.masked_outside(
+            xy, 55., 57.).mask
+        return mx
+
     if newSlice in ['30S', ]:
         mx = np.ma.masked_outside(
             xy, -32., -28., ).mask
@@ -305,7 +310,7 @@ def makeMask(name, newSlice, xt, xz, xy, xx, xd, debug=False):
         mx += ((np.ma.masked_inside(xx, -27.5, -25.).mask * np.ma.masked_inside(xy, 58., 60.5).mask)) #Irm small square top
         return mx
 
-    if newSlice in ['LIseas',]: #Labrador &  Irminger seas
+    if newSlice in ['LIseas', ]: #Labrador &  Irminger seas
         mx = (np.ma.masked_outside(xx, -69., -45.).mask + np.ma.masked_outside(xy, 53., 67.).mask) #Lab
         mx *= (np.ma.masked_outside(xx, -45., -25.).mask + np.ma.masked_outside(xy, 53., 67.).mask) #Irm main
         mx += ((np.ma.masked_inside(xx, -30., -25.).mask * np.ma.masked_inside(xy, 53., 58.).mask)) #Irm square

diff --git a/bgcval2/bgcvaltools/pftnames.py b/bgcval2/bgcvaltools/pftnames.py
@@ -274,6 +274,7 @@ def makeLongNameDict():
     lnd['thetaoga'] = "Global Average Sea Water Potential Temperature"
     lnd['scalarHeatContent'] = "Global heat content"
 
+    lnd['thkcello'] = 'Cell thickness'
     lnd['sowaflup'] = "Net Upward Water Flux"
     lnd['sohefldo'] = "Net Downward Heat Flux"
     lnd['fsitherm'] = "Water flux due to freezing/melting" 
@@ -339,7 +340,8 @@ def makeLongNameDict():
     lnd['EVS'] = 'Water Evaporation flux '
     lnd['Precip'] = 'Precipitation'
     lnd['sowindsp'] = 'Surface wind speed'
-    lnd['sowflisf'] = 'Ice Shelf Melting'     
+    lnd['sowflisf'] = 'Ice Shelf Melting' 
+    lnd['friver'] = 'River Water Flux'     
     lnd['fov'] = 'AMOC Meridional freshwater transport'     
     lnd['fov_sa'] = 'AMOC Meridional freshwater transport (South Atlantic)'     
     lnd['fov_stna'] = 'AMOC Meridional freshwater transport (Subtropial North Atlantic)'     
@@ -548,6 +550,7 @@ def makeLongNameDict():
     lnd['32S'] = "32S"
     lnd['30S'] = "30S"
     lnd['40N'] = "40N"
+    lnd['55N'] = "55N"
 
     lnd['WeddelSea'] = "Weddel Sea"
     lnd['Enderby'] = "Enderby Region"  # Regions from Pierce 1995 - https://doi.org/10.1175/1520-0485(1995)025<2046:CROHAF>2.0.CO;2

diff --git a/key_files/hfbasinatlantic.yml b/key_files/hfbasinatlantic.yml
@@ -27,7 +27,7 @@ model_vars      : hfbasin_atlantic
 model_convert   : choose_best_var
 
 layers          : layerless
-regions         : 26N Global NorthAtlanticOcean SouthAtlanticOcean 30S 40N
+regions         : 26N Global NorthAtlanticOcean SouthAtlanticOcean 30S 40N 55N
 smoothings      : DataOnly 5and30