nctoolkit 1.2.1__tar.gz → 1.2.3__tar.gz

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: nctoolkit
-Version: 1.2.1
+Version: 1.2.3
 Summary: A Python package for netCDF analysis and post-processing
 Home-page: https://github.com/pmlmodelling/nctoolkit
 Author: Robert Wilson
@@ -42,6 +42,7 @@ Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
+Dynamic: license-file
 Dynamic: maintainer
 Dynamic: project-url
 Dynamic: provides-extra

{nctoolkit-1.2.1 → nctoolkit-1.2.3}/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.1 → nctoolkit-1.2.3}/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.1 → nctoolkit-1.2.3}/nctoolkit/runthis.py

@@ -128,6 +128,10 @@ def run_this(os_command, self, output="one", out_file=None, suppress=False):
 
     cores = session_info["cores"]
 
+    # if len(self) == 1:
+    #     if cores > 1:
+    #         os_command = os_command.replace("cdo ", f"cdo -P {cores} ")
+
     if len(self) == 1:
         output = "ensemble"
 
@@ -243,12 +247,16 @@ def run_this(os_command, self, output="one", out_file=None, suppress=False):
                         if self._zip:
                             ff_command = ff_command.replace("cdo ", "cdo -z zip ")
 
+                    if session_info["cores"] > 1:
+                        if len(self) == 1:
+                            ff_command = ff_command.replace("cdo ", f"cdo -P {session_info['cores']} ")
                     new_history.append(ff_command)
 
                     #warnings.simplefilter("ignore")
 
                     #with patch('sys.warnoptions', []):
 
+
                     if cores > 1:
                         temp = pool.apply_async(
                             run_cdo,
@@ -288,13 +296,6 @@ def run_this(os_command, self, output="one", out_file=None, suppress=False):
                             warnings.warn(mm)
                             if mm in session_warnings:
                                 session_warnings.remove(mm)
-                        # remove element from session_warnings
-
-                        #session_warnings.remove(ff)
-                    #tidy_warnings(w)
-                #if cores > 1:
-                #    pool.close()
-
 
                 self.history = copy.deepcopy(new_history)
                 self.current = copy.deepcopy(target_list)
@@ -324,6 +325,7 @@ def run_this(os_command, self, output="one", out_file=None, suppress=False):
 
                 return None
 
+
             if ((output == "one") and (len(self) > 1)) or self._zip is False:
                 new_history = copy.deepcopy(self._hold_history)
 
@@ -417,11 +419,15 @@ def run_this(os_command, self, output="one", out_file=None, suppress=False):
                                 warnings.warn(
                                     f"The following variables are not in all files, so were ignored when merging: {removed}"
                                 )
-
+                            
                             target = run_cdo(
                                 os_command, target, out_file, precision=self._precision
                             )
                 else:
+                    if session_info["cores"] > 1: 
+                        if len(self) == 1:
+                           os_command = os_command.replace("cdo ", f"cdo -P {session_info['cores']} ")
+
                     target = run_cdo(
                         os_command, target, out_file, precision=self._precision
                     )

{nctoolkit-1.2.1 → nctoolkit-1.2.3}/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.1 → nctoolkit-1.2.3}/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.1 → nctoolkit-1.2.3}/nctoolkit/verticals.py

@@ -32,32 +32,44 @@ def generate_level_bounds(self):
 
 
 
-def bottom(self):
+def bottom(self, choice = "level"):
     """
-    bottom: Extract the bottom level from a dataset
+    bottom: Extract the bottom level or value from a dataset
 
-    This extracts the bottom level from each netCDF file. Please note that for
+    This extracts the bottom level or value from each netCDF file. Please note that for
     ensembles, it uses the first file to derive the index of the bottom level.
 
-    You may need to double check that the bottom vertical level is the sea 'bottom' etc., as this is not always the case.
-
-    Use bottom_mask for files when the bottom cell in netCDF files do not represent
-    the actual bottom.
+    Parameters
+    -------------
+    choice : str
+        Set to 'level' to extract the bottom level, or 'value' to extract the bottommost non-missing value. 
 
     Examples
     ------------
 
     If you wanted to extract the bottom vertical level of a dataset, do the following:
 
-    >>> ds.bottom()
+    >>> ds.bottom(choice = 'level')
 
     This method is most useful for things like oceanic model data, where the bottom cell corresponds to the bottom of the ocean.
 
+    If you wanted to find the deepest non-missing value in a dataset, you would do the following:
+
+    >>> ds.bottom(choice = 'value')
+
     """
 
     # extract the number of the bottom level
     # Use the first file for an ensemble
     # pull the cdo command together, then run it or store it
+
+    if choice not in ["level", "value"]:
+        raise ValueError("Choice must be either 'level' or 'value'")
+
+    if choice == "value":
+        self.cdo_command("bottomvalue")
+        return None
+
     if len(self) > 1:
         ff = self.current[0]
         warnings.warn(

{nctoolkit-1.2.1 → nctoolkit-1.2.3}/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.3/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.1 → nctoolkit-1.2.3}/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.1',
+      version='1.2.3',
       description=DESCRIPTION,
       description_content_type='text/plain',
       long_description=LONG_DESCRIPTION,