Skip to content

Commit

Permalink
fmk - updating WorkflowApp to avoid duplicates in JSON and changing s…
Browse files Browse the repository at this point in the history
…ome errorMessage to statusMEssages
  • Loading branch information
fmckenna committed Oct 8, 2024
1 parent 868d613 commit 71b061a
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions WorkflowAppHydroUQ.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -695,7 +695,7 @@ WorkflowAppHydroUQ::processResults(QString &dirName)

QWidget *oldResults = theComponentSelection->swapComponent(QString("RES"), theResults);
if (oldResults != NULL) {
this->errorMessage("WorkflowAppHydroUQ::processResults() - Deleting oldResults");
this->statusMessage("WorkflowAppHydroUQ::processResults() - Deleting oldResults");
delete oldResults;
}
// if (oldResults != NULL && oldResults != theResults) {;
Expand Down Expand Up @@ -741,7 +741,7 @@ WorkflowAppHydroUQ::clear(void)

QWidget *oldResults = theComponentSelection->swapComponent(QString("RES"), theResults); // The "swap" takes care of deleting the oldResults widget that was swapped out from theComponentSelection. theResults is the new widget that was swapped in and is now owned by theComponentSelection. oldResults is the old widget that was swapped out and is now owned by this function so it needs to be deleted, though smart pointers could take care of this if we refactor the code to use them.
if (oldResults != NULL && oldResults != theResults) {
this->errorMessage("WorkflowAppHydroUQ::clear() - Deleting oldResults");
this->statusMessage("WorkflowAppHydroUQ::clear() - Deleting oldResults");
delete oldResults;
}

Expand Down Expand Up @@ -1110,8 +1110,8 @@ WorkflowAppHydroUQ::setUpForApplicationRun(QString &workingDir, QString &subDir)


// Adding extra job parameters for MPM, already has "driverFile", "errorFile", "inputFile", "outputFile"
QStringList requiredEnvVars = {"driverFile", "inputFile", "publicDirectory", "programFile", "defaultMaxRunTime", "maxRunTime"};
QStringList defaultEnvVars = {"sc_driver", "scInput.json", "../mpm-public-ls6", "osu_lwf", "1440", "120"};
QStringList requiredEnvVars = {"publicDirectory", "programFile", "defaultMaxRunTime", "maxRunTime"};
QStringList defaultEnvVars = {"../mpm-public-ls6", "osu_lwf", "1440", "120"};
for (auto reqVar : requiredEnvVars)
{
if (eventAppData.contains(reqVar))
Expand Down

0 comments on commit 71b061a

Please sign in to comment.