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

Output Processor Refactor -- Part 2 #10384

Merged
merged 17 commits into from
Apr 6, 2024
Merged

Output Processor Refactor -- Part 2 #10384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
8561908
Modify SetupOutputVariable API to reduce default arguments
amirroth Jan 20, 2024
e469481
Remove General.MovingAvg.cc
amirroth Jan 20, 2024
6bdffbc
Fix plugin issue, collapse StoreType/SOVStoreType and TimeStepType/SO…
amirroth Jan 21, 2024
a6a1de1
Rebased some enums at 0
amirroth Jan 21, 2024
12ed421
A little object-orientation and functionality unification
amirroth Jan 24, 2024
fc3959c
More object orientation and unification. Eliminate hopefully redunda…
amirroth Jan 24, 2024
f6aeb2e
Cleanup. More object orientation.
amirroth Jan 26, 2024
f4a1331
Merge remote-tracking branch 'origin/develop' into OutputProcessor2
amirroth Feb 12, 2024
85330a1
Remove {} argument pattern.
amirroth Feb 23, 2024
0875e2c
Commit unit test changes
amirroth Feb 23, 2024
eee1d9a
Merge remote-tracking branch 'origin/develop' into OutputProcessor2
amirroth Feb 23, 2024
357890c
Merge develop; resolve conflicts
amirroth Feb 23, 2024
35ab973
Merge remote-tracking branch 'origin/develop' into OutputProcessor2
Myoldmopar Feb 28, 2024
0643f1d
Clang format
Myoldmopar Feb 28, 2024
6bc3b11
Merge remote-tracking branch 'origin/develop' into OutputProcessor2
amirroth Apr 3, 2024
afe82ff
Merge branch 'OutputProcessor2' of github.com:NREL/EnergyPlus into Ou…
amirroth Apr 3, 2024
58bbe38
Use a full string and it works...
Myoldmopar Apr 5, 2024
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
464 changes: 232 additions & 232 deletions src/EnergyPlus/AirflowNetwork/src/Solver.cpp
View file
Open in desktop

Large diffs are not rendered by default.

26 changes: 12 additions & 14 deletions src/EnergyPlus/BaseboardElectric.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,40 +348,38 @@ namespace BaseboardElectric {
"Baseboard Total Heating Energy",
Constant::Units::J,
thisBaseboard.Energy,
OutputProcessor::SOVTimeStepType::System,
OutputProcessor::SOVStoreType::Summed,
OutputProcessor::TimeStepType::System,
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Collapsed indirection from SOVTimeStepType to TimeStepType and SOVStoreType to StoreType.

OutputProcessor::StoreType::Sum,
thisBaseboard.EquipName,
Constant::eResource::EnergyTransfer,
OutputProcessor::SOVEndUseCat::Baseboard,
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Reordered API eliminates most instances of {} arguments.

{},
OutputProcessor::SOVGroup::HVAC); // "System");
OutputProcessor::Group::HVAC,
OutputProcessor::EndUseCat::Baseboard);

SetupOutputVariable(state,
"Baseboard Total Heating Rate",
Constant::Units::W,
thisBaseboard.Power,
OutputProcessor::SOVTimeStepType::System,
OutputProcessor::SOVStoreType::Average,
OutputProcessor::TimeStepType::System,
OutputProcessor::StoreType::Average,
thisBaseboard.EquipName);

SetupOutputVariable(state,
"Baseboard Electricity Energy",
Constant::Units::J,
thisBaseboard.ElecUseLoad,
OutputProcessor::SOVTimeStepType::System,
OutputProcessor::SOVStoreType::Summed,
OutputProcessor::TimeStepType::System,
OutputProcessor::StoreType::Sum,
thisBaseboard.EquipName,
Constant::eResource::Electricity,
OutputProcessor::SOVEndUseCat::Heating,
{},
OutputProcessor::SOVGroup::HVAC); // "System");
OutputProcessor::Group::HVAC,
OutputProcessor::EndUseCat::Heating);

