gfdlvitals 3.0.8__tar.gz → 3.0.10__tar.gz

{gfdlvitals-3.0.8/gfdlvitals.egg-info → gfdlvitals-3.0.10}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: gfdlvitals
-Version: 3.0.8
+Version: 3.0.10
 Summary: Tools for calculating scalar diagnostics from GFDL models
 Home-page: https://github.com/jkrasting/gfdlvitals
 Author: John Krasting
@@ -16,6 +16,16 @@ Classifier: Programming Language :: Python :: 3.9
 Requires-Python: >=3.7
 Description-Content-Type: text/x-rst
 License-File: LICENSE
+Requires-Dist: setuptools
+Requires-Dist: numpy
+Requires-Dist: scipy
+Requires-Dist: h5netcdf
+Requires-Dist: pandas
+Requires-Dist: netCDF4
+Requires-Dist: matplotlib
+Requires-Dist: xarray
+Requires-Dist: cftime
+Requires-Dist: nc-time-axis
 
 
 **gfdlvitals** is a Python package in the public domain

{gfdlvitals-3.0.8 → gfdlvitals-3.0.10}/gfdlvitals/averagers/cubesphere.py

@@ -62,7 +62,9 @@ def xr_average(fyear, tar, modules):
                 _masked_area.sum().data,
             )
 
