Merge branch 'NHERI-SimCenter:master' into master

Author: JustinBonus

modules/Workflow/WorkflowApplications.json

@@ -331,7 +331,12 @@
           "type": "path",
           "description": "Name of JSON file containing an array of id,filename pairs. For each asset id the application creates a AIM file with name filename",
           "default": "assets.json"
-        }
+        },
+        {
+          "id": "workflowInput",
+          "type": "workflowDefault",
+          "description": "name of file containing the input"
+        }	  
       ],
       "Outputs": []
     },
@@ -1366,4 +1371,4 @@
       }
     ]
   }
-}
+}

modules/createEVENT/SimCenterEvent/SimCenterEvent.py

@@ -63,6 +63,14 @@ def write_RV(AIM_file, EVENT_file):  # noqa: N802, N803, D103
     if 'RegionalEvent' in aim_file.keys():  # noqa: SIM118
         input_units = aim_file['RegionalEvent'].get('units', None)
 
+        # if units are specified in the AIM file, use these instead 
+        if 'Events' in aim_file.keys():
+            if 'units' in aim_file['Events'][0].keys():
+                event_units = aim_file['Events'][0]['units']
+                if event_units:
+                    input_units = event_units
+                
+    
     output_units = aim_file.get('units', None)
 
     # scale the input data to the event unit used internally

modules/performRegionalMapping/GISSpecifiedEvents/GISSpecifiedEvent.py

@@ -37,6 +37,8 @@
 # Stevan Gavrilovic
 #
 
+import os
+import json
 import argparse  # noqa: I001
 from pathlib import Path
 import xml.etree.ElementTree as ET
@@ -68,9 +70,12 @@ def is_xml_file(filename):  # noqa: D103
         return False
 
 
-def create_event(asset_file: str, event_grid_file: str):  # noqa: C901, D103, N803, RUF100
+def create_event(asset_file: str, event_grid_file: str, workflow_input: str):  # noqa: C901, D103, N803, RUF100
+
+    event_grid_file_path = os.path.dirname(event_grid_file)
+    
     if is_raster_file(event_grid_file):
-        return create_raster_event(asset_file, event_grid_file)
+        create_raster_event(asset_file, event_grid_file, 0)
     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
@@ -80,11 +85,39 @@ def create_event(asset_file: str, event_grid_file: str):  # noqa: C901, D103, N8
             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
+    #
+    
+    #print(f'ORIGINAL: {event_grid_file}')
+    
+    multiple_entries = data.get("RegionalEvent", {}).get("multiple", [])
+    for i, entry in enumerate(multiple_entries):
+
+        # 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)        
+
+    
+    
+
 
 if __name__ == '__main__':
     parser = argparse.ArgumentParser()
     parser.add_argument('--assetFile')
     parser.add_argument('--filenameEVENTgrid')
+    parser.add_argument('--workflowInput')    
     args = parser.parse_args()
 
-    create_event(args.assetFile, args.filenameEVENTgrid)
+    create_event(args.assetFile, args.filenameEVENTgrid, args.workflowInput)

modules/performRegionalMapping/GISSpecifiedEvents/RasterEvent.py

@@ -37,6 +37,7 @@
 # Stevan Gavrilovic
 #
 
+import os
 import argparse  # noqa: I001
 import json, csv  # noqa: E401
 from pathlib import Path
@@ -53,13 +54,18 @@ def sample_raster_at_latlon(src, lat, lon):  # noqa: D103
     if row < 0 or row >= src.height or col < 0 or col >= src.width:
         raise IndexError('Transformed coordinates are out of raster bounds')  # noqa: EM101, TRY003
 
-    # Read the raster value at the given row and column
-    raster_value = src.read(1)[row, col]
+    # Read the raster value at the given row and column for all layers NOT just the first
+    #raster_value = src.read(1)[row, col]
+    data = src.read()
+    raster_values = data[:, row, col]
+    return raster_values  # noqa: RET504
 
-    return raster_value  # noqa: RET504
 
+def create_event(asset_file, event_grid_file, num_entry):  # noqa: C901, D103, N803, RUF100
 
-def create_event(asset_file, event_grid_file):  # 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}')
+    
     # read the event grid data file
     event_grid_path = Path(event_grid_file).resolve()
     event_dir = event_grid_path.parent
@@ -94,7 +100,13 @@ def create_event(asset_file, event_grid_file):  # noqa: C901, D103, N803, RUF100
             # Load the asset data
             asset_data = json.load(asset_file)
 
-            im_tag = asset_data['RegionalEvent']['intensityMeasures'][0]
+            if num_entry == 0:
+                im_tag = asset_data['RegionalEvent']['intensityMeasures']
+                units = asset_data['RegionalEvent']['units']
+            else:
+                im_tag = asset_data['RegionalEvent']['multiple'][num_entry-1]['intensityMeasures']
+                units = asset_data['RegionalEvent']['multiple'][num_entry-1]['units']
+            
 
             # Extract the latitude and longitude
             lat = float(asset_data['GeneralInformation']['location']['latitude'])
@@ -113,31 +125,81 @@ def create_event(asset_file, event_grid_file):  # noqa: C901, D103, N803, RUF100
                     val = sample_raster_at_latlon(
                         src=src, lat=lat_transformed, lon=lon_transformed
                     )
-
-                    data = [[im_tag], [val]]
+                    
+                    data = [im_tag, val]
 
                     # Save the simcenter file name
                     file_name = f'Site_{asset_id}.csvx{0}x{int(asset_id):05d}'
 
                     data_final.append([file_name, lat, lon])
 
                     csv_save_path = event_dir / f'Site_{asset_id}.csv'
-                    with open(csv_save_path, 'w', newline='') as file:  # noqa: PTH123
-                        # Create a CSV writer object
-                        writer = csv.writer(file)
 
-                        # Write the data to the CSV file
-                        writer.writerows(data)
+                    if num_entry == 0:
+
+                        # if first entry
+                        #    create the csv file and add the data
+                        
+                        with open(csv_save_path, 'w', newline='') as file:  # noqa: PTH123
+                            # Create a CSV writer object
+                            writer = csv.writer(file)
+
+                            # Write the data to the CSV file
+                            writer.writerows(data)
+                    else:
+
+                        # subsequent entries
+                        #  read existing file, append header and row data, 
+                        #  and finally write new file with updated data
+                        #
+                        
+                        # Read the existing file
+                        if os.path.exists(csv_save_path):
+                            with open(csv_save_path, mode='r') as f:
+                                reader = csv.DictReader(f)
+                                rows = list(reader)
+                                fieldnames = reader.fieldnames or []
+                        else:
+                            rows = []
+                            fieldnames = []
+
+                        # extend field names and row data with additional stuff to be added
+                        # IS IM_TAG a single value or an array .. should be array!
+
+                        extra = dict(zip(im_tag, val))
+                        for k in extra:
+                            if k not in fieldnames:
+                                fieldnames.append(k)
+                        for row in rows:
+                            row.update(extra)
+                        
+                        # Overwrite existing file
+                        with open(csv_save_path, mode='w', newline='') as f:
+                            writer = csv.DictWriter(f, fieldnames=fieldnames)
+                            writer.writeheader()
+                            writer.writerows(rows)                        
+
 
                     # prepare a dictionary of events
                     event_list_json = [[file_name, 1.0]]
 
-                    asset_data['Events'] = [{}]
-                    asset_data['Events'][0] = {
-                        'EventFolderPath': str(event_dir),
-                        'Events': event_list_json,
-                        'type': 'intensityMeasure',
-                    }
+
+                    # in asset file, add event info including now units
+                    if num_entry == 0:
+
+                        # if first, add an event field
+                        asset_data['Events'] = [{}]
+                        asset_data['Events'][0] = {
+                            'EventFolderPath': str(event_dir),
+                            'Events': event_list_json,
+                            'type': 'intensityMeasure',
+                            'units': units
+                        }
+
+                    else:
+                        
+                        # if additional, update units to include new                       
+                        asset_data['Events'][0]['units'].update(units)
 
                     with open(asset_file_path, 'w', encoding='utf-8') as f:  # noqa: PTH123
                         json.dump(asset_data, f, indent=2)

modules/performRegionalMapping/NearestNeighborEvents/NNE.py

@@ -404,6 +404,7 @@ def find_neighbors(  # noqa: C901, D103
     parser.add_argument('--neighbors', type=int)
     parser.add_argument('--filter_label', default='')
     parser.add_argument('--doParallel', default='False')
+    parser.add_argument('--workflowInput')    
     parser.add_argument('-n', '--numP', default='8')
     parser.add_argument('-m', '--mpiExec', default='mpiexec')
     parser.add_argument('--seed', type=int, default=None)

modules/performRegionalMapping/SiteSpecifiedEvents/SSE.py

@@ -263,6 +263,7 @@ def create_event(asset_file, event_grid_file, multipleEvents, doParallel):  # no
     parser.add_argument('--assetFile')
     parser.add_argument('--filenameEVENTgrid')
     parser.add_argument('--multipleEvents', default='True')
+    parser.add_argument('--workflowInput')        
     parser.add_argument('--doParallel', default='False')
     parser.add_argument('-n', '--numP', default='8')
     parser.add_argument('-m', '--mpiExec', default='mpixece')