Skip to content

Commit

Permalink
Merge pull request #15 from zsarnoczay/master
Browse files Browse the repository at this point in the history
update Example 9 to use Pelicun 3 and update inputs for examples 1-8
  • Loading branch information
fmckenna authored Apr 16, 2024
2 parents 576aca9 + 4a50640 commit e5b5621
Show file tree
Hide file tree
Showing 18 changed files with 427 additions and 413 deletions.
34 changes: 25 additions & 9 deletions E1BasicHAZUS/input.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"ApplicationData": {
"assetSourceFile": "SanFrancisco_buildings.csv",
"filter": "8000-8024",
"inputIsGIS": false,
"pathToSource": "{Current_Dir}/input_data"
}
}
Expand All @@ -16,11 +17,12 @@
"ApplicationData": {
"DL_Method": "HAZUS MH EQ IM",
"Realizations": 100,
"auto_script": "PelicunDefault/Hazus_Earthquake_IM.py",
"coupled_EDP": true,
"detailed_results": false,
"event_time": "off",
"ground_failure": false,
"log_file": true
"log_file": true,
"regional": "true"
}
}
},
Expand All @@ -39,8 +41,6 @@
}
}
},
"Performance": {
},
"RegionalEvent": {
"Application": "UserInputGM",
"ApplicationData": {
Expand Down Expand Up @@ -80,13 +80,29 @@
"Buildings": {
}
},
"DefaultValues": {
"driverFile": "driver",
"edpFiles": [
"EDP.json"
],
"filenameDL": "BIM.json",
"filenameEDP": "EDP.json",
"filenameEVENT": "EVENT.json",
"filenameSAM": "SAM.json",
"filenameSIM": "SIM.json",
"rvFiles": [
"SAM.json",
"EVENT.json",
"SIM.json"
],
"workflowInput": "scInput.json",
"workflowOutput": "EDP.json"
},
"Modeling": {
"Buildings": {
}
},
"Name": "E1 - HAZUS",
"Performance": {
},
"RegionalEvent": {
"eventFile": "EventGrid.csv",
"eventFilePath": "{Current_Dir}/input_data/San_Andreas_Mw72_filtered",
Expand Down Expand Up @@ -116,13 +132,13 @@
"waste": false,
"water": false
},
"commonFileDir": "input_data",
"outputs": {
"AIM": false,
"DM": true,
"DV": true,
"EDP": true,
"IM": false,
"every_realization": false
"IM": false
},
"randomVariables": [
],
Expand All @@ -131,5 +147,5 @@
"force": "kips",
"length": "ft",
"time": "sec"
}
},
}
26 changes: 12 additions & 14 deletions E2MDOFBuildingResponse/input.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"ApplicationData": {
"assetSourceFile": "AnchorageBuildings.csv",
"filter": "1-5",
"inputIsGIS": false,
"pathToSource": "{Current_Dir}/input_data"
}
}
Expand All @@ -16,17 +17,20 @@
"ApplicationData": {
"DL_Method": "HAZUS MH EQ Story",
"Realizations": 1000,
"auto_script": "PelicunDefault/Hazus_Earthquake_Story.py",
"coupled_EDP": false,
"detailed_results": false,
"event_time": "off",
"ground_failure": false,
"log_file": true
"log_file": true,
"regional": "true"
}
}
},
"EDP": {
"Application": "StandardEarthquakeEDP",
"ApplicationData": {
"Buildings": {
"Application": "StandardEarthquakeEDP",
"ApplicationData": {
}
}
},
"Events": [
Expand All @@ -44,8 +48,6 @@
}
}
},
"Performance": {
},
"RegionalEvent": {
"Application": "UserInputGM",
"ApplicationData": {
Expand Down Expand Up @@ -90,14 +92,12 @@
"edpFiles": [
"EDP.json"
],
"filenameAIM": "AIM.json",
"filenameDL": "BIM.json",
"filenameEDP": "EDP.json",
"filenameEVENT": "EVENT.json",
"filenameSAM": "SAM.json",
"filenameSIM": "SIM.json",
"rvFiles": [
"AIM.json",
"SAM.json",
"EVENT.json",
"SIM.json"
Expand All @@ -108,14 +108,12 @@
"Modeling": {
"Buildings": {
"hazusData": "HazusData.txt",
"pathToHazusFile": ".",
"pathToHazusFile": "./input_data",
"stdDamping": 0.1,
"stdStiffness": 0.2
}
},
"Name": "E2 - MDOF Building Response",
"Performance": {
},
"RegionalEvent": {
"eventFile": "EventGrid.csv",
"eventFilePath": "{Current_Dir}/input_data/records",
Expand Down Expand Up @@ -164,13 +162,13 @@
"waste": false,
"water": false
},
"commonFileDir": "input_data",
"outputs": {
"AIM": false,
"DM": true,
"DV": true,
"EDP": true,
"IM": false,
"every_realization": false
"IM": false
},
"randomVariables": [
],
Expand All @@ -179,5 +177,5 @@
"force": "kips",
"length": "ft",
"time": "sec"
}
},
}
20 changes: 10 additions & 10 deletions E3PhysicsBasedGroundMotions/input.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"ApplicationData": {
"assetSourceFile": "BerkeleyBuildings.csv",
"filter": "170,1493,1977,2380,2459",
"inputIsGIS": false,
"pathToSource": "{Current_Dir}/input_data"
}
}
Expand All @@ -16,17 +17,20 @@
"ApplicationData": {
"DL_Method": "HAZUS MH EQ Story",
"Realizations": 1000,
"auto_script": "PelicunDefault/Hazus_Earthquake_Story.py",
"coupled_EDP": false,
"detailed_results": false,
"event_time": "off",
"ground_failure": false,
"log_file": true
"log_file": true,
"regional": "true"
}
}
},
"EDP": {
"Application": "StandardEarthquakeEDP",
"ApplicationData": {
"Buildings": {
"Application": "StandardEarthquakeEDP",
"ApplicationData": {
}
}
},
"Events": [
Expand All @@ -44,8 +48,6 @@
}
}
},
"Performance": {
},
"RegionalEvent": {
"Application": "UserInputGM",
"ApplicationData": {
Expand Down Expand Up @@ -112,8 +114,6 @@
}
},
"Name": "E3 - Physics Based Ground Motions",
"Performance": {
},
"RegionalEvent": {
"eventFile": "EventGrid.csv",
"eventFilePath": "{Current_Dir}/input_data/SW4_filtered",
Expand Down Expand Up @@ -162,13 +162,13 @@
"waste": false,
"water": false
},
"commonFileDir": "input_data",
"outputs": {
"AIM": false,
"DM": true,
"DV": true,
"EDP": true,
"IM": false,
"every_realization": false
"IM": false
},
"randomVariables": [
],
Expand Down
22 changes: 13 additions & 9 deletions E4OpenSeesPyFEM/input.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"ApplicationData": {
"assetSourceFile": "UniversityVillageAlbany.csv",
"filter": "0,14,35,57,76",
"inputIsGIS": false,
"pathToSource": "{Current_Dir}/input_data"
}
}
Expand All @@ -15,18 +16,21 @@
"Application": "Pelicun3",
"ApplicationData": {
"DL_Method": "HAZUS MH EQ Story",
"Realizations": 5,
"Realizations": 500,
"auto_script": "PelicunDefault/Hazus_Earthquake_Story.py",
"coupled_EDP": true,
"detailed_results": false,
"event_time": "off",
"ground_failure": false,
"log_file": true
"log_file": true,
"regional": "true"
}
}
},
"EDP": {
"Application": "StandardEarthquakeEDP",
"ApplicationData": {
"Buildings": {
"Application": "StandardEarthquakeEDP",
"ApplicationData": {
}
}
},
"Events": [
Expand All @@ -49,8 +53,6 @@
}
}
},
"Performance": {
},
"RegionalEvent": {
"Application": "UserInputGM",
"ApplicationData": {
Expand Down Expand Up @@ -113,8 +115,6 @@
}
},
"Name": "E4 - OpenSeesPy FEM",
"Performance": {
},
"RegionalEvent": {
"eventFile": "EventGrid.csv",
"eventFilePath": "{Current_Dir}/input_data/records",
Expand All @@ -129,6 +129,9 @@
},
"Simulation": {
"Buildings": {
"Application": "OpenSeesPy-Simulation",
"ApplicationData": {
}
}
},
"UQ": {
Expand All @@ -152,6 +155,7 @@
"waste": false,
"water": false
},
"commonFileDir": "input_data",
"outputs": {
"AIM": false,
"DM": true,
Expand Down
11 changes: 5 additions & 6 deletions E5GroundShakingAndLiquefaction/input.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"ApplicationData": {
"assetSourceFile": "all_bldgs.csv",
"filter": "1-10",
"inputIsGIS": false,
"pathToSource": "{Current_Dir}/input_data"
}
}
Expand All @@ -16,11 +17,12 @@
"ApplicationData": {
"DL_Method": "HAZUS MH EQ IM",
"Realizations": 1000,
"auto_script": "PelicunDefault/Hazus_Earthquake_IM.py",
"coupled_EDP": true,
"detailed_results": false,
"event_time": "off",
"ground_failure": true,
"log_file": true
"log_file": true,
"regional": "true"
}
}
},
Expand All @@ -39,8 +41,6 @@
}
}
},
"Performance": {
},
"RegionalEvent": {
"Application": "UserInputGM",
"ApplicationData": {
Expand Down Expand Up @@ -103,8 +103,6 @@
}
},
"Name": "E5 - Ground Shaking + Liquefaction",
"Performance": {
},
"RegionalEvent": {
"eventFile": "EventGrid.csv",
"eventFilePath": "{Current_Dir}/input_data/IMs",
Expand Down Expand Up @@ -136,6 +134,7 @@
"waste": false,
"water": false
},
"commonFileDir": "input_data",
"outputs": {
"AIM": false,
"DM": true,
Expand Down
Loading

0 comments on commit e5b5621

Please sign in to comment.