Skip to content

For halted workflow, return before FT and OSM save #5539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joseph-robertson merged 9 commits into from
Dec 15, 2025
+9 −18
Merged

For halted workflow, return before FT and OSM save #5539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f5a8716
Return before FT for halted workflow.
Dec 2, 2025
0b2eb37
Return before saving OSM for halted workflow.
Dec 2, 2025
982783d
Merge branch 'develop' into fix-halt-workflow
Dec 4, 2025
6792a3c
Remove temporary comment.
Dec 5, 2025
a71cca8
Revert not debug saving
jmarrec Dec 8, 2025
3476260
Don't re-save IDF at the end
jmarrec Dec 8, 2025
3afeb78
If you halted and didn't do anything in runTranslator (no IDF created…
jmarrec Dec 8, 2025
9b52600
Trigger new windows build.
Dec 10, 2025
bd3c759
Merge branch 'develop' into fix-halt-workflow
Dec 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions src/workflow/OSWorkflow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,17 +438,7 @@ bool OSWorkflow::run() {
}
}

// TODO: Is this really necessary? Seems like it's done before already (in RunPreProcess)
if (workspace_) {
// Save final IDF
if (m_add_timings) {
m_timers->newTimer("Save IDF");
}
workspace_->save(runDirPath / "in.idf", true);
if (m_add_timings) {
m_timers->tockCurrentTimer();
}
}
// No need to save the workspace (IDF) here, done before already (in RunPreProcess)

if (!workflowJSON.runOptions()->fast()) {
communicateResults();
Expand Down
12 changes: 6 additions & 6 deletions src/workflow/RunPreProcess.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@ namespace openstudio {
void OSWorkflow::runPreProcess() {
state = State::PreProcess;

// Skip the pre-processor if halted
if (runner.halted()) {
LOG(Info, "Workflow halted, skipping the EnergyPlus pre-processor");
return;
}

auto runDirPath = workflowJSON.absoluteRunDir();
const bool skipEnergyPlusPreprocess = workflowJSON.runOptions()->skipEnergyPlusPreprocess();

Expand All @@ -47,12 +53,6 @@ void OSWorkflow::runPreProcess() {
applyMeasures(MeasureType::ReportingMeasure, ApplyMeasureType::EnergyPlusOutputRequest);
LOG(Info, "Finished collecting EnergyPlus output requests from Reporting measures.");

// Skip the pre-processor if halted
if (runner.halted()) {
LOG(Info, "Workflow halted, skipping the EnergyPlus pre-processor");
return;
}

// TODO: I am extremely confused as to why we force add this stuff...
if (!skipEnergyPlusPreprocess) {
LOG(Info, "Running EnergyPlus Preprocess");
Expand Down
3 changes: 2 additions & 1 deletion src/workflow/RunTranslator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,10 @@ void OSWorkflow::runTranslator() {
// skip if halted
// TODO: I don't understand this
if (runner.halted()) {
LOG(Info, "Workflow halted, skipping OSM to IDF translation");
LOG(Info, "Workflow halted, skipping the OSM to IDF translation");
// This allows model arguments to still be calculated
workspace_ = Workspace{};
return;

@jmarrec jmarrec Dec 8, 2025

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that's ok.

}

auto runDir = workflowJSON.absoluteRunDir();
Expand Down
Loading