gfdlvitals 3.0.9__py3-none-any.whl → 3.0.11__py3-none-any.whl

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.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(
                 _dset_weighted, fyear, f"{fyear}.{region}Ave{modules[member]}.db"

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.isel(nv=1) - t_bounds.isel(nv=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/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.isel(nv=1) - t_bounds.isel(nv=0)
+                weights = dt.astype("float") * _masked_area
                 if _measure == "soil_area":
                     area_x_depth = _masked_area * depth
                     gmeantools.write_sqlite_data(

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.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(
                 _dset_weighted, fyear, f"{fyear}.{region}Ave{modules[member]}.db"

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.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(
                 _dset_weighted, fyear, f"{fyear}.{region}Ave{modules[member]}.db"

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/util/extract_ocean_scalar.py

@@ -19,18 +19,21 @@ def mom6(fdata, fyear, outdir, outname="globalAveOcean.db"):
         Path to output directory
     """
 
-    ignore_list = ["time_bounds", "time_bnds", "average_T2", "average_T1", "average_DT"]
+    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:
+        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:
-                result = result[:, 0]
+                if len(result.shape) == 2:
+                    result = result[:, 0]
+                else:
+                    result = result[:]
                 result = np.ma.average(
                     result,
                     weights=[
@@ -50,7 +53,10 @@ def mom6(fdata, fyear, outdir, outname="globalAveOcean.db"):
                     axis=0,
                 )
             elif result.shape[0] == 1:
-                result = result[0, 0]
+                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)

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

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

{gfdlvitals-3.0.9.dist-info → gfdlvitals-3.0.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: gfdlvitals
-Version: 3.0.9
+Version: 3.0.11
 Summary: Tools for calculating scalar diagnostics from GFDL models
 Home-page: https://github.com/jkrasting/gfdlvitals
 Author: John Krasting

{gfdlvitals-3.0.9.dist-info → gfdlvitals-3.0.11.dist-info}/RECORD

@@ -1,17 +1,17 @@
 docs/source/conf.py,sha256=KWXm19n5XaW1kMIw64FNCuTqAnKDsjkeyQ6MHPQmP9s,2337
 gfdlvitals/__init__.py,sha256=TS9rlf4WiV2SnMdH-J99noYxJtZGtsU2IsUs17iSxaI,377
 gfdlvitals/cli.py,sha256=AKt1hWlhuuSkK8hgpts7OTAxY2B_ZrEH5BuL_CWnbC4,5156
-gfdlvitals/extensions.py,sha256=1HbVBSO1XRypbzHAcmmJxyfyLA7UmGl3m5TdgWlZV2w,18598
+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=d9tZGukCPNrxCp5IHYV1vljyMB3lf59YuH03fD9AE1k,59
+gfdlvitals/version.py,sha256=BghlqG1OlHDUh5HeT1Gia9ipnZDU4210sYotGhI77Vg,60
 gfdlvitals/averagers/__init__.py,sha256=q9VRiraniy0-HwrwOZNw7wmGZEgQxYuSeOvpPMz0dYI,248
-gfdlvitals/averagers/cubesphere.py,sha256=vxdEr14pwP3kr9NLMRYu6_WiHi-sR3LGy9A72ouIEr0,2170
-gfdlvitals/averagers/ice.py,sha256=s3Ou1vNkgXa9pNpeoX-HPWoQ40Vut-fDudQQSwDYYek,5622
+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=CPKh0QQA6pIB5Iof50L6yCz3FHji8Q4N3Z568fecoIo,4772
-gfdlvitals/averagers/latlon.py,sha256=HCRyDEj3ucOZ8M0LE4Wox4jZnaOPXPwHgAnNUOexYuA,2125
-gfdlvitals/averagers/tripolar.py,sha256=dtjE8mBqteIPdvP0_Z2w8IzRmcty0QZawuNNuY7SKoA,2267
+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
@@ -44,20 +44,20 @@ gfdlvitals/resources/fonts/Roboto_Condensed/RobotoCondensed-LightItalic.ttf,sha2
 gfdlvitals/resources/fonts/Roboto_Condensed/RobotoCondensed-Regular.ttf,sha256=8Fq2wereREu_Tj4AcQdW6VwqHQmhBCWWcUmAIhnAwMs,169848
 gfdlvitals/util/__init__.py,sha256=e_EzzVZZu5Gu2w8rVBZqfYi38cQlUyEh11HSzeeYGPw,324
 gfdlvitals/util/average.py,sha256=-f3-nHx8PaLu535VQHN0wX5NUDXBWD1WmKiqO8UShqM,12107
-gfdlvitals/util/extract_ocean_scalar.py,sha256=ouvqQuUD1VaG3M2olkml8MUCu0rwQIkqGHWIEX_H97U,1860
+gfdlvitals/util/extract_ocean_scalar.py,sha256=ygxxTj2R4s6Y258LnmGT1-qfkQt181MPuA_zwgS1coM,2082
 gfdlvitals/util/git.py,sha256=tt9qNHEDMLW2SuzHtr0P5_iuoKAj_3g-GKEEMfkoNJc,1596
 gfdlvitals/util/gmeantools.py,sha256=dy-ZeQPv7V5TBWm6EKZtZvrEjtAQJOax3B_gm8vdxcE,12543
 gfdlvitals/util/merge.py,sha256=pzihnvME1ym2MCyc2BeeQq7Jk10GECSoFBcvTubTY-g,1120
 gfdlvitals/util/netcdf.py,sha256=CYmP8HQ4iwTvC3HltjF_6_C2FrEEGocWoSiCfHWETQA,2217
-gfdlvitals/util/xrtools.py,sha256=Dck9YId_aQxGdfOJ54NVpZWPjfyTeWvdiljYz5NmOgc,2708
-gfdlvitals-3.0.9.data/scripts/db2nc,sha256=htD-aVKLHGeszfvx_3gH1iYs2bXyCIRRZ_BZYvAjxyQ,5793
-gfdlvitals-3.0.9.data/scripts/gfdlvitals,sha256=z7jnQIebmlz6eo0qv0X2UWgVU9TAERJ9a38YIbucVjA,172
-gfdlvitals-3.0.9.data/scripts/plotdb,sha256=m_QS96umb3aFIfr1fdfDa81pT8RP-AJ9LhP9Bbr4LQs,1632
+gfdlvitals/util/xrtools.py,sha256=4gIDkBIG_tW-lBHUfETmsOoDy3oKO0eUoGFaWOmvtEY,2924
+gfdlvitals-3.0.11.data/scripts/db2nc,sha256=htD-aVKLHGeszfvx_3gH1iYs2bXyCIRRZ_BZYvAjxyQ,5793
+gfdlvitals-3.0.11.data/scripts/gfdlvitals,sha256=z7jnQIebmlz6eo0qv0X2UWgVU9TAERJ9a38YIbucVjA,172
+gfdlvitals-3.0.11.data/scripts/plotdb,sha256=m_QS96umb3aFIfr1fdfDa81pT8RP-AJ9LhP9Bbr4LQs,1632
 scripts/db2nc,sha256=_KqHUowYB8Ff1td6Cb0isWtwlNbnJrMUNri9Ge8kd1E,5807
 scripts/gfdlvitals,sha256=k5RYzFXWN_2Ckr2mdRbJ-IyMdCQAxuE3RBkGpIXvp3U,186
 scripts/plotdb,sha256=Rf79UOCwGy9f5HxtgSeiYUiiotS2Bqh-Unr0G4yykyg,1645
-gfdlvitals-3.0.9.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-gfdlvitals-3.0.9.dist-info/METADATA,sha256=0xuGfsGPd1bIpAiQA-lP7HKL0-VYZERLDyRVQNWyuho,1292
-gfdlvitals-3.0.9.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-gfdlvitals-3.0.9.dist-info/top_level.txt,sha256=_nlHTn5dcU38mu0h1NZouDSBQouNvihfTSmua76bwLs,24
-gfdlvitals-3.0.9.dist-info/RECORD,,
+gfdlvitals-3.0.11.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+gfdlvitals-3.0.11.dist-info/METADATA,sha256=y_q8Cu-b5OciOFHzh0o8LUPuZ10RuRdYiBWX_wGpbbQ,1293
+gfdlvitals-3.0.11.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+gfdlvitals-3.0.11.dist-info/top_level.txt,sha256=_nlHTn5dcU38mu0h1NZouDSBQouNvihfTSmua76bwLs,24
+gfdlvitals-3.0.11.dist-info/RECORD,,

{gfdlvitals-3.0.9.dist-info → gfdlvitals-3.0.11.dist-info}/WHEEL

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