Skip to content

Commit

Permalink
Merge pull request #10384 from NREL/OutputProcessor2
Browse files Browse the repository at this point in the history 
Output Processor Refactor -- Part 2
  • Loading branch information
@Myoldmopar
Myoldmopar authored Apr 6, 2024
2 parents 9d7789a + 58bbe38 commit 775886b
Show file tree
Hide file tree
Showing 174 changed files with 10,982 additions and 12,091 deletions.
464 changes: 232 additions & 232 deletions src/EnergyPlus/AirflowNetwork/src/Solver.cpp
View file

Large diffs are not rendered by default.

26 changes: 12 additions & 14 deletions src/EnergyPlus/BaseboardElectric.cc
View file
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,
OutputProcessor::StoreType::Sum,
thisBaseboard.EquipName,
Constant::eResource::EnergyTransfer,
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.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
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
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

4 comments on commit 775886b

@nrel-bot-2b
Copy link

Choose a reason for hiding this comment

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

develop (Myoldmopar) - x86_64-Linux-Ubuntu-22.04-gcc-11.4: OK (2788 of 2788 tests passed, 0 test warnings)

Build Badge Test Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

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

develop (Myoldmopar) - Win64-Windows-10-VisualStudio-16: OK (2766 of 2766 tests passed, 0 test warnings)

Build Badge Test Badge

@nrel-bot-2
Copy link

Choose a reason for hiding this comment

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

develop (Myoldmopar) - x86_64-Linux-Ubuntu-22.04-gcc-11.4-IntegrationCoverage-Debug: OK (791 of 791 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

@nrel-bot-2c
Copy link

Choose a reason for hiding this comment

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

develop (Myoldmopar) - x86_64-Linux-Ubuntu-22.04-gcc-11.4-UnitTestsCoverage-Debug: OK (1978 of 1978 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

Please sign in to comment.