From 77ac08603007d8cc782f588bae041eac5caf07d6 Mon Sep 17 00:00:00 2001 From: fmckenna Date: Thu, 29 Sep 2022 22:34:47 -0700 Subject: [PATCH] fmk - changing key UQ_Method to UQ in example inputs --- Examples/qfem-0001/src/input.json | 2 +- Examples/qfem-0002/src/input.json | 2 +- Examples/qfem-0003/src/input.json | 2 +- Examples/qfem-0004/src/input.json | 2 +- Examples/qfem-0005/src/input.json | 2 +- Examples/qfem-0006/src/input.json | 2 +- Examples/qfem-0007/src/input.json | 2 +- Examples/qfem-0008/src/input.json | 2 +- Examples/qfem-0009/src/input.json | 2 +- Examples/qfem-0010/src/input.json | 2 +- Examples/qfem-0014/src/input.json | 2 +- Examples/qfem-0015/src/input.json | 2 +- Examples/qfem-0016/src/input.json | 2 +- Examples/qfem-0017/src/input.json | 2 +- Examples/qfem-0017/src/scInput.json | 2 +- Examples/qfem-0018/src/input.json | 2 +- Examples/qfem-0019/src/input.json | 2 +- Examples/qfem-0020/src/templatedir/HeirBayesRunner.py | 4 ++-- Examples/qfem-0020/src/templatedir/HierBayesRunner.py | 4 ++-- Examples/qfem-0020/src/templatedir/scInput.json | 2 +- Examples/qfem-0021/src/input.json | 2 +- Examples/qfem-0022/src/input.json | 2 +- Examples/qfem-0023/src/input.json | 2 +- 23 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Examples/qfem-0001/src/input.json b/Examples/qfem-0001/src/input.json index 46b3b49a..b48759a9 100644 --- a/Examples/qfem-0001/src/input.json +++ b/Examples/qfem-0001/src/input.json @@ -1,5 +1,5 @@ { - "UQ_Method": { + "UQ": { "samplingMethodData": { "method": "LHS", "samples": 50, diff --git a/Examples/qfem-0002/src/input.json b/Examples/qfem-0002/src/input.json index 5913828b..d4cfb546 100644 --- a/Examples/qfem-0002/src/input.json +++ b/Examples/qfem-0002/src/input.json @@ -1,7 +1,7 @@ { "FEM": { }, - "UQ_Method": { + "UQ": { "samplingMethodData": { "method": "LHS", "samples": 200, diff --git a/Examples/qfem-0003/src/input.json b/Examples/qfem-0003/src/input.json index d1d66fe7..7e2ee8ed 100644 --- a/Examples/qfem-0003/src/input.json +++ b/Examples/qfem-0003/src/input.json @@ -1,5 +1,5 @@ { - "UQ_Method": { + "UQ": { "reliabilityMethodData": { "integrationMethod": "Second Order", "levelType": "Probability Levels", diff --git a/Examples/qfem-0004/src/input.json b/Examples/qfem-0004/src/input.json index 7f85cb1e..5f3e5d48 100644 --- a/Examples/qfem-0004/src/input.json +++ b/Examples/qfem-0004/src/input.json @@ -1,5 +1,5 @@ { - "UQ_Method": { + "UQ": { "samplingMethodData": { "method": "LHS", "samples": 1000, diff --git a/Examples/qfem-0005/src/input.json b/Examples/qfem-0005/src/input.json index cc29276a..4a9d4365 100644 --- a/Examples/qfem-0005/src/input.json +++ b/Examples/qfem-0005/src/input.json @@ -1,5 +1,5 @@ { - "UQ_Method": { + "UQ": { "samplingMethodData": { "method": "LHS", "samples": 200, diff --git a/Examples/qfem-0006/src/input.json b/Examples/qfem-0006/src/input.json index 905c56c9..5c51c5d2 100644 --- a/Examples/qfem-0006/src/input.json +++ b/Examples/qfem-0006/src/input.json @@ -1,5 +1,5 @@ { - "UQ_Method": { + "UQ": { "calibrationMethodData": { "calibrationDataFile": "{Current_Dir}/minimumValue.txt", "convergenceTol": 1e-10, diff --git a/Examples/qfem-0007/src/input.json b/Examples/qfem-0007/src/input.json index eaae8138..105469f2 100644 --- a/Examples/qfem-0007/src/input.json +++ b/Examples/qfem-0007/src/input.json @@ -1,5 +1,5 @@ { - "UQ_Method": { + "UQ": { "calibrationMethodData": { "convergenceTol": 1e-10, "factors": "", diff --git a/Examples/qfem-0008/src/input.json b/Examples/qfem-0008/src/input.json index aed8713d..71aa7e86 100644 --- a/Examples/qfem-0008/src/input.json +++ b/Examples/qfem-0008/src/input.json @@ -1,5 +1,5 @@ { - "UQ_Method": { + "UQ": { "bayesianCalibrationMethodData": { "burnInSamples": 0, "calibrationDataFile": "{Current_Dir}/eigData.csv", diff --git a/Examples/qfem-0009/src/input.json b/Examples/qfem-0009/src/input.json index 8c180b85..e9b3d566 100644 --- a/Examples/qfem-0009/src/input.json +++ b/Examples/qfem-0009/src/input.json @@ -23,7 +23,7 @@ "name": "Node_2_Disp_2" } ], - "UQ_Method": { + "UQ": { "samplingMethodData": { "method": "Monte Carlo", "samples": 500, diff --git a/Examples/qfem-0010/src/input.json b/Examples/qfem-0010/src/input.json index f0115713..53f5e0de 100644 --- a/Examples/qfem-0010/src/input.json +++ b/Examples/qfem-0010/src/input.json @@ -1,5 +1,5 @@ { - "UQ_Method": { + "UQ": { "samplingMethodData": { "method": "LHS", "samples": 200, diff --git a/Examples/qfem-0014/src/input.json b/Examples/qfem-0014/src/input.json index ece52e90..157718c8 100644 --- a/Examples/qfem-0014/src/input.json +++ b/Examples/qfem-0014/src/input.json @@ -25,7 +25,7 @@ "type": "scalar" } ], - "UQ_Method": { + "UQ": { "calDataFile": "eigData.csv", "calDataFilePath": "{Current_Dir}/.", "logLikelihoodFile": "", diff --git a/Examples/qfem-0015/src/input.json b/Examples/qfem-0015/src/input.json index fb77941a..513bcb9f 100644 --- a/Examples/qfem-0015/src/input.json +++ b/Examples/qfem-0015/src/input.json @@ -30,7 +30,7 @@ ], "FEM": { }, - "UQ_Method": { + "UQ": { "surrogateMethodInfo": { "DoEmethod": "None", "accuracyLimit": 0.02, diff --git a/Examples/qfem-0016/src/input.json b/Examples/qfem-0016/src/input.json index 0842a40b..d168d9c8 100644 --- a/Examples/qfem-0016/src/input.json +++ b/Examples/qfem-0016/src/input.json @@ -29,7 +29,7 @@ ], "FEM": { }, - "UQ_Method": { + "UQ": { "surrogateMethodInfo": { "DoEmethod": "None", "accuracyLimit": 0.02, diff --git a/Examples/qfem-0017/src/input.json b/Examples/qfem-0017/src/input.json index c883743d..7a33ed40 100644 --- a/Examples/qfem-0017/src/input.json +++ b/Examples/qfem-0017/src/input.json @@ -11,7 +11,7 @@ "name": "Node_3_Disp_2" } ], - "UQ_Method": { + "UQ": { "Config File": "{Current_Dir}/UQpySimpleExample.json", "Parameters": [ { diff --git a/Examples/qfem-0017/src/scInput.json b/Examples/qfem-0017/src/scInput.json index bd3ef530..35503e8e 100644 --- a/Examples/qfem-0017/src/scInput.json +++ b/Examples/qfem-0017/src/scInput.json @@ -24,7 +24,7 @@ ], "FEM": { }, - "UQ_Method": { + "UQ": { "Config File": "{Current_Dir}/UQpySimpleExample.json", "Parameters": [ { diff --git a/Examples/qfem-0018/src/input.json b/Examples/qfem-0018/src/input.json index 3e6b1803..47f10e22 100644 --- a/Examples/qfem-0018/src/input.json +++ b/Examples/qfem-0018/src/input.json @@ -22,7 +22,7 @@ ], "FEM":{ }, - "UQ_Method": { + "UQ": { "calibrationMethodData": { "calibrationDataFile": "{Current_Dir}/calDataField.csv", "convergenceTol": 0.0001, diff --git a/Examples/qfem-0019/src/input.json b/Examples/qfem-0019/src/input.json index fa35ca1c..6e302b9b 100644 --- a/Examples/qfem-0019/src/input.json +++ b/Examples/qfem-0019/src/input.json @@ -20,7 +20,7 @@ "type": "field" } ], - "UQ_Method": { + "UQ": { "calDataFile": "calDataField.csv", "calDataFilePath": "{Current_Dir}/.", "logLikelihoodFile": "", diff --git a/Examples/qfem-0020/src/templatedir/HeirBayesRunner.py b/Examples/qfem-0020/src/templatedir/HeirBayesRunner.py index 72016941..387565ea 100644 --- a/Examples/qfem-0020/src/templatedir/HeirBayesRunner.py +++ b/Examples/qfem-0020/src/templatedir/HeirBayesRunner.py @@ -205,7 +205,7 @@ def getUQData(self): input_data = json.load(f) self.ApplicationData = input_data["Applications"] - self.uqData = input_data["UQ_Method"] + self.uqData = input_data["UQ"] self.simulationData = self.ApplicationData["FEM"] self.randomVarsData = input_data["randomVariables"] self.demandParams = input_data["EDP"] @@ -237,4 +237,4 @@ def main(): if __name__ == "__main__": - main() \ No newline at end of file + main() diff --git a/Examples/qfem-0020/src/templatedir/HierBayesRunner.py b/Examples/qfem-0020/src/templatedir/HierBayesRunner.py index 8903700c..b0bcd538 100644 --- a/Examples/qfem-0020/src/templatedir/HierBayesRunner.py +++ b/Examples/qfem-0020/src/templatedir/HierBayesRunner.py @@ -205,7 +205,7 @@ def getUQData(self): input_data = json.load(f) self.ApplicationData = input_data["Applications"] - self.uqData = input_data["UQ_Method"] + self.uqData = input_data["UQ"] self.simulationData = self.ApplicationData["FEM"] self.randomVarsData = input_data["randomVariables"] self.demandParams = input_data["EDP"] @@ -237,4 +237,4 @@ def main(): if __name__ == "__main__": - main() \ No newline at end of file + main() diff --git a/Examples/qfem-0020/src/templatedir/scInput.json b/Examples/qfem-0020/src/templatedir/scInput.json index a50825f0..0615f8b7 100644 --- a/Examples/qfem-0020/src/templatedir/scInput.json +++ b/Examples/qfem-0020/src/templatedir/scInput.json @@ -25,7 +25,7 @@ ], "FEM": { }, - "UQ_Method": { + "UQ": { "Config File": "{Current_Dir}/ConfigHierBayes.json", "Parameters": [ { diff --git a/Examples/qfem-0021/src/input.json b/Examples/qfem-0021/src/input.json index 8d06a6a2..589ddb70 100644 --- a/Examples/qfem-0021/src/input.json +++ b/Examples/qfem-0021/src/input.json @@ -23,7 +23,7 @@ ], "FEM": { }, - "UQ_Method": { + "UQ": { "surrogateMethodInfo": { "DoEmethod": "IMSEw", "accuracyLimit": 0.02, diff --git a/Examples/qfem-0022/src/input.json b/Examples/qfem-0022/src/input.json index 9fbff059..ec88f5af 100644 --- a/Examples/qfem-0022/src/input.json +++ b/Examples/qfem-0022/src/input.json @@ -30,7 +30,7 @@ ], "FEM": { }, - "UQ_Method": { + "UQ": { "surrogateMethodInfo": { "advancedOpt": false, "inpFile": "PLoM_variables.csv", diff --git a/Examples/qfem-0023/src/input.json b/Examples/qfem-0023/src/input.json index d0b67b76..cd2cdb96 100644 --- a/Examples/qfem-0023/src/input.json +++ b/Examples/qfem-0023/src/input.json @@ -23,7 +23,7 @@ ], "FEM": { }, - "UQ_Method": { + "UQ": { "PCAvarianceRatio": 0.99, "RVdataGroup": "", "RVsensitivityGroup": "",