fmk - bug fix for HPC usage, importlib and regional_event need passing to create_event

Author: fmckenna

modules/performRegionalMapping/GISSpecifiedEvents/GISSpecifiedEvent.py

@@ -74,8 +74,20 @@ def create_event(asset_file: str, event_grid_file: str, workflow_input: str, do_
 
     event_grid_file_path = os.path.dirname(event_grid_file)
 
+    #
+    # open input file & get Regional Event data
+    #
+
+    json_path = os.path.join(os.getcwd(), workflow_input)
+    print(json_path)
+
+    with open(json_path, 'r') as f:
+	data = json.load(f)
+
+    regional_event = data.get("RegionalEvent")
+    
     if is_raster_file(event_grid_file):
-        create_raster_event(asset_file, event_grid_file, 0, do_parallel)
+        create_raster_event(asset_file, event_grid_file, 0, do_parallel, regional_event)
     elif is_xml_file(event_grid_file):  # noqa: RET505
         # Here you would call a function to handle XML files
         # For now, we'll just raise a NotImplementedError
@@ -85,15 +97,6 @@ def create_event(asset_file: str, event_grid_file: str, workflow_input: str, do_
             f'{event_grid_file} is not a raster. Only rasters are currently supported.'  # noqa: EM102
         )
 
-    #
-    # open input file, see if other raster files to deal with
-    #
-
-    # path to file and open it
-    json_path = os.path.join(os.path.dirname(os.getcwd()), workflow_input)
-    with open(json_path, 'r') as f:
-        data = json.load(f)
-
     #
     # If multiple exists, update event_file
     #   note: create_raster_event modified for this purpose
@@ -107,11 +110,11 @@ def create_event(asset_file: str, event_grid_file: str, workflow_input: str, do_
         # is this assumption correct on file paths?
         next_file = data['RegionalEvent']['multiple'][i]['eventFile']
         next_file_path = os.path.join(event_grid_file_path, next_file)
-        create_raster_event(asset_file, next_file_path, i+1, do_parallel)        
-
+        create_raster_event(asset_file, next_file_path, i+1, do_parallel, regional_event)
 
-    
-
+#
+# main function
+#
 
 if __name__ == '__main__':
     parser = argparse.ArgumentParser()

modules/performRegionalMapping/GISSpecifiedEvents/RasterEvent.py

@@ -44,6 +44,7 @@
 import rasterio
 import pyproj
 from rasterio.transform import rowcol
+import importlib
 
 
 def sample_raster_at_latlon(src, lat, lon):  # noqa: D103
@@ -62,7 +63,7 @@ def sample_raster_at_latlon(src, lat, lon):  # noqa: D103
     return raster_values  # noqa: RET504
 
 
-def create_event(asset_file, event_grid_file, num_entry, do_parallel):  # noqa: C901, D103, N803, RUF100
+def create_event(asset_file, event_grid_file, num_entry, do_parallel, regional_event):  # noqa: C901, D103, N803, RUF100
 
     #print(f'asset_file: {asset_file}, entry: {num_entry}')    
     #print(f'event_grid_file: {event_grid_file}, entry: {num_entry}')
@@ -126,11 +127,11 @@ def create_event(asset_file, event_grid_file, num_entry, do_parallel):  # noqa:
                 asset_data = json.load(asset_file)
 
                 if num_entry == 0:
-                    im_tag = asset_data['RegionalEvent']['intensityMeasures']
-                    units = asset_data['RegionalEvent']['units']
+                    im_tag = regional_event['intensityMeasures']
+                    units = regional_event['units']
                 else:
-                    im_tag = asset_data['RegionalEvent']['multiple'][num_entry-1]['intensityMeasures']
-                    units = asset_data['RegionalEvent']['multiple'][num_entry-1]['units']
+                    im_tag = regional_event['multiple'][num_entry-1]['intensityMeasures']
+                    units = regional_event['multiple'][num_entry-1]['units']
 
 
                 # Extract the latitude and longitude