Merge pull request #60 from zsarnoczay/master

azs - fix bug to save DL settings appropriately to config file
NHERI-SimCenter · Feb 8, 2024 · d60b476 · d60b476
2 parents 0b98848 + 642d68a
commit d60b476
Showing 1 changed file with 7 additions and 14 deletions.
diff --git a/WorkflowAppPBE.cpp b/WorkflowAppPBE.cpp
@@ -326,13 +326,15 @@ WorkflowAppPBE::outputToJSON(QJsonObject &jsonObjectTop) {
         return result;
     }
 
-    QJsonObject jsonLossModel;
-    if (theDLModelSelection->outputToJSON(jsonLossModel) == false) {
+    if (theDLModelSelection->outputToJSON(jsonObjectTop) == false) {
       qDebug() << "WorkflowAppPBE::outputToJSON - DL_Selection failed";
       return false;
     }
-
-    jsonObjectTop["DL"] = jsonLossModel;
+
+    if (theDLModelSelection->outputAppDataToJSON(apps) == false) {
+      qDebug() << "WorkflowAppPBE::outputToJSON - DL_Selection failed appData";
+      return false;
+    }
 
     QJsonObject appPrf;
     if (thePrfMethodSelection->outputToJSON(appPrf) == false) {
@@ -352,16 +354,7 @@ WorkflowAppPBE::outputToJSON(QJsonObject &jsonObjectTop) {
     jsonObjectTop["Performance"] = prfFinal;
 
     prfFinal["ApplicationData"] = dataPrf["Performance"];
-    apps["Performance"] = prfFinal;
-
-
-    QJsonObject appsDL;
-    if (theDLModelSelection->outputAppDataToJSON(appsDL) == false) {
-      qDebug() << "WorkflowAppPBE::outputToJSON - DL_Selection failed appData";
-      return false;
-    }
-
-    apps["DL"] = appsDL;
+    apps["Performance"] = prfFinal;  
 
     jsonObjectTop["Applications"]=apps;