Merge pull request #156 from abiyfantaye/master

Made all CFD events use OpenFOAM-10
NHERI-SimCenter · May 29, 2024 · eb56d4e · eb56d4e
2 parents b921d34 + c6e2348
commit eb56d4e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/EVENTS/EmptyDomainCFD/EmptyDomainCFD.cpp b/EVENTS/EmptyDomainCFD/EmptyDomainCFD.cpp
@@ -192,7 +192,7 @@ bool EmptyDomainCFD::initialize()
 //    openFoamVersion->addItem("7");
 //    openFoamVersion->addItem("9");
     openFoamVersion->addItem("10");
-    openFoamVersion->setCurrentIndex(1);
+    openFoamVersion->setCurrentIndex(0);
     openFoamVersion->setMinimumWidth(50);
     openFoamVersion->setDisabled(true);
 

diff --git a/EVENTS/IsolatedBuildingCFD/IsolatedBuildingCFD.cpp b/EVENTS/IsolatedBuildingCFD/IsolatedBuildingCFD.cpp
@@ -184,10 +184,10 @@ bool IsolatedBuildingCFD::initialize()
     QLabel *openFoamVersionLabel = new QLabel("Version of OpenFOAM Distribution: ");
 
     openFoamVersion = new QComboBox ();
-    openFoamVersion->addItem("7");
-    openFoamVersion->addItem("9");
+//    openFoamVersion->addItem("7");
+//    openFoamVersion->addItem("9");
     openFoamVersion->addItem("10");
-    openFoamVersion->setCurrentIndex(2);
+    openFoamVersion->setCurrentIndex(0);
     openFoamVersion->setMinimumWidth(50);
 
 
@@ -696,7 +696,17 @@ bool IsolatedBuildingCFD::inputFromJSON(QJsonObject &jsonObject)
         caseDirectoryPathWidget->setText(jsonObject["caseDirectoryPath"].toString());
     }
 
-    openFoamVersion->setCurrentText(jsonObject["OpenFoamVersion"].toString());
+
+    QString foamVersion = jsonObject["OpenFoamVersion"].toString();
+
+    //Check if it's version 10 other wise switch to 10
+    //the backend application running on TACC uses OpenFOAM-10 for now
+    if(foamVersion != "10")
+    {
+        foamVersion = "10";
+    }
+
+    openFoamVersion->setCurrentText(foamVersion);
 
     geometry->inputFromJSON(jsonObject);
     snappyHexMesh->inputFromJSON(jsonObject);

diff --git a/EVENTS/WindEventSelection.cpp b/EVENTS/WindEventSelection.cpp
@@ -190,8 +190,8 @@ WindEventSelection::WindEventSelection(RandomVariablesContainer *theRandomVariab
     connect(eventSelection,SIGNAL(currentTextChanged(QString)),this,SLOT(eventSelectionChanged(QString)));
 
     // status and error messaging
-    //connect(theIsolatedBuildingCFD, SIGNAL(errorMessage(QString)), this,SLOT(sendErrorMessage(QString)));
-    //connect(theEmptyDomainCFD, SIGNAL(errorMessage(QString)), this,SLOT(sendErrorMessage(QString)));
+    connect(theIsolatedBuildingCFD, SIGNAL(errorMessage(QString)), this,SLOT(sendErrorMessage(QString)));
+    connect(theSurroundedBuildingCFD, SIGNAL(errorMessage(QString)), this,SLOT(sendErrorMessage(QString)));
 }
 
 WindEventSelection::~WindEventSelection()