small change in intpp to use local area.

Author: ledm

bgcval2/functions/TotalIntPP.py

@@ -53,11 +53,19 @@ def loadDataMask(gridfn):
 def TotalIntPP(nc, keys, **kwargs):
     """
     This function calculated the total primary production for the MEDUSA model in the eORCA grid.
+
+    preferentially use area provided in the netcdf.
     """
-    areafile = get_kwarg_file(kwargs, 'areafile')
 
-    if not loadedArea:
-        model_area = loadDataMask(areafile)
+    # area provided 
+    area_key = find_best_var(nc, ['area', 'area_grid_T', 'areacello', 'area_cello'])
+    if area_key:
+        model_area = nc.variables[area_key][:]
+    else:
+        areafile = get_kwarg_file(kwargs, 'areafile')
+
+        if not loadedArea:
+            model_area = loadDataMask(areafile)
 
     #    mmolN/m2/d        [mg C /m2/d]   [mgC/m2/yr] [gC/m2/yr]     Gt/m2/yr # MEDUSA UNITS
     factor = 1.     * 6.625 * 12.011 * 365.       / 1000.   /     1E15

bgcval2/functions/circulation.py

@@ -849,7 +849,7 @@ def gulfstream(nc, keys, **kwargs):
 
     if not loadedArea:
         loadDataMask(areafile, maskname, grid)
-
+ 
     if grid == 'eORCA1':
         latslice26Nnm = eORCA1_latslice26Nnm
         #data=[-80.5011659 , -79.50119298, -78.50121829, -77.50124181,

key_lists/debug.yml

@@ -8,7 +8,7 @@ keys:
 #    SouthernTotalIceExtent: True
 #    DrakePassageTransport: True
 #     hfbasinatlantic: True
-#   AMOC_26N: True
+   AMOC_26N: True
 #    ficeberg: True
 #   volTemperature: True
 #   volSalinity: True
@@ -19,7 +19,7 @@ keys:
 #   DavisStraightMassFlux: True
 #   NorwegianSeaMassFlux: True
 
-    sltbasinatlantic: True
+#    sltbasinatlantic: True
 #   pbsi3: True
 #    agessc: True
 #   int_pn: True