gfdlvitals 3.0.10__tar.gz → 3.0.12__tar.gz

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: gfdlvitals
-Version: 3.0.10
+Version: 3.0.12
 Summary: Tools for calculating scalar diagnostics from GFDL models
 Home-page: https://github.com/jkrasting/gfdlvitals
 Author: John Krasting
@@ -26,6 +26,7 @@ Requires-Dist: matplotlib
 Requires-Dist: xarray
 Requires-Dist: cftime
 Requires-Dist: nc-time-axis
+Dynamic: license-file
 
 
 **gfdlvitals** is a Python package in the public domain

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

@@ -63,7 +63,7 @@ def xr_average(fyear, tar, modules):
             )
 
             t_bounds = dset.time_bnds
-            dt = t_bounds[:,:,1] - t_bounds[:,:,0]
+            dt = t_bounds.isel(nv=1) - t_bounds.isel(nv=0)
             weights = dt.astype("float") * _masked_area
             _dset_weighted = xrtools.xr_weighted_avg(dset, weights)
             xrtools.xr_to_db(

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

@@ -137,7 +137,7 @@ def xr_average(fyear, tar, modules):
             _dset_min = _dset_min.rename(newvars)
 
             t_bounds = dset.time_bnds
-            dt = t_bounds[:,:,1] - t_bounds[:,:,0]
+            dt = t_bounds.isel(nv=1) - t_bounds.isel(nv=0)
             weights = dt.astype("float")
 
             _dset_weighted = xrtools.xr_weighted_avg(_dset, weights)

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

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

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

@@ -58,7 +58,7 @@ def xr_average(fyear, tar, modules):
             )
 
             t_bounds = dset.time_bnds
-            dt = t_bounds[:,:,1] - t_bounds[:,:,0]
+            dt = t_bounds.isel(nv=1) - t_bounds.isel(nv=0)
             weights = dt.astype("float") * _masked_area
             _dset_weighted = xrtools.xr_weighted_avg(dset, weights)
             xrtools.xr_to_db(

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

@@ -63,7 +63,7 @@ def xr_average(fyear, tar, modules):
             )
 
             t_bounds = dset.time_bnds
-            dt = t_bounds[:,:,1] - t_bounds[:,:,0]
+            dt = t_bounds.isel(nv=1) - t_bounds.isel(nv=0)
             weights = dt.astype("float") * _masked_area
             _dset_weighted = xrtools.xr_weighted_avg(dset, weights)
             xrtools.xr_to_db(

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

@@ -43,37 +43,57 @@ def routines(args, infile):
         "aerosol_month_cmip": "AeroCMIP",
     }
     if any(comp in comps for comp in ["atmos", "all"]):
-        averagers.cubesphere.xr_average(fyear, tar, modules)
+        try:
+            averagers.cubesphere.xr_average(fyear, tar, modules)
+        except Exception as exc:
+            print("\n\n# -----\n# Atmosphere vitals failed\n# -----\n\n")
+            print(exc)
 
     # -- Land Fields
     modules = {"land_month": "Land"}
     if any(comp in comps for comp in ["land", "all"]):
-        averagers.land_lm4.xr_average(fyear, tar, modules)
+        try:
+            averagers.land_lm4.xr_average(fyear, tar, modules)
+        except Exception as exc:
+            print("\n\n# -----\n# Land vitals failed\n# -----\n\n")
+            print(exc)
 
     # -- Ice
     modules = {"ice_month": "Ice"}
     if any(comp in comps for comp in ["ice", "all"]):
-        averagers.ice.xr_average(fyear, tar, modules)
+        try:
+            averagers.ice.xr_average(fyear, tar, modules)
+        except Exception as exc:
+            print("\n\n# -----\n# Ice vitals failed\n# -----\n\n")
+            print(exc)
 
     # -- 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()
+        try:
+            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()
+        except Exception as exc:
+            print("\n\n# -----\n# Ice shelf vitals failed\n# -----\n\n")
+            print(exc)
 
     # -- 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, "./", outname="globalAveOcean.db")
-            fdata.close()
+        try:
+            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, "./", outname="globalAveOcean.db")
+                fdata.close()
+        except Exception as exc:
+            print("\n\n# -----\n# Ocean vitals failed\n# -----\n\n")
+            print(exc)
 
     # -- OBGC
     modules = {
@@ -89,11 +109,19 @@ def routines(args, infile):
         "ocean_bling_cmip6_omip_tracers_year_z": "OBGC",
     }
     if any(comp in comps for comp in ["obgc", "all"]):
-        averagers.tripolar.xr_average(fyear, tar, modules)
+        try:
+            averagers.tripolar.xr_average(fyear, tar, modules)
+        except Exception as exc:
+            print("\n\n# -----\n# OBGC vitals failed\n# -----\n\n")
+            print(exc)
 
     # -- AMOC
     if any(comp in comps for comp in ["amoc", "all"]):
-        diags.amoc.mom6_amoc(fyear, tar)
+        try:
+            diags.amoc.mom6_amoc(fyear, tar)
+        except Exception as exc:
+            print("\n\n# -----\n# AMOC vitals failed\n# -----\n\n")
+            print(exc)
 
     # -- Close out the tarfile handle
     tar.close()

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

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

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: gfdlvitals
-Version: 3.0.10
+Version: 3.0.12
 Summary: Tools for calculating scalar diagnostics from GFDL models
 Home-page: https://github.com/jkrasting/gfdlvitals
 Author: John Krasting
@@ -26,6 +26,7 @@ Requires-Dist: matplotlib
 Requires-Dist: xarray
 Requires-Dist: cftime
 Requires-Dist: nc-time-axis
+Dynamic: license-file
 
 
 **gfdlvitals** is a Python package in the public domain