gfdlvitals 3.0.6__py3-none-any.whl → 3.0.8__py3-none-any.whl

gfdlvitals/extensions.py

@@ -1,6 +1,7 @@
 """ Pandas class extension for gfdlvitals """
 
 import copy
+import datetime
 import math
 import sqlite3
 import warnings
@@ -369,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
@@ -394,6 +395,11 @@ class VitalsDataFrame(pd.DataFrame):
         self
             Extended dataset
         """
+
+        # convert ISO index to datetime object
+        if isinstance(self.index[0], str):
+            self.index = [datetime.datetime.fromisoformat(x) for x in self.index]
+
         tindex = np.array(
             [
                 cftime.date2num(x, "days since 0001-01-01", calendar="noleap")

gfdlvitals/plot.py

@@ -45,6 +45,7 @@ def plot_timeseries(
     labels=None,
     legend=True,
     means=True,
+    title="both",
 ):
     """Standardized function to make a timeseries plot
 
@@ -71,6 +72,9 @@ def plot_timeseries(
         Display a legend for the plot, by default True
     means : bool, optional
         Add variable means to the legend, by default True
+    title : str, optional
+        Specify "varname", "longname", "both", or "none",
+        by default "both"
 
     Returns
     -------
@@ -210,12 +214,14 @@ def plot_timeseries(
         # Text annotations
 
         if i == 0:
+            _varname = var if (title in ["varname", "both"]) else ""
             axes_dict[label]["topline_label"] = _ax.text(
-                0.01, 1.08, var, ha="left", transform=ax1.transAxes, fontsize=22
+                0.01, 1.08, _varname, ha="left", transform=ax1.transAxes, fontsize=22
             )
 
             _long_name = dset[var].attrs["long_name"]
             _long_name = f"Sum of {_long_name}" if plottype == "sum" else _long_name
+            _long_name = _long_name if (title in ["longname", "both"]) else ""
 
             axes_dict[label]["longname_label"] = _ax.text(
                 0.01,

gfdlvitals/version.py

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

{gfdlvitals-3.0.6.dist-info → gfdlvitals-3.0.8.dist-info}/METADATA

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

{gfdlvitals-3.0.6.dist-info → gfdlvitals-3.0.8.dist-info}/RECORD

@@ -1,10 +1,10 @@
 docs/source/conf.py,sha256=KWXm19n5XaW1kMIw64FNCuTqAnKDsjkeyQ6MHPQmP9s,2337
 gfdlvitals/__init__.py,sha256=TS9rlf4WiV2SnMdH-J99noYxJtZGtsU2IsUs17iSxaI,377
 gfdlvitals/cli.py,sha256=rpsi6yw_k1mGzorvlfHbf_C9CXsU3zJuNxGOur3vLdY,5132
-gfdlvitals/extensions.py,sha256=9GUP3Lt2N9n7xy8L9Bm07GtVa5L6lNs_AfQ0BUJGLr0,18403
-gfdlvitals/plot.py,sha256=ry0u5IDua_Pa3Fu49BqtlIXaVyf5J1B2HV6Mcfk5yAo,12258
+gfdlvitals/extensions.py,sha256=1HbVBSO1XRypbzHAcmmJxyfyLA7UmGl3m5TdgWlZV2w,18598
+gfdlvitals/plot.py,sha256=X5zB5ChxhuBs6OANMdU-9WH_ZUbGEnaNCWXrhllYpT0,12539
 gfdlvitals/sample.py,sha256=wvjmx--IbvKKT0AIucw5GE1DCYcVQPtAr7VGY4rMUaA,225
-gfdlvitals/version.py,sha256=YnRK4j7bJ-mgKcmhqYtljeQV9rLGpbsHSWUEq9Yh9zQ,59
+gfdlvitals/version.py,sha256=HHiD2B5KAaK9uyx6c2kNqTsx57-98OnzQ5tiaH9iaaM,59
 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
@@ -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=Dck9YId_aQxGdfOJ54NVpZWPjfyTeWvdiljYz5NmOgc,2708
-gfdlvitals-3.0.6.data/scripts/db2nc,sha256=htD-aVKLHGeszfvx_3gH1iYs2bXyCIRRZ_BZYvAjxyQ,5793
-gfdlvitals-3.0.6.data/scripts/gfdlvitals,sha256=z7jnQIebmlz6eo0qv0X2UWgVU9TAERJ9a38YIbucVjA,172
-gfdlvitals-3.0.6.data/scripts/plotdb,sha256=m_QS96umb3aFIfr1fdfDa81pT8RP-AJ9LhP9Bbr4LQs,1632
+gfdlvitals-3.0.8.data/scripts/db2nc,sha256=htD-aVKLHGeszfvx_3gH1iYs2bXyCIRRZ_BZYvAjxyQ,5793
+gfdlvitals-3.0.8.data/scripts/gfdlvitals,sha256=z7jnQIebmlz6eo0qv0X2UWgVU9TAERJ9a38YIbucVjA,172
+gfdlvitals-3.0.8.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.6.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-gfdlvitals-3.0.6.dist-info/METADATA,sha256=ndlfS9rF8_4CEjjqWv9LtJQpxSieSWatAMRZxOKoBOA,1292
-gfdlvitals-3.0.6.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-gfdlvitals-3.0.6.dist-info/top_level.txt,sha256=_nlHTn5dcU38mu0h1NZouDSBQouNvihfTSmua76bwLs,24
-gfdlvitals-3.0.6.dist-info/RECORD,,
+gfdlvitals-3.0.8.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+gfdlvitals-3.0.8.dist-info/METADATA,sha256=SeGP0Aloeal3HdaLma8zCnIXipo5dZZEITCzo0Tn8Zs,1292
+gfdlvitals-3.0.8.dist-info/WHEEL,sha256=AtBG6SXL3KF_v0NxLf0ehyVOh0cold-JbJYXNGorC6Q,92
+gfdlvitals-3.0.8.dist-info/top_level.txt,sha256=_nlHTn5dcU38mu0h1NZouDSBQouNvihfTSmua76bwLs,24
+gfdlvitals-3.0.8.dist-info/RECORD,,

{gfdlvitals-3.0.6.dist-info → gfdlvitals-3.0.8.dist-info}/WHEEL

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