SetupOutputVariable(state,
"Baseboard Electricity Rate",
Constant::Units::W,
thisBaseboard.ElecUseRate,
OutputProcessor::SOVTimeStepType::System,
OutputProcessor::SOVStoreType::Average,
OutputProcessor::TimeStepType::System,
OutputProcessor::StoreType::Average,
thisBaseboard.EquipName);
}
}
Expand Down
46 changes: 22 additions & 24 deletions src/EnergyPlus/BaseboardRadiator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,80 +434,78 @@ namespace BaseboardRadiator {
"Baseboard Total Heating Energy",
Constant::Units::J,
thisBaseboard.Energy,
OutputProcessor::SOVTimeStepType::System,
OutputProcessor::SOVStoreType::Summed,
OutputProcessor::TimeStepType::System,
OutputProcessor::StoreType::Sum,
thisBaseboard.EquipID,
Constant::eResource::EnergyTransfer,
OutputProcessor::SOVEndUseCat::Baseboard,
{},
OutputProcessor::SOVGroup::HVAC); // "System");
OutputProcessor::Group::HVAC,
OutputProcessor::EndUseCat::Baseboard);

SetupOutputVariable(state,
"Baseboard Hot Water Energy",
Constant::Units::J,
thisBaseboard.Energy,
OutputProcessor::SOVTimeStepType::System,
OutputProcessor::SOVStoreType::Summed,
OutputProcessor::TimeStepType::System,
OutputProcessor::StoreType::Sum,
thisBaseboard.EquipID,
Constant::eResource::PlantLoopHeatingDemand,
OutputProcessor::SOVEndUseCat::Baseboard,
{},
OutputProcessor::SOVGroup::HVAC); // "System");
OutputProcessor::Group::HVAC,
OutputProcessor::EndUseCat::Baseboard);

SetupOutputVariable(state,
"Baseboard Total Heating Rate",
Constant::Units::W,
thisBaseboard.Power,
OutputProcessor::SOVTimeStepType::System,
OutputProcessor::SOVStoreType::Average,
OutputProcessor::TimeStepType::System,
OutputProcessor::StoreType::Average,
thisBaseboard.EquipID);

SetupOutputVariable(state,
"Baseboard Hot Water Mass Flow Rate",
Constant::Units::kg_s,
thisBaseboard.WaterMassFlowRate,
OutputProcessor::SOVTimeStepType::System,
OutputProcessor::SOVStoreType::Average,
OutputProcessor::TimeStepType::System,
OutputProcessor::StoreType::Average,
thisBaseboard.EquipID);

SetupOutputVariable(state,
"Baseboard Air Mass Flow Rate",
Constant::Units::kg_s,
thisBaseboard.AirMassFlowRate,
OutputProcessor::SOVTimeStepType::System,
OutputProcessor::SOVStoreType::Average,
OutputProcessor::TimeStepType::System,
OutputProcessor::StoreType::Average,
thisBaseboard.EquipID);

SetupOutputVariable(state,
"Baseboard Air Inlet Temperature",
Constant::Units::C,
thisBaseboard.AirInletTemp,
OutputProcessor::SOVTimeStepType::System,
OutputProcessor::SOVStoreType::Average,
OutputProcessor::TimeStepType::System,
OutputProcessor::StoreType::Average,
thisBaseboard.EquipID);

SetupOutputVariable(state,
"Baseboard Air Outlet Temperature",
Constant::Units::C,
thisBaseboard.AirOutletTemp,
OutputProcessor::SOVTimeStepType::System,
OutputProcessor::SOVStoreType::Average,
OutputProcessor::TimeStepType::System,
OutputProcessor::StoreType::Average,
thisBaseboard.EquipID);

SetupOutputVariable(state,
"Baseboard Water Inlet Temperature",
Constant::Units::C,
thisBaseboard.WaterInletTemp,
OutputProcessor::SOVTimeStepType::System,
OutputProcessor::SOVStoreType::Average,
OutputProcessor::TimeStepType::System,
OutputProcessor::StoreType::Average,
thisBaseboard.EquipID);

