nctoolkit 1.2.2__tar.gz → 1.2.4__tar.gz

{nctoolkit-1.2.2 → nctoolkit-1.2.4}/PKG-INFO

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

{nctoolkit-1.2.2 → nctoolkit-1.2.4}/nctoolkit/add_etc.py

@@ -145,11 +145,17 @@ def operation(self, method="mul", ff=None, var=None):
             else:
                 ff_times_df = (
                     pd.DataFrame({"time": ff_times})
-                    .assign(
-                        year=lambda x: x.time.dt.year,
-                        month=lambda x: x.time.dt.month,
-                        day=lambda x: x.time.dt.day,
-                    )
+                )
+                ff_times_df["year"] = [x.year for x in ff_times]
+                ff_times_df["month"] = [x.month for x in ff_times]
+                ff_times_df["day"] = [x.day for x in ff_times]
+                    # .assign(
+                    #     year=lambda x: x.time.dt.year,
+                    #     month=lambda x: x.time.dt.month,
+                    #     day=lambda x: x.time.dt.day,
+                    # )
+                ff_times_df = (
+                    ff_times_df
                     .drop(columns="time")
                 )
 

{nctoolkit-1.2.2 → nctoolkit-1.2.4}/nctoolkit/fldstat.py

@@ -313,6 +313,8 @@ def spatial_sum(self, by_area=False):
         # run_this(cdo_command, self, output="ensemble")
 
         return None
+    
+    self.run()
 
     new_files = []
     new_commands = []

{nctoolkit-1.2.2 → nctoolkit-1.2.4}/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.2 → nctoolkit-1.2.4}/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.2 → nctoolkit-1.2.4}/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.2 → nctoolkit-1.2.4}/nctoolkit/show.py

@@ -1,5 +1,6 @@
 import subprocess
 from dateutil.parser import parse
+import xarray as xr
 
 
 def nc_times(ff):
@@ -31,7 +32,12 @@ def nc_times(ff):
         cdo_result = [parse(x) for x in cdo_result]
         return cdo_result
     except:
-        return cdo_result
+        try:
+            ds = xr.open_dataset(ff) 
+            times = list(ds.time.values)
+            return times
+        except:
+            return cdo_result
 
 
 def nc_format(ff):

{nctoolkit-1.2.2 → nctoolkit-1.2.4}/nctoolkit/tozlev.py

@@ -55,9 +55,11 @@ def to_zlevels(self, levels=None, thickness=None, depths=None, surface=None):
     # Set up the thickness
 
     ds = self.copy()
-
-    ds.subset(variables=ds.contents.query("nlevels > 1").variable)
-    ds.run()
+   
+    var_select = list(ds.contents.query("nlevels > 1").variable)
+    if len(var_select) > 1: 
+        ds.subset(variables=ds.contents.query("nlevels > 1").variable)
+        ds.run()
     vars = ds.variables
 
     sorted = False

{nctoolkit-1.2.2 → nctoolkit-1.2.4}/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.2 → nctoolkit-1.2.4}/nctoolkit.egg-info/SOURCES.txt

@@ -4,6 +4,7 @@ CONTRIBUTIONS.md
 LICENSE
 MANIFEST.in
 README.md
+pyproject.toml
 requirements.txt
 setup.py
 benchmarks/benchmark_nctoolkit_versus_xarray.ipynb

nctoolkit-1.2.4/pyproject.toml

@@ -0,0 +1,5 @@
+# pyproject.toml
+[build-system]
+# XXX: If your project needs other packages to build properly, add them to this list.
+requires = ["setuptools >= 42.0.0"]
+build-backend = "setuptools.build_meta"

{nctoolkit-1.2.2 → nctoolkit-1.2.4}/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.2',
+      version='1.2.4',
       description=DESCRIPTION,
       description_content_type='text/plain',
       long_description=LONG_DESCRIPTION,