fmk - updating backend to use UQ and not UQ_Method

fmckenna · fmckenna · commit 64ec50c9cd85 · 2022-09-30T12:24:28.000-07:00
diff --git a/modules/createEDP/standardWindEDP/input.json b/modules/createEDP/standardWindEDP/input.json
@@ -100,7 +100,7 @@
         "type": "MDOF_BuildingModel",
         "weight": 144
     },
-    "UQ_Method": {
+    "UQ": {
         "samplingMethodData": {
             "method": "LHS",
             "samples": 10,
diff --git a/modules/createEVENT/DEDM_HRP/dakota.json b/modules/createEVENT/DEDM_HRP/dakota.json
@@ -94,7 +94,7 @@
         "type": "MDOF_BuildingModel",
         "weight": "RV.weigh"
     },
-    "UQ_Method": {
+    "UQ": {
         "samplingMethodData": {
             "evalID": "RV.DAKOTA_EVAL_ID",
             "method": "LHS",
diff --git a/modules/createEVENT/DEDM_HRP/testInput.json b/modules/createEVENT/DEDM_HRP/testInput.json
@@ -100,7 +100,7 @@
         "type": "MDOF_BuildingModel",
         "weight": 144
     },
-    "UQ_Method": {
+    "UQ": {
         "samplingMethodData": {
             "method": "LHS",
             "samples": 10,
diff --git a/modules/createEVENT/NonisolatedLowRiseTPU/dakota.json b/modules/createEVENT/NonisolatedLowRiseTPU/dakota.json
@@ -110,7 +110,7 @@
         "type": "MDOF_BuildingModel",
         "weight": "RV.wF"
     },
-    "UQ_Method": {
+    "UQ": {
         "samplingMethodData": {
             "method": "LHS",
             "samples": 20,
diff --git a/modules/createEVENT/groundMotionIM/IntensityMeasureComputer.py b/modules/createEVENT/groundMotionIM/IntensityMeasureComputer.py
@@ -548,8 +548,8 @@ def main(BIM_file, EVENT_file, IM_file, unitScaled, ampScaled):
     bim_im = bim_file.get('IntensityMeasure', None)
     output_periods = []
     if bim_im is None:
-        # search it again under UQ_Method/surrogateMethodInfo
-        bim_im = bim_file['UQ_Method']['surrogateMethodInfo'].get('IntensityMeasure',None)
+        # search it again under UQ/surrogateMethodInfo
+        bim_im = bim_file['UQ']['surrogateMethodInfo'].get('IntensityMeasure',None)
     if bim_im is None or len(bim_im)==0:
         # no intensity measure calculation requested
         return
diff --git a/modules/createEVENT/windTunnelExperiment/testInput.json b/modules/createEVENT/windTunnelExperiment/testInput.json
@@ -93,7 +93,7 @@
         "type": "MDOF_BuildingModel",
         "weight": 144
     },
-    "UQ_Method": {
+    "UQ": {
         "samplingMethodData": {
             "evalID": "RV.DAKOTA_EVAL_ID",
             "method": "LHS",
diff --git a/modules/performUQ/SimCenterUQ/SimCenterUQ.py b/modules/performUQ/SimCenterUQ/SimCenterUQ.py
@@ -71,7 +71,7 @@ def main(args):
         with open(inputFile) as data_file:    
             data = json.load(data_file)
 
-        uq_data = data["UQ_Method"]
+        uq_data = data["UQ"]
 
         myScriptDir = os.path.dirname(os.path.realpath(__file__))
 
diff --git a/modules/performUQ/SimCenterUQ/nataf_gsa/CMakeLists.txt b/modules/performUQ/SimCenterUQ/nataf_gsa/CMakeLists.txt
@@ -111,11 +111,9 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
 		add_compile_definitions(OPENMP_RUN)
 	endif() 
 
-	install(TARGETS nataf_gsa DESTINATION bin)
+	install(TARGETS nataf_gsa DESTINATION ../..)
 	add_compile_definitions($<$<CONFIG:Debug>:_ITERATOR_DEBUG_LEVEL=0>)
 
-
-
 else()
 
 	ADD_DEFINITIONS("-DBOOST_ALL_NO_LIB")
@@ -236,4 +234,4 @@ else()
 
 	install(TARGETS nataf_gsa DESTINATION bin)
 	
-endif()
+endif()
diff --git a/modules/performUQ/SimCenterUQ/nataf_gsa/ERANataf.h b/modules/performUQ/SimCenterUQ/nataf_gsa/ERANataf.h
@@ -108,7 +108,7 @@ class ERANataf
 						string workflowDriver,
 						string osType,
 						string runType);
-	void ERANataf::simulateAppBatchSurrogate(string workflowDriver,
+	void simulateAppBatchSurrogate(string workflowDriver,
 						string osType,
 						string runType,
 						jsonInput inp,
diff --git a/modules/performUQ/SimCenterUQ/nataf_gsa/jsonInput.cpp b/modules/performUQ/SimCenterUQ/nataf_gsa/jsonInput.cpp
@@ -77,8 +77,8 @@ jsonInput::jsonInput(string workDir, string inpFile, int procno)
 	// Check if I am the correct engine.
 	//
 
-	uqType = UQjson["UQ_Method"]["uqType"];
-	std::string uqEngine = UQjson["UQ_Method"]["uqEngine"];
+	uqType = UQjson["UQ"]["uqType"];
+	std::string uqEngine = UQjson["UQ"]["uqEngine"];
 
 	if ((uqEngine.compare("SimCenterUQ")==0)) {
 		// pass
@@ -96,7 +96,7 @@ jsonInput::jsonInput(string workDir, string inpFile, int procno)
 	} else
 	{
 		//*ERROR*
-		std::string methodType = UQjson["UQ_Method"]["uqType"];
+		std::string methodType = UQjson["UQ"]["uqType"];
 		std::string errMsg = "Error reading json: 'Forward Analysis' or 'Sensitivity Analysis' backend is called, but the user requested " + methodType;
 		theErrorFile.write(errMsg);
 	}
@@ -158,9 +158,9 @@ jsonInput::jsonInput(string workDir, string inpFile, int procno)
 		performPCA = false;
 	}
 
-	if (UQjson["UQ_Method"].find("performPCA") != UQjson["UQ_Method"].end()) {
+	if (UQjson["UQ"].find("performPCA") != UQjson["UQ"].end()) {
 
-		std::string PCAoption = UQjson["UQ_Method"]["performPCA"];
+		std::string PCAoption = UQjson["UQ"]["performPCA"];
 		if ((PCAoption.compare("Yes") == 0)) {
 			performPCA = true;
 		}
@@ -170,8 +170,8 @@ jsonInput::jsonInput(string workDir, string inpFile, int procno)
 	}
 
 	if (performPCA && (uqType.compare("Sensitivity Analysis") == 0)) {
-		if (UQjson["UQ_Method"].find("PCAvarianceRatio") != UQjson["UQ_Method"].end()) {
-			PCAvarRatioThres = UQjson["UQ_Method"]["PCAvarianceRatio"];
+		if (UQjson["UQ"].find("PCAvarianceRatio") != UQjson["UQ"].end()) {
+			PCAvarRatioThres = UQjson["UQ"]["PCAvarianceRatio"];
 			if (PCAvarRatioThres <= 0) {
 				std::string errMsg = "Error reading input: PCA variance ratio should be greater than zero.";
 				theErrorFile.write(errMsg);
@@ -200,7 +200,7 @@ jsonInput::jsonInput(string workDir, string inpFile, int procno)
 	// Basic Info
 	//
 
-	UQmethod = UQjson["UQ_Method"]["samplingMethodData"]["method"];
+	UQmethod = UQjson["UQ"]["samplingMethodData"]["method"];
 
 
 	//
@@ -216,13 +216,13 @@ jsonInput::jsonInput(string workDir, string inpFile, int procno)
 			nrv++;
 			rvNames.push_back(elem["name"]);
 		}
-		inpPath = UQjson["UQ_Method"]["samplingMethodData"]["inpFile"];
-		outPath = UQjson["UQ_Method"]["samplingMethodData"]["outFile"];
+		inpPath = UQjson["UQ"]["samplingMethodData"]["inpFile"];
+		outPath = UQjson["UQ"]["samplingMethodData"]["outFile"];
 
 		getGroupIdx(UQjson);		
 
-		inpFileType = UQjson["UQ_Method"]["samplingMethodData"]["inpFiletype"];		
-		outFileType = UQjson["UQ_Method"]["samplingMethodData"]["outFiletype"];
+		inpFileType = UQjson["UQ"]["samplingMethodData"]["inpFiletype"];		
+		outFileType = UQjson["UQ"]["samplingMethodData"]["outFiletype"];
 
 		nmc = 0;
 		rseed = 0;
@@ -234,8 +234,8 @@ jsonInput::jsonInput(string workDir, string inpFile, int procno)
 	else {
 		inpPath = "";
 		outPath = "";
-		nmc = UQjson["UQ_Method"]["samplingMethodData"]["samples"];
-		rseed = UQjson["UQ_Method"]["samplingMethodData"]["seed"];
+		nmc = UQjson["UQ"]["samplingMethodData"]["samples"];
+		rseed = UQjson["UQ"]["samplingMethodData"]["seed"];
 
 		if (procno == 0)  std::cout << " Nope we do sampling\n";
 
@@ -255,14 +255,14 @@ jsonInput::jsonInput(string workDir, string inpFile, int procno)
 	nre = 0;
 
 	std::string resampGroupTxt;
-	if (UQjson["UQ_Method"]["samplingMethodData"].find("RVdataGroup") != UQjson["UQ_Method"]["samplingMethodData"].end()) {
+	if (UQjson["UQ"]["samplingMethodData"].find("RVdataGroup") != UQjson["UQ"]["samplingMethodData"].end()) {
 		// if the key "sensitivityGroups" exists
-		resampGroupTxt = UQjson["UQ_Method"]["samplingMethodData"]["RVdataGroup"];
+		resampGroupTxt = UQjson["UQ"]["samplingMethodData"]["RVdataGroup"];
 		resampGroupTxt.erase(remove(resampGroupTxt.begin(), resampGroupTxt.end(), ' '), resampGroupTxt.end());
 	}
-	else if (UQjson["UQ_Method"].find("RVdataGroup") != UQjson["UQ_Method"].end()) {
+	else if (UQjson["UQ"].find("RVdataGroup") != UQjson["UQ"].end()) {
 		// FOR VERSION COMPETIBILITY - TO BE REMOVED SOON.... sy 08/12/2022
-		resampGroupTxt = UQjson["UQ_Method"]["RVdataGroup"];
+		resampGroupTxt = UQjson["UQ"]["RVdataGroup"];
 		resampGroupTxt.erase(remove(resampGroupTxt.begin(), resampGroupTxt.end(), ' '), resampGroupTxt.end());
 	}
 	else {
@@ -852,10 +852,10 @@ jsonInput::getGroupIdx(json UQjson) {
 	//
 
 	bool generate_default_RVsensitivityGroup = true;
-	if (UQjson["UQ_Method"].find("RVsensitivityGroup") != UQjson["UQ_Method"].end()) {
+	if (UQjson["UQ"].find("RVsensitivityGroup") != UQjson["UQ"].end()) {
 
 		// if the key "sensitivityGroups" exists
-		std::string groupTxt = UQjson["UQ_Method"]["RVsensitivityGroup"];
+		std::string groupTxt = UQjson["UQ"]["RVsensitivityGroup"];
 		if (!groupTxt.empty()) {
 			// if value of "sensitivityGroups" is nonempty
 			groupTxt.erase(remove(groupTxt.begin(), groupTxt.end(), ' '), groupTxt.end()); // remove any white spaces
@@ -878,4 +878,4 @@ jsonInput::getGroupIdx(json UQjson) {
 	}
 
 	ngr = groups.size();
-}
+}
diff --git a/modules/performUQ/SimCenterUQ/runPLoM.py b/modules/performUQ/SimCenterUQ/runPLoM.py
@@ -100,7 +100,7 @@ def __init__(self, work_dir, run_type, os_type, job_config, errlog, input_file,
         # self.x_dim, self.y_dim, self.rv_name, self.g_name = self._create_variables(job_config)
 
         # read PLoM parameters
-        surrogateInfo = job_config["UQ_Method"]["surrogateMethodInfo"]
+        surrogateInfo = job_config["UQ"]["surrogateMethodInfo"]
         if self._parse_plom_parameters(surrogateInfo):
             msg = 'runPLoM.__init__: Error in reading PLoM parameters.'
             self.errlog.exit(msg)
@@ -192,15 +192,15 @@ def _run_simulation(self):
         ## KZ modified 0331
         with open(self.input_file,'r') as f:
             tmp = json.load(f)
-        tmp['UQ_Method']['uqType'] = 'Forward Propagation'
-        tmp['UQ_Method']['parallelExecution'] = True
-        samplingObj = tmp['UQ_Method']['surrogateMethodInfo']['samplingMethod']
-        tmp['UQ_Method']['samplingMethodData']=dict()
+        tmp['UQ']['uqType'] = 'Forward Propagation'
+        tmp['UQ']['parallelExecution'] = True
+        samplingObj = tmp['UQ']['surrogateMethodInfo']['samplingMethod']
+        tmp['UQ']['samplingMethodData']=dict()
         ## KZ modified 0331
-        tmp['UQ_Method']['uqEngine'] = 'Dakota'
+        tmp['UQ']['uqEngine'] = 'Dakota'
         tmp['Applications']['UQ']['Application'] = 'Dakota-UQ'
         for key, item in samplingObj.items():
-            tmp['UQ_Method']['samplingMethodData'][key] = item
+            tmp['UQ']['samplingMethodData'][key] = item
         with open('sc_dakota_plom.json','w') as f:
             json.dump(tmp, f, indent=2)
 
@@ -788,8 +788,8 @@ def build_surrogate(work_dir, os_type, run_type, input_file, workflow_driver):
     f.close()
 
     # check the uq type
-    if job_config['UQ_Method']['uqType'] != 'PLoM Model':
-        msg = 'UQ type inconsistency : user wanted <' + job_config['UQ_Method']['uqType'] + \
+    if job_config['UQ']['uqType'] != 'PLoM Model':
+        msg = 'UQ type inconsistency : user wanted <' + job_config['UQ']['uqType'] + \
             '> but called <PLoM Model> program'
         errlog.exit(msg)
 
@@ -829,4 +829,4 @@ def build_surrogate(work_dir, os_type, run_type, input_file, workflow_driver):
     # workflowDriver
     workflow_driver = inputArgs[3]
     # start build the surrogate
-    build_surrogate(work_dir, os_type, run_type, input_file, workflow_driver)    
+    build_surrogate(work_dir, os_type, run_type, input_file, workflow_driver)    
diff --git a/modules/performUQ/SimCenterUQ/surrogateBuild.py b/modules/performUQ/SimCenterUQ/surrogateBuild.py
@@ -110,15 +110,15 @@ def readJson(self):
         except ValueError:
             msg = "invalid json format - dakota.json"
             self.exit(msg)
-        if dakotaJson["UQ_Method"]["uqType"] != "Train GP Surrogate Model":
+        if dakotaJson["UQ"]["uqType"] != "Train GP Surrogate Model":
             msg = (
                     "UQ type inconsistency : user wanted <"
-                    + dakotaJson["UQ_Method"]["uqType"]
+                    + dakotaJson["UQ"]["uqType"]
                     + "> but we called <Global Surrogate Modeling> program"
             )
             self.exit(msg)
 
-        surrogateJson = dakotaJson["UQ_Method"]["surrogateMethodInfo"]
+        surrogateJson = dakotaJson["UQ"]["surrogateMethodInfo"]
 
         if surrogateJson["method"] == "Sampling and Simulation":
             random.seed(surrogateJson["seed"])
diff --git a/modules/performUQ/UCSD_UQ/parseData.py b/modules/performUQ/UCSD_UQ/parseData.py
@@ -36,7 +36,7 @@ def parseDataFunction(dakotaJsonFile, logFile, tmpSimCenterDir, mainscriptDir):
     logFile.write("\n\tParsing the inputs read in from json file")
     applications = jsonInputs["Applications"]
     edpInputs = jsonInputs["EDP"]
-    uqInputs = jsonInputs["UQ_Method"]
+    uqInputs = jsonInputs["UQ"]
     # femInputs = jsonInputs['fem']
     # localAppDirInputs = jsonInputs['localAppDir']
     # pythonInputs = jsonInputs['python']
diff --git a/modules/performUQ/dakota/DakotaFEM.py b/modules/performUQ/dakota/DakotaFEM.py
@@ -92,7 +92,7 @@ def main(args):
 
     if uqData['samples'] is None: # this happens when the uq details are stored at the wrong place in the AIM file
         with open(aimName) as data_file:
-            uq_info = json.load(data_file)['UQ_Method']
+            uq_info = json.load(data_file)['UQ']
 
         if 'samplingMethodData' in uq_info.keys():
             uq_info = uq_info['samplingMethodData']
diff --git a/modules/performUQ/other/HeirBayesRunner.py b/modules/performUQ/other/HeirBayesRunner.py
@@ -197,7 +197,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"]
@@ -232,4 +232,4 @@ def main():
 
 
 if __name__ == "__main__":
-    main()
+    main()
diff --git a/modules/performUQ/other/runOtherUQ.py b/modules/performUQ/other/runOtherUQ.py
@@ -57,7 +57,7 @@ def main():
     applicationsData = inputData["Applications"]
 
     # Get data to pass to UQ driver
-    uqData = inputData["UQ_Method"]
+    uqData = inputData["UQ"]
     simulationData = applicationsData["FEM"]
     randomVarsData = inputData["randomVariables"]
     demandParams = inputData["EDP"]
