Merge branch 'NHERI-SimCenter:master' into master

JustinBonus · web-flow · commit 71d3fc0df88f · 2025-07-24T14:41:35.000-07:00
diff --git a/modules/Workflow/WorkflowApplications.json b/modules/Workflow/WorkflowApplications.json
@@ -438,6 +438,11 @@
         "ExecutablePath": "applications/createEVENT/physicsBasedMotion/PhysicsBasedMotion",
         "ApplicationSpecificInputs": []
       },
+      {
+        "Name": "DRM",
+        "ExecutablePath": "applications/createEVENT/DRM/DRM.py",
+        "ApplicationSpecificInputs": []
+      },      
       {
         "Name": "ExistingPEER_Events",
         "ExecutablePath": "applications/createEVENT/multiplePEER/MultiplePEER",
@@ -737,6 +742,22 @@
           }
         ]
       },
+      {
+        "Name": "FemoraInput",
+        "ExecutablePath": "applications/createSAM/openSeesInput/OpenSeesInput",
+        "ApplicationSpecificInputs": [
+          {
+            "id": "fileName",
+            "type": "string",
+            "description": "Defines the name of the main OpenSees model file."
+          },
+          {
+            "id": "filePath",
+            "type": "string",
+            "description": "Defines the location of the main OpenSees model file."
+          }
+        ]
+      },
       {
         "Name": "CustomPyInput",
         "ExecutablePath": "applications/createSAM/customPyInput/customPyInput.py",
diff --git a/modules/Workflow/whale/main.py b/modules/Workflow/whale/main.py
@@ -987,17 +987,30 @@ def _parse_inputs(self):  # noqa: C901
         log_msg('  OK', prepend_timestamp=False)
 
         # store the specified units (if available)
-        if 'units' in input_data:
+        if 'units' in input_data:   # TODO check for a bug. I think it should be input_data["GeneralInformation"]
             self.units = input_data['units']
 
             log_msg('The following units were specified: ', prepend_timestamp=False)
             for key, unit in self.units.items():
                 log_msg(f'  {key}: {unit}', prepend_timestamp=False)
         else:
-            self.units = None
-            log_msg(
-                'No units specified; using Standard units.', prepend_timestamp=False
-            )
+            # check  the general info for units
+            general_info = input_data.get('GeneralInformation', None)
+            if general_info:
+                self.units = general_info.get('units', None)
+                if self.units :
+                    log_msg(
+                        'The following units were specified in the GeneralInformation section: ',  
+                        prepend_timestamp=False
+                    )
+                    for key, unit in self.units.items():
+                        log_msg(f'  {key}: {unit}', prepend_timestamp=False)
+            else:
+                # if no units were specified, use the standard units
+                self.units = None
+                log_msg(
+                    'No units specified; using Standard units.', prepend_timestamp=False
+                )
 
         # store the specified output types
         self.output_types = input_data.get('outputs', None)
diff --git a/modules/createEVENT/CMakeLists.txt b/modules/createEVENT/CMakeLists.txt
@@ -31,4 +31,5 @@ add_subdirectory(stochasticWave)
 add_subdirectory(TaichiEvent)
 add_subdirectory(Celeris)
 add_subdirectory(shakeMapEvent)
+add_subdirectory(DRM)
 
diff --git a/modules/createEVENT/DRM/CMakeLists.txt b/modules/createEVENT/DRM/CMakeLists.txt
@@ -0,0 +1,3 @@
+#Python scripts for pre and post-processing
+simcenter_add_python_script(SCRIPT DRM.py)
+
diff --git a/modules/createEVENT/DRM/DRM.py b/modules/createEVENT/DRM/DRM.py
@@ -0,0 +1,65 @@
+import json
+import sys 
+import h5py
+
+def main(args):  
+    srtName = args[2]  
+    evtName = args[4]
+
+    # nothing to do with the random variables for now
+
+    with open(srtName, encoding='utf-8') as json_file: 
+        data = json.load(json_file)
+
+
+    if "--getRV" in args:
+        preprocessing = True
+
+
+        
+    # create the event json file
+    event_data = {
+        "randomVariables": [],
+        "Events" : []
+    }
+    # right now the drm only supports one event so the randomVariables should be empty
+
+    for i, event in enumerate(data["Events"][0]["Events"]):
+        dt = event.get("dT", -1)
+        numStep = event.get("numSteps", -1)
+        if dt < 0 or numStep < 0:
+            if data["Events"][0]["system"] == "local":
+                # reading the dt from the hdf5 file
+                with h5py.File(event["filePath"], 'r') as f:
+                    if dt < 0:
+                        dt = f["DRM_Metadata"]["dt"][()]
+                    if numStep < 0:
+                        tstart = f["DRM_Metadata"]["tstart"][()]
+                        tend = f["DRM_Metadata"]["tend"][()]
+                        numStep = int((tend - tstart) / dt)
+        # update the event with the dt and numStep
+        event["dT"] = dt
+        event["numSteps"] = numStep
+        event_data["Events"].append(event)
+        event_data["Events"][i]["index"] = i
+        event_data["Events"][i]["type"] = "DRM"
+        event_data["Events"][i]["system"] = data["Events"][0]["system"]
+        if event_data["Events"][i]["system"] == "predefined-designsafe":
+            path = event_data["Events"][i]["filePath"]
+            path = path.split("/")
+            path = "../../"+ path[-1]
+            event_data["Events"][i]["filePath"] = path
+            
+        
+
+
+
+    # create the event json file
+    with open(evtName, 'w', encoding='utf-8') as outfile:
+        json.dump(event_data, outfile, indent=2, ensure_ascii=False)
+
+
+
+if __name__ == "__main__":
+    main(sys.argv)
+    
diff --git a/modules/createSAM/openSeesInput/OpenSeesInput.c b/modules/createSAM/openSeesInput/OpenSeesInput.c
@@ -157,7 +157,22 @@ main(int argc, char **argv) {
     if (ndf != NULL)
       json_object_set(rootSAM,"ndf", ndf);
 
-    
+    json_t *inputType = json_object_get(theSIM, "type");
+    if (inputType != NULL) {
+      json_object_set(rootSAM,"subType", inputType);
+    }
+    json_t *useDamping = json_object_get(theSIM, "useDamping");
+    if (useDamping != NULL) {
+      json_object_set(rootSAM,"useDamping", useDamping);
+    }
+    json_t *numCoresPerModel = json_object_get(theSIM, "numCores");
+    if (numCoresPerModel != NULL) {
+      json_object_set(rootSAM,"coresPerModel", numCoresPerModel);
+    } else {
+      json_object_set(rootSAM,"coresPerModel", json_integer(1));
+    }
+
+
     json_t *theRVs = json_object_get(theSIM,"randomVar");
 
     // check nodes exists
diff --git a/modules/performSIMULATION/openSees/OpenSeesPreprocessor.cpp b/modules/performSIMULATION/openSees/OpenSeesPreprocessor.cpp
@@ -241,7 +241,8 @@ OpenSeesPreprocessor::processSections(ofstream &s) {
 }
 
 int 
-OpenSeesPreprocessor::processNodes(ofstream &s){
+OpenSeesPreprocessor::processNodes(ofstream &s)
+{
 
   int index;
   json_t *node;
@@ -325,7 +326,8 @@ OpenSeesPreprocessor::processNodes(ofstream &s){
 }
 
 int 
-OpenSeesPreprocessor::processElements(ofstream &s){
+OpenSeesPreprocessor::processElements(ofstream &s)
+{
 
   int index;
   json_t *element;
@@ -434,12 +436,21 @@ OpenSeesPreprocessor::processDamping(ofstream &s){
 */
 
 int
-OpenSeesPreprocessor::processDamping(ofstream &s){
+OpenSeesPreprocessor::processDamping(ofstream &s) {
 
   //
   // determine dampingRatio .. should be in SAM, use SIM if not there
   //
-  
+  json_t *useDamping = json_object_get(rootSAM,"useDamping");
+  if (useDamping != NULL && json_is_true(useDamping) == false) {
+    s << "# Damping not used in this analysis\n";
+    return -1;
+  } else {
+    s << "# Damping used in this analysis\n";
+  }
+
+
+
   // get ratio from SAM, either mainbody or in Properties
   json_t *dampingT = json_object_get(rootSAM,"dampingRatio");
   if (dampingT == NULL) {
@@ -933,17 +944,27 @@ OpenSeesPreprocessor::processEvents(ofstream &s){
 	  s << "analysis " << json_string_value(json_object_get(rootSIM,"analysis")) << "\n";
 
 	
-	processDamping(s);
-
-	
+	int useDamping = processDamping(s);
+
+	if (useDamping == 0) {
+		s  << "set lambda1 [lindex $lambdaN 0]\n"
+		   << "set T1 [expr 2*3.14159/$lambda1]\n"
+		   << "set dTana [expr $T1/20.]\n"
+		   << "if {$dt < $dTana} {set dTana $dt}\n";
+		s << "analyze [expr int($numStep*$dt/$dTana)] $dTana \n";
+		s << "remove recorders \n";
+	}
+	else if (useDamping == -1) {
+	  // damping not used
+	  s << "analyze $numStep $dt \n";
+	  s << "remove recorders \n";
+	} else {
+		// not supported
+		std::cerr << "OpenSeesPreprocessor - damping model not supported.\n";
+		return -1;
+	}
 	
 	//s << "set lambdaN [eigen 1];\n"
-	s  << "set lambda1 [lindex $lambdaN 0]\n"
-	   << "set T1 [expr 2*3.14159/$lambda1]\n"
-	   << "set dTana [expr $T1/20.]\n"
-	   << "if {$dt < $dTana} {set dTana $dt}\n";
-	s << "analyze [expr int($numStep*$dt/$dTana)] $dTana \n";
-	s << "remove recorders \n";
       }
     }
 
@@ -957,7 +978,9 @@ OpenSeesPreprocessor::processEvents(ofstream &s){
 	      edpList.end(); ++itEDP) {
 	  s << " " << *itEDP;
 	}
-	s <<  "]\n puts $output\n }\n call_python \n";
+	s <<  "]\n puts $output\n }";
+  // remove calling python inside tcl since it broke the mpi
+  // "\nset pid [getPID]\nif {$pid==0} {call_python} \nbarrier\n";
 
       } else if(strstr(postprocessingScript, ".tcl") != NULL) {
 	  
@@ -993,6 +1016,63 @@ OpenSeesPreprocessor::processEvent(ofstream &s,
   const char *eventType = json_string_value(json_object_get(event,"type"));
   //  std::cerr << "Processing Event type: " << eventType << "\n";
 
+    if (strcmp(eventType,"DRM") == 0) {
+      const char *eventName = json_string_value(json_object_get(event,"name"));
+      std::string eventPath = json_string_value(json_object_get(event,"filePath"));
+      double factor = json_number_value(json_object_get(event,"factor"));
+      double crdScale = json_number_value(json_object_get(event,"crd_scale"));
+      double distanceTolerance = json_number_value(json_object_get(event,"distance_tolerance"));
+      int doCoordinateTransformation = json_integer_value(json_object_get(event,"do_coordinate_transformation"));
+      double T00 = json_number_value(json_object_get(event,"T00"));
+      double T01 = json_number_value(json_object_get(event,"T01"));
+      double T02 = json_number_value(json_object_get(event,"T02"));
+      double T10 = json_number_value(json_object_get(event,"T10"));
+      double T11 = json_number_value(json_object_get(event,"T11"));
+      double T12 = json_number_value(json_object_get(event,"T12"));
+      double T20 = json_number_value(json_object_get(event,"T20"));
+      double T21 = json_number_value(json_object_get(event,"T21"));
+      double T22 = json_number_value(json_object_get(event,"T22"));
+      double x00 = json_number_value(json_object_get(event,"x00"));
+      double x01 = json_number_value(json_object_get(event,"x01"));
+      double x02 = json_number_value(json_object_get(event,"x02"));
+      const char *system = json_string_value(json_object_get(event,"system"));
+	  double numSteps = json_integer_value(json_object_get(event,"numSteps"));
+	  double dT = json_number_value(json_object_get(event,"dT"));
+
+
+
+      if (strcmp(system,"Remote") == 0 || 
+          strcmp(system,"remote") == 0 ||
+          strcmp(system,"REMOTE") == 0 ||
+          strcmp(system,"DesignSafe") == 0 ||
+          strcmp(system,"designsafe") == 0 ||
+          strcmp(system,"DESIGNSAFE") == 0) 
+      {
+            // make the eventPath ..
+            eventPath = "../";
+      }
+
+
+      //  print out the DRM event
+      s << "#set maxPatternTag [getMaxPatternTag]\n";
+      s << "set maxPatternTag 1000;\n";
+      s << "set patternTag [expr $maxPatternTag + 1]\n";
+      //  pattern H5DRM $patternTag "/path/to/H5DRM/dataset" $factor $crd_scale $distance_tolerance $do_coordinate_transformation $T00 $T01 $T02 $T10 $T11 $T12 $T20 $T21 $T22 $x00 $x01 $x02
+      s << "pattern H5DRM $patternTag \"" << eventPath << "\"" << " " << factor << " "
+        << crdScale << " " << distanceTolerance << " " << doCoordinateTransformation << " "
+        << T00 << " " << T01 << " " << T02 << " "
+        << T10 << " " << T11 << " " << T12 << " "
+        << T20 << " " << T21 << " " << T22 << " "
+        << x00 << " " << x01 << " " << x02 << "\n";
+        s << "set DRM_NAME \"" << eventName << "\"\n";
+		s << "set  numStep " << numSteps << "\n";
+		s << "set dt " << dT << "\n";
+		analysisType = 1;
+    }
+
+
+
+
   if (strcmp(eventType,"Seismic") == 0 ||
       strcmp(eventType,"Wind") == 0    ||
       strcmp(eventType,"timeHistory") == 0    ||      
diff --git a/modules/performSIMULATION/openSees/OpenSeesSimulation.py b/modules/performSIMULATION/openSees/OpenSeesSimulation.py
diff --git a/modules/performUQ/UCSD_UQ/tmcmcFunctions.py b/modules/performUQ/UCSD_UQ/tmcmcFunctions.py
diff --git a/modules/performUQ/common/adaptive_doe.py b/modules/performUQ/common/adaptive_doe.py

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+#Python scripts for pre and post-processing`
	`2`	`+simcenter_add_python_script(SCRIPT DRM.py)`
	`3`	`+`