SetupOutputVariable(state,
"Baseboard Water Outlet Temperature",
Constant::Units::C,
thisBaseboard.WaterOutletTemp,
OutputProcessor::SOVTimeStepType::System,
OutputProcessor::SOVStoreType::Average,
OutputProcessor::TimeStepType::System,
OutputProcessor::StoreType::Average,
thisBaseboard.EquipID);
}
}
Expand Down
43 changes: 21 additions & 22 deletions src/EnergyPlus/BoilerSteam.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,66 +412,65 @@ namespace BoilerSteam {
"Boiler Heating Rate",
Constant::Units::W,
this->BoilerLoad,
OutputProcessor::SOVTimeStepType::System,
OutputProcessor::SOVStoreType::Average,
OutputProcessor::TimeStepType::System,
OutputProcessor::StoreType::Average,
this->Name);

SetupOutputVariable(state,
"Boiler Heating Energy",
Constant::Units::J,
this->BoilerEnergy,
OutputProcessor::SOVTimeStepType::System,
OutputProcessor::SOVStoreType::Summed,
OutputProcessor::TimeStepType::System,
OutputProcessor::StoreType::Sum,
this->Name,
Constant::eResource::EnergyTransfer,
OutputProcessor::SOVEndUseCat::Boilers,
{},
OutputProcessor::SOVGroup::Plant);
OutputProcessor::Group::Plant,
OutputProcessor::EndUseCat::Boilers);
SetupOutputVariable(state,
format("Boiler {} Rate", sFuelType),
Constant::Units::W,
this->FuelUsed,
OutputProcessor::SOVTimeStepType::System,
OutputProcessor::SOVStoreType::Average,
OutputProcessor::TimeStepType::System,
OutputProcessor::StoreType::Average,
this->Name);
SetupOutputVariable(state,
format("Boiler {} Energy", sFuelType),
Constant::Units::J,
this->FuelConsumed,
OutputProcessor::SOVTimeStepType::System,
OutputProcessor::SOVStoreType::Summed,
OutputProcessor::TimeStepType::System,
OutputProcessor::StoreType::Sum,
this->Name,
Constant::eFuel2eResource[(int)this->FuelType],
OutputProcessor::SOVEndUseCat::Heating,
this->EndUseSubcategory,
OutputProcessor::SOVGroup::Plant);
OutputProcessor::Group::Plant,
OutputProcessor::EndUseCat::Heating,
this->EndUseSubcategory);
SetupOutputVariable(state,
"Boiler Steam Efficiency",
Constant::Units::None,
this->BoilerEff,
OutputProcessor::SOVTimeStepType::System,
OutputProcessor::SOVStoreType::Average,
OutputProcessor::TimeStepType::System,
OutputProcessor::StoreType::Average,
this->Name);
SetupOutputVariable(state,
"Boiler Steam Inlet Temperature",
Constant::Units::C,
this->BoilerInletTemp,
OutputProcessor::SOVTimeStepType::System,
OutputProcessor::SOVStoreType::Average,
OutputProcessor::TimeStepType::System,
OutputProcessor::StoreType::Average,
this->Name);
SetupOutputVariable(state,
"Boiler Steam Outlet Temperature",
Constant::Units::C,
this->BoilerOutletTemp,
OutputProcessor::SOVTimeStepType::System,
OutputProcessor::SOVStoreType::Average,
OutputProcessor::TimeStepType::System,
OutputProcessor::StoreType::Average,
this->Name);
SetupOutputVariable(state,
"Boiler Steam Mass Flow Rate",
Constant::Units::kg_s,
this->BoilerMassFlowRate,
OutputProcessor::SOVTimeStepType::System,
OutputProcessor::SOVStoreType::Average,
OutputProcessor::TimeStepType::System,
OutputProcessor::StoreType::Average,
this->Name);
}

Expand Down
Loading
Loading