nctoolkit 1.2.3__tar.gz → 1.2.5__tar.gz

{nctoolkit-1.2.3 → nctoolkit-1.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nctoolkit
-Version: 1.2.3
+Version: 1.2.5
 Summary: A Python package for netCDF analysis and post-processing
 Home-page: https://github.com/pmlmodelling/nctoolkit
 Author: Robert Wilson

{nctoolkit-1.2.3 → nctoolkit-1.2.5}/nctoolkit/cleanup.py

@@ -81,7 +81,7 @@ def cleanup():
                 session_info["temp_dir"] = "/tmp/"
 
 
-def clean_all():
+def clean_all(x = None, y = None):
     """
     Remove all temporary files created by nctoolkit in the present session
     """
@@ -91,6 +91,10 @@ def clean_all():
     # or would attempt to create after
     # operation failure
     # It also finds temp files generated by ncea that are still on the system
+    if x is not None:
+        return None
+    if y is not None:
+        return None
 
     candidates = []
     for directory in get_tempdirs():
@@ -142,6 +146,8 @@ def temp_check():
         mylist = mylist + [f for f in glob.glob("/usr/tmp/*")]
         mylist = [f for f in mylist if "nctoolkit" in f]
 
+        session_info["old_files"] = mylist
+
         if len(mylist) > 0:
             if len(mylist) == 1:
                 print(

{nctoolkit-1.2.3 → nctoolkit-1.2.5}/nctoolkit/mergers.py

@@ -216,9 +216,14 @@ def merge(self, join="variables", match=["year", "month", "day"], check=True):
     all_df = []
     if len(all_times) > 1:
         for i in range(0, len(all_times)):
-            month = [v.month for v in all_times[i]]
-            year = [v.year for v in all_times[i]]
-            day = [v.day for v in all_times[i]]
+            try:
+                month = [v.month for v in all_times[i]]
+                year = [v.year for v in all_times[i]]
+                day = [v.day for v in all_times[i]]
+            except:
+                month = [int(str(v).split("T")[0].split("-")[1]) for v in all_times[i]]
+                year = [int(str(v).split("T")[0].split("-")[0]) for v in all_times[i]]
+                day = [int(str(v).split("T")[0].split("-")[2]) for v in all_times[i]]
             i_data = pd.DataFrame({"year": year, "month": month, "day": day})
             i_data = i_data.loc[:, match]
             all_df.append(i_data)

{nctoolkit-1.2.3 → nctoolkit-1.2.5}/nctoolkit/mp_adders.py

@@ -2,7 +2,7 @@ import pandas as pd
 from nctoolkit.api import open_data, open_thredds
 from nctoolkit.matchpoint import open_matchpoint
 import nctoolkit.api as api
-
+import xarray as xr
 
 def match_points(
     ds=None,
@@ -91,6 +91,10 @@ def add_data(self, x=None, variables=None, depths=None, nan=None, top=False, qui
         Set to True to suppress output
 
     """
+    self.depths = None
+
+    invert = False
+
     thredds = False
     try:
         if len(x.history) == 0:
@@ -157,6 +161,7 @@ def add_data(self, x=None, variables=None, depths=None, nan=None, top=False, qui
         self.data = open_data(x, checks=False)
         # ds_vars = open_data(self.data[0], checks = False)
 
+
     if variables is None:
         if quiet is False:
             print("All variables will be used")
@@ -221,6 +226,11 @@ def add_data(self, x=None, variables=None, depths=None, nan=None, top=False, qui
     else:
         self.data = open_data(x, checks=False)
 
+    # if invert:
+    #     self.depths.invert_levels()
+    #     self.data.invert_levels()
+    #     print("inverted")
+
     self.variables = variables
 
     if len(kwargs) > 0:

{nctoolkit-1.2.3 → nctoolkit-1.2.5}/nctoolkit/mp_matchups.py

@@ -302,7 +302,8 @@ def matchup(self, tmean=False, regrid="bil", max_extrap=5, quiet = False):
             if self.variables is not None:
                 ds.subset(variables=self.variables)
             if self.top:
-                ds.top()
+                if len(ds.levels) > 1:
+                    ds.cdo_command("topvalue")
 
             if self.temporal:
                 for opt in ["day", "year", "month"]:

{nctoolkit-1.2.3 → nctoolkit-1.2.5}/nctoolkit/verticals.py

@@ -176,22 +176,21 @@ def vertical_interp(
             if surface is None:
                 raise ValueError("Please provide surface")
 
-    if fixed is None:
-        if thickness is None:
-            raise ValueError("You must provide the fixed arg")
-
     if depths is None:
         if fixed is False:
             if thickness is None:
-                raise ValueError("Please provide thickness")
+                raise ValueError("Please provide thickness or depths")
+
+    if thickness is not None:
+        fixed = False
+
+    if depths is not None:
+        fixed = False
 
     if not isinstance(fixed, bool):
         if thickness is None:
             raise TypeError("fixed must be a bool")
 
-    if thickness is not None:
-        fixed = False
-
     if isinstance(levels, (int, float)):
         levels = [levels]
 

{nctoolkit-1.2.3 → nctoolkit-1.2.5}/setup.py

@@ -46,7 +46,7 @@ extras_require["complete"] = ["geoviews", "rioxarray", "cfchecker", "geocube", "
 REQUIREMENTS = [i.strip() for i in open("requirements.txt").readlines()]
 
 setup(name='nctoolkit',
-      version='1.2.3',
+      version='1.2.5',
       description=DESCRIPTION,
       description_content_type='text/plain',
       long_description=LONG_DESCRIPTION,