-            weights = dset.average_DT.astype("float") * _masked_area
+            t_bounds = dset.time_bnds
+            dt = t_bounds[:,:,1] - t_bounds[:,:,0]
+            weights = dt.astype("float") * _masked_area
             _dset_weighted = xrtools.xr_weighted_avg(dset, weights)
             xrtools.xr_to_db(
                 _dset_weighted, fyear, f"{fyear}.{region}Ave{modules[member]}.db"

{gfdlvitals-3.0.8 → gfdlvitals-3.0.10}/gfdlvitals/averagers/ice.py

@@ -136,7 +136,10 @@ def xr_average(fyear, tar, modules):
             newvars = {x: x + "_min" for x in list(_dset_min.variables)}
             _dset_min = _dset_min.rename(newvars)
 
-            weights = dset.average_DT.astype("float")
+            t_bounds = dset.time_bnds
+            dt = t_bounds[:,:,1] - t_bounds[:,:,0]
+            weights = dt.astype("float")
+
             _dset_weighted = xrtools.xr_weighted_avg(_dset, weights)
             newvars = {x: x + "_mean" for x in list(_dset_weighted.variables)}
             _dset_weighted = _dset_weighted.rename(newvars)

{gfdlvitals-3.0.8 → gfdlvitals-3.0.10}/gfdlvitals/averagers/land_lm4.py

@@ -111,7 +111,9 @@ def xr_average(fyear, tar, modules):
 
                 # _masked_area = _masked_area.fillna(0)
 
-                weights = dset.average_DT.astype("float") * _masked_area
+                t_bounds = dset.time_bnds
+                dt = t_bounds[:,:,1] - t_bounds[:,:,0]
+                weights = dt.astype("float") * _masked_area
                 if _measure == "soil_area":
                     area_x_depth = _masked_area * depth
                     gmeantools.write_sqlite_data(

{gfdlvitals-3.0.8 → gfdlvitals-3.0.10}/gfdlvitals/averagers/latlon.py

@@ -57,7 +57,9 @@ def xr_average(fyear, tar, modules):
                 _masked_area.sum().data,
             )
 
-            weights = dset.average_DT.astype("float") * _masked_area
+            t_bounds = dset.time_bnds
+            dt = t_bounds[:,:,1] - t_bounds[:,:,0]
+            weights = dt.astype("float") * _masked_area
             _dset_weighted = xrtools.xr_weighted_avg(dset, weights)
             xrtools.xr_to_db(
                 _dset_weighted, fyear, f"{fyear}.{region}Ave{modules[member]}.db"

{gfdlvitals-3.0.8 → gfdlvitals-3.0.10}/gfdlvitals/averagers/tripolar.py

@@ -62,7 +62,9 @@ def xr_average(fyear, tar, modules):
                 _masked_area.sum().data,
             )
 
-            weights = dset.average_DT.astype("float") * _masked_area
+            t_bounds = dset.time_bnds
+            dt = t_bounds[:,:,1] - t_bounds[:,:,0]
+            weights = dt.astype("float") * _masked_area
             _dset_weighted = xrtools.xr_weighted_avg(dset, weights)
             xrtools.xr_to_db(
                 _dset_weighted, fyear, f"{fyear}.{region}Ave{modules[member]}.db"

{gfdlvitals-3.0.8 → gfdlvitals-3.0.10}/gfdlvitals/cli.py

@@ -123,6 +123,7 @@ def process_year(args, infile):
             "AeroCMIP",
             "Ocean",
             "Ice",
+            "IceShelf",
             "TOPAZ",
             "COBALT",
             "BLING",

{gfdlvitals-3.0.8 → gfdlvitals-3.0.10}/gfdlvitals/extensions.py

@@ -617,26 +617,21 @@ def open_db(
     for var in variables:
         tsobj = Timeseries(dbfile, var, legacy_land=legacy_land, start=start, end=end)
         if len(tsobj.t) > 0:
-            data[var] = tsobj.data
-            years = years + list(tsobj.t)
+            data[var] = pd.Series(tsobj.data, index=list(tsobj.t))
             attributes[var] = {
                 "long_name": tsobj.long_name,
                 "units": tsobj.units,
                 "cell_measure": tsobj.cell_measure,
             }
 
-    years = sorted(list(set(years)))
-    years = [x + float(yearshift) for x in years]
-
-    variables = list(set(variables) - set(skipped))
-
     if start is None:
         start = -1 * math.inf
 
     if end is None:
         end = math.inf
 
-    df = pd.DataFrame(data, index=years)
+    df = pd.DataFrame(data)
+    df.index = df.index + float(yearshift)
     df = df[(df.index >= start) & (df.index <= end)]
     df.index = cftime.num2date(
         (df.index * 365.0) - (365.0 / 2.0) - 1,

{gfdlvitals-3.0.8 → gfdlvitals-3.0.10}/gfdlvitals/models/CM4.py

@@ -55,13 +55,24 @@ def routines(args, infile):
     if any(comp in comps for comp in ["ice", "all"]):
         averagers.ice.xr_average(fyear, tar, modules)
 
+    # -- Ice Shelf
+    fname = f"{fyear}.ice_shelf_scalar.nc"
+    if any(comp in comps for comp in ["iceshelf", "all"]):
+        if tar_member_exists(tar, fname):
+            print(fname)
+            fdata = nctools.extract_from_tar(tar, fname, ncfile=True)
+            extract_ocean_scalar.mom6(
+                fdata, fyear, "./", outname="globalAveIceShelf.db"
+            )
+            fdata.close()
+
     # -- Ocean
     fname = f"{fyear}.ocean_scalar_annual.nc"
     if any(comp in comps for comp in ["ocean", "all"]):
         if tar_member_exists(tar, fname):
             print(f"{fyear}.ocean_scalar_annual.nc")
             fdata = nctools.extract_from_tar(tar, fname, ncfile=True)
-            extract_ocean_scalar.mom6(fdata, fyear, "./")
+            extract_ocean_scalar.mom6(fdata, fyear, "./", outname="globalAveOcean.db")
             fdata.close()
 
     # -- OBGC

gfdlvitals-3.0.10/gfdlvitals/util/extract_ocean_scalar.py

@@ -0,0 +1,63 @@
+""" Extract scalar fields from ocean model output """
+
+import numpy as np
+from . import gmeantools
+
+__all__ = ["mom6"]
+
+
+def mom6(fdata, fyear, outdir, outname="globalAveOcean.db"):
+    """Extract MOM6 scalar output and save to sqlite
+
+    Parameters
+    ----------
+    fdata : netCDF4.Dataset
+        Input ocean_scalar.nc file
+    fyear : str
+        Year being processed
+    outdir : str
+        Path to output directory
+    """
+
+    ignore_list = ["time_bounds", "time_bnds", "average_T2", "average_T1", "average_DT", "nv"]
+
+    var_dict = fdata.variables.keys()
+    var_dict = list(set(var_dict) - set(ignore_list))
+
+    for varname in var_dict:
+        if len(fdata.variables[varname].shape) <= 2:
+            units = gmeantools.extract_metadata(fdata, varname, "units")
+            long_name = gmeantools.extract_metadata(fdata, varname, "long_name")
+            result = fdata.variables[varname]
+            if result.shape[0] == 12:
+                if len(result.shape) == 2:
+                    result = result[:, 0]
+                else:
+                    result = result[:]
+                result = np.ma.average(
+                    result,
+                    weights=[
+                        31.0,
+                        28.0,
+                        31.0,
+                        30.0,
+                        31.0,
+                        30.0,
+                        31.0,
+                        31.0,
+                        30.0,
+                        31.0,
+                        30.0,
+                        31.0,
+                    ],
+                    axis=0,
+                )
+            elif result.shape[0] == 1:
+                if len(result.shape) == 2:
+                    result = result[0, 0]
+                else:
+                    result = result[0]
+            sqlfile = f"{outdir}/{fyear}.{outname}"
+            gmeantools.write_metadata(sqlfile, varname, "units", units)
+            gmeantools.write_metadata(sqlfile, varname, "long_name", long_name)
+            gmeantools.write_sqlite_data(sqlfile, varname, fyear[:4], result)

{gfdlvitals-3.0.8 → gfdlvitals-3.0.10}/gfdlvitals/util/xrtools.py

@@ -1,6 +1,7 @@
 """ Tools for working with xarray datasets """
 
 import xarray as xr
+import numpy as np
 
 from gfdlvitals.util.gmeantools import write_sqlite_data
 from gfdlvitals.util.gmeantools import write_metadata
@@ -84,8 +85,13 @@ def xr_weighted_avg(dset, weights):
         variables = list(dset.variables.keys())
         for x in variables:
             if sorted(dset[x].dims) == sorted(weight.dims):
+                if 'timedelta' in str(dset[x].dtype):
+                    dset[x] = dset[x].astype(np.float32)
                 _dset[x] = dset[x]
 
+        if isinstance(weight, xr.DataArray):
+            weight = weight.fillna(0.0)
+
         _dset_weighted = _dset.weighted(weight).mean()
         for x in list(_dset_weighted.variables):
             _dset_weighted[x] = _dset_weighted[x].astype(dset[x].dtype)

{gfdlvitals-3.0.8 → gfdlvitals-3.0.10}/gfdlvitals/version.py

@@ -1,3 +1,3 @@
 """momlevel: version information"""
 
-__version__ = "3.0.8"
+__version__ = "3.0.10"

{gfdlvitals-3.0.8 → gfdlvitals-3.0.10/gfdlvitals.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: gfdlvitals
-Version: 3.0.8
+Version: 3.0.10
 Summary: Tools for calculating scalar diagnostics from GFDL models
 Home-page: https://github.com/jkrasting/gfdlvitals
 Author: John Krasting
@@ -16,6 +16,16 @@ Classifier: Programming Language :: Python :: 3.9
 Requires-Python: >=3.7
 Description-Content-Type: text/x-rst
 License-File: LICENSE
+Requires-Dist: setuptools
+Requires-Dist: numpy
+Requires-Dist: scipy
+Requires-Dist: h5netcdf
+Requires-Dist: pandas
+Requires-Dist: netCDF4
+Requires-Dist: matplotlib
+Requires-Dist: xarray
+Requires-Dist: cftime
+Requires-Dist: nc-time-axis
 
 
 **gfdlvitals** is a Python package in the public domain

gfdlvitals-3.0.8/gfdlvitals/util/extract_ocean_scalar.py

@@ -1,34 +0,0 @@
-""" Extract scalar fields from ocean model output """
-
-from . import gmeantools
-
-__all__ = ["mom6"]
-
-
-def mom6(fdata, fyear, outdir):
-    """Extract MOM6 scalar output and save to sqlite
-
-    Parameters
-    ----------
-    fdata : netCDF4.Dataset
-        Input ocean_scalar.nc file
-    fyear : str
-        Year being processed
-    outdir : str
-        Path to output directory
-    """
-
-    ignore_list = ["time_bounds", "time_bnds", "average_T2", "average_T1", "average_DT"]
-
-    var_dict = fdata.variables.keys()
-    var_dict = list(set(var_dict) - set(ignore_list))
-
-    for varname in var_dict:
-        if len(fdata.variables[varname].shape) == 2:
-            units = gmeantools.extract_metadata(fdata, varname, "units")
-            long_name = gmeantools.extract_metadata(fdata, varname, "long_name")
-            result = fdata.variables[varname][0, 0]
-            sqlfile = outdir + "/" + fyear + ".globalAveOcean.db"
-            gmeantools.write_metadata(sqlfile, varname, "units", units)
-            gmeantools.write_metadata(sqlfile, varname, "long_name", long_name)
-            gmeantools.write_sqlite_data(sqlfile, varname, fyear[:4], result)