Merge pull request #131 from JustinBonus/master

Fix MPM paddle file
NHERI-SimCenter · Dec 6, 2024 · 9958d42 · 9958d42
2 parents aafdbfc + 9ea5f81
commit 9958d42
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/EVENTS/MPM/BoundaryMPM.cpp b/EVENTS/MPM/BoundaryMPM.cpp
@@ -1300,7 +1300,8 @@ BoundaryMPM::outputToJSON(QJsonObject &jsonObject)
       // }
 
       // boundariesObject["file"] = paddleDisplacementFile->getFilename() ; // Paddle motion file
-      boundariesObject["file"] = QString("WaveMaker/") + paddleFile; // Paddle motion file assuming use of Data directory for claymore (TODO: relative paths)
+      // QString("WaveMaker/") + paddleFile; // Paddle motion file assuming use of Data directory for claymore (TODO: relative paths)
+      boundariesObject["file"] = QString("../") + QString("wmdisp_LWF_Unbroken_Amp4_SF500_twm10sec_1200hz_14032023.csv"); 
       boundariesObject["output_frequency"] = 1200.0; // TODO: Either be user set or read-in from motion_file
       boundariesObject["friction_static"] = 0.0;
       boundariesObject["friction_dynamic"] = 0.0;
@@ -1327,7 +1328,9 @@ BoundaryMPM::outputToJSON(QJsonObject &jsonObject)
         paddleTimeArray.append(a->text().toDouble());
         paddleTimeArray.append(b->text().toDouble());
         // boundariesObject["time"] = paddleTimeArray;
-        boundariesObject["file"] = QString(dataDir->text());
+        // boundariesObject["file"] = QString(dataDir->text());
+        boundariesObject["file"] = QString("../") + QString("wmdisp_LWF_Unbroken_Amp4_SF500_twm10sec_1200hz_14032023.csv");
+        boundariesObject["output_frequency"] = 1200.0; // TODO: Either be user set or read-in from motion_file
         boundariesObject["object"] = QString("OSU Paddle");
     }
 

diff --git a/EVENTS/MPM/MPM.cpp b/EVENTS/MPM/MPM.cpp
@@ -1495,12 +1495,18 @@ bool MPM::inputFromJSON(QJsonObject &jsonObject)
 
   // openFoamVersion->setCurrentText(jsonObject["OpenFoamVersion"].toString());
 
-  // mpmSettings->inputFromJSON(jsonObject);
-  // mpmBodies->inputFromJSON(jsonObject);
-  // mpmBoundaries->inputFromJSON(jsonObject);
-  // mpmSensors->inputFromJSON(jsonObject);
-  // mpmOutputs->inputFromJSON(jsonObject);
-  // mpmResults->inputFromJSON(jsonObject);
+    if (mpmSettings)
+      mpmSettings->inputFromJSON(jsonObject);
+    if (mpmBodies)
+      mpmBodies->inputFromJSON(jsonObject);
+    if (mpmBoundaries)
+      mpmBoundaries->inputFromJSON(jsonObject);
+    if (mpmSensors)
+      mpmSensors->inputFromJSON(jsonObject);
+    if (mpmOutputs)
+      mpmOutputs->inputFromJSON(jsonObject);
+    if (mpmResults) 
+      mpmResults->inputFromJSON(jsonObject);
 
   this->showVisualization();
   return true;

diff --git a/WorkflowAppHydroUQ.cpp b/WorkflowAppHydroUQ.cpp
@@ -260,7 +260,7 @@ WorkflowAppHydroUQ::WorkflowAppHydroUQ(RemoteService *theService, QWidget *paren
 }
 
 // Development mode for tools
-constexpr bool DEV_MODE = true; // Set to true for development mode, false for production mode
+constexpr bool DEV_MODE = false; // Set to true for development mode, false for production mode
 
 // Quickly enable/disable tools here for compile-time
 constexpr bool USE_CLAYMORE_TOOL = true;