goesgcp 2.1.0__tar.gz → 2.1.1__tar.gz

{goesgcp-2.1.0/goesgcp.egg-info → goesgcp-2.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: goesgcp
-Version: 2.1.0
+Version: 2.1.1
 Summary: A package to download and process GOES-16/17 data
 Home-page: https://github.com/helvecioneto/goesgcp
 Author: Helvecio B. L. Neto

{goesgcp-2.1.0 → goesgcp-2.1.1}/goesgcp/main.py

@@ -280,20 +280,20 @@ def crop_reproject(args):
 def remap_file(args):
     """ Remap the download file based on the input file. """
 
-    base_file, target_file, var_name, save_format, output = args
+    base_file, target_file, var_name, save_format, output, method = args
 
     # Open the files
     base_ds = xr.open_dataset(base_file, engine="netcdf4")
 
     if save_format == 'by_date':
-        file_datetime = datetime.strptime(ds.time_coverage_start, 
+        file_datetime = datetime.strptime(base_ds.time_coverage_start, 
                                           "%Y-%m-%dT%H:%M:%S.%fZ")
         year = file_datetime.strftime("%Y")
         month = file_datetime.strftime("%m")
         day = file_datetime.strftime("%d")
         output_directory = f"{output}{year}/{month}/{day}/"
     elif save_format == 'julian':
-        file_datetime = datetime.strptime(ds.time_coverage_start, 
+        file_datetime = datetime.strptime(base_ds.time_coverage_start, 
                                           "%Y-%m-%dT%H:%M:%S.%fZ")
         year = file_datetime.strftime("%Y")
         julian_day = file_datetime.timetuple().tm_yday
@@ -311,7 +311,7 @@ def remap_file(args):
 
     # Run the cdo command
     cdo_command = [
-        "cdo", "remapnn," + base_file, target_file, output_file
+        "cdo", method+"," + base_file, target_file, output_file
     ]
 
     try:
@@ -336,7 +336,7 @@ def process_file(args):
     """
     
     bucket_name, blob_name, local_path, output_path, var_name, lat_min, lat_max, lon_min, lon_max, resolution, \
-    save_format, retries, remap = args
+    save_format, retries, remap, met = args
 
     attempt = 0
     while attempt < retries:
@@ -364,7 +364,7 @@ def process_file(args):
     # Remap the file
     if remap is not None:
         # Remap the file
-        remap_file((remap, output_file, var_name, save_format, output_path))
+        remap_file((remap, output_file, var_name, save_format, output_path, met))
 
     # Remove the local file
     pathlib.Path(local_path).unlink()
@@ -434,11 +434,13 @@ def main():
     parser.add_argument('--lat_max', type=float, default=81.3282, help='Maximum latitude of the bounding box')
     parser.add_argument('--lon_min', type=float, default=-156.2995, help='Minimum longitude of the bounding box')
     parser.add_argument('--lon_max', type=float, default=6.2995, help='Maximum longitude of the bounding box')
-    parser.add_argument('--resolution', type=float, default=0.03208, help='Resolution of the output file')
+    parser.add_argument('--resolution', type=float, default=0.01, help='Resolution of the output file')
     parser.add_argument('--output', type=str, default='output/', help='Path for saving output files')
 
     # Remap
     parser.add_argument('--remap', type=str, default=None, help='Give a input file to remap the output')
+    parser.add_argument('--method', type=str, default='remapnn', help='Remap method to use (e.g., remapnn)')
+
 
     # Other settings
     parser.add_argument('--parallel', type=lambda x: bool(strtobool(x)), default=True, help='Use parallel processing')
@@ -477,6 +479,7 @@ def main():
     bt_min = args.bt_min
     save_format = args.save_format
     remap = args.remap
+    method = args.method
 
 
     # Check mandatory arguments
@@ -510,8 +513,8 @@ def main():
     # Check operational mode if is recent or specific date
     if start and end:
         files_list = get_files_period(storage_client, bucket_name,
-                                       product, pattern, start, end,
-                                        bt_hour, bt_min, freq)
+                                    product, pattern, start, end,
+                                    bt_hour, bt_min, freq)
     else:
         # Get recent files
         files_list = get_recent_files(storage_client, bucket_name, product, pattern, recent)
@@ -534,7 +537,7 @@ def main():
         # Create a list of tasks
         tasks = [(bucket_name, file, f"tmp/{file.split('/')[-1]}", output_path, var_name, 
         lat_min, lat_max, lon_min, lon_max, resolution,
-        save_format, max_attempts, remap) for file in files_list]
+        save_format, max_attempts, remap, method) for file in files_list]
 
         # Download files in parallel
         with Pool(processes=args.processes) as pool:
@@ -546,7 +549,7 @@ def main():
             local_path = f"tmp/{file.split('/')[-1]}"
             process_file((bucket_name, file, local_path, output_path, var_name,
             lat_min, lat_max, lon_min, lon_max, resolution,
-            save_format, max_attempts, remap))
+            save_format, max_attempts, remap, method))
             loading_bar.update(1)
         loading_bar.close()
 

{goesgcp-2.1.0 → goesgcp-2.1.1/goesgcp.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: goesgcp
-Version: 2.1.0
+Version: 2.1.1
 Summary: A package to download and process GOES-16/17 data
 Home-page: https://github.com/helvecioneto/goesgcp
 Author: Helvecio B. L. Neto

{goesgcp-2.1.0 → goesgcp-2.1.1}/setup.py

@@ -18,7 +18,7 @@ else:
 
 setup(
     name="goesgcp",
-    version="2.1.0",
+    version="2.1.1",
     author="Helvecio B. L. Neto",
     author_email="helvecioblneto@gmail.com",
     description="A package to download and process GOES-16/17 data",