fixed #71

blaylockbk · Apr 27, 2022 · de70cb7 · de70cb7 · blaylockbk · Apr 27, 2022
1 parent 4cbd739
commit de70cb7
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/herbie/archive.py b/herbie/archive.py
@@ -463,7 +463,7 @@ def get_localFilePath(self, searchString=None):
             hash_label = hashlib.sha1(all_grib_msg.encode()).hexdigest()
 
             # Append the filename to distinguish it from the full file.
-            outFile = outFile.with_suffix(f".grib2.subset_{hash_label}")
+            outFile = outFile.parent / f"subset_{hash_label}__{outFile.name}"
 
         return outFile
 

diff --git a/herbie/tools.py b/herbie/tools.py
@@ -124,7 +124,13 @@ def fast_Herbie(DATES, fxx=[0], *, max_threads=50, **kwargs):
 
 
 def fast_Herbie_download(
-    DATES, *, searchString=None, fxx=[0], max_threads=20, **kwargs
+    DATES,
+    *,
+    searchString=None,
+    fxx=[0],
+    max_threads=20,
+    download_kw={},
+    **kwargs,
 ):
     """
     Use multithreading to download many Herbie objects
@@ -155,7 +161,7 @@ def fast_Herbie_download(
     log.info(f"🧵 Working on {tasks} tasks with {threads} threads.")
 
     with ThreadPoolExecutor(max_threads) as exe:
-        futures = [exe.submit(H.download, searchString) for H in passed]
+        futures = [exe.submit(H.download, searchString, **download_kw) for H in passed]
 
         # Return list of Herbie objects in order completed
         _ = [future.result() for future in as_completed(futures)]
@@ -168,7 +174,15 @@ def fast_Herbie_download(
     return dict(passed=passed, failed=failed)
 
 
-def fast_Herbie_xarray(DATES, *, searchString=None, fxx=[0], max_threads=5, **kwargs):
+def fast_Herbie_xarray(
+    DATES,
+    *,
+    searchString=None,
+    fxx=[0],
+    max_threads=5,
+    xarray_kw={},
+    **kwargs,
+):
     """
     Use multithreading to download many Herbie objects
 
@@ -204,7 +218,7 @@ def fast_Herbie_xarray(DATES, *, searchString=None, fxx=[0], max_threads=5, **kw
     log.info(f"🧵 Working on {tasks} tasks with {threads} threads.")
 
     with ThreadPoolExecutor(max_threads) as exe:
-        futures = [exe.submit(H.xarray, searchString) for H in passed]
+        futures = [exe.submit(H.xarray, searchString, **xarray_kw) for H in passed]
 
         # Return list of Herbie objects in order completed
         ds_list = [future.result() for future in as_completed(futures)]