gfdlvitals 3.0.10__py3-none-any.whl → 3.0.12__py3-none-any.whl

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/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/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/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/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/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/version.py

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

{gfdlvitals-3.0.10.dist-info → gfdlvitals-3.0.12.dist-info}/METADATA

@@ -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.dist-info → gfdlvitals-3.0.12.dist-info}/RECORD

@@ -4,19 +4,19 @@ gfdlvitals/cli.py,sha256=AKt1hWlhuuSkK8hgpts7OTAxY2B_ZrEH5BuL_CWnbC4,5156
 gfdlvitals/extensions.py,sha256=gi7Y3n56N_dfGBu4a4ocJxPGF731BEBR0btu5aL27uA,18477
 gfdlvitals/plot.py,sha256=X5zB5ChxhuBs6OANMdU-9WH_ZUbGEnaNCWXrhllYpT0,12539
 gfdlvitals/sample.py,sha256=wvjmx--IbvKKT0AIucw5GE1DCYcVQPtAr7VGY4rMUaA,225
-gfdlvitals/version.py,sha256=F2vlZ5yqSJLp9JF1dPtCAaYTQZQN1uAl8k2SXEShgDU,60
+gfdlvitals/version.py,sha256=Y_GuiaVvfxLi2ALsEw8x05NMI95GT41PdQoRRjwKrnA,60
 gfdlvitals/averagers/__init__.py,sha256=q9VRiraniy0-HwrwOZNw7wmGZEgQxYuSeOvpPMz0dYI,248
-gfdlvitals/averagers/cubesphere.py,sha256=YLsx8EvSclFtfPjBIeMpRYN3FKIMmCOjMtUTHOwJFBk,2246
-gfdlvitals/averagers/ice.py,sha256=XJo6r-jDNsKEJx6Mue1_QdFdeJcVQFoHI5DGs0K8SXA,5699
+gfdlvitals/averagers/cubesphere.py,sha256=q1SF-Qlmxdgia_u_oYXNgw-NtpkgMuZk-ZMKuNSnLbI,2254
+gfdlvitals/averagers/ice.py,sha256=uBZczgBCtxPGv3BnOhAzMDcaCfUKvIZ8P5BQyX5LSVI,5707
 gfdlvitals/averagers/land_lm3.py,sha256=HfzfGeCCB344kOfYutansuXCkV80uZaDZA7ULw72WHA,1879
-gfdlvitals/averagers/land_lm4.py,sha256=h_ISguOlGE4Har9KpQYvKLobtwRMxzJA0tbKI8eyY6I,4856
-gfdlvitals/averagers/latlon.py,sha256=HIj6f0KyF2sMDTMNd2FEnGef2dQz0NQQQiYuFUFL3cY,2201
-gfdlvitals/averagers/tripolar.py,sha256=pGbnsYzLfU3NUb7m8oDZNYvfFuuUmgHy5NqHm1TKBsA,2343
+gfdlvitals/averagers/land_lm4.py,sha256=S6mtGolA5iY_BFiWh5nO5bWy7vv-T_RSE7u1TO-IrPE,4864
+gfdlvitals/averagers/latlon.py,sha256=5KQSU6jyp5mrIIlE5pAQwYtPZKmJWa3VrD9XD9kI9mY,2209
+gfdlvitals/averagers/tripolar.py,sha256=HOIWI-BWTmouh3VrjSCFBTNNYQtGbHGNX0TPru3lzyk,2351
 gfdlvitals/diags/__init__.py,sha256=1w_CSncdjJRC6ingsqfAI6EPy0KgK2J2NCTD_ifYpj8,104
 gfdlvitals/diags/amoc.py,sha256=bDyKfLe0MkNp2nyfyG-yABma1vw5EbWqExN2WfFDXwE,3219
 gfdlvitals/diags/fms.py,sha256=UDUAxihg9kZGRwxYaSOslLPrhYgNBrtBwJJFSUsLFFg,2568
 gfdlvitals/diags/m6toolbox.py,sha256=U6Aau5b0QWVvFEblbt4r_9RK9oj23gaXiPwLOtf4gSM,15854
-gfdlvitals/models/CM4.py,sha256=0pkgZVv4yoJUjPXZkcY_T1VjJKjSdIeND9u6vpvZQ4s,3322
+gfdlvitals/models/CM4.py,sha256=tLNfN6r8z3KWP_P3zImg4O2UQ_Q-kASOM-_Nls0Acxk,4360
 gfdlvitals/models/ESM2.py,sha256=TpMGHMmHY_6cuFQziDVdLtdejgSxGU0Uyybp0-1YIy0,2054
 gfdlvitals/models/__init__.py,sha256=0A7Sf8iA5xpy_hSLTtmS9Nw8SULj62uaOerUG2y90qk,91
 gfdlvitals/resources/LM3_variable_dictionary.pkl,sha256=y8vYQWGAvAaEhDNSAJexGSI5tBLpp1MyF8ro3cI3wK0,15915
@@ -50,14 +50,14 @@ gfdlvitals/util/gmeantools.py,sha256=dy-ZeQPv7V5TBWm6EKZtZvrEjtAQJOax3B_gm8vdxcE
 gfdlvitals/util/merge.py,sha256=pzihnvME1ym2MCyc2BeeQq7Jk10GECSoFBcvTubTY-g,1120
 gfdlvitals/util/netcdf.py,sha256=CYmP8HQ4iwTvC3HltjF_6_C2FrEEGocWoSiCfHWETQA,2217
 gfdlvitals/util/xrtools.py,sha256=4gIDkBIG_tW-lBHUfETmsOoDy3oKO0eUoGFaWOmvtEY,2924
-gfdlvitals-3.0.10.data/scripts/db2nc,sha256=htD-aVKLHGeszfvx_3gH1iYs2bXyCIRRZ_BZYvAjxyQ,5793
-gfdlvitals-3.0.10.data/scripts/gfdlvitals,sha256=z7jnQIebmlz6eo0qv0X2UWgVU9TAERJ9a38YIbucVjA,172
-gfdlvitals-3.0.10.data/scripts/plotdb,sha256=m_QS96umb3aFIfr1fdfDa81pT8RP-AJ9LhP9Bbr4LQs,1632
+gfdlvitals-3.0.12.data/scripts/db2nc,sha256=htD-aVKLHGeszfvx_3gH1iYs2bXyCIRRZ_BZYvAjxyQ,5793
+gfdlvitals-3.0.12.data/scripts/gfdlvitals,sha256=z7jnQIebmlz6eo0qv0X2UWgVU9TAERJ9a38YIbucVjA,172
+gfdlvitals-3.0.12.data/scripts/plotdb,sha256=m_QS96umb3aFIfr1fdfDa81pT8RP-AJ9LhP9Bbr4LQs,1632
+gfdlvitals-3.0.12.dist-info/licenses/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scripts/db2nc,sha256=_KqHUowYB8Ff1td6Cb0isWtwlNbnJrMUNri9Ge8kd1E,5807
 scripts/gfdlvitals,sha256=k5RYzFXWN_2Ckr2mdRbJ-IyMdCQAxuE3RBkGpIXvp3U,186
 scripts/plotdb,sha256=Rf79UOCwGy9f5HxtgSeiYUiiotS2Bqh-Unr0G4yykyg,1645
-gfdlvitals-3.0.10.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-gfdlvitals-3.0.10.dist-info/METADATA,sha256=R99mR6xvqTiW_xAWngmQ8qJSGEve7KdHzM1TJdxacIs,1293
-gfdlvitals-3.0.10.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-gfdlvitals-3.0.10.dist-info/top_level.txt,sha256=_nlHTn5dcU38mu0h1NZouDSBQouNvihfTSmua76bwLs,24
-gfdlvitals-3.0.10.dist-info/RECORD,,
+gfdlvitals-3.0.12.dist-info/METADATA,sha256=lvCfUa5UmH4p8AMj2HZ3yUUN5esdrP_YqwOYCFfh2j8,1315
+gfdlvitals-3.0.12.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+gfdlvitals-3.0.12.dist-info/top_level.txt,sha256=_nlHTn5dcU38mu0h1NZouDSBQouNvihfTSmua76bwLs,24
+gfdlvitals-3.0.12.dist-info/RECORD,,

{gfdlvitals-3.0.10.dist-info → gfdlvitals-3.0.12.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any