Merge remote-tracking branch 'upstream/master'

Author: yisangriB

modules/Workflow/WorkflowApplications.json

@@ -82,7 +82,7 @@
           "ExecutablePath": "applications/createAIM/GeoJSON_to_ASSET/GeoJSON_to_ASSET.py",
         "ApplicationSpecificInputs": [
           {
-            "id": "assetFile",
+            "id": "assetSourceFile",
             "type": "path",
             "description": "path to asset database file"
           },

modules/createAIM/GeoJSON_to_ASSET/GeoJSON_to_ASSET.py

@@ -193,9 +193,8 @@ def defineConnectivities(self, AIM_id_prefix = None, edges_file_name = None,\
         self.gdf = edges
         return
 
-def split_and_select_components(input_config):
+def split_and_select_components(input_config, asset_source_file):
     component_dict = dict()
-    asset_source_file = input_config["assetSourceFile"]
     with open(asset_source_file, 'r', encoding="utf-8") as f:
         source_data = json.load(f)
     crs = source_data["crs"]
@@ -251,7 +250,7 @@ def init_workdir(component_dict, outDir):
         component_dir.update({comp:compDir})
     return component_dir
 
-def create_asset_files(output_file, 
+def create_asset_files(output_file, asset_source_file,
     asset_type, input_file, doParallel): 
     # check if running parallel
     numP = 1
@@ -281,7 +280,9 @@ def create_asset_files(output_file,
         ["ApplicationData"]
     # if input_config.get("Roadway", None):
     #     roadSegLength = float(input_config['Roadway'].get('maxRoadLength_m', "100000"))
-    component_dict = split_and_select_components(input_config)
+
+    # assetSourceFile passed through command may be different from input_config when run on designsafe
+    component_dict = split_and_select_components(input_config, asset_source_file)
     component_dir = init_workdir(component_dict, outDir)
     assets_array = []
     for component_type, component_data in component_dict.items():
@@ -341,6 +342,7 @@ def create_asset_files(output_file,
 
     parser = argparse.ArgumentParser()
     parser.add_argument('--assetFile')
+    parser.add_argument('--assetSourceFile')
     parser.add_argument('--assetType')
     parser.add_argument('--inputJsonFile')
     parser.add_argument('--doParallel', default="False")    
@@ -350,7 +352,8 @@ def create_asset_files(output_file,
     args = parser.parse_args()
 
     if args.getRV:
-        sys.exit(create_asset_files(args.assetFile, args.assetType,\
+        sys.exit(create_asset_files(args.assetFile, args.assetSourceFile,\
+                                    args.assetType,\
                                     args.inputJsonFile, args.doParallel))
     else:
         pass # not used

modules/performRegionalMapping/SiteSpecifiedEvents/SSE.py

@@ -46,8 +46,9 @@
 import pandas as pd
 from scipy.cluster.vq import vq
 import importlib
+import os
 
-def create_event(asset_file, event_grid_file, doParallel):
+def create_event(asset_file, event_grid_file, multipleEvents, doParallel):
 
 
     # check if running parallel
@@ -172,13 +173,25 @@ def create_event(asset_file, event_grid_file, doParallel):
                 event_df = pd.read_csv(event_dir / event_collection_file, header=0)
 
                 # append the GM record name to the event list
-                event_list.append(event_df.iloc[idx,0])
+                event_list.append(event_df.iloc[0,0])
 
                 # append the scale factor (or 1.0) to the scale list
                 if len(event_df.columns) > 1:
-                    scale_list.append(float(event_df.iloc[idx,1]))
+                    scale_list.append(float(event_df.iloc[0,1]))
                 else:
                     scale_list.append(1.0)
+                
+                # If GP_file contains multiple events    
+                if multipleEvents:
+                    # Read the GP_file
+                    if event_df.shape[0] > 1:
+                        for row in range(1,event_df.shape[0]):
+                            event_list.append(event_df.iloc[row,0])
+                            # append the scale factor (or 1.0) to the scale list
+                            if len(event_df.columns) > 1:
+                                scale_list.append(float(event_df.iloc[row,1]))
+                            else:
+                                scale_list.append(1.0)
 
             # if the grid has intensity measures
             elif event_type == 'intensityMeasure':
@@ -189,6 +202,16 @@ def create_event(asset_file, event_grid_file, doParallel):
                 # IM collections are not scaled
                 scale_list.append(1.0)
 
+                # If GP_file contains multiple events  
+                if multipleEvents:
+                    # Read the GP_file
+                    GP_file = os.path.join(event_dir, closestPnt['GP_file'])
+                    GP_file_df = pd.read_csv(GP_file, header=0)
+                    if GP_file_df.shape[0] > 1:
+                        for row in range(1,GP_file_df.shape[0]):
+                            event_list.append(closestPnt['GP_file']+f'x{row}')
+                            scale_list.append(1.0)
+
         # TODO: update the LLNL input data and remove this clause
         else:
             event_list = []
@@ -210,8 +233,7 @@ def create_event(asset_file, event_grid_file, doParallel):
 
 
         # save the event dictionary to the AIM
-        # TODO: we assume there is only one event
-        # handling multiple events will require more sophisticated inputs
+
         # save the event dictionary to the BIM                                          
         asset_data['Events'] = [{}]        
         asset_data['Events'][0] = {
@@ -230,9 +252,10 @@ def create_event(asset_file, event_grid_file, doParallel):
     parser = argparse.ArgumentParser()
     parser.add_argument('--assetFile')
     parser.add_argument('--filenameEVENTgrid')
+    parser.add_argument('--multipleEvents', default="True")
     parser.add_argument('--doParallel', default="False")    
     parser.add_argument("-n", "--numP", default='8')
     parser.add_argument("-m", "--mpiExec", default='mpixece')
     args = parser.parse_args()
 
-    create_event(args.assetFile, args.filenameEVENTgrid, args.doParallel)
+    create_event(args.assetFile, args.filenameEVENTgrid, args.multipleEvents, args.doParallel)