nctoolkit 1.2.0__tar.gz → 1.2.2__tar.gz

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: nctoolkit
-Version: 1.2.0
+Version: 1.2.2
 Summary: A Python package for netCDF analysis and post-processing
 Home-page: https://github.com/pmlmodelling/nctoolkit
 Author: Robert Wilson
@@ -36,6 +36,19 @@ Requires-Dist: rioxarray; extra == "complete"
 Requires-Dist: cfchecker; extra == "complete"
 Requires-Dist: geocube; extra == "complete"
 Requires-Dist: geopandas; extra == "complete"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: maintainer
+Dynamic: project-url
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 
 

{nctoolkit-1.2.0 → nctoolkit-1.2.2}/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.0 → nctoolkit-1.2.2}/nctoolkit/static_plot.py

@@ -55,6 +55,7 @@ def fix_label(x):
     new_x = new_x.replace("/m**3", "m$^{-3}$")
     new_x = new_x.replace("/m^3", "m$^{-3}$")
     new_x = new_x.replace("/m^2", "m$^{-2}$")
+    new_x = new_x.replace("/yr", "year$^{-1}$")
     new_x = new_x.replace("/m2", "m$^{-2}$")
     new_x = new_x.replace("/d)", "d$^{-1}$)")
     new_x = new_x.replace("/s)", "s$^{-1}$)")

{nctoolkit-1.2.0 → nctoolkit-1.2.2}/nctoolkit/subset.py

@@ -413,6 +413,12 @@ def select_timesteps(self, times=None):
     if not isinstance(times, list):
         times = [times]
 
+    # coerce to int
+    try:
+        times = [int(x) if "int" in str(type(x)) else x for x in times]
+    except:
+        pass
+
     for tt in times:
         if not isinstance(tt, int):
             raise TypeError(f"{tt} is not an int")

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