Skip to content
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

Remove allowedObjects check from energyPlusOutputRequests #5358

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
+8 −27
Open

Remove allowedObjects check from energyPlusOutputRequests #5358

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 8 additions & 27 deletions src/workflow/Util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,38 +172,19 @@ bool mergeOutputTableSummaryReports(IdfObject& existingObject, const IdfObject&

bool addEnergyPlusOutputRequest(Workspace& workspace, IdfObject& idfObject) {

static const std::vector<IddObjectType> allowedObjects{
IddObjectType::Output_Surfaces_List,
IddObjectType::Output_Surfaces_Drawing,
IddObjectType::Output_Schedules,
IddObjectType::Output_Constructions,
IddObjectType::Output_Table_TimeBins,
IddObjectType::Output_Table_Monthly,
IddObjectType::Output_Variable,
IddObjectType::Output_Meter,
IddObjectType::Output_Meter_MeterFileOnly,
IddObjectType::Output_Meter_Cumulative,
IddObjectType::Output_Meter_Cumulative_MeterFileOnly,
IddObjectType::Meter_Custom,
IddObjectType::Meter_CustomDecrement,
IddObjectType::EnergyManagementSystem_OutputVariable,
};

auto iddObjectType = idfObject.iddObject().type();

if (std::find(allowedObjects.cbegin(), allowedObjects.end(), iddObjectType) != allowedObjects.end()) {

// If already present, don't do it
for (const auto& wo : workspace.getObjectsByType(iddObjectType)) {
if (idfObject.dataFieldsEqual(wo)) {
return false;
}
// If already present, don't do it
for (const auto& wo : workspace.getObjectsByType(iddObjectType)) {
if (idfObject.dataFieldsEqual(wo)) {
return false;
}
}

workspace.addObject(idfObject);
workspace.addObject(idfObject);

return true;

return true;
}

// static const std::vector<IddObjectType> allowedUniqueObjects{
// // IddObjectType::Output_EnergyManagementSystem, // TODO: have to merge
Expand Down
Loading