gfdlvitals 3.0.6__tar.gz → 3.0.8__tar.gz

{gfdlvitals-3.0.6/gfdlvitals.egg-info → gfdlvitals-3.0.8}/PKG-INFO

@@ -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 → gfdlvitals-3.0.8}/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-3.0.6 → gfdlvitals-3.0.8}/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-3.0.6 → gfdlvitals-3.0.8}/gfdlvitals/version.py

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

{gfdlvitals-3.0.6 → gfdlvitals-3.0.8/gfdlvitals.egg-info}/PKG-INFO

@@ -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