Merge branch 'master' of https://github.com/BSC-ES/providentia

Author: albavilanova

providentia/cams.py

@@ -484,6 +484,9 @@ def download_cams_experiment(self, experiment):
                     # print the request
                     self.print_request(cams_dict['dataset'], request)
 
+                    # get last downloaded file in case there was a keyboard interrupt
+                    self.download_instance.latest_nc_file_path = final_path
+
                     # make the request
                     try:
                         self.download_instance.logger.info(f"Downloading {final_path}") # TODO change message

providentia/download.py

@@ -1521,6 +1521,10 @@ def copy_non_interpolated_experiment(self, experiment, initial_check, files_to_d
 
                             # copy file
                             esarchive_path = join(esarchive_dir, nc_file)
+
+                            # get last downloaded file in case there was a keyboard interrupt
+                            self.latest_nc_file_path = gpfs_path
+
                             try:
                                 with open(os.devnull, 'wb') as devnull:
                                     subprocess.check_call([rsync_command, esarchive_path, gpfs_path], stdout=devnull, stderr=subprocess.STDOUT)
@@ -1641,8 +1645,8 @@ def sighandler(self, *unused):
 
         # delete the las downloaded nc file to avoid corrupted files
         if hasattr(self, 'latest_nc_file_path'):
-            self.logger.info(f"\nDeleting last file to avoid corruption: {self.latest_nc_file_path}...")
             if os.path.isfile(self.latest_nc_file_path):
+                self.logger.info(f"\nDeleting last file to avoid corruption: {self.latest_nc_file_path}...")
                 os.remove(self.latest_nc_file_path)
 
         # remove the output files from dtrsync in case it was a download from storage5

settings/internal/cams/cams_dataset.yaml

@@ -39,7 +39,9 @@ cams_analysis:
     forecast: false
     level: '0'
     month_names: false
-    time: 00:00
+    time: [
+        "00:00", "01:00", "02:00", "03:00", "04:00", "05:00", "06:00", "07:00", "08:00", "09:00", "10:00", "11:00",
+        "12:00", "13:00", "14:00", "15:00", "16:00", "17:00", "18:00", "19:00", "20:00", "21:00", "22:00", "23:00" ]
     data_format: netcdf_zip
     calendar: standard
     stream: false