fixed a couple places where the area was incorrect.

Author: ledm

bgcval2/functions/AirSeaFluxCO2.py

@@ -43,11 +43,13 @@
 
 def load_area_and_mask(areafile):
     """Load area file and its mask."""
-    if isinstance(areafile, list) and len(areafile)==1:
+    if 'area' in nc.variables.keys():
+        area = nc.variables['area'][:]
+    elif isinstance(areafile, list) and len(areafile)==1:
         areafile = areafile[0]
-    nc = dataset(areafile, 'r')
-    area = nc.variables['e2t'][:] * nc.variables['e1t'][:]
-    nc.close()
+        nc = dataset(areafile, 'r')
+        area = nc.variables['e2t'][:] * nc.variables['e1t'][:]
+        nc.close()
     loaded_area_and_mask = True
     return area
 

bgcval2/functions/BenCa.py

@@ -43,13 +43,13 @@
 
 def load_area_and_mask(areafile):
     """Load area file and its mask."""
-    if isinstance(areafile, list) and len(areafile)==1:
+    if 'area' in nc.variables.keys():
+        area = nc.variables['area'][:]
+    elif isinstance(areafile, list) and len(areafile)==1:
         areafile = areafile[0]
-    else:
-        raise ValueError(f"{areafile} must be a length=1 list containing a single file descriptor.")
-    nc = dataset(areafile, 'r')
-    area = nc.variables['e2t'][:] * nc.variables['e1t'][:]
-    nc.close()
+        nc = dataset(areafile, 'r')
+        area = nc.variables['e2t'][:] * nc.variables['e1t'][:]
+        nc.close()
     loaded_area_and_mask = True
     return area
 

bgcval2/functions/InvtAlk.py

@@ -58,10 +58,13 @@ def calc_total_invtalk(nc, keys, **kwargs):
     """
     This function calculates the total quantity of dissolved alkalinity for the MEDUSA model on the eORCA grid.
     """
-    areafile = get_kwarg_file(kwargs, 'areafile')
+    if 'area' in nc.variables.keys():
+        area = nc.variables['area'][:]
+    else:
+        areafile = get_kwarg_file(kwargs, 'areafile')
 
-    if not loaded_area_and_mask:
-        area = load_area_and_mask(areafile)
+        if not loaded_area_and_mask:
+            area = load_area_and_mask(areafile)
 
     factor =  1. / 1.E18   # meq / m2 -> Peq
     try: