From b4f621103b2039af0a4ba634d7ec3d3f2ded4d91 Mon Sep 17 00:00:00 2001 From: fmckenna Date: Wed, 24 Apr 2024 11:48:20 -0700 Subject: [PATCH] fmk - fixing some json files as not valid JSON, removing extraneous key-pair items relalted to running app --- .gitignore | 80 ++++++++++++++++++++++++++++ E11SeasideWDNAndBuildings/input.json | 8 +-- E13HurricaneSurge/input.json | 2 +- E1BasicHAZUS/input.json | 2 +- E2MDOFBuildingResponse/input.json | 2 +- E7HurricaneWindWater/input.json | 7 +-- E9Tsunami/input.json | 2 +- 7 files changed, 87 insertions(+), 16 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d8ae636 --- /dev/null +++ b/.gitignore @@ -0,0 +1,80 @@ +# Prerequisites +*.d + +# old text editor files +*~ + +# Qt created files +moc* + +# Compiled Object files +*.slo +*.lo +*.o +*.obj +*.pyc + +# Precompiled Headers +*.gch +*.pch + +# Compiled Dynamic libraries +*.so +*.dylib +*.dll + +!winDLLS/ +!winDLLS/* + +# Fortran module files +*.mod +*.smod + +# Compiled Static libraries +*.lai +*.la +*.a +*.lib + +# Executables +*.exe +*.out +*.app +EE_UQ +StochasticGroundMotion + +# QT +*.pro.user +qcustomplot.h +qcustomplot.cpp +*.stash +qrc_images.cpp +qrc_images1.cpp +qrc_styles.cpp + +# Sensitive Information +R2DUserPass.h + +# OTHER +Makefile +Makefile.* +StandardEarthquakeEDP +OpenSeesInput +OpenSeesPostprocessor +OpenSeesPreprocessor +extractEDP +MultipleSimCenterEvents +MultiplePEER_Events +postprocessDAKOTA +*.pyc +*.autosave +debug.log +MDOF_BuildingModelToSAM +build +results +userID.sh +Frameworks +*.lnk +.vscode/* +.DS_Store* +*zip \ No newline at end of file diff --git a/E11SeasideWDNAndBuildings/input.json b/E11SeasideWDNAndBuildings/input.json index e538590..a5fb1cf 100644 --- a/E11SeasideWDNAndBuildings/input.json +++ b/E11SeasideWDNAndBuildings/input.json @@ -42,7 +42,7 @@ }, "DL": { "Buildings": { - "Application": "pelicun", + "Application": "Pelicun3", "ApplicationData": { "DL_Method": "User-provided Fragilities", "Realizations": 5, @@ -291,7 +291,6 @@ "water": true }, "commonFileDir": "", - "localAppDir": "/Users/fmckenna/NHERI/R2DTool/build/R2D.app/Contents/MacOS", "outputs": { "AIM": true, "DM": true, @@ -302,14 +301,11 @@ }, "randomVariables": [ ], - "remoteAppDir": "/Users/fmckenna/NHERI/R2DTool/build/R2D.app/Contents/MacOS", - "runDir": "/Users/fmckenna/Documents/R2D/LocalWorkDir", "runType": "runningLocal", "type": "Earthquake", "units": { "force": "lb", "length": "inch", "time": "sec" - }, - "workingDir": "/Users/fmckenna/Documents/R2D/LocalWorkDir" + } } diff --git a/E13HurricaneSurge/input.json b/E13HurricaneSurge/input.json index b7c8222..ad8aad9 100644 --- a/E13HurricaneSurge/input.json +++ b/E13HurricaneSurge/input.json @@ -27,7 +27,7 @@ }, "DL": { "Buildings": { - "Application": "pelicun", + "Application": "Pelicun3", "ApplicationData": { "DL_Method": "HAZUS MH HU", "Realizations": 5000, diff --git a/E1BasicHAZUS/input.json b/E1BasicHAZUS/input.json index b05da83..8aa0849 100644 --- a/E1BasicHAZUS/input.json +++ b/E1BasicHAZUS/input.json @@ -147,5 +147,5 @@ "force": "kips", "length": "ft", "time": "sec" - }, + } } diff --git a/E2MDOFBuildingResponse/input.json b/E2MDOFBuildingResponse/input.json index 6f210a7..551b3b1 100644 --- a/E2MDOFBuildingResponse/input.json +++ b/E2MDOFBuildingResponse/input.json @@ -177,5 +177,5 @@ "force": "kips", "length": "ft", "time": "sec" - }, + } } diff --git a/E7HurricaneWindWater/input.json b/E7HurricaneWindWater/input.json index 317e972..d25b268 100644 --- a/E7HurricaneWindWater/input.json +++ b/E7HurricaneWindWater/input.json @@ -135,7 +135,6 @@ "water": false }, "commonFileDir": "input_data", - "localAppDir": "/Users/adamzs/SimCenter", "outputs": { "AIM": false, "DM": true, @@ -145,14 +144,10 @@ }, "randomVariables": [ ], - "remoteAppDir": "/Users/adamzs/SimCenter", - "runDir": "/Users/adamzs/Documents/R2D/LocalWorkDir", - "runType": "runningLocal", "type": "Earthquake", "units": { "force": "kips", "length": "ft", "time": "sec" - }, - "workingDir": "/Users/adamzs/Documents/R2D/LocalWorkDir" + } } diff --git a/E9Tsunami/input.json b/E9Tsunami/input.json index 5d3f034..f6b94dd 100644 --- a/E9Tsunami/input.json +++ b/E9Tsunami/input.json @@ -159,5 +159,5 @@ "force": "N", "length": "m", "time": "sec" - }, + } }