gfdlvitals 3.0.7__tar.gz → 3.0.9__tar.gz

{gfdlvitals-3.0.7/gfdlvitals.egg-info → gfdlvitals-3.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gfdlvitals
-Version: 3.0.7
+Version: 3.0.9
 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.7 → gfdlvitals-3.0.9}/gfdlvitals/cli.py

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

{gfdlvitals-3.0.7 → gfdlvitals-3.0.9}/gfdlvitals/extensions.py

@@ -370,7 +370,7 @@ class VitalsDataFrame(pd.DataFrame):
         padding = np.arange(1, maxlen - len(self.index) + 1) + endyear[0]
         added_index = [cftime.DatetimeNoLeap(x, *endyear[1:]) for x in padding]
         _df = pd.DataFrame({"times": added_index}).set_index("times")
-        _df = self.append(_df)
+        _df = pd.concat([self,_df])
         _df.attrs = self.attrs
         for column in self.columns:
             _df[column].attrs = self[column].attrs

{gfdlvitals-3.0.7 → gfdlvitals-3.0.9}/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.7 → gfdlvitals-3.0.9}/gfdlvitals/util/extract_ocean_scalar.py

@@ -1,11 +1,12 @@
 """ Extract scalar fields from ocean model output """
 
+import numpy as np
 from . import gmeantools
 
 __all__ = ["mom6"]
 
 
-def mom6(fdata, fyear, outdir):
+def mom6(fdata, fyear, outdir, outname="globalAveOcean.db"):
     """Extract MOM6 scalar output and save to sqlite
 
     Parameters
@@ -27,8 +28,30 @@ def mom6(fdata, fyear, outdir):
         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"
+            result = fdata.variables[varname]
+            if result.shape[0] == 12:
+                result = result[:, 0]
+                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:
+                result = result[0, 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.7 → gfdlvitals-3.0.9}/gfdlvitals/version.py

@@ -1,3 +1,3 @@
 """momlevel: version information"""
 
-__version__ = "3.0.7"
+__version__ = "3.0.9"

{gfdlvitals-3.0.7 → gfdlvitals-3.0.9/gfdlvitals.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gfdlvitals
-Version: 3.0.7
+Version: 3.0.9
 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