diff --git a/src/EnergyPlus/AirflowNetwork/src/Solver.cpp b/src/EnergyPlus/AirflowNetwork/src/Solver.cpp index cfe4184c47b..b0a110eb25e 100644 --- a/src/EnergyPlus/AirflowNetwork/src/Solver.cpp +++ b/src/EnergyPlus/AirflowNetwork/src/Solver.cpp @@ -5277,36 +5277,36 @@ namespace AirflowNetwork { "AFN Zone Outdoor Air Mass Flow Rate", Constant::Units::kg_s, exchangeData(i).SumMHr, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Mixing Mass Flow Rate", Constant::Units::kg_s, exchangeData(i).SumMMHr, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Outdoor Air CO2 Mass Flow Rate", Constant::Units::kg_s, exchangeData(i).SumMHrCO, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Mixing CO2 Mass Flow Rate", Constant::Units::kg_s, exchangeData(i).SumMMHrCO, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Total CO2 Mass Flow Rate", Constant::Units::kg_s, exchangeData(i).TotalCO2, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(i).Name); } } @@ -5317,37 +5317,37 @@ namespace AirflowNetwork { "AFN Zone Outdoor Air Mass Flow Rate", Constant::Units::kg_s, exchangeData(i).SumMHr, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Mixing Mass Flow Rate", Constant::Units::kg_s, exchangeData(i).SumMMHr, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(i).Name); } SetupOutputVariable(m_state, "AFN Zone Outdoor Air Generic Air Contaminant Mass Flow Rate", Constant::Units::kg_s, exchangeData(i).SumMHrGC, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Mixing Generic Air Contaminant Mass Flow Rate", Constant::Units::kg_s, exchangeData(i).SumMMHrGC, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Total Generic Air Contaminant Mass Flow Rate", Constant::Units::kg_s, exchangeData(i).TotalGC, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(i).Name); } } @@ -5577,23 +5577,23 @@ namespace AirflowNetwork { "AFN Node Temperature", Constant::Units::C, AirflowNetworkNodeSimu(i).TZ, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, AirflowNetworkNodeData(i).Name); SetupOutputVariable(m_state, "AFN Node Humidity Ratio", Constant::Units::kgWater_kgDryAir, AirflowNetworkNodeSimu(i).WZ, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, AirflowNetworkNodeData(i).Name); if (m_state.dataContaminantBalance->Contaminant.CO2Simulation) { SetupOutputVariable(m_state, "AFN Node CO2 Concentration", Constant::Units::ppm, AirflowNetworkNodeSimu(i).CO2Z, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, AirflowNetworkNodeData(i).Name); } if (m_state.dataContaminantBalance->Contaminant.GenericContamSimulation) { @@ -5601,8 +5601,8 @@ namespace AirflowNetwork { "AFN Node Generic Air Contaminant Concentration", Constant::Units::ppm, AirflowNetworkNodeSimu(i).GCZ, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, AirflowNetworkNodeData(i).Name); } if (!(SupplyFanType == FanType_SimpleOnOff && i <= AirflowNetworkNumOfZones)) { @@ -5610,8 +5610,8 @@ namespace AirflowNetwork { "AFN Node Total Pressure", Constant::Units::Pa, AirflowNetworkNodeSimu(i).PZ, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, AirflowNetworkNodeData(i).Name); } if (AirflowNetworkNodeData(i).ExtNodeNum > 0) { @@ -5619,8 +5619,8 @@ namespace AirflowNetwork { "AFN Node Wind Pressure", Constant::Units::Pa, AirflowNetworkNodeSimu(i).PZ, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, AirflowNetworkNodeData(i).Name); } } @@ -5631,36 +5631,36 @@ namespace AirflowNetwork { "AFN Linkage Node 1 to Node 2 Mass Flow Rate", Constant::Units::kg_s, linkReport(i).FLOW, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, AirflowNetworkLinkageData(i).Name); SetupOutputVariable(m_state, "AFN Linkage Node 2 to Node 1 Mass Flow Rate", Constant::Units::kg_s, linkReport(i).FLOW2, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, AirflowNetworkLinkageData(i).Name); SetupOutputVariable(m_state, "AFN Linkage Node 1 to Node 2 Volume Flow Rate", Constant::Units::m3_s, linkReport(i).VolFLOW, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, AirflowNetworkLinkageData(i).Name); SetupOutputVariable(m_state, "AFN Linkage Node 2 to Node 1 Volume Flow Rate", Constant::Units::m3_s, linkReport(i).VolFLOW2, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, AirflowNetworkLinkageData(i).Name); SetupOutputVariable(m_state, "AFN Linkage Node 1 to Node 2 Pressure Difference", Constant::Units::Pa, AirflowNetworkLinkSimu(i).DP, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, AirflowNetworkLinkageData(i).Name); } } @@ -5678,8 +5678,8 @@ namespace AirflowNetwork { "AFN Surface Venting Window or Door Opening Factor", Constant::Units::None, MultizoneSurfaceData(i).OpenFactor, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, MultizoneSurfaceData(i).SurfName); if (m_state.dataGlobal->AnyEnergyManagementSystemInModel) { SetupEMSActuator(m_state, @@ -5694,72 +5694,72 @@ namespace AirflowNetwork { "AFN Surface Venting Window or Door Opening Modulation Multiplier", Constant::Units::None, m_state.dataSurface->SurfWinVentingOpenFactorMultRep(SurfNum), - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, m_state.dataSurface->Surface(SurfNum).Name); SetupOutputVariable(m_state, "AFN Surface Venting Inside Setpoint Temperature", Constant::Units::C, m_state.dataSurface->SurfWinInsideTempForVentingRep(SurfNum), - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, m_state.dataSurface->Surface(SurfNum).Name); SetupOutputVariable(m_state, "AFN Surface Venting Availability Status", Constant::Units::None, m_state.dataSurface->SurfWinVentingAvailabilityRep(SurfNum), - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, m_state.dataSurface->Surface(SurfNum).Name); if (MultizoneSurfaceData(i).OccupantVentilationControlNum > 0) { SetupOutputVariable(m_state, "AFN Surface Venting Window or Door Opening Factor at Previous Time Step", Constant::Units::None, MultizoneSurfaceData(i).OpenFactorLast, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, MultizoneSurfaceData(i).SurfName); SetupOutputVariable(m_state, "AFN Surface Opening Elapsed Time", Constant::Units::min, MultizoneSurfaceData(i).OpenElapsedTime, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, MultizoneSurfaceData(i).SurfName); SetupOutputVariable(m_state, "AFN Surface Closing Elapsed Time", Constant::Units::min, MultizoneSurfaceData(i).CloseElapsedTime, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, MultizoneSurfaceData(i).SurfName); SetupOutputVariable(m_state, "AFN Surface Opening Status at Previous Time Step", Constant::Units::None, MultizoneSurfaceData(i).PrevOpeningstatus, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, MultizoneSurfaceData(i).SurfName); SetupOutputVariable(m_state, "AFN Surface Opening Status", Constant::Units::None, MultizoneSurfaceData(i).OpeningStatus, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, MultizoneSurfaceData(i).SurfName); SetupOutputVariable(m_state, "AFN Surface Opening Probability Status", Constant::Units::None, MultizoneSurfaceData(i).OpeningProbStatus, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, MultizoneSurfaceData(i).SurfName); SetupOutputVariable(m_state, "AFN Surface Closing Probability Status", Constant::Units::None, MultizoneSurfaceData(i).ClosingProbStatus, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, MultizoneSurfaceData(i).SurfName); } } @@ -5771,369 +5771,369 @@ namespace AirflowNetwork { "AFN Zone Infiltration Sensible Heat Gain Rate", Constant::Units::W, AirflowNetworkReportData(i).MultiZoneInfiSenGainW, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Infiltration Sensible Heat Gain Energy", Constant::Units::J, AirflowNetworkReportData(i).MultiZoneInfiSenGainJ, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Ventilation Sensible Heat Gain Rate", Constant::Units::W, AirflowNetworkReportData(i).MultiZoneVentSenGainW, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Ventilation Sensible Heat Gain Energy", Constant::Units::J, AirflowNetworkReportData(i).MultiZoneVentSenGainJ, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Mixing Sensible Heat Gain Rate", Constant::Units::W, AirflowNetworkReportData(i).MultiZoneMixSenGainW, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Mixing Sensible Heat Gain Energy", Constant::Units::J, AirflowNetworkReportData(i).MultiZoneMixSenGainJ, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Infiltration Sensible Heat Loss Rate", Constant::Units::W, AirflowNetworkReportData(i).MultiZoneInfiSenLossW, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Infiltration Sensible Heat Loss Energy", Constant::Units::J, AirflowNetworkReportData(i).MultiZoneInfiSenLossJ, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Ventilation Sensible Heat Loss Rate", Constant::Units::W, AirflowNetworkReportData(i).MultiZoneVentSenLossW, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Ventilation Sensible Heat Loss Energy", Constant::Units::J, AirflowNetworkReportData(i).MultiZoneVentSenLossJ, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Mixing Sensible Heat Loss Rate", Constant::Units::W, AirflowNetworkReportData(i).MultiZoneMixSenLossW, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Mixing Sensible Heat Loss Energy", Constant::Units::J, AirflowNetworkReportData(i).MultiZoneMixSenLossJ, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Infiltration Latent Heat Gain Rate", Constant::Units::W, AirflowNetworkReportData(i).MultiZoneInfiLatGainW, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Infiltration Latent Heat Gain Energy", Constant::Units::J, AirflowNetworkReportData(i).MultiZoneInfiLatGainJ, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Infiltration Latent Heat Loss Rate", Constant::Units::W, AirflowNetworkReportData(i).MultiZoneInfiLatLossW, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Infiltration Latent Heat Loss Energy", Constant::Units::J, AirflowNetworkReportData(i).MultiZoneInfiLatLossJ, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Ventilation Latent Heat Gain Rate", Constant::Units::W, AirflowNetworkReportData(i).MultiZoneVentLatGainW, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Ventilation Latent Heat Gain Energy", Constant::Units::J, AirflowNetworkReportData(i).MultiZoneVentLatGainJ, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Ventilation Latent Heat Loss Rate", Constant::Units::W, AirflowNetworkReportData(i).MultiZoneVentLatLossW, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Ventilation Latent Heat Loss Energy", Constant::Units::J, AirflowNetworkReportData(i).MultiZoneVentLatLossJ, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Mixing Latent Heat Gain Rate", Constant::Units::W, AirflowNetworkReportData(i).MultiZoneMixLatGainW, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Mixing Latent Heat Gain Energy", Constant::Units::J, AirflowNetworkReportData(i).MultiZoneMixLatGainJ, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Mixing Latent Heat Loss Rate", Constant::Units::W, AirflowNetworkReportData(i).MultiZoneMixLatLossW, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Mixing Latent Heat Loss Energy", Constant::Units::J, AirflowNetworkReportData(i).MultiZoneInfiLatLossJ, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, Zone(i).Name); // Supply leak losses due to force air systems SetupOutputVariable(m_state, "AFN Zone Duct Leaked Air Sensible Heat Gain Rate", Constant::Units::W, AirflowNetworkReportData(i).LeakSenGainW, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Duct Leaked Air Sensible Heat Gain Energy", Constant::Units::J, AirflowNetworkReportData(i).LeakSenGainJ, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Duct Leaked Air Sensible Heat Loss Rate", Constant::Units::W, AirflowNetworkReportData(i).LeakSenLossW, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Duct Leaked Air Sensible Heat Loss Energy", Constant::Units::J, AirflowNetworkReportData(i).LeakSenLossJ, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Duct Leaked Air Latent Heat Gain Rate", Constant::Units::W, AirflowNetworkReportData(i).LeakLatGainW, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Duct Leaked Air Latent Heat Gain Energy", Constant::Units::J, AirflowNetworkReportData(i).LeakLatGainJ, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Duct Leaked Air Latent Heat Loss Rate", Constant::Units::W, AirflowNetworkReportData(i).LeakLatLossW, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Duct Leaked Air Latent Heat Loss Energy", Constant::Units::J, AirflowNetworkReportData(i).LeakLatLossJ, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, Zone(i).Name); // Conduction losses due to force air systems SetupOutputVariable(m_state, "AFN Zone Duct Conduction Sensible Heat Gain Rate", Constant::Units::W, AirflowNetworkReportData(i).CondSenGainW, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Duct Conduction Sensible Heat Gain Energy", Constant::Units::J, AirflowNetworkReportData(i).CondSenGainJ, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Duct Conduction Sensible Heat Loss Rate", Constant::Units::W, AirflowNetworkReportData(i).CondSenLossW, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Duct Conduction Sensible Heat Loss Energy", Constant::Units::J, AirflowNetworkReportData(i).CondSenLossJ, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Duct Diffusion Latent Heat Gain Rate", Constant::Units::W, AirflowNetworkReportData(i).DiffLatGainW, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Duct Diffusion Latent Heat Gain Energy", Constant::Units::J, AirflowNetworkReportData(i).DiffLatGainJ, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Duct Diffusion Latent Heat Loss Rate", Constant::Units::W, AirflowNetworkReportData(i).DiffLatLossW, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Duct Diffusion Latent Heat Loss Energy", Constant::Units::J, AirflowNetworkReportData(i).DiffLatLossJ, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, Zone(i).Name); // Radiation losses due to forced air systems SetupOutputVariable(m_state, "AFN Zone Duct Radiation Heat Gain Rate", Constant::Units::W, AirflowNetworkReportData(i).RadGainW, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Duct Radiation Sensible Heat Gain Energy", Constant::Units::J, AirflowNetworkReportData(i).RadGainJ, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Duct Radiation Heat Loss Rate", Constant::Units::W, AirflowNetworkReportData(i).RadLossW, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Duct Radiation Sensible Heat Loss Energy", Constant::Units::J, AirflowNetworkReportData(i).RadLossJ, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, Zone(i).Name); // Total losses due to force air systems SetupOutputVariable(m_state, "AFN Distribution Sensible Heat Gain Rate", Constant::Units::W, AirflowNetworkReportData(i).TotalSenGainW, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(i).Name); SetupOutputVariable(m_state, "AFN Distribution Sensible Heat Gain Energy", Constant::Units::J, AirflowNetworkReportData(i).TotalSenGainJ, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, Zone(i).Name); SetupOutputVariable(m_state, "AFN Distribution Sensible Heat Loss Rate", Constant::Units::W, AirflowNetworkReportData(i).TotalSenLossW, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(i).Name); SetupOutputVariable(m_state, "AFN Distribution Sensible Heat Loss Energy", Constant::Units::J, AirflowNetworkReportData(i).TotalSenLossJ, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, Zone(i).Name); SetupOutputVariable(m_state, "AFN Distribution Latent Heat Gain Rate", Constant::Units::W, AirflowNetworkReportData(i).TotalLatGainW, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(i).Name); SetupOutputVariable(m_state, "AFN Distribution Latent Heat Gain Energy", Constant::Units::J, AirflowNetworkReportData(i).TotalLatGainJ, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, Zone(i).Name); SetupOutputVariable(m_state, "AFN Distribution Latent Heat Loss Rate", Constant::Units::W, AirflowNetworkReportData(i).TotalLatLossW, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(i).Name); SetupOutputVariable(m_state, "AFN Distribution Latent Heat Loss Energy", Constant::Units::J, AirflowNetworkReportData(i).TotalLatLossJ, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, Zone(i).Name); } @@ -6142,79 +6142,79 @@ namespace AirflowNetwork { "AFN Zone Infiltration Volume", Constant::Units::m3, AirflowNetworkZnRpt(i).InfilVolume, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Infiltration Mass", Constant::Units::kg, AirflowNetworkZnRpt(i).InfilMass, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Infiltration Air Change Rate", Constant::Units::ach, AirflowNetworkZnRpt(i).InfilAirChangeRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Ventilation Volume", Constant::Units::m3, AirflowNetworkZnRpt(i).VentilVolume, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Ventilation Mass", Constant::Units::kg, AirflowNetworkZnRpt(i).VentilMass, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Ventilation Air Change Rate", Constant::Units::ach, AirflowNetworkZnRpt(i).VentilAirChangeRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Mixing Volume", Constant::Units::m3, AirflowNetworkZnRpt(i).MixVolume, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Mixing Mass", Constant::Units::kg, AirflowNetworkZnRpt(i).MixMass, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Exfiltration Heat Transfer Rate", Constant::Units::W, AirflowNetworkZnRpt(i).ExfilTotalLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Exfiltration Sensible Heat Transfer Rate", Constant::Units::W, AirflowNetworkZnRpt(i).ExfilSensiLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Exfiltration Latent Heat Transfer Rate", Constant::Units::W, AirflowNetworkZnRpt(i).ExfilLatentLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(i).Name); } @@ -6224,22 +6224,22 @@ namespace AirflowNetwork { "AFN Zone Average Pressure", Constant::Units::Pa, nodeReport(i).PZ, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone On Cycle Pressure", Constant::Units::Pa, nodeReport(i).PZON, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(i).Name); SetupOutputVariable(m_state, "AFN Zone Off Cycle Pressure", Constant::Units::Pa, nodeReport(i).PZOFF, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(i).Name); } for (i = 1; i <= AirflowNetworkNumOfSurfaces; ++i) { @@ -6247,50 +6247,50 @@ namespace AirflowNetwork { "AFN Linkage Node 1 to 2 Average Mass Flow Rate", Constant::Units::kg_s, linkReport1(i).FLOW, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, MultizoneSurfaceData(i).SurfName); SetupOutputVariable(m_state, "AFN Linkage Node 2 to 1 Average Mass Flow Rate", Constant::Units::kg_s, linkReport1(i).FLOW2, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, MultizoneSurfaceData(i).SurfName); SetupOutputVariable(m_state, "AFN Linkage Node 1 to 2 Average Volume Flow Rate", Constant::Units::m3_s, linkReport1(i).VolFLOW, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, MultizoneSurfaceData(i).SurfName); SetupOutputVariable(m_state, "AFN Linkage Node 2 to 1 Average Volume Flow Rate", Constant::Units::m3_s, linkReport1(i).VolFLOW2, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, MultizoneSurfaceData(i).SurfName); SetupOutputVariable(m_state, "AFN Surface Average Pressure Difference", Constant::Units::Pa, linkReport1(i).DP, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, MultizoneSurfaceData(i).SurfName); SetupOutputVariable(m_state, "AFN Surface On Cycle Pressure Difference", Constant::Units::Pa, linkReport1(i).DPON, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, MultizoneSurfaceData(i).SurfName); SetupOutputVariable(m_state, "AFN Surface Off Cycle Pressure Difference", Constant::Units::Pa, linkReport1(i).DPOFF, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, MultizoneSurfaceData(i).SurfName); } } @@ -10917,8 +10917,8 @@ namespace AirflowNetwork { "AFN Node Total Pressure", Constant::Units::Pa, AirflowNetworkNodeSimu(j).PZ, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, AirflowNetworkNodeData(j).Name); } } @@ -10934,36 +10934,36 @@ namespace AirflowNetwork { "AFN Linkage Node 1 to Node 2 Mass Flow Rate", Constant::Units::kg_s, linkReport(i).FLOW, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, AirflowNetworkLinkageData(i).Name); SetupOutputVariable(m_state, "AFN Linkage Node 2 to Node 1 Mass Flow Rate", Constant::Units::kg_s, linkReport(i).FLOW2, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, AirflowNetworkLinkageData(i).Name); SetupOutputVariable(m_state, "AFN Linkage Node 1 to Node 2 Volume Flow Rate", Constant::Units::m3_s, linkReport(i).VolFLOW, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, AirflowNetworkLinkageData(i).Name); SetupOutputVariable(m_state, "AFN Linkage Node 2 to Node 1 Volume Flow Rate", Constant::Units::m3_s, linkReport(i).VolFLOW2, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, AirflowNetworkLinkageData(i).Name); SetupOutputVariable(m_state, "AFN Linkage Node 1 to Node 2 Pressure Difference", Constant::Units::Pa, AirflowNetworkLinkSimu(i).DP, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, AirflowNetworkLinkageData(i).Name); } } @@ -10989,36 +10989,36 @@ namespace AirflowNetwork { "AFN Linkage Node 1 to Node 2 Mass Flow Rate", Constant::Units::kg_s, linkReport(i).FLOW, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, AirflowNetworkLinkageData(i).Name); SetupOutputVariable(m_state, "AFN Linkage Node 2 to Node 1 Mass Flow Rate", Constant::Units::kg_s, linkReport(i).FLOW2, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, AirflowNetworkLinkageData(i).Name); SetupOutputVariable(m_state, "AFN Linkage Node 1 to Node 2 Volume Flow Rate", Constant::Units::m3_s, linkReport(i).VolFLOW, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, AirflowNetworkLinkageData(i).Name); SetupOutputVariable(m_state, "AFN Linkage Node 2 to Node 1 Volume Flow Rate", Constant::Units::m3_s, linkReport(i).VolFLOW2, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, AirflowNetworkLinkageData(i).Name); SetupOutputVariable(m_state, "AFN Linkage Node 1 to Node 2 Pressure Difference", Constant::Units::Pa, AirflowNetworkLinkSimu(i).DP, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, AirflowNetworkLinkageData(i).Name); } } diff --git a/src/EnergyPlus/BaseboardElectric.cc b/src/EnergyPlus/BaseboardElectric.cc index 8607126a5d1..50b6c66a5ea 100644 --- a/src/EnergyPlus/BaseboardElectric.cc +++ b/src/EnergyPlus/BaseboardElectric.cc @@ -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); } } diff --git a/src/EnergyPlus/BaseboardRadiator.cc b/src/EnergyPlus/BaseboardRadiator.cc index e01c77cf400..ad0978f75ed 100644 --- a/src/EnergyPlus/BaseboardRadiator.cc +++ b/src/EnergyPlus/BaseboardRadiator.cc @@ -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); } } diff --git a/src/EnergyPlus/BoilerSteam.cc b/src/EnergyPlus/BoilerSteam.cc index a634f444dfb..12a3e7681bf 100644 --- a/src/EnergyPlus/BoilerSteam.cc +++ b/src/EnergyPlus/BoilerSteam.cc @@ -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); } diff --git a/src/EnergyPlus/Boilers.cc b/src/EnergyPlus/Boilers.cc index a717b4561eb..7dbd18da558 100644 --- a/src/EnergyPlus/Boilers.cc +++ b/src/EnergyPlus/Boilers.cc @@ -379,110 +379,109 @@ void BoilerSpecs::SetupOutputVars(EnergyPlusData &state) "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 Inlet Temperature", Constant::Units::C, this->BoilerInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Boiler Outlet Temperature", Constant::Units::C, this->BoilerOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Boiler Mass Flow Rate", Constant::Units::kg_s, this->BoilerMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Boiler Ancillary Electricity Rate", Constant::Units::W, this->ParasiticElecPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Boiler Ancillary Electricity Energy", Constant::Units::J, this->ParasiticElecConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Heating, - "Boiler Parasitic", - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Heating, + "Boiler Parasitic"); if (this->FuelType != Constant::eFuel::Electricity) { SetupOutputVariable(state, format("Boiler Ancillary {} Rate", sFuelType), Constant::Units::W, this->ParasiticFuelRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, format("Boiler Ancillary {} Energy", sFuelType), Constant::Units::J, this->ParasiticFuelConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eFuel2eResource[(int)this->FuelType], - OutputProcessor::SOVEndUseCat::Heating, - "Boiler Parasitic", - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Heating, + "Boiler Parasitic"); } SetupOutputVariable(state, "Boiler Part Load Ratio", Constant::Units::None, this->BoilerPLR, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Boiler Efficiency", Constant::Units::None, this->BoilerEff, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); if (state.dataGlobal->AnyEnergyManagementSystemInModel) { SetupEMSInternalVariable(state, "Boiler Nominal Capacity", this->Name, "[W]", this->NomCap); diff --git a/src/EnergyPlus/CTElectricGenerator.cc b/src/EnergyPlus/CTElectricGenerator.cc index c6583fdd294..db8b1b92d94 100644 --- a/src/EnergyPlus/CTElectricGenerator.cc +++ b/src/EnergyPlus/CTElectricGenerator.cc @@ -363,73 +363,71 @@ namespace CTElectricGenerator { "Generator Produced AC Electricity Rate", Constant::Units::W, this->ElecPowerGenerated, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Produced AC Electricity Energy", Constant::Units::J, this->ElecEnergyGenerated, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::ElectricityProduced, - OutputProcessor::SOVEndUseCat::Cogeneration, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Cogeneration); SetupOutputVariable(state, format("Generator {} Rate", sFuelType), Constant::Units::W, this->FuelEnergyUseRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, format("Generator {} Energy", sFuelType), Constant::Units::J, this->FuelEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eFuel2eResource[(int)this->FuelType], - OutputProcessor::SOVEndUseCat::Cogeneration, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Cogeneration); // general fuel use report (to match other generators) SetupOutputVariable(state, "Generator Fuel HHV Basis Rate", Constant::Units::W, this->FuelEnergyUseRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Fuel HHV Basis Energy", Constant::Units::J, this->FuelEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, format("Generator {} Mass Flow Rate", sFuelType), Constant::Units::kg_s, this->FuelMdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Exhaust Air Temperature", Constant::Units::C, this->ExhaustStackTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); if (this->HeatRecActive) { @@ -437,80 +435,78 @@ namespace CTElectricGenerator { "Generator Exhaust Heat Recovery Rate", Constant::Units::W, this->QExhaustRecovered, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Exhaust Heat Recovery Energy", Constant::Units::J, this->ExhaustEnergyRec, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::HeatRecovery, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::HeatRecovery); SetupOutputVariable(state, "Generator Lube Heat Recovery Rate", Constant::Units::W, this->QLubeOilRecovered, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Lube Heat Recovery Energy", Constant::Units::J, this->LubeOilEnergyRec, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::HeatRecovery, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::HeatRecovery); SetupOutputVariable(state, "Generator Produced Thermal Rate", Constant::Units::W, this->QTotalHeatRecovered, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Produced Thermal Energy", Constant::Units::J, this->TotalHeatEnergyRec, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Generator Heat Recovery Inlet Temperature", Constant::Units::C, this->HeatRecInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Heat Recovery Outlet Temperature", Constant::Units::C, this->HeatRecOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Heat Recovery Mass Flow Rate", Constant::Units::kg_s, this->HeatRecMdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); } } diff --git a/src/EnergyPlus/ChilledCeilingPanelSimple.cc b/src/EnergyPlus/ChilledCeilingPanelSimple.cc index 731d59aed37..41bae19bd08 100644 --- a/src/EnergyPlus/ChilledCeilingPanelSimple.cc +++ b/src/EnergyPlus/ChilledCeilingPanelSimple.cc @@ -688,88 +688,86 @@ void GetCoolingPanelInput(EnergyPlusData &state) "Cooling Panel Total Cooling Rate", Constant::Units::W, thisCP.Power, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisCP.Name); SetupOutputVariable(state, "Cooling Panel Total System Cooling Rate", Constant::Units::W, thisCP.TotPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisCP.Name); SetupOutputVariable(state, "Cooling Panel Convective Cooling Rate", Constant::Units::W, thisCP.ConvPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisCP.Name); SetupOutputVariable(state, "Cooling Panel Radiant Cooling Rate", Constant::Units::W, thisCP.RadPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisCP.Name); SetupOutputVariable(state, "Cooling Panel Total Cooling Energy", Constant::Units::J, thisCP.Energy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisCP.Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::CoolingPanel, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::CoolingPanel); SetupOutputVariable(state, "Cooling Panel Total System Cooling Energy", Constant::Units::J, thisCP.TotEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisCP.Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::CoolingPanel, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::CoolingPanel); SetupOutputVariable(state, "Cooling Panel Convective Cooling Energy", Constant::Units::J, thisCP.ConvEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisCP.Name); SetupOutputVariable(state, "Cooling Panel Radiant Cooling Energy", Constant::Units::J, thisCP.RadEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisCP.Name); SetupOutputVariable(state, "Cooling Panel Water Mass Flow Rate", Constant::Units::kg_s, thisCP.WaterMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisCP.Name); SetupOutputVariable(state, "Cooling Panel Water Inlet Temperature", Constant::Units::C, thisCP.WaterInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisCP.Name); SetupOutputVariable(state, "Cooling Panel Water Outlet Temperature", Constant::Units::C, thisCP.WaterOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisCP.Name); } } diff --git a/src/EnergyPlus/ChillerAbsorption.cc b/src/EnergyPlus/ChillerAbsorption.cc index a38a2973ef5..4e38df64a63 100644 --- a/src/EnergyPlus/ChillerAbsorption.cc +++ b/src/EnergyPlus/ChillerAbsorption.cc @@ -496,98 +496,95 @@ void BLASTAbsorberSpecs::setupOutputVars(EnergyPlusData &state) "Chiller Electricity Rate", Constant::Units::W, this->Report.PumpingPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Electricity Energy", Constant::Units::J, this->Report.PumpingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Cooling); SetupOutputVariable(state, "Chiller Evaporator Cooling Rate", Constant::Units::W, this->Report.QEvap, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Evaporator Cooling Energy", Constant::Units::J, this->Report.EvapEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::Chillers, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Chillers); SetupOutputVariable(state, "Chiller Evaporator Inlet Temperature", Constant::Units::C, this->Report.EvapInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Evaporator Outlet Temperature", Constant::Units::C, this->Report.EvapOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Evaporator Mass Flow Rate", Constant::Units::kg_s, this->Report.Evapmdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Condenser Heat Transfer Rate", Constant::Units::W, this->Report.QCond, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Condenser Heat Transfer Energy", Constant::Units::J, this->Report.CondEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::HeatRejection, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::HeatRejection); SetupOutputVariable(state, "Chiller Condenser Inlet Temperature", Constant::Units::C, this->Report.CondInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Condenser Outlet Temperature", Constant::Units::C, this->Report.CondOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Condenser Mass Flow Rate", Constant::Units::kg_s, this->Report.Condmdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); if (this->GenHeatSourceType == DataLoopNode::NodeFluidType::Water) { @@ -595,59 +592,56 @@ void BLASTAbsorberSpecs::setupOutputVars(EnergyPlusData &state) "Chiller Hot Water Consumption Rate", Constant::Units::W, this->Report.QGenerator, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Source Hot Water Energy", Constant::Units::J, this->Report.GeneratorEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::PlantLoopHeatingDemand, - OutputProcessor::SOVEndUseCat::Chillers, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Chillers); } else { if (this->GenInputOutputNodesUsed) { SetupOutputVariable(state, "Chiller Source Steam Rate", Constant::Units::W, this->Report.QGenerator, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Source Steam Energy", Constant::Units::J, this->Report.GeneratorEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::PlantLoopHeatingDemand, - OutputProcessor::SOVEndUseCat::Chillers, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Chillers); } else { SetupOutputVariable(state, "Chiller Source Steam Rate", Constant::Units::W, this->Report.QGenerator, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Source Steam Energy", Constant::Units::J, this->Report.GeneratorEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::DistrictHeatingSteam, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Cooling); } } @@ -655,8 +649,8 @@ void BLASTAbsorberSpecs::setupOutputVars(EnergyPlusData &state) "Chiller COP", Constant::Units::W_W, this->Report.ActualCOP, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); if (state.dataGlobal->AnyEnergyManagementSystemInModel) { diff --git a/src/EnergyPlus/ChillerElectricASHRAE205.cc b/src/EnergyPlus/ChillerElectricASHRAE205.cc index 007dc8991b5..35189c96652 100644 --- a/src/EnergyPlus/ChillerElectricASHRAE205.cc +++ b/src/EnergyPlus/ChillerElectricASHRAE205.cc @@ -965,196 +965,194 @@ void ASHRAE205ChillerSpecs::setOutputVariables(EnergyPlusData &state) "Chiller Part Load Ratio", Constant::Units::None, this->ChillerPartLoadRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Cycling Ratio", Constant::Units::None, this->ChillerCyclingRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Minimum Part Load Ratio", Constant::Units::None, this->MinPartLoadRat, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Electricity Rate", Constant::Units::W, this->Power, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Electricity Energy", Constant::Units::J, this->Energy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cooling, - this->EndUseSubcategory, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Cooling, + this->EndUseSubcategory); SetupOutputVariable(state, "Chiller Evaporator Cooling Rate", Constant::Units::W, this->QEvaporator, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Evaporator Cooling Energy", Constant::Units::J, this->EvapEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::Chillers, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Chillers); SetupOutputVariable(state, "Chiller Evaporator Inlet Temperature", Constant::Units::C, this->EvapInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Evaporator Outlet Temperature", Constant::Units::C, this->EvapOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Evaporator Mass Flow Rate", Constant::Units::kg_s, this->EvapMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Condenser Heat Transfer Rate", Constant::Units::W, this->QCondenser, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Condenser Heat Transfer Energy", Constant::Units::J, this->CondEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::HeatRejection, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::HeatRejection); SetupOutputVariable(state, "Chiller COP", Constant::Units::W_W, this->ActualCOP, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Condenser Inlet Temperature", Constant::Units::C, this->CondInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Condenser Outlet Temperature", Constant::Units::C, this->CondOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Condenser Mass Flow Rate", Constant::Units::kg_s, this->CondMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Effective Heat Rejection Temperature", Constant::Units::C, this->ChillerCondAvgTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Zone Heat Gain Rate", Constant::Units::W, this->AmbientZoneGain, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Zone Heat Gain Energy", Constant::Units::J, this->AmbientZoneGainEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Oil Cooler Heat Transfer Rate", Constant::Units::W, this->QOilCooler, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Oil Cooler Heat Transfer Energy", Constant::Units::J, this->OilCoolerEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Auxiliary Heat Transfer Rate", Constant::Units::W, this->QAuxiliary, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Auxiliary Heat Transfer Energy", Constant::Units::J, this->AuxiliaryEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); } diff --git a/src/EnergyPlus/ChillerElectricEIR.cc b/src/EnergyPlus/ChillerElectricEIR.cc index 42a705ce393..f9fe217d6f8 100644 --- a/src/EnergyPlus/ChillerElectricEIR.cc +++ b/src/EnergyPlus/ChillerElectricEIR.cc @@ -761,148 +761,146 @@ void ElectricEIRChillerSpecs::setupOutputVars(EnergyPlusData &state) "Chiller Part Load Ratio", Constant::Units::None, this->ChillerPartLoadRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Cycling Ratio", Constant::Units::None, this->ChillerCyclingRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Electricity Rate", Constant::Units::W, this->Power, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Electricity Energy", Constant::Units::J, this->Energy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cooling, - this->EndUseSubcategory, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Cooling, + this->EndUseSubcategory); SetupOutputVariable(state, "Chiller Evaporator Cooling Rate", Constant::Units::W, this->QEvaporator, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Evaporator Cooling Energy", Constant::Units::J, this->EvapEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::Chillers, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Chillers); SetupOutputVariable(state, "Chiller False Load Heat Transfer Rate", Constant::Units::W, this->ChillerFalseLoadRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller False Load Heat Transfer Energy", Constant::Units::J, this->ChillerFalseLoad, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Chiller Evaporator Inlet Temperature", Constant::Units::C, this->EvapInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Evaporator Outlet Temperature", Constant::Units::C, this->EvapOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Evaporator Mass Flow Rate", Constant::Units::kg_s, this->EvapMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Condenser Heat Transfer Rate", Constant::Units::W, this->QCondenser, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Condenser Heat Transfer Energy", Constant::Units::J, this->CondEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::HeatRejection, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::HeatRejection); SetupOutputVariable(state, "Chiller COP", Constant::Units::W_W, this->ActualCOP, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Capacity Temperature Modifier Multiplier", Constant::Units::None, this->ChillerCapFT, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller EIR Temperature Modifier Multiplier", Constant::Units::None, this->ChillerEIRFT, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller EIR Part Load Modifier Multiplier", Constant::Units::None, this->ChillerEIRFPLR, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); // Condenser mass flow and outlet temp are valid for water cooled @@ -911,24 +909,24 @@ void ElectricEIRChillerSpecs::setupOutputVars(EnergyPlusData &state) "Chiller Condenser Inlet Temperature", Constant::Units::C, this->CondInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Condenser Outlet Temperature", Constant::Units::C, this->CondOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Condenser Mass Flow Rate", Constant::Units::kg_s, this->CondMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); // If heat recovery is active then setup report variables @@ -937,52 +935,51 @@ void ElectricEIRChillerSpecs::setupOutputVars(EnergyPlusData &state) "Chiller Total Recovered Heat Rate", Constant::Units::W, this->QHeatRecovered, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Total Recovered Heat Energy", Constant::Units::J, this->EnergyHeatRecovery, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::HeatRecovery, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::HeatRecovery); SetupOutputVariable(state, "Chiller Heat Recovery Inlet Temperature", Constant::Units::C, this->HeatRecInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Heat Recovery Outlet Temperature", Constant::Units::C, this->HeatRecOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Heat Recovery Mass Flow Rate", Constant::Units::kg_s, this->HeatRecMassFlow, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Effective Heat Rejection Temperature", Constant::Units::C, this->ChillerCondAvgTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); } @@ -991,8 +988,8 @@ void ElectricEIRChillerSpecs::setupOutputVars(EnergyPlusData &state) "Chiller Condenser Inlet Temperature", Constant::Units::C, this->CondInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); if (this->CondenserFanPowerRatio > 0) { @@ -1000,67 +997,63 @@ void ElectricEIRChillerSpecs::setupOutputVars(EnergyPlusData &state) "Chiller Condenser Fan Electricity Rate", Constant::Units::W, this->CondenserFanPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Condenser Fan Electricity Energy", Constant::Units::J, this->CondenserFanEnergyConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Cooling); } if (this->CondenserType == DataPlant::CondenserType::EvapCooled) { SetupOutputVariable(state, "Chiller Evaporative Condenser Water Volume", Constant::Units::m3, this->EvapWaterConsump, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::Water, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); SetupOutputVariable(state, "Chiller Evaporative Condenser Mains Supply Water Volume", Constant::Units::m3, this->EvapWaterConsump, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::MainsWater, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); if (this->BasinHeaterPowerFTempDiff > 0.0) { SetupOutputVariable(state, "Chiller Basin Heater Electricity Rate", Constant::Units::W, this->BasinHeaterPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Basin Heater Electricity Energy", Constant::Units::J, this->BasinHeaterConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Chillers, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Chillers); } } } diff --git a/src/EnergyPlus/ChillerExhaustAbsorption.cc b/src/EnergyPlus/ChillerExhaustAbsorption.cc index abb1e367c89..d1ab2be9986 100644 --- a/src/EnergyPlus/ChillerExhaustAbsorption.cc +++ b/src/EnergyPlus/ChillerExhaustAbsorption.cc @@ -536,141 +536,136 @@ void ExhaustAbsorberSpecs::setupOutputVariables(EnergyPlusData &state) "Chiller Heater Evaporator Cooling Rate", Constant::Units::W, this->CoolingLoad, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ChillerName); SetupOutputVariable(state, "Chiller Heater Evaporator Cooling Energy", Constant::Units::J, this->CoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, ChillerName, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::Chillers, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Chillers); SetupOutputVariable(state, "Chiller Heater Heating Rate", Constant::Units::W, this->HeatingLoad, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ChillerName); SetupOutputVariable(state, "Chiller Heater Heating Energy", Constant::Units::J, this->HeatingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, ChillerName, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::Boilers, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Boilers); SetupOutputVariable(state, "Chiller Heater Condenser Heat Transfer Rate", Constant::Units::W, this->TowerLoad, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ChillerName); SetupOutputVariable(state, "Chiller Heater Condenser Heat Transfer Energy", Constant::Units::J, this->TowerEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, ChillerName, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::HeatRejection, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::HeatRejection); SetupOutputVariable(state, "Chiller Heater Cooling Source Heat COP", Constant::Units::W_W, this->ThermalEnergyCOP, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ChillerName); SetupOutputVariable(state, "Chiller Heater Electricity Rate", Constant::Units::W, this->ElectricPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ChillerName); // Do not include this on meters, this would duplicate the cool electric and heat electric SetupOutputVariable(state, "Chiller Heater Electricity Energy", Constant::Units::J, this->ElectricEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, ChillerName); SetupOutputVariable(state, "Chiller Heater Cooling Electricity Rate", Constant::Units::W, this->CoolElectricPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ChillerName); SetupOutputVariable(state, "Chiller Heater Cooling Electricity Energy", Constant::Units::J, this->CoolElectricEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, ChillerName, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Cooling); SetupOutputVariable(state, "Chiller Heater Heating Electricity Rate", Constant::Units::W, this->HeatElectricPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ChillerName); SetupOutputVariable(state, "Chiller Heater Heating Electricity Energy", Constant::Units::J, this->HeatElectricEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, ChillerName, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Heating, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Heating); SetupOutputVariable(state, "Chiller Heater Evaporator Inlet Temperature", Constant::Units::C, this->ChillReturnTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ChillerName); SetupOutputVariable(state, "Chiller Heater Evaporator Outlet Temperature", Constant::Units::C, this->ChillSupplyTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ChillerName); SetupOutputVariable(state, "Chiller Heater Evaporator Mass Flow Rate", Constant::Units::kg_s, this->ChillWaterFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ChillerName); if (this->isWaterCooled) { @@ -678,30 +673,30 @@ void ExhaustAbsorberSpecs::setupOutputVariables(EnergyPlusData &state) "Chiller Heater Condenser Inlet Temperature", Constant::Units::C, this->CondReturnTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ChillerName); SetupOutputVariable(state, "Chiller Heater Condenser Outlet Temperature", Constant::Units::C, this->CondSupplyTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ChillerName); SetupOutputVariable(state, "Chiller Heater Condenser Mass Flow Rate", Constant::Units::kg_s, this->CondWaterFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ChillerName); } else { SetupOutputVariable(state, "Chiller Heater Condenser Inlet Temperature", Constant::Units::C, this->CondReturnTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ChillerName); } @@ -709,104 +704,104 @@ void ExhaustAbsorberSpecs::setupOutputVariables(EnergyPlusData &state) "Chiller Heater Heating Inlet Temperature", Constant::Units::C, this->HotWaterReturnTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ChillerName); SetupOutputVariable(state, "Chiller Heater Heating Outlet Temperature", Constant::Units::C, this->HotWaterSupplyTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ChillerName); SetupOutputVariable(state, "Chiller Heater Heating Mass Flow Rate", Constant::Units::kg_s, this->HotWaterFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ChillerName); SetupOutputVariable(state, "Chiller Heater Cooling Part Load Ratio", Constant::Units::None, this->CoolPartLoadRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ChillerName); SetupOutputVariable(state, "Chiller Heater Maximum Cooling Rate", Constant::Units::W, this->CoolingCapacity, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ChillerName); SetupOutputVariable(state, "Chiller Heater Heating Part Load Ratio", Constant::Units::None, this->HeatPartLoadRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ChillerName); SetupOutputVariable(state, "Chiller Heater Maximum Heating Rate", Constant::Units::W, this->HeatingCapacity, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ChillerName); SetupOutputVariable(state, "Chiller Heater Runtime Fraction", Constant::Units::None, this->FractionOfPeriodRunning, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ChillerName); SetupOutputVariable(state, "Chiller Heater Source Exhaust Inlet Temperature", Constant::Units::C, this->ExhaustInTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ChillerName); SetupOutputVariable(state, "Chiller Heater Source Exhaust Inlet Mass Flow Rate", Constant::Units::kg_s, this->ExhaustInFlow, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ChillerName); SetupOutputVariable(state, "Chiller Heater Heating Heat Recovery Potential Rate", Constant::Units::W, this->ExhHeatRecPotentialHeat, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ChillerName); SetupOutputVariable(state, "Chiller Heater Cooling Heat Recovery Potential Rate", Constant::Units::W, this->ExhHeatRecPotentialCool, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ChillerName); SetupOutputVariable(state, "Chiller Heater Cooling Source Heat Transfer Rate", Constant::Units::W, this->CoolThermalEnergyUseRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ChillerName); SetupOutputVariable(state, "Chiller Heater Heating Source Heat Transfer Rate", Constant::Units::W, this->HeatThermalEnergyUseRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ChillerName); } diff --git a/src/EnergyPlus/ChillerGasAbsorption.cc b/src/EnergyPlus/ChillerGasAbsorption.cc index 42bb82b4bf4..bfce6b11c6f 100644 --- a/src/EnergyPlus/ChillerGasAbsorption.cc +++ b/src/EnergyPlus/ChillerGasAbsorption.cc @@ -537,195 +537,188 @@ void GasAbsorberSpecs::setupOutputVariables(EnergyPlusData &state) "Chiller Heater Evaporator Cooling Rate", Constant::Units::W, this->CoolingLoad, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Heater Evaporator Cooling Energy", Constant::Units::J, this->CoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::Chillers, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Chillers); SetupOutputVariable(state, "Chiller Heater Heating Rate", Constant::Units::W, this->HeatingLoad, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Heater Heating Energy", Constant::Units::J, this->HeatingEnergy, - 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, "Chiller Heater Condenser Heat Transfer Rate", Constant::Units::W, this->TowerLoad, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Heater Condenser Heat Transfer Energy", Constant::Units::J, this->TowerEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::HeatRejection, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::HeatRejection); SetupOutputVariable(state, format("Chiller Heater {} Rate", sFuelType), Constant::Units::W, this->FuelUseRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); // Do not include this on meters, this would duplicate the cool fuel and heat fuel SetupOutputVariable(state, format("Chiller Heater {} Energy", sFuelType), Constant::Units::J, this->FuelEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, format("Chiller Heater Cooling {} Rate", sFuelType), Constant::Units::W, this->CoolFuelUseRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, format("Chiller Heater Cooling {} Energy", sFuelType), Constant::Units::J, this->CoolFuelEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eFuel2eResource[(int)this->FuelType], - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Cooling); SetupOutputVariable(state, "Chiller Heater Cooling COP", Constant::Units::W_W, this->FuelCOP, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, format("Chiller Heater Heating {} Rate", sFuelType), Constant::Units::W, this->HeatFuelUseRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, format("Chiller Heater Heating {} Energy", sFuelType), Constant::Units::J, this->HeatFuelEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eFuel2eResource[(int)this->FuelType], - OutputProcessor::SOVEndUseCat::Heating, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Heating); SetupOutputVariable(state, "Chiller Heater Electricity Rate", Constant::Units::W, this->ElectricPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); // Do not include this on meters, this would duplicate the cool electric and heat electric SetupOutputVariable(state, "Chiller Heater Electricity Energy", Constant::Units::J, this->ElectricEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Chiller Heater Cooling Electricity Rate", Constant::Units::W, this->CoolElectricPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Heater Cooling Electricity Energy", Constant::Units::J, this->CoolElectricEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Cooling); SetupOutputVariable(state, "Chiller Heater Heating Electricity Rate", Constant::Units::W, this->HeatElectricPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Heater Heating Electricity Energy", Constant::Units::J, this->HeatElectricEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Heating, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Heating); SetupOutputVariable(state, "Chiller Heater Evaporator Inlet Temperature", Constant::Units::C, this->ChillReturnTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Heater Evaporator Outlet Temperature", Constant::Units::C, this->ChillSupplyTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Heater Evaporator Mass Flow Rate", Constant::Units::kg_s, this->ChillWaterFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); if (this->isWaterCooled) { @@ -733,30 +726,30 @@ void GasAbsorberSpecs::setupOutputVariables(EnergyPlusData &state) "Chiller Heater Condenser Inlet Temperature", Constant::Units::C, this->CondReturnTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Heater Condenser Outlet Temperature", Constant::Units::C, this->CondSupplyTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Heater Condenser Mass Flow Rate", Constant::Units::kg_s, this->CondWaterFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); } else { SetupOutputVariable(state, "Chiller Heater Condenser Inlet Temperature", Constant::Units::C, this->CondReturnTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); } @@ -764,59 +757,59 @@ void GasAbsorberSpecs::setupOutputVariables(EnergyPlusData &state) "Chiller Heater Heating Inlet Temperature", Constant::Units::C, this->HotWaterReturnTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Heater Heating Outlet Temperature", Constant::Units::C, this->HotWaterSupplyTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Heater Heating Mass Flow Rate", Constant::Units::kg_s, this->HotWaterFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Heater Cooling Part Load Ratio", Constant::Units::None, this->CoolPartLoadRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Heater Maximum Cooling Rate", Constant::Units::W, this->CoolingCapacity, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Heater Heating Part Load Ratio", Constant::Units::None, this->HeatPartLoadRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Heater Maximum Heating Rate", Constant::Units::W, this->HeatingCapacity, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Heater Runtime Fraction", Constant::Units::None, this->FractionOfPeriodRunning, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); } diff --git a/src/EnergyPlus/ChillerIndirectAbsorption.cc b/src/EnergyPlus/ChillerIndirectAbsorption.cc index 1318627dd9d..cc70d9670ac 100644 --- a/src/EnergyPlus/ChillerIndirectAbsorption.cc +++ b/src/EnergyPlus/ChillerIndirectAbsorption.cc @@ -575,108 +575,105 @@ void IndirectAbsorberSpecs::setupOutputVars(EnergyPlusData &state) "Chiller Electricity Rate", Constant::Units::W, this->Report.PumpingPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Electricity Energy", Constant::Units::J, this->Report.PumpingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Cooling); SetupOutputVariable(state, "Chiller Evaporator Cooling Rate", Constant::Units::W, this->Report.QEvap, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Evaporator Cooling Energy", Constant::Units::J, this->Report.EvapEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::Chillers, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Chillers); SetupOutputVariable(state, "Chiller Evaporator Inlet Temperature", Constant::Units::C, this->Report.EvapInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Evaporator Outlet Temperature", Constant::Units::C, this->Report.EvapOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Evaporator Mass Flow Rate", Constant::Units::kg_s, this->Report.Evapmdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Condenser Heat Transfer Rate", Constant::Units::W, this->Report.QCond, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Condenser Heat Transfer Energy", Constant::Units::J, this->Report.CondEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::HeatRejection, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::HeatRejection); SetupOutputVariable(state, "Chiller Condenser Inlet Temperature", Constant::Units::C, this->Report.CondInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Condenser Outlet Temperature", Constant::Units::C, this->Report.CondOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Condenser Mass Flow Rate", Constant::Units::kg_s, this->Report.Condmdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); if (this->GenHeatSourceType == DataLoopNode::NodeFluidType::Water) { @@ -684,62 +681,59 @@ void IndirectAbsorberSpecs::setupOutputVars(EnergyPlusData &state) "Chiller Hot Water Consumption Rate", Constant::Units::W, this->Report.QGenerator, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Source Hot Water Energy", Constant::Units::J, this->Report.GeneratorEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Cooling); } else { if (this->GenInputOutputNodesUsed) { SetupOutputVariable(state, "Chiller Source Steam Rate", Constant::Units::W, this->Report.QGenerator, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Source Steam Energy", Constant::Units::J, this->Report.GeneratorEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::PlantLoopHeatingDemand, - OutputProcessor::SOVEndUseCat::Chillers, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Chillers); } else { SetupOutputVariable(state, "Chiller Source Steam Rate", Constant::Units::W, this->Report.QGenerator, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Source Steam Energy", Constant::Units::J, this->Report.GeneratorEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::DistrictHeatingSteam, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Cooling); } } @@ -747,32 +741,32 @@ void IndirectAbsorberSpecs::setupOutputVars(EnergyPlusData &state) "Chiller COP", Constant::Units::W_W, this->Report.ActualCOP, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Part Load Ratio", Constant::Units::None, this->Report.ChillerPartLoadRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Cycling Ratio", Constant::Units::None, this->Report.ChillerCyclingFrac, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Steam Heat Loss Rate", Constant::Units::W, this->Report.LoopLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); if (state.dataGlobal->AnyEnergyManagementSystemInModel) { diff --git a/src/EnergyPlus/ChillerReformulatedEIR.cc b/src/EnergyPlus/ChillerReformulatedEIR.cc index 0409c1726cb..2d432ae4095 100644 --- a/src/EnergyPlus/ChillerReformulatedEIR.cc +++ b/src/EnergyPlus/ChillerReformulatedEIR.cc @@ -641,172 +641,170 @@ void ReformulatedEIRChillerSpecs::setupOutputVars(EnergyPlusData &state) "Chiller Part Load Ratio", Constant::Units::None, this->ChillerPartLoadRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Cycling Ratio", Constant::Units::None, this->ChillerCyclingRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Electricity Rate", Constant::Units::W, this->Power, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Electricity Energy", Constant::Units::J, this->Energy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cooling, - this->EndUseSubcategory, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Cooling, + this->EndUseSubcategory); SetupOutputVariable(state, "Chiller Evaporator Cooling Rate", Constant::Units::W, this->QEvaporator, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Evaporator Cooling Energy", Constant::Units::J, this->EvapEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::Chillers, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Chillers); SetupOutputVariable(state, "Chiller False Load Heat Transfer Rate", Constant::Units::W, this->ChillerFalseLoadRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller False Load Heat Transfer Energy", Constant::Units::J, this->ChillerFalseLoad, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Chiller Evaporator Inlet Temperature", Constant::Units::C, this->EvapInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Evaporator Outlet Temperature", Constant::Units::C, this->EvapOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Evaporator Mass Flow Rate", Constant::Units::kg_s, this->EvapMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Condenser Heat Transfer Rate", Constant::Units::W, this->QCondenser, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Condenser Heat Transfer Energy", Constant::Units::J, this->CondEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::HeatRejection, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::HeatRejection); SetupOutputVariable(state, "Chiller COP", Constant::Units::W_W, this->ActualCOP, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Capacity Temperature Modifier Multiplier", Constant::Units::None, this->ChillerCapFT, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller EIR Temperature Modifier Multiplier", Constant::Units::None, this->ChillerEIRFT, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller EIR Part Load Modifier Multiplier", Constant::Units::None, this->ChillerEIRFPLR, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Condenser Inlet Temperature", Constant::Units::C, this->CondInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Condenser Outlet Temperature", Constant::Units::C, this->CondOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Condenser Mass Flow Rate", Constant::Units::kg_s, this->CondMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); // If heat recovery is active then setup report variables @@ -815,52 +813,51 @@ void ReformulatedEIRChillerSpecs::setupOutputVars(EnergyPlusData &state) "Chiller Total Recovered Heat Rate", Constant::Units::W, this->QHeatRecovery, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Total Recovered Heat Energy", Constant::Units::J, this->EnergyHeatRecovery, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::HeatRejection, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::HeatRejection); SetupOutputVariable(state, "Chiller Heat Recovery Inlet Temperature", Constant::Units::C, this->HeatRecInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Heat Recovery Outlet Temperature", Constant::Units::C, this->HeatRecOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Heat Recovery Mass Flow Rate", Constant::Units::kg_s, this->HeatRecMassFlow, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Effective Heat Rejection Temperature", Constant::Units::C, this->ChillerCondAvgTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); } diff --git a/src/EnergyPlus/Coils/CoilCoolingDX.cc b/src/EnergyPlus/Coils/CoilCoolingDX.cc index adc30cf4964..daa97ecef9f 100644 --- a/src/EnergyPlus/Coils/CoilCoolingDX.cc +++ b/src/EnergyPlus/Coils/CoilCoolingDX.cc @@ -246,66 +246,64 @@ void CoilCoolingDX::oneTimeInit(EnergyPlusData &state) "Cooling Coil Total Cooling Rate", Constant::Units::W, this->totalCoolingEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); SetupOutputVariable(state, "Cooling Coil Total Cooling Energy", Constant::Units::J, this->totalCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::CoolingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::CoolingCoils); SetupOutputVariable(state, "Cooling Coil Sensible Cooling Rate", Constant::Units::W, this->sensCoolingEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); SetupOutputVariable(state, "Cooling Coil Sensible Cooling Energy", Constant::Units::J, this->sensCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->name); SetupOutputVariable(state, "Cooling Coil Latent Cooling Rate", Constant::Units::W, this->latCoolingEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); SetupOutputVariable(state, "Cooling Coil Latent Cooling Energy", Constant::Units::J, this->latCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->name); SetupOutputVariable(state, "Cooling Coil Electricity Rate", Constant::Units::W, this->performance.powerUse, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); SetupOutputVariable(state, "Cooling Coil Electricity Energy", Constant::Units::J, this->performance.electricityConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); if (this->performance.compressorFuelType != Constant::eFuel::Electricity) { std::string_view const sFuelType = Constant::eFuelNames[(int)this->performance.compressorFuelType]; @@ -313,131 +311,129 @@ void CoilCoolingDX::oneTimeInit(EnergyPlusData &state) format("Cooling Coil {} Rate", sFuelType), Constant::Units::W, this->performance.compressorFuelRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); SetupOutputVariable(state, format("Cooling Coil {} Energy", sFuelType), Constant::Units::J, this->performance.compressorFuelConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->name, Constant::eFuel2eResource[(int)this->performance.compressorFuelType], - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); } SetupOutputVariable(state, "Cooling Coil Runtime Fraction", Constant::Units::None, this->coolingCoilRuntimeFraction, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); SetupOutputVariable(state, "Cooling Coil Crankcase Heater Electricity Rate", Constant::Units::W, this->performance.crankcaseHeaterPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); SetupOutputVariable(state, "Cooling Coil Crankcase Heater Electricity Energy", Constant::Units::J, this->performance.crankcaseHeaterElectricityConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); // Ported from variable speed coil SetupOutputVariable(state, "Cooling Coil Air Mass Flow Rate", Constant::Units::kg_s, this->airMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); SetupOutputVariable(state, "Cooling Coil Air Inlet Temperature", Constant::Units::C, this->inletAirDryBulbTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); SetupOutputVariable(state, "Cooling Coil Air Inlet Humidity Ratio", Constant::Units::kgWater_kgDryAir, this->inletAirHumRat, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); SetupOutputVariable(state, "Cooling Coil Air Outlet Temperature", Constant::Units::C, this->outletAirDryBulbTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); SetupOutputVariable(state, "Cooling Coil Air Outlet Humidity Ratio", Constant::Units::kgWater_kgDryAir, this->outletAirHumRat, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); SetupOutputVariable(state, "Cooling Coil Part Load Ratio", Constant::Units::None, this->partLoadRatioReport, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); SetupOutputVariable(state, "Cooling Coil Upper Speed Level", Constant::Units::None, this->speedNumReport, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); SetupOutputVariable(state, "Cooling Coil Neighboring Speed Levels Ratio", Constant::Units::None, this->speedRatioReport, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); SetupOutputVariable(state, "Cooling Coil Condenser Inlet Temperature", Constant::Units::C, this->condenserInletTemperature, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); SetupOutputVariable(state, "Cooling Coil Dehumidification Mode", Constant::Units::None, this->dehumidificationMode, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); SetupOutputVariable(state, "Cooling Coil Waste Heat Power", Constant::Units::W, this->wasteHeatEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); SetupOutputVariable(state, "Cooling Coil Waste Heat Energy", Constant::Units::J, this->wasteHeatEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->name); if (this->performance.evapCondBasinHeatCap > 0) { @@ -445,123 +441,117 @@ void CoilCoolingDX::oneTimeInit(EnergyPlusData &state) "Cooling Coil Basin Heater Electricity Rate", Constant::Units::W, this->performance.basinHeaterPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); SetupOutputVariable(state, "Cooling Coil Basin Heater Electricity Energy", Constant::Units::J, this->performance.basinHeaterElectricityConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); } if (this->condensateTankIndex > 0) { SetupOutputVariable(state, "Cooling Coil Condensate Volume Flow Rate", Constant::Units::m3_s, this->condensateVolumeFlow, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); SetupOutputVariable(state, "Cooling Coil Condensate Volume", Constant::Units::m3, this->condensateVolumeConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->name, Constant::eResource::OnSiteWater, - OutputProcessor::SOVEndUseCat::Condensate, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Condensate); } if (this->evaporativeCondSupplyTankIndex > 0) { SetupOutputVariable(state, "Cooling Coil Evaporative Condenser Pump Electricity Rate", Constant::Units::W, this->evapCondPumpElecPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); SetupOutputVariable(state, "Cooling Coil Evaporative Condenser Pump Electricity Energy", Constant::Units::J, this->evapCondPumpElecConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Condensate, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Condensate); SetupOutputVariable(state, "Cooling Coil Evaporative Condenser Water Volume Flow Rate", Constant::Units::m3_s, this->evaporativeCondSupplyTankVolumeFlow, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); SetupOutputVariable(state, "Cooling Coil Evaporative Condenser Water Volume", Constant::Units::m3, this->evaporativeCondSupplyTankConsump, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->name, Constant::eResource::Water, - OutputProcessor::SOVEndUseCat::Condensate, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Condensate); SetupOutputVariable(state, "Cooling Coil Evaporative Condenser Mains Supply Water Volume", Constant::Units::m3, this->evaporativeCondSupplyTankConsump, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->name, Constant::eResource::MainsWater, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); } if (this->SubcoolReheatFlag) { SetupOutputVariable(state, "SubcoolReheat Cooling Coil Operation Mode", Constant::Units::None, this->performance.OperatingMode, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); SetupOutputVariable(state, "SubcoolReheat Cooling Coil Operation Mode Ratio", Constant::Units::None, this->performance.ModeRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); SetupOutputVariable(state, "SubcoolReheat Cooling Coil Recovered Heat Energy Rate", Constant::Units::W, this->recoveredHeatEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); SetupOutputVariable(state, "SubcoolReheat Cooling Coil Recovered Heat Energy", Constant::Units::J, this->recoveredHeatEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::HeatRecovery, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::HeatRecovery); } if (this->isSecondaryDXCoilInZone) { @@ -569,16 +559,16 @@ void CoilCoolingDX::oneTimeInit(EnergyPlusData &state) "Secondary Coil Heat Rejection Rate", Constant::Units::W, this->secCoilSensHeatRejEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); SetupOutputVariable(state, "Secondary Coil Heat Rejection Energy", Constant::Units::J, this->secCoilSensHeatRejEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->name); } } diff --git a/src/EnergyPlus/CondenserLoopTowers.cc b/src/EnergyPlus/CondenserLoopTowers.cc index c7ad4fc5fea..2fa6f4624fc 100644 --- a/src/EnergyPlus/CondenserLoopTowers.cc +++ b/src/EnergyPlus/CondenserLoopTowers.cc @@ -1868,89 +1868,89 @@ namespace CondenserLoopTowers { "Cooling Tower Inlet Temperature", Constant::Units::C, this->InletWaterTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Outlet Temperature", Constant::Units::C, this->OutletWaterTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Mass Flow Rate", Constant::Units::kg_s, this->WaterMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Heat Transfer Rate", Constant::Units::W, this->Qactual, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Fan Electricity Rate", Constant::Units::W, this->FanPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Fan Electricity Energy", Constant::Units::J, this->FanEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::HeatRejection, - this->EndUseSubcategory, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::HeatRejection, + this->EndUseSubcategory); // Added for fluid bypass SetupOutputVariable(state, "Cooling Tower Bypass Fraction", Constant::Units::None, this->BypassFraction, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Operating Cells Count", Constant::Units::None, this->NumCellOn, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Fan Cycling Ratio", Constant::Units::None, this->FanCyclingRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); if (this->BasinHeaterPowerFTempDiff > 0.0) { SetupOutputVariable(state, "Cooling Tower Basin Heater Electricity Rate", Constant::Units::W, this->BasinHeaterPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Basin Heater Electricity Energy", Constant::Units::J, this->BasinHeaterConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::HeatRejection, - "BasinHeater", - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::HeatRejection, + "BasinHeater"); } } @@ -1960,88 +1960,88 @@ namespace CondenserLoopTowers { "Cooling Tower Inlet Temperature", Constant::Units::C, this->InletWaterTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Outlet Temperature", Constant::Units::C, this->OutletWaterTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Mass Flow Rate", Constant::Units::kg_s, this->WaterMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Heat Transfer Rate", Constant::Units::W, this->Qactual, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Fan Electricity Rate", Constant::Units::W, this->FanPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Fan Electricity Energy", Constant::Units::J, this->FanEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::HeatRejection, - this->EndUseSubcategory, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::HeatRejection, + this->EndUseSubcategory); SetupOutputVariable(state, "Cooling Tower Fan Cycling Ratio", Constant::Units::None, this->FanCyclingRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Fan Speed Level", Constant::Units::None, this->SpeedSelected, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Operating Cells Count", Constant::Units::None, this->NumCellOn, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); if (this->BasinHeaterPowerFTempDiff > 0.0) { SetupOutputVariable(state, "Cooling Tower Basin Heater Electricity Rate", Constant::Units::W, this->BasinHeaterPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Basin Heater Electricity Energy", Constant::Units::J, this->BasinHeaterConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::HeatRejection, - "BasinHeater", - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::HeatRejection, + "BasinHeater"); } } @@ -2051,88 +2051,88 @@ namespace CondenserLoopTowers { "Cooling Tower Inlet Temperature", Constant::Units::C, this->InletWaterTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Outlet Temperature", Constant::Units::C, this->OutletWaterTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Mass Flow Rate", Constant::Units::kg_s, this->WaterMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Heat Transfer Rate", Constant::Units::W, this->Qactual, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Fan Electricity Rate", Constant::Units::W, this->FanPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Fan Electricity Energy", Constant::Units::J, this->FanEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::HeatRejection, - this->EndUseSubcategory, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::HeatRejection, + this->EndUseSubcategory); SetupOutputVariable(state, "Cooling Tower Air Flow Rate Ratio", Constant::Units::None, this->AirFlowRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Fan Part Load Ratio", Constant::Units::None, this->FanCyclingRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Operating Cells Count", Constant::Units::None, this->NumCellOn, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); if (this->BasinHeaterPowerFTempDiff > 0.0) { SetupOutputVariable(state, "Cooling Tower Basin Heater Electricity Rate", Constant::Units::W, this->BasinHeaterPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Basin Heater Electricity Energy", Constant::Units::J, this->BasinHeaterConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::HeatRejection, - "BasinHeater", - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::HeatRejection, + "BasinHeater"); } } @@ -2142,82 +2142,82 @@ namespace CondenserLoopTowers { "Cooling Tower Inlet Temperature", Constant::Units::C, this->InletWaterTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Outlet Temperature", Constant::Units::C, this->OutletWaterTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Mass Flow Rate", Constant::Units::kg_s, this->WaterMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Heat Transfer Rate", Constant::Units::W, this->Qactual, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Fan Electricity Rate", Constant::Units::W, this->FanPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Fan Electricity Energy", Constant::Units::J, this->FanEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::HeatRejection, - this->EndUseSubcategory, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::HeatRejection, + this->EndUseSubcategory); SetupOutputVariable(state, "Cooling Tower Fan Speed Ratio", Constant::Units::None, this->AirFlowRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Operating Cells Count", Constant::Units::None, this->NumCellOn, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); if (this->BasinHeaterPowerFTempDiff > 0.0) { SetupOutputVariable(state, "Cooling Tower Basin Heater Electricity Rate", Constant::Units::W, this->BasinHeaterPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Basin Heater Electricity Energy", Constant::Units::J, this->BasinHeaterConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::HeatRejection, - "BasinHeater", - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::HeatRejection, + "BasinHeater"); } } // setup common water reporting for all types of towers. @@ -2226,132 +2226,128 @@ namespace CondenserLoopTowers { "Cooling Tower Make Up Water Volume Flow Rate", Constant::Units::m3_s, this->MakeUpVdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Make Up Water Volume", Constant::Units::m3, this->MakeUpVol, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Cooling Tower Storage Tank Water Volume Flow Rate", Constant::Units::m3_s, this->TankSupplyVdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Storage Tank Water Volume", Constant::Units::m3, this->TankSupplyVol, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::Water, - OutputProcessor::SOVEndUseCat::HeatRejection, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::HeatRejection); SetupOutputVariable(state, "Cooling Tower Starved Storage Tank Water Volume Flow Rate", Constant::Units::m3_s, this->StarvedMakeUpVdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Starved Storage Tank Water Volume", Constant::Units::m3, this->StarvedMakeUpVol, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Cooling Tower Make Up Mains Water Volume", Constant::Units::m3, this->StarvedMakeUpVol, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::MainsWater, - OutputProcessor::SOVEndUseCat::HeatRejection, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::HeatRejection); } else { // tower water from mains and gets metered SetupOutputVariable(state, "Cooling Tower Make Up Water Volume Flow Rate", Constant::Units::m3_s, this->MakeUpVdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Make Up Water Volume", Constant::Units::m3, this->MakeUpVol, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::Water, - OutputProcessor::SOVEndUseCat::HeatRejection, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::HeatRejection); SetupOutputVariable(state, "Cooling Tower Make Up Mains Water Volume", Constant::Units::m3, this->MakeUpVol, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::MainsWater, - OutputProcessor::SOVEndUseCat::HeatRejection, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::HeatRejection); } SetupOutputVariable(state, "Cooling Tower Water Evaporation Volume Flow Rate", Constant::Units::m3_s, this->EvaporationVdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Water Evaporation Volume", Constant::Units::m3, this->EvaporationVol, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Cooling Tower Water Drift Volume Flow Rate", Constant::Units::m3_s, this->DriftVdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Water Drift Volume", Constant::Units::m3, this->DriftVol, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Cooling Tower Water Blowdown Volume Flow Rate", Constant::Units::m3_s, this->BlowdownVdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Water Blowdown Volume", Constant::Units::m3, this->BlowdownVol, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); } diff --git a/src/EnergyPlus/CoolTower.cc b/src/EnergyPlus/CoolTower.cc index 15c7531471d..4991348103a 100644 --- a/src/EnergyPlus/CoolTower.cc +++ b/src/EnergyPlus/CoolTower.cc @@ -438,156 +438,153 @@ namespace CoolTower { "Zone Cooltower Sensible Heat Loss Energy", Constant::Units::J, state.dataCoolTower->CoolTowerSys(CoolTowerNum).SenHeatLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, Zone(state.dataCoolTower->CoolTowerSys(CoolTowerNum).ZonePtr).Name); SetupOutputVariable(state, "Zone Cooltower Sensible Heat Loss Rate", Constant::Units::W, state.dataCoolTower->CoolTowerSys(CoolTowerNum).SenHeatPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(state.dataCoolTower->CoolTowerSys(CoolTowerNum).ZonePtr).Name); SetupOutputVariable(state, "Zone Cooltower Latent Heat Loss Energy", Constant::Units::J, state.dataCoolTower->CoolTowerSys(CoolTowerNum).LatHeatLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, Zone(state.dataCoolTower->CoolTowerSys(CoolTowerNum).ZonePtr).Name); SetupOutputVariable(state, "Zone Cooltower Latent Heat Loss Rate", Constant::Units::W, state.dataCoolTower->CoolTowerSys(CoolTowerNum).LatHeatPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(state.dataCoolTower->CoolTowerSys(CoolTowerNum).ZonePtr).Name); SetupOutputVariable(state, "Zone Cooltower Air Volume", Constant::Units::m3, state.dataCoolTower->CoolTowerSys(CoolTowerNum).CoolTAirVol, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, Zone(state.dataCoolTower->CoolTowerSys(CoolTowerNum).ZonePtr).Name); SetupOutputVariable(state, "Zone Cooltower Current Density Air Volume Flow Rate", Constant::Units::m3_s, state.dataCoolTower->CoolTowerSys(CoolTowerNum).AirVolFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(state.dataCoolTower->CoolTowerSys(CoolTowerNum).ZonePtr).Name); SetupOutputVariable(state, "Zone Cooltower Standard Density Air Volume Flow Rate", Constant::Units::m3_s, state.dataCoolTower->CoolTowerSys(CoolTowerNum).AirVolFlowRateStd, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(state.dataCoolTower->CoolTowerSys(CoolTowerNum).ZonePtr).Name); SetupOutputVariable(state, "Zone Cooltower Air Mass", Constant::Units::kg, state.dataCoolTower->CoolTowerSys(CoolTowerNum).CoolTAirMass, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, Zone(state.dataCoolTower->CoolTowerSys(CoolTowerNum).ZonePtr).Name); SetupOutputVariable(state, "Zone Cooltower Air Mass Flow Rate", Constant::Units::kg_s, state.dataCoolTower->CoolTowerSys(CoolTowerNum).AirMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(state.dataCoolTower->CoolTowerSys(CoolTowerNum).ZonePtr).Name); SetupOutputVariable(state, "Zone Cooltower Air Inlet Temperature", Constant::Units::C, state.dataCoolTower->CoolTowerSys(CoolTowerNum).InletDBTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(state.dataCoolTower->CoolTowerSys(CoolTowerNum).ZonePtr).Name); SetupOutputVariable(state, "Zone Cooltower Air Inlet Humidity Ratio", Constant::Units::kgWater_kgDryAir, state.dataCoolTower->CoolTowerSys(CoolTowerNum).InletHumRat, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(state.dataCoolTower->CoolTowerSys(CoolTowerNum).ZonePtr).Name); SetupOutputVariable(state, "Zone Cooltower Air Outlet Temperature", Constant::Units::C, state.dataCoolTower->CoolTowerSys(CoolTowerNum).OutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(state.dataCoolTower->CoolTowerSys(CoolTowerNum).ZonePtr).Name); SetupOutputVariable(state, "Zone Cooltower Air Outlet Humidity Ratio", Constant::Units::kgWater_kgDryAir, state.dataCoolTower->CoolTowerSys(CoolTowerNum).OutletHumRat, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(state.dataCoolTower->CoolTowerSys(CoolTowerNum).ZonePtr).Name); SetupOutputVariable(state, "Zone Cooltower Pump Electricity Rate", Constant::Units::W, state.dataCoolTower->CoolTowerSys(CoolTowerNum).PumpElecPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Zone(state.dataCoolTower->CoolTowerSys(CoolTowerNum).ZonePtr).Name); SetupOutputVariable(state, "Zone Cooltower Pump Electricity Energy", Constant::Units::J, state.dataCoolTower->CoolTowerSys(CoolTowerNum).PumpElecConsump, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, Zone(state.dataCoolTower->CoolTowerSys(CoolTowerNum).ZonePtr).Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); //"System"); + OutputProcessor::Group::HVAC, // System + OutputProcessor::EndUseCat::Cooling); if (state.dataCoolTower->CoolTowerSys(CoolTowerNum).CoolTWaterSupplyMode == WaterSupplyMode::FromMains) { SetupOutputVariable(state, "Zone Cooltower Water Volume", Constant::Units::m3, state.dataCoolTower->CoolTowerSys(CoolTowerNum).CoolTWaterConsump, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, Zone(state.dataCoolTower->CoolTowerSys(CoolTowerNum).ZonePtr).Name); SetupOutputVariable(state, "Zone Cooltower Mains Water Volume", Constant::Units::m3, state.dataCoolTower->CoolTowerSys(CoolTowerNum).CoolTWaterConsump, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, Zone(state.dataCoolTower->CoolTowerSys(CoolTowerNum).ZonePtr).Name, Constant::eResource::MainsWater, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); // "System"); + OutputProcessor::Group::HVAC, // System + OutputProcessor::EndUseCat::Cooling); } else if (state.dataCoolTower->CoolTowerSys(CoolTowerNum).CoolTWaterSupplyMode == WaterSupplyMode::FromTank) { SetupOutputVariable(state, "Zone Cooltower Water Volume", Constant::Units::m3, state.dataCoolTower->CoolTowerSys(CoolTowerNum).CoolTWaterConsump, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, Zone(state.dataCoolTower->CoolTowerSys(CoolTowerNum).ZonePtr).Name); SetupOutputVariable(state, "Zone Cooltower Storage Tank Water Volume", Constant::Units::m3, state.dataCoolTower->CoolTowerSys(CoolTowerNum).CoolTWaterConsump, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, Zone(state.dataCoolTower->CoolTowerSys(CoolTowerNum).ZonePtr).Name); SetupOutputVariable(state, "Zone Cooltower Starved Mains Water Volume", Constant::Units::m3, state.dataCoolTower->CoolTowerSys(CoolTowerNum).CoolTWaterStarvMakeup, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, Zone(state.dataCoolTower->CoolTowerSys(CoolTowerNum).ZonePtr).Name, Constant::eResource::MainsWater, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); // "System"); + OutputProcessor::Group::HVAC, // System + OutputProcessor::EndUseCat::Cooling); } } } diff --git a/src/EnergyPlus/CurveManager.cc b/src/EnergyPlus/CurveManager.cc index 8b2fdf043c9..dc1f31d16cc 100644 --- a/src/EnergyPlus/CurveManager.cc +++ b/src/EnergyPlus/CurveManager.cc @@ -2723,8 +2723,8 @@ namespace Curve { format("Performance Curve Input Variable {} Value", numStr), Constant::Units::None, thisCurve->inputs[dim - 1], - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisCurve->Name); } // set the output up last so it shows up after the input in the csv file @@ -2732,8 +2732,8 @@ namespace Curve { "Performance Curve Output Value", Constant::Units::None, thisCurve->output, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisCurve->Name); } @@ -2742,29 +2742,29 @@ namespace Curve { "Performance Curve Input Variable 1 Value", Constant::Units::None, thisPressCurve.CurveInput1, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisPressCurve.Name); SetupOutputVariable(state, "Performance Curve Input Variable 2 Value", Constant::Units::None, thisPressCurve.CurveInput2, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisPressCurve.Name); SetupOutputVariable(state, "Performance Curve Input Variable 3 Value", Constant::Units::None, thisPressCurve.CurveInput3, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisPressCurve.Name); SetupOutputVariable(state, "Performance Curve Output Value", Constant::Units::None, thisPressCurve.CurveOutput, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisPressCurve.Name); } diff --git a/src/EnergyPlus/DElightManagerF.cc b/src/EnergyPlus/DElightManagerF.cc index 245bab94b24..2f44b1390c5 100644 --- a/src/EnergyPlus/DElightManagerF.cc +++ b/src/EnergyPlus/DElightManagerF.cc @@ -654,8 +654,8 @@ namespace DElightManagerF { "Daylighting Reference Point Illuminance", Constant::Units::lux, znDayl.refPts(refPt.indexToFracAndIllum).lums[(int)Lum::Illum], - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, refPt.Name); } else { print(delightInFile, diff --git a/src/EnergyPlus/DXCoils.cc b/src/EnergyPlus/DXCoils.cc index e8170e723bb..0123e68dd38 100644 --- a/src/EnergyPlus/DXCoils.cc +++ b/src/EnergyPlus/DXCoils.cc @@ -5429,80 +5429,78 @@ void GetDXCoils(EnergyPlusData &state) "Cooling Coil Total Cooling Rate", Constant::Units::W, thisDXCoil.TotalCoolingEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Cooling Coil Total Cooling Energy", Constant::Units::J, thisDXCoil.TotalCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::CoolingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::CoolingCoils); SetupOutputVariable(state, "Cooling Coil Sensible Cooling Rate", Constant::Units::W, thisDXCoil.SensCoolingEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Cooling Coil Sensible Cooling Energy", Constant::Units::J, thisDXCoil.SensCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name); SetupOutputVariable(state, "Cooling Coil Latent Cooling Rate", Constant::Units::W, thisDXCoil.LatCoolingEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Cooling Coil Latent Cooling Energy", Constant::Units::J, thisDXCoil.LatCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name); SetupOutputVariable(state, "Cooling Coil Electricity Rate", Constant::Units::W, thisDXCoil.ElecCoolingPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Cooling Coil Electricity Energy", Constant::Units::J, thisDXCoil.ElecCoolingConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); SetupOutputVariable(state, "Cooling Coil Runtime Fraction", Constant::Units::None, thisDXCoil.CoolingCoilRuntimeFraction, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); if (thisDXCoil.IsSecondaryDXCoilInZone) { SetupOutputVariable(state, "Secondary Coil Heat Rejection Rate", Constant::Units::W, thisDXCoil.SecCoilSensibleHeatGainRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); } @@ -5512,20 +5510,19 @@ void GetDXCoils(EnergyPlusData &state) "Cooling Coil Condensate Volume Flow Rate", Constant::Units::m3_s, thisDXCoil.CondensateVdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Cooling Coil Condensate Volume", Constant::Units::m3, thisDXCoil.CondensateVol, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name, Constant::eResource::OnSiteWater, - OutputProcessor::SOVEndUseCat::Condensate, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Condensate); } if (thisDXCoil.ReportEvapCondVars) { @@ -5533,68 +5530,64 @@ void GetDXCoils(EnergyPlusData &state) "Cooling Coil Condenser Inlet Temperature", Constant::Units::C, thisDXCoil.CondInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Cooling Coil Evaporative Condenser Water Volume", Constant::Units::m3, thisDXCoil.EvapWaterConsump, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name, Constant::eResource::Water, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); SetupOutputVariable(state, "Cooling Coil Evaporative Condenser Mains Supply Water Volume", Constant::Units::m3, thisDXCoil.EvapWaterConsump, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name, Constant::eResource::MainsWater, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); SetupOutputVariable(state, "Cooling Coil Evaporative Condenser Pump Electricity Rate", Constant::Units::W, thisDXCoil.EvapCondPumpElecPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Cooling Coil Evaporative Condenser Pump Electricity Energy", Constant::Units::J, thisDXCoil.EvapCondPumpElecConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); if (thisDXCoil.BasinHeaterPowerFTempDiff > 0.0) { SetupOutputVariable(state, "Cooling Coil Basin Heater Electricity Rate", Constant::Units::W, thisDXCoil.BasinHeaterPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Cooling Coil Basin Heater Electricity Energy", Constant::Units::J, thisDXCoil.BasinHeaterConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); } } @@ -5605,15 +5598,15 @@ void GetDXCoils(EnergyPlusData &state) "Cooling Coil Stage 2 Runtime Fraction", Constant::Units::None, thisDXCoil.CoolingCoilStg2RuntimeFrac, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Cooling Coil Dehumidification Mode", Constant::Units::None, thisDXCoil.DehumidificationMode, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); } @@ -5626,116 +5619,112 @@ void GetDXCoils(EnergyPlusData &state) "Heating Coil Heating Rate", Constant::Units::W, thisDXCoil.TotalHeatingEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Heating Coil Heating Energy", Constant::Units::J, thisDXCoil.TotalHeatingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::HeatingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::HeatingCoils); SetupOutputVariable(state, "Heating Coil Electricity Rate", Constant::Units::W, thisDXCoil.ElecHeatingPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Heating Coil Electricity Energy", Constant::Units::J, thisDXCoil.ElecHeatingConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Heating, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Heating); SetupOutputVariable(state, "Heating Coil Defrost Electricity Rate", Constant::Units::W, thisDXCoil.DefrostPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Heating Coil Defrost Electricity Energy", Constant::Units::J, thisDXCoil.DefrostConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Heating, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Heating); SetupOutputVariable(state, "Heating Coil Crankcase Heater Electricity Rate", Constant::Units::W, thisDXCoil.CrankcaseHeaterPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Heating Coil Crankcase Heater Electricity Energy", Constant::Units::J, thisDXCoil.CrankcaseHeaterConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Heating, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Heating); SetupOutputVariable(state, "Heating Coil Runtime Fraction", Constant::Units::None, thisDXCoil.HeatingCoilRuntimeFraction, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); if (thisDXCoil.IsSecondaryDXCoilInZone) { SetupOutputVariable(state, "Secondary Coil Total Heat Removal Rate", Constant::Units::W, thisDXCoil.SecCoilTotalHeatRemovalRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Secondary Coil Sensible Heat Removal Rate", Constant::Units::W, thisDXCoil.SecCoilSensibleHeatRemovalRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Secondary Coil Latent Heat Removal Rate", Constant::Units::W, thisDXCoil.SecCoilLatentHeatRemovalRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Secondary Coil Sensible Heat Ratio", Constant::Units::None, thisDXCoil.SecCoilSHR, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Secondary Coil Compressor Part Load Ratio", Constant::Units::None, thisDXCoil.CompressorPartLoadRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); } } @@ -5747,80 +5736,78 @@ void GetDXCoils(EnergyPlusData &state) "Cooling Coil Total Cooling Rate", Constant::Units::W, thisDXCoil.TotalCoolingEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Cooling Coil Total Cooling Energy", Constant::Units::J, thisDXCoil.TotalCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::CoolingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::CoolingCoils); SetupOutputVariable(state, "Cooling Coil Sensible Cooling Rate", Constant::Units::W, thisDXCoil.SensCoolingEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Cooling Coil Sensible Cooling Energy", Constant::Units::J, thisDXCoil.SensCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name); SetupOutputVariable(state, "Cooling Coil Latent Cooling Rate", Constant::Units::W, thisDXCoil.LatCoolingEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Cooling Coil Latent Cooling Energy", Constant::Units::J, thisDXCoil.LatCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name); SetupOutputVariable(state, "Cooling Coil Electricity Rate", Constant::Units::W, thisDXCoil.ElecCoolingPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Cooling Coil Electricity Energy", Constant::Units::J, thisDXCoil.ElecCoolingConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); SetupOutputVariable(state, "Cooling Coil Runtime Fraction", Constant::Units::None, thisDXCoil.CoolingCoilRuntimeFraction, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); if (thisDXCoil.IsSecondaryDXCoilInZone) { SetupOutputVariable(state, "Secondary Coil Heat Rejection Rate", Constant::Units::W, thisDXCoil.SecCoilSensibleHeatGainRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); } @@ -5829,68 +5816,64 @@ void GetDXCoils(EnergyPlusData &state) "Cooling Coil Condenser Inlet Temperature", Constant::Units::C, thisDXCoil.CondInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Cooling Coil Evaporative Condenser Water Volume", Constant::Units::m3, thisDXCoil.EvapWaterConsump, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name, Constant::eResource::Water, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); SetupOutputVariable(state, "Cooling Coil Evaporative Condenser Mains Supply Water Volume", Constant::Units::m3, thisDXCoil.EvapWaterConsump, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name, Constant::eResource::MainsWater, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); SetupOutputVariable(state, "Cooling Coil Evaporative Condenser Pump Electricity Rate", Constant::Units::W, thisDXCoil.EvapCondPumpElecPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Cooling Coil Evaporative Condenser Pump Electricity Energy", Constant::Units::J, thisDXCoil.EvapCondPumpElecConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); if (thisDXCoil.BasinHeaterPowerFTempDiff > 0.0) { SetupOutputVariable(state, "Cooling Coil Basin Heater Electricity Rate", Constant::Units::W, thisDXCoil.BasinHeaterPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Cooling Coil Basin Heater Electricity Energy", Constant::Units::J, thisDXCoil.BasinHeaterConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); } } @@ -5904,8 +5887,8 @@ void GetDXCoils(EnergyPlusData &state) "Cooling Coil Total Cooling Rate", Constant::Units::W, thisDXCoil.TotalCoolingEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); if (thisDXCoil.IsDXCoilInZone) { @@ -5913,20 +5896,19 @@ void GetDXCoils(EnergyPlusData &state) "Cooling Coil Total Cooling Energy", Constant::Units::J, thisDXCoil.TotalCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::CoolingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::CoolingCoils); } else { SetupOutputVariable(state, "Cooling Coil Total Cooling Energy", Constant::Units::J, thisDXCoil.TotalCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name); } @@ -5934,36 +5916,36 @@ void GetDXCoils(EnergyPlusData &state) "Cooling Coil Sensible Cooling Rate", Constant::Units::W, thisDXCoil.SensCoolingEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Cooling Coil Sensible Cooling Energy", Constant::Units::J, thisDXCoil.SensCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name); SetupOutputVariable(state, "Cooling Coil Latent Cooling Rate", Constant::Units::W, thisDXCoil.LatCoolingEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Cooling Coil Latent Cooling Energy", Constant::Units::J, thisDXCoil.LatCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name); SetupOutputVariable(state, "Cooling Coil Runtime Fraction", Constant::Units::None, thisDXCoil.CoolingCoilRuntimeFraction, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); if (thisDXCoil.ReportCoolingCoilCrankcasePower) { @@ -5971,20 +5953,19 @@ void GetDXCoils(EnergyPlusData &state) "Cooling Coil Crankcase Heater Electricity Rate", Constant::Units::W, thisDXCoil.CrankcaseHeaterPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Cooling Coil Crankcase Heater Electricity Energy", Constant::Units::J, thisDXCoil.CrankcaseHeaterConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::WaterSystem, //"DHW" - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::WaterSystem); // DHW } // new report variables for a HP water heater DX coil @@ -5992,35 +5973,34 @@ void GetDXCoils(EnergyPlusData &state) "Cooling Coil Total Water Heating Rate", Constant::Units::W, thisDXCoil.TotalHeatingEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Cooling Coil Total Water Heating Energy", Constant::Units::J, thisDXCoil.TotalHeatingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name); //, & // ResourceTypeKey='ENERGYTRANSFER',EndUseKey='HEATING',GroupKey='Plant') SetupOutputVariable(state, "Cooling Coil Water Heating Electricity Rate", Constant::Units::W, thisDXCoil.ElecWaterHeatingPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Cooling Coil Water Heating Electricity Energy", Constant::Units::J, thisDXCoil.ElecWaterHeatingConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::WaterSystem, // "DHW", - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::WaterSystem); // DHW } else if (thisDXCoil.DXCoilType_Num == CoilDX_MultiSpeedCooling) { @@ -6030,66 +6010,64 @@ void GetDXCoils(EnergyPlusData &state) "Cooling Coil Total Cooling Rate", Constant::Units::W, thisDXCoil.TotalCoolingEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Cooling Coil Total Cooling Energy", Constant::Units::J, thisDXCoil.TotalCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::CoolingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::CoolingCoils); SetupOutputVariable(state, "Cooling Coil Sensible Cooling Rate", Constant::Units::W, thisDXCoil.SensCoolingEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Cooling Coil Sensible Cooling Energy", Constant::Units::J, thisDXCoil.SensCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name); SetupOutputVariable(state, "Cooling Coil Latent Cooling Rate", Constant::Units::W, thisDXCoil.LatCoolingEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Cooling Coil Latent Cooling Energy", Constant::Units::J, thisDXCoil.LatCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name); SetupOutputVariable(state, "Cooling Coil Electricity Rate", Constant::Units::W, thisDXCoil.ElecCoolingPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Cooling Coil Electricity Energy", Constant::Units::J, thisDXCoil.ElecCoolingConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); if (thisDXCoil.FuelType != Constant::eFuel::Electricity) { std::string_view sFuelType = Constant::eFuelNames[static_cast(thisDXCoil.FuelType)]; @@ -6097,28 +6075,27 @@ void GetDXCoils(EnergyPlusData &state) format("Cooling Coil {} Rate", sFuelType), Constant::Units::W, thisDXCoil.FuelUsed, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, format("Cooling Coil {} Energy", sFuelType), Constant::Units::J, thisDXCoil.FuelConsumed, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name, Constant::eFuel2eResource[(int)thisDXCoil.FuelType], - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); } SetupOutputVariable(state, "Cooling Coil Runtime Fraction", Constant::Units::None, thisDXCoil.CoolingCoilRuntimeFraction, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); if (thisDXCoil.ReportEvapCondVars) { @@ -6126,68 +6103,64 @@ void GetDXCoils(EnergyPlusData &state) "Cooling Coil Condenser Inlet Temperature", Constant::Units::C, thisDXCoil.CondInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Cooling Coil Evaporative Condenser Water Volume", Constant::Units::m3, thisDXCoil.EvapWaterConsump, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name, Constant::eResource::Water, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); SetupOutputVariable(state, "Cooling Coil Evaporative Condenser Mains Supply Water Volume", Constant::Units::m3, thisDXCoil.EvapWaterConsump, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name, Constant::eResource::MainsWater, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); SetupOutputVariable(state, "Cooling Coil Evaporative Condenser Pump Electricity Rate", Constant::Units::W, thisDXCoil.EvapCondPumpElecPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Cooling Coil Evaporative Condenser Pump Electricity Energy", Constant::Units::J, thisDXCoil.EvapCondPumpElecConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); if (thisDXCoil.BasinHeaterPowerFTempDiff > 0.0) { SetupOutputVariable(state, "Cooling Coil Basin Heater Electricity Rate", Constant::Units::W, thisDXCoil.BasinHeaterPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Cooling Coil Basin Heater Electricity Energy", Constant::Units::J, thisDXCoil.BasinHeaterConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); } } if (thisDXCoil.IsSecondaryDXCoilInZone) { @@ -6195,8 +6168,8 @@ void GetDXCoils(EnergyPlusData &state) "Secondary Coil Heat Rejection Rate", Constant::Units::W, thisDXCoil.SecCoilSensibleHeatGainRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); } @@ -6209,38 +6182,36 @@ void GetDXCoils(EnergyPlusData &state) "Heating Coil Heating Rate", Constant::Units::W, thisDXCoil.TotalHeatingEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Heating Coil Heating Energy", Constant::Units::J, thisDXCoil.TotalHeatingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::HeatingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::HeatingCoils); SetupOutputVariable(state, "Heating Coil Electricity Rate", Constant::Units::W, thisDXCoil.ElecHeatingPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Heating Coil Electricity Energy", Constant::Units::J, thisDXCoil.ElecHeatingConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Heating, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Heating); if (thisDXCoil.FuelType != Constant::eFuel::Electricity) { std::string_view sFuelType = Constant::eFuelNames[static_cast(thisDXCoil.FuelType)]; @@ -6248,20 +6219,19 @@ void GetDXCoils(EnergyPlusData &state) format("Heating Coil {} Rate", sFuelType), Constant::Units::W, thisDXCoil.FuelUsed, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, format("Heating Coil {} Energy", sFuelType), Constant::Units::J, thisDXCoil.FuelConsumed, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name, Constant::eFuel2eResource[(int)thisDXCoil.FuelType], - OutputProcessor::SOVEndUseCat::HeatingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::HeatingCoils); } if (thisDXCoil.FuelType != Constant::eFuel::Electricity && thisDXCoil.DefrostStrategy == StandardRatings::DefrostStrat::ReverseCycle) { @@ -6270,65 +6240,62 @@ void GetDXCoils(EnergyPlusData &state) format("Heating Coil Defrost {} Rate", sFuelType), Constant::Units::W, thisDXCoil.DefrostPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, format("Heating Coil Defrost {} Energy", sFuelType), Constant::Units::J, thisDXCoil.DefrostConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name, Constant::eFuel2eResource[(int)thisDXCoil.FuelType], - OutputProcessor::SOVEndUseCat::Heating, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Heating); } else { SetupOutputVariable(state, "Heating Coil Defrost Electricity Rate", Constant::Units::W, thisDXCoil.DefrostPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Heating Coil Defrost Electricity Energy", Constant::Units::J, thisDXCoil.DefrostConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Heating, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Heating); } SetupOutputVariable(state, "Heating Coil Crankcase Heater Electricity Rate", Constant::Units::W, thisDXCoil.CrankcaseHeaterPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Heating Coil Crankcase Heater Electricity Energy", Constant::Units::J, thisDXCoil.CrankcaseHeaterConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Heating, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Heating); SetupOutputVariable(state, "Heating Coil Runtime Fraction", Constant::Units::None, thisDXCoil.HeatingCoilRuntimeFraction, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); if (thisDXCoil.IsSecondaryDXCoilInZone) { @@ -6336,29 +6303,29 @@ void GetDXCoils(EnergyPlusData &state) "Secondary Coil Total Heat Removal Rate", Constant::Units::W, thisDXCoil.SecCoilTotalHeatRemovalRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Secondary Coil Sensible Heat Removal Rate", Constant::Units::W, thisDXCoil.SecCoilSensibleHeatRemovalRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Secondary Coil Latent Heat Removal Rate", Constant::Units::W, thisDXCoil.SecCoilLatentHeatRemovalRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Secondary Coil Sensible Heat Ratio", Constant::Units::None, thisDXCoil.SecCoilSHR, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); } } @@ -6371,74 +6338,72 @@ void GetDXCoils(EnergyPlusData &state) "Cooling Coil Total Cooling Rate", Constant::Units::W, thisDXCoil.TotalCoolingEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Cooling Coil Total Cooling Energy", Constant::Units::J, thisDXCoil.TotalCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::CoolingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::CoolingCoils); SetupOutputVariable(state, "Cooling Coil Sensible Cooling Rate", Constant::Units::W, thisDXCoil.SensCoolingEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Cooling Coil Sensible Cooling Energy", Constant::Units::J, thisDXCoil.SensCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name); SetupOutputVariable(state, "Cooling Coil Latent Cooling Rate", Constant::Units::W, thisDXCoil.LatCoolingEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Cooling Coil Latent Cooling Energy", Constant::Units::J, thisDXCoil.LatCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name); SetupOutputVariable(state, "Cooling Coil Runtime Fraction", Constant::Units::None, thisDXCoil.CoolingCoilRuntimeFraction, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); if (thisDXCoil.CondensateCollectMode == CondensateCollectAction::ToTank) { SetupOutputVariable(state, "Cooling Coil Condensate Volume Flow Rate", Constant::Units::m3_s, thisDXCoil.CondensateVdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Cooling Coil Condensate Volume", Constant::Units::m3, thisDXCoil.CondensateVol, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name, Constant::eResource::OnSiteWater, - OutputProcessor::SOVEndUseCat::Condensate, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Condensate); } } @@ -6450,26 +6415,25 @@ void GetDXCoils(EnergyPlusData &state) "Heating Coil Heating Rate", Constant::Units::W, thisDXCoil.TotalHeatingEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Heating Coil Heating Energy", Constant::Units::J, thisDXCoil.TotalHeatingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::HeatingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::HeatingCoils); SetupOutputVariable(state, "Heating Coil Runtime Fraction", Constant::Units::None, thisDXCoil.HeatingCoilRuntimeFraction, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); } @@ -6481,69 +6445,68 @@ void GetDXCoils(EnergyPlusData &state) "Cooling Coil Total Cooling Rate", Constant::Units::W, thisDXCoil.TotalCoolingEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Cooling Coil Total Cooling Energy", Constant::Units::J, thisDXCoil.TotalCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::CoolingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::CoolingCoils); SetupOutputVariable(state, "Cooling Coil Sensible Cooling Rate", Constant::Units::W, thisDXCoil.SensCoolingEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Cooling Coil Sensible Cooling Energy", Constant::Units::J, thisDXCoil.SensCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name); SetupOutputVariable(state, "Cooling Coil Latent Cooling Rate", Constant::Units::W, thisDXCoil.LatCoolingEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Cooling Coil Latent Cooling Energy", Constant::Units::J, thisDXCoil.LatCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name); SetupOutputVariable(state, "Cooling Coil Runtime Fraction", Constant::Units::None, thisDXCoil.CoolingCoilRuntimeFraction, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); // Followings for VRF_FluidTCtrl Only SetupOutputVariable(state, "Cooling Coil VRF Evaporating Temperature", Constant::Units::C, thisDXCoil.EvaporatingTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Cooling Coil VRF Super Heating Degrees", Constant::Units::C, thisDXCoil.ActualSH, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); if (thisDXCoil.CondensateCollectMode == CondensateCollectAction::ToTank) { @@ -6551,20 +6514,19 @@ void GetDXCoils(EnergyPlusData &state) "Cooling Coil Condensate Volume Flow Rate", Constant::Units::m3_s, thisDXCoil.CondensateVdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Cooling Coil Condensate Volume", Constant::Units::m3, thisDXCoil.CondensateVol, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name, Constant::eResource::OnSiteWater, - OutputProcessor::SOVEndUseCat::Condensate, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Condensate); } } @@ -6576,41 +6538,40 @@ void GetDXCoils(EnergyPlusData &state) "Heating Coil Heating Rate", Constant::Units::W, thisDXCoil.TotalHeatingEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Heating Coil Heating Energy", Constant::Units::J, thisDXCoil.TotalHeatingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisDXCoil.Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::HeatingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::HeatingCoils); SetupOutputVariable(state, "Heating Coil Runtime Fraction", Constant::Units::None, thisDXCoil.HeatingCoilRuntimeFraction, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); // Followings for VRF_FluidTCtrl Only SetupOutputVariable(state, "Heating Coil VRF Condensing Temperature", Constant::Units::C, thisDXCoil.CondensingTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); SetupOutputVariable(state, "Heating Coil VRF Subcooling Degrees", Constant::Units::C, thisDXCoil.ActualSC, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDXCoil.Name); } } @@ -6811,20 +6772,19 @@ void InitDXCoil(EnergyPlusData &state, int const DXCoilNum) // number of the cur "Cooling Coil Crankcase Heater Electricity Rate", Constant::Units::W, state.dataDXCoils->DXCoil(DXCoilNumTemp).CrankcaseHeaterPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataDXCoils->DXCoil(DXCoilNumTemp).Name); SetupOutputVariable(state, "Cooling Coil Crankcase Heater Electricity Energy", Constant::Units::J, state.dataDXCoils->DXCoil(DXCoilNumTemp).CrankcaseHeaterConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataDXCoils->DXCoil(DXCoilNumTemp).Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); state.dataDXCoils->DXCoil(DXCoilNumTemp).ReportCoolingCoilCrankcasePower = false; } } @@ -17707,7 +17667,7 @@ void CalcVRFCoilCapModFac(EnergyPlusData &state, if (present(CoilIndex)) { CoilNum = CoilIndex; } else { - GetDXCoilIndex(state, CoilName, CoilNum, ErrorsFound, {}, true); + GetDXCoilIndex(state, CoilName, CoilNum, ErrorsFound, "", true); } BFC_rate = state.dataDXCoils->DXCoil(CoilNum).RateBFVRFIUEvap; diff --git a/src/EnergyPlus/DataAirLoop.hh b/src/EnergyPlus/DataAirLoop.hh index 7dbbdef2b64..e71a8b2308b 100644 --- a/src/EnergyPlus/DataAirLoop.hh +++ b/src/EnergyPlus/DataAirLoop.hh @@ -58,6 +58,7 @@ #include #include #include + #include #include diff --git a/src/EnergyPlus/DataHeatBalance.cc b/src/EnergyPlus/DataHeatBalance.cc index 69cc2c4d750..50127631597 100644 --- a/src/EnergyPlus/DataHeatBalance.cc +++ b/src/EnergyPlus/DataHeatBalance.cc @@ -208,86 +208,86 @@ void AirReportVars::setUpOutputVars(EnergyPlusData &state, std::string_view pref format("{} Mean Air Temperature", prefix), Constant::Units::C, this->MeanAirTemp, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, name); SetupOutputVariable(state, format("{} Operative Temperature", prefix), Constant::Units::C, this->OperativeTemp, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, name); SetupOutputVariable(state, format("{} Mean Air Dewpoint Temperature", prefix), Constant::Units::C, this->MeanAirDewPointTemp, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, name); SetupOutputVariable(state, format("{} Mean Air Humidity Ratio", prefix), Constant::Units::kgWater_kgDryAir, this->MeanAirHumRat, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, name); SetupOutputVariable(state, format("{} Air Heat Balance Internal Convective Heat Gain Rate", prefix), Constant::Units::W, this->SumIntGains, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name); SetupOutputVariable(state, format("{} Air Heat Balance Surface Convection Rate", prefix), Constant::Units::W, this->SumHADTsurfs, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name); SetupOutputVariable(state, format("{} Air Heat Balance Interzone Air Transfer Rate", prefix), Constant::Units::W, this->SumMCpDTzones, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name); SetupOutputVariable(state, format("{} Air Heat Balance Outdoor Air Transfer Rate", prefix), Constant::Units::W, this->SumMCpDtInfil, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name); SetupOutputVariable(state, format("{} Air Heat Balance System Air Transfer Rate", prefix), Constant::Units::W, this->SumMCpDTsystem, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name); SetupOutputVariable(state, format("{} Air Heat Balance System Convective Heat Gain Rate", prefix), Constant::Units::W, this->SumNonAirSystem, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name); SetupOutputVariable(state, format("{} Air Heat Balance Air Energy Storage Rate", prefix), Constant::Units::W, this->CzdTdt, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name); if (state.dataGlobal->DisplayAdvancedReportVariables) { SetupOutputVariable(state, format("{} Air Heat Balance Deviation Rate", prefix), Constant::Units::W, this->imBalance, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name); } } diff --git a/src/EnergyPlus/DataZoneEnergyDemands.cc b/src/EnergyPlus/DataZoneEnergyDemands.cc index fc74e3dba0b..9f7a1da3eb2 100644 --- a/src/EnergyPlus/DataZoneEnergyDemands.cc +++ b/src/EnergyPlus/DataZoneEnergyDemands.cc @@ -108,13 +108,13 @@ void ZoneSystemSensibleDemand::setUpOutputVars(EnergyPlusData &state, format("{} Air System Sensible Heating Energy", prefix), Constant::Units::J, this->airSysHeatEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::Heating, - {}, - OutputProcessor::SOVGroup::Building, + OutputProcessor::Group::Building, + OutputProcessor::EndUseCat::Heating, + "", name, zoneMult, listMult); @@ -122,13 +122,13 @@ void ZoneSystemSensibleDemand::setUpOutputVars(EnergyPlusData &state, format("{} Air System Sensible Cooling Energy", prefix), Constant::Units::J, this->airSysCoolEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::Building, + OutputProcessor::Group::Building, + OutputProcessor::EndUseCat::Cooling, + "", // End-use subcat name, zoneMult, listMult); @@ -137,30 +137,30 @@ void ZoneSystemSensibleDemand::setUpOutputVars(EnergyPlusData &state, format("{} Air System Sensible Heating Energy", prefix), Constant::Units::J, this->airSysHeatEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, name); SetupOutputVariable(state, format("{} Air System Sensible Cooling Energy", prefix), Constant::Units::J, this->airSysCoolEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, name); } SetupOutputVariable(state, format("{} Air System Sensible Heating Rate", prefix), Constant::Units::W, this->airSysHeatRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name); SetupOutputVariable(state, format("{} Air System Sensible Cooling Rate", prefix), Constant::Units::W, this->airSysCoolRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name); // The following output variables are for the predicted Heating/Cooling load for the zone which can be compared to actual load. // There are two sets of data available: one where zone and group multipliers have been applied and another where the multipliers have @@ -169,52 +169,52 @@ void ZoneSystemSensibleDemand::setUpOutputVars(EnergyPlusData &state, format("{} Predicted Sensible Load to Setpoint Heat Transfer Rate", prefix), Constant::Units::W, this->predictedRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name); SetupOutputVariable(state, format("{} Predicted Sensible Load to Heating Setpoint Heat Transfer Rate", prefix), Constant::Units::W, this->predictedHSPRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name); SetupOutputVariable(state, format("{} Predicted Sensible Load to Cooling Setpoint Heat Transfer Rate", prefix), Constant::Units::W, this->predictedCSPRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name); // Second, these report variable ARE multiplied by zone and group multipliers SetupOutputVariable(state, format("{} System Predicted Sensible Load to Setpoint Heat Transfer Rate", prefix), Constant::Units::W, this->TotalOutputRequired, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name); SetupOutputVariable(state, format("{} System Predicted Sensible Load to Heating Setpoint Heat Transfer Rate", prefix), Constant::Units::W, this->OutputRequiredToHeatingSP, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name); SetupOutputVariable(state, format("{} System Predicted Sensible Load to Cooling Setpoint Heat Transfer Rate", prefix), Constant::Units::W, this->OutputRequiredToCoolingSP, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name); if (staged) { SetupOutputVariable(state, format("{} Thermostat Staged Number", prefix), Constant::Units::None, this->StageNum, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name); } } @@ -232,44 +232,44 @@ void ZoneSystemMoistureDemand::setUpOutputVars(EnergyPlusData &state, format("{} Air System Latent Heating Energy", prefix), Constant::Units::J, this->airSysHeatEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, name); SetupOutputVariable(state, format("{} Air System Latent Cooling Energy", prefix), Constant::Units::J, this->airSysCoolEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, name); SetupOutputVariable(state, format("{} Air System Latent Heating Rate", prefix), Constant::Units::W, this->airSysHeatRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name); SetupOutputVariable(state, format("{} Air System Latent Cooling Rate", prefix), Constant::Units::W, this->airSysCoolRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name); // temporarily hide these behind DoLatentSizing flag SetupOutputVariable(state, format("{} Air System Sensible Heat Ratio", prefix), Constant::Units::None, this->airSysSensibleHeatRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name); SetupOutputVariable(state, format("{} Air Vapor Pressure Difference", prefix), Constant::Units::Pa, this->vaporPressureDifference, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name); } // The following output variables are for the predicted moisture load for the zone with humidity controlled specified. @@ -279,44 +279,44 @@ void ZoneSystemMoistureDemand::setUpOutputVars(EnergyPlusData &state, format("{} Predicted Moisture Load Moisture Transfer Rate", prefix), Constant::Units::kgWater_s, this->predictedRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name); SetupOutputVariable(state, format("{} Predicted Moisture Load to Humidifying Setpoint Moisture Transfer Rate", prefix), Constant::Units::kgWater_s, this->predictedHumSPRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name); SetupOutputVariable(state, format("{} Predicted Moisture Load to Dehumidifying Setpoint Moisture Transfer Rate", prefix), Constant::Units::kgWater_s, this->predictedDehumSPRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name); // Second, these report variable ARE multiplied by zone and group multipliers SetupOutputVariable(state, format("{} System Predicted Moisture Load Moisture Transfer Rate", prefix), Constant::Units::kgWater_s, this->TotalOutputRequired, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name); SetupOutputVariable(state, format("{} System Predicted Moisture Load to Humidifying Setpoint Moisture Transfer Rate", prefix), Constant::Units::kgWater_s, this->OutputRequiredToHumidifyingSP, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name); SetupOutputVariable(state, format("{} System Predicted Moisture Load to Dehumidifying Setpoint Moisture Transfer Rate", prefix), Constant::Units::kgWater_s, this->OutputRequiredToDehumidifyingSP, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name); } diff --git a/src/EnergyPlus/DaylightingDevices.cc b/src/EnergyPlus/DaylightingDevices.cc index 34a686f9fd3..37a8942ad32 100644 --- a/src/EnergyPlus/DaylightingDevices.cc +++ b/src/EnergyPlus/DaylightingDevices.cc @@ -302,58 +302,58 @@ namespace Dayltg { "Tubular Daylighting Device Transmitted Solar Radiation Rate", Constant::Units::W, state.dataDaylightingDevicesData->TDDPipe(PipeNum).TransmittedSolar, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataDaylightingDevicesData->TDDPipe(PipeNum).Name); SetupOutputVariable(state, "Tubular Daylighting Device Pipe Absorbed Solar Radiation Rate", Constant::Units::W, state.dataDaylightingDevicesData->TDDPipe(PipeNum).PipeAbsorbedSolar, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataDaylightingDevicesData->TDDPipe(PipeNum).Name); SetupOutputVariable(state, "Tubular Daylighting Device Heat Gain Rate", Constant::Units::W, state.dataDaylightingDevicesData->TDDPipe(PipeNum).HeatGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataDaylightingDevicesData->TDDPipe(PipeNum).Name); SetupOutputVariable(state, "Tubular Daylighting Device Heat Loss Rate", Constant::Units::W, state.dataDaylightingDevicesData->TDDPipe(PipeNum).HeatLoss, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataDaylightingDevicesData->TDDPipe(PipeNum).Name); SetupOutputVariable(state, "Tubular Daylighting Device Beam Solar Transmittance", Constant::Units::None, state.dataDaylightingDevicesData->TDDPipe(PipeNum).TransSolBeam, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataDaylightingDevicesData->TDDPipe(PipeNum).Name); SetupOutputVariable(state, "Tubular Daylighting Device Beam Visible Transmittance", Constant::Units::None, state.dataDaylightingDevicesData->TDDPipe(PipeNum).TransVisBeam, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataDaylightingDevicesData->TDDPipe(PipeNum).Name); SetupOutputVariable(state, "Tubular Daylighting Device Diffuse Solar Transmittance", Constant::Units::None, state.dataDaylightingDevicesData->TDDPipe(PipeNum).TransSolDiff, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataDaylightingDevicesData->TDDPipe(PipeNum).Name); SetupOutputVariable(state, "Tubular Daylighting Device Diffuse Visible Transmittance", Constant::Units::None, state.dataDaylightingDevicesData->TDDPipe(PipeNum).TransVisDiff, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataDaylightingDevicesData->TDDPipe(PipeNum).Name); } // PipeNum diff --git a/src/EnergyPlus/DaylightingManager.cc b/src/EnergyPlus/DaylightingManager.cc index 40095b7e5e4..fa7662df167 100644 --- a/src/EnergyPlus/DaylightingManager.cc +++ b/src/EnergyPlus/DaylightingManager.cc @@ -3817,15 +3817,15 @@ void GetDaylightingParametersInput(EnergyPlusData &state) format("Daylighting Window Reference Point {} Illuminance", refPtNum), Constant::Units::lux, refPt.illumFromWinRep, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, format("Daylighting Window Reference Point {} View Luminance", refPtNum), Constant::Units::cd_m2, refPt.lumWinRep, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); } } @@ -3854,15 +3854,15 @@ void GetDaylightingParametersInput(EnergyPlusData &state) "Daylighting Window Reference Point Illuminance", Constant::Units::lux, refPt.illumFromWinRep, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, varKey); SetupOutputVariable(state, "Daylighting Window Reference Point View Luminance", Constant::Units::cd_m2, refPt.lumWinRep, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, varKey); } } // for (controlNum) @@ -4541,29 +4541,29 @@ void GetDaylightingControls(EnergyPlusData &state, bool &ErrorsFound) format("Daylighting Reference Point {} Illuminance", refPtNum), Constant::Units::lux, refPt.lums[iLum_Illum], - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, daylightControl.Name); SetupOutputVariable(state, format("Daylighting Reference Point {} Daylight Illuminance Setpoint Exceeded Time", refPtNum), Constant::Units::hr, refPt.timeExceedingDaylightIlluminanceSetPoint, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, daylightControl.Name); SetupOutputVariable(state, format("Daylighting Reference Point {} Glare Index", refPtNum), Constant::Units::None, refPt.glareIndex, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, daylightControl.Name); SetupOutputVariable(state, format("Daylighting Reference Point {} Glare Index Setpoint Exceeded Time", refPtNum), Constant::Units::hr, refPt.timeExceedingGlareIndexSetPoint, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, daylightControl.Name); } // if (DaylightMethod == SplitFlux) } // for (RefPtNum) @@ -4605,8 +4605,8 @@ void GetDaylightingControls(EnergyPlusData &state, bool &ErrorsFound) "Daylighting Lighting Power Multiplier", Constant::Units::None, daylightControl.PowerReductionFactor, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, daylightControl.Name); } // for (controlNum) } // GetDaylightingControls() diff --git a/src/EnergyPlus/DemandManager.cc b/src/EnergyPlus/DemandManager.cc index afd99a7c688..473af6da6c5 100644 --- a/src/EnergyPlus/DemandManager.cc +++ b/src/EnergyPlus/DemandManager.cc @@ -472,56 +472,56 @@ void GetDemandManagerListInput(EnergyPlusData &state) "Demand Manager Meter Demand Power", Constant::Units::W, thisDemandMgrList.MeterDemand, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, thisDemandMgrList.Name); SetupOutputVariable(state, "Demand Manager Average Demand Power", Constant::Units::W, thisDemandMgrList.AverageDemand, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, thisDemandMgrList.Name); SetupOutputVariable(state, "Demand Manager Peak Demand Power", Constant::Units::W, thisDemandMgrList.PeakDemand, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, thisDemandMgrList.Name); SetupOutputVariable(state, "Demand Manager Scheduled Limit Power", Constant::Units::W, thisDemandMgrList.ScheduledLimit, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, thisDemandMgrList.Name); SetupOutputVariable(state, "Demand Manager Demand Limit Power", Constant::Units::W, thisDemandMgrList.DemandLimit, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, thisDemandMgrList.Name); SetupOutputVariable(state, "Demand Manager Over Limit Power", Constant::Units::W, thisDemandMgrList.OverLimit, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, thisDemandMgrList.Name); SetupOutputVariable(state, "Demand Manager Over Limit Time", Constant::Units::hr, thisDemandMgrList.OverLimitDuration, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, thisDemandMgrList.Name); if (ErrorsFound) { @@ -535,24 +535,24 @@ void GetDemandManagerListInput(EnergyPlusData &state) "Demand Manager Exterior Energy Iteration Count", Constant::Units::None, state.dataDemandManager->DemandManagerExtIterations, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "ManageDemand"); SetupOutputVariable(state, "Demand Manager Heat Balance Iteration Count", Constant::Units::None, state.dataDemandManager->DemandManagerHBIterations, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "ManageDemand"); SetupOutputVariable(state, "Demand Manager HVAC Iteration Count", Constant::Units::None, state.dataDemandManager->DemandManagerHVACIterations, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "ManageDemand"); } } diff --git a/src/EnergyPlus/DesiccantDehumidifiers.cc b/src/EnergyPlus/DesiccantDehumidifiers.cc index d118e208e56..4bee83d47db 100644 --- a/src/EnergyPlus/DesiccantDehumidifiers.cc +++ b/src/EnergyPlus/DesiccantDehumidifiers.cc @@ -1450,82 +1450,81 @@ namespace DesiccantDehumidifiers { "Dehumidifier Removed Water Mass", Constant::Units::kg, desicDehum.WaterRemove, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, desicDehum.Name); SetupOutputVariable(state, "Dehumidifier Removed Water Mass Flow Rate", Constant::Units::kg_s, desicDehum.WaterRemoveRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, desicDehum.Name); SetupOutputVariable(state, "Dehumidifier Part Load Ratio", Constant::Units::None, desicDehum.PartLoad, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, desicDehum.Name); SetupOutputVariable(state, "Dehumidifier Electricity Rate", Constant::Units::W, desicDehum.ElecUseRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, desicDehum.Name); SetupOutputVariable(state, "Dehumidifier Electricity Energy", Constant::Units::J, desicDehum.ElecUseEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, desicDehum.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); SetupOutputVariable(state, "Dehumidifier Regeneration Specific Energy", Constant::Units::J_kgWater, desicDehum.SpecRegenEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, desicDehum.Name); SetupOutputVariable(state, "Dehumidifier Regeneration Rate", Constant::Units::W, desicDehum.QRegen, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, desicDehum.Name); SetupOutputVariable(state, "Dehumidifier Regeneration Energy", Constant::Units::J, desicDehum.RegenEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, desicDehum.Name); SetupOutputVariable(state, "Dehumidifier Regeneration Air Speed", Constant::Units::m_s, desicDehum.RegenAirVel, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, desicDehum.Name); SetupOutputVariable(state, "Dehumidifier Regeneration Air Mass Flow Rate", Constant::Units::kg_s, desicDehum.RegenAirInMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, desicDehum.Name); SetupOutputVariable(state, "Dehumidifier Process Air Mass Flow Rate", Constant::Units::kg_s, desicDehum.ProcAirInMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, desicDehum.Name); } @@ -1539,42 +1538,41 @@ namespace DesiccantDehumidifiers { "Dehumidifier Removed Water Mass", Constant::Units::kg, desicDehum.WaterRemove, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, desicDehum.Name); SetupOutputVariable(state, "Dehumidifier Removed Water Mass Flow Rate", Constant::Units::kg_s, desicDehum.WaterRemoveRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, desicDehum.Name); SetupOutputVariable(state, "Dehumidifier Part Load Ratio", Constant::Units::None, desicDehum.PartLoad, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, desicDehum.Name); if (desicDehum.ExhaustFanMaxVolFlowRate > 0) { SetupOutputVariable(state, "Dehumidifier Exhaust Fan Electricity Rate", Constant::Units::W, desicDehum.ExhaustFanPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, desicDehum.Name); SetupOutputVariable(state, "Dehumidifier Exhaust Fan Electricity Energy", Constant::Units::J, desicDehum.ExhaustFanElecConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, desicDehum.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); } } diff --git a/src/EnergyPlus/DualDuct.cc b/src/EnergyPlus/DualDuct.cc index c9312e66973..c847df283f2 100644 --- a/src/EnergyPlus/DualDuct.cc +++ b/src/EnergyPlus/DualDuct.cc @@ -349,15 +349,15 @@ namespace DualDuct { "Zone Air Terminal Cold Supply Duct Damper Position", Constant::Units::None, thisDD.ColdAirDamperPosition, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDD.Name); SetupOutputVariable(state, "Zone Air Terminal Hot Supply Duct Damper Position", Constant::Units::None, thisDD.HotAirDamperPosition, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDD.Name); } // end Number of Damper Loop @@ -504,22 +504,22 @@ namespace DualDuct { "Zone Air Terminal Cold Supply Duct Damper Position", Constant::Units::None, thisDD.ColdAirDamperPosition, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDD.Name); SetupOutputVariable(state, "Zone Air Terminal Hot Supply Duct Damper Position", Constant::Units::None, thisDD.HotAirDamperPosition, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDD.Name); SetupOutputVariable(state, "Zone Air Terminal Outdoor Air Volume Flow Rate", Constant::Units::m3_s, thisDD.OutdoorAirFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDD.Name); } // end Number of Damper Loop } @@ -709,22 +709,22 @@ namespace DualDuct { "Zone Air Terminal Outdoor Air Duct Damper Position", Constant::Units::None, thisDD.OADamperPosition, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDD.Name); SetupOutputVariable(state, "Zone Air Terminal Recirculated Air Duct Damper Position", Constant::Units::None, thisDD.RecircAirDamperPosition, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDD.Name); SetupOutputVariable(state, "Zone Air Terminal Outdoor Air Fraction", Constant::Units::None, thisDD.OAFraction, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisDD.Name); } // end Number of Damper Loop diff --git a/src/EnergyPlus/EarthTube.cc b/src/EnergyPlus/EarthTube.cc index 56927c51330..3a8bb30db2a 100644 --- a/src/EnergyPlus/EarthTube.cc +++ b/src/EnergyPlus/EarthTube.cc @@ -480,124 +480,122 @@ void GetEarthTube(EnergyPlusData &state, bool &ErrorsFound) // If errors found i "Earth Tube Zone Sensible Cooling Energy", Constant::Units::J, thisZnRptET.EarthTubeHeatLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::NonState, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, zone.Name); SetupOutputVariable(state, "Earth Tube Zone Sensible Cooling Rate", Constant::Units::W, thisZnRptET.EarthTubeHeatLossRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, zone.Name); SetupOutputVariable(state, "Earth Tube Zone Sensible Heating Energy", Constant::Units::J, thisZnRptET.EarthTubeHeatGain, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::NonState, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, zone.Name); SetupOutputVariable(state, "Earth Tube Zone Sensible Heating Rate", Constant::Units::W, thisZnRptET.EarthTubeHeatGainRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, zone.Name); SetupOutputVariable(state, "Earth Tube Air Flow Volume", Constant::Units::m3, thisZnRptET.EarthTubeVolume, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::NonState, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, zone.Name); SetupOutputVariable(state, "Earth Tube Current Density Air Volume Flow Rate", Constant::Units::m3_s, thisZnRptET.EarthTubeVolFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, zone.Name); SetupOutputVariable(state, "Earth Tube Standard Density Air Volume Flow Rate", Constant::Units::m3_s, thisZnRptET.EarthTubeVolFlowRateStd, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, zone.Name); SetupOutputVariable(state, "Earth Tube Air Flow Mass", Constant::Units::kg, thisZnRptET.EarthTubeMass, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::NonState, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, zone.Name); SetupOutputVariable(state, "Earth Tube Air Mass Flow Rate", Constant::Units::kg_s, thisZnRptET.EarthTubeMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, zone.Name); SetupOutputVariable(state, "Earth Tube Water Mass Flow Rate", Constant::Units::kg_s, thisZnRptET.EarthTubeWaterMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, zone.Name); SetupOutputVariable(state, "Earth Tube Fan Electricity Energy", Constant::Units::J, thisZnRptET.EarthTubeFanElec, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::NonState, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, zone.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Invalid, - {}, - OutputProcessor::SOVGroup::Building); + OutputProcessor::Group::Building); SetupOutputVariable(state, "Earth Tube Fan Electricity Rate", Constant::Units::W, thisZnRptET.EarthTubeFanElecPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, zone.Name); SetupOutputVariable(state, "Earth Tube Zone Inlet Air Temperature", Constant::Units::C, thisZnRptET.EarthTubeAirTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, zone.Name); SetupOutputVariable(state, "Earth Tube Ground Interface Temperature", Constant::Units::C, thisEarthTube.GroundTempt, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, zone.Name); SetupOutputVariable(state, "Earth Tube Outdoor Air Heat Transfer Rate", Constant::Units::W, thisZnRptET.EarthTubeOATreatmentPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, zone.Name); SetupOutputVariable(state, "Earth Tube Zone Inlet Wet Bulb Temperature", Constant::Units::C, thisZnRptET.EarthTubeWetBulbTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, zone.Name); SetupOutputVariable(state, "Earth Tube Zone Inlet Humidity Ratio", Constant::Units::kgWater_kgDryAir, thisZnRptET.EarthTubeHumRat, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, zone.Name); } } @@ -740,30 +738,30 @@ void initEarthTubeVertical(EnergyPlusData &state) format("Earth Tube Node Temperature {}", nodeNum), Constant::Units::C, thisEarthTube.tCurrent[nodeNum - 1], - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, zone.Name); SetupOutputVariable(state, format("Earth Tube Undisturbed Ground Temperature {}", nodeNum), Constant::Units::C, thisEarthTube.tUndist[nodeNum - 1], - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, zone.Name); } SetupOutputVariable(state, "Earth Tube Upper Boundary Ground Temperature", Constant::Units::C, thisEarthTube.tUpperBound, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, zone.Name); SetupOutputVariable(state, "Earth Tube Lower Boundary Ground Temperature", Constant::Units::C, thisEarthTube.tLowerBound, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, zone.Name); } } // ...end of firstTimeInits block diff --git a/src/EnergyPlus/EcoRoofManager.cc b/src/EnergyPlus/EcoRoofManager.cc index 68a8e756425..0b20a2dc349 100644 --- a/src/EnergyPlus/EcoRoofManager.cc +++ b/src/EnergyPlus/EcoRoofManager.cc @@ -541,128 +541,128 @@ namespace EcoRoofManager { "Green Roof Soil Temperature", Constant::Units::C, thisEcoRoof->Tg, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Environment"); SetupOutputVariable(state, "Green Roof Vegetation Temperature", Constant::Units::C, thisEcoRoof->Tf, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Environment"); SetupOutputVariable(state, "Green Roof Soil Root Moisture Ratio", Constant::Units::None, thisEcoRoof->MeanRootMoisture, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Environment"); SetupOutputVariable(state, "Green Roof Soil Near Surface Moisture Ratio", Constant::Units::None, thisEcoRoof->Moisture, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Environment"); SetupOutputVariable(state, "Green Roof Soil Sensible Heat Transfer Rate per Area", Constant::Units::W_m2, thisEcoRoof->sensibleg, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Environment"); SetupOutputVariable(state, "Green Roof Vegetation Sensible Heat Transfer Rate per Area", Constant::Units::W_m2, thisEcoRoof->sensiblef, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Environment"); SetupOutputVariable(state, "Green Roof Vegetation Moisture Transfer Rate", Constant::Units::m_s, thisEcoRoof->Vfluxf, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Environment"); SetupOutputVariable(state, "Green Roof Soil Moisture Transfer Rate", Constant::Units::m_s, thisEcoRoof->Vfluxg, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Environment"); SetupOutputVariable(state, "Green Roof Vegetation Latent Heat Transfer Rate per Area", Constant::Units::W_m2, thisEcoRoof->Lf, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Environment"); SetupOutputVariable(state, "Green Roof Soil Latent Heat Transfer Rate per Area", Constant::Units::W_m2, thisEcoRoof->Lg, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Environment"); SetupOutputVariable(state, "Green Roof Cumulative Precipitation Depth", Constant::Units::m, thisEcoRoof->CumPrecip, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Environment"); SetupOutputVariable(state, "Green Roof Cumulative Irrigation Depth", Constant::Units::m, thisEcoRoof->CumIrrigation, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Environment"); SetupOutputVariable(state, "Green Roof Cumulative Runoff Depth", Constant::Units::m, thisEcoRoof->CumRunoff, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Environment"); SetupOutputVariable(state, "Green Roof Cumulative Evapotranspiration Depth", Constant::Units::m, thisEcoRoof->CumET, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Environment"); SetupOutputVariable(state, "Green Roof Current Precipitation Depth", Constant::Units::m, thisEcoRoof->CurrentPrecipitation, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Environment"); SetupOutputVariable(state, "Green Roof Current Irrigation Depth", Constant::Units::m, thisEcoRoof->CurrentIrrigation, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Environment"); SetupOutputVariable(state, "Green Roof Current Runoff Depth", Constant::Units::m, thisEcoRoof->CurrentRunoff, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Environment"); SetupOutputVariable(state, "Green Roof Current Evapotranspiration Depth", Constant::Units::m, thisEcoRoof->CurrentET, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Environment"); } diff --git a/src/EnergyPlus/EconomicLifeCycleCost.cc b/src/EnergyPlus/EconomicLifeCycleCost.cc index 222dfb74a73..1895608fe0b 100644 --- a/src/EnergyPlus/EconomicLifeCycleCost.cc +++ b/src/EnergyPlus/EconomicLifeCycleCost.cc @@ -1670,7 +1670,7 @@ void WriteTabularLifeCycleCostReport(EnergyPlusData &state) //--------------------------------- // Life-Cycle Cost Verification and Results Report //--------------------------------- - OutputReportTabular::WriteReportHeaders(state, "Life-Cycle Cost Report", "Entire Facility", OutputProcessor::StoreType::Averaged); + OutputReportTabular::WriteReportHeaders(state, "Life-Cycle Cost Report", "Entire Facility", OutputProcessor::StoreType::Average); //---- Life-Cycle Cost Parameters rowHead.allocate(11); columnHead.allocate(1); diff --git a/src/EnergyPlus/EconomicTariff.cc b/src/EnergyPlus/EconomicTariff.cc index 090b644b9f3..7d63413b407 100644 --- a/src/EnergyPlus/EconomicTariff.cc +++ b/src/EnergyPlus/EconomicTariff.cc @@ -4105,7 +4105,7 @@ void WriteTabularTariffReports(EnergyPlusData &state) // Economics Results Summary Report //--------------------------------- OutputReportTabular::WriteReportHeaders( - state, "Economics Results Summary Report", "Entire Facility", OutputProcessor::StoreType::Averaged); + state, "Economics Results Summary Report", "Entire Facility", OutputProcessor::StoreType::Average); for (int iUnitSystem = 0; iUnitSystem <= 1; iUnitSystem++) { OutputReportTabular::UnitsStyle unitsStyle_cur = state.dataOutRptTab->unitsStyle; @@ -4275,7 +4275,7 @@ void WriteTabularTariffReports(EnergyPlusData &state) for (int iTariff = 1; iTariff <= state.dataEconTariff->numTariff; ++iTariff) { auto const &tariff = state.dataEconTariff->tariff(iTariff); auto const &computation = state.dataEconTariff->computation(iTariff); - OutputReportTabular::WriteReportHeaders(state, "Tariff Report", tariff.tariffName, OutputProcessor::StoreType::Averaged); + OutputReportTabular::WriteReportHeaders(state, "Tariff Report", tariff.tariffName, OutputProcessor::StoreType::Average); rowHead.allocate(7); columnHead.allocate(1); columnWidth.allocate(1); diff --git a/src/EnergyPlus/ElectricBaseboardRadiator.cc b/src/EnergyPlus/ElectricBaseboardRadiator.cc index 544f2bc8667..b7bfd8befec 100644 --- a/src/EnergyPlus/ElectricBaseboardRadiator.cc +++ b/src/EnergyPlus/ElectricBaseboardRadiator.cc @@ -441,68 +441,66 @@ namespace ElectricBaseboardRadiator { "Baseboard Total Heating Rate", Constant::Units::W, elecBaseboard.TotPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, elecBaseboard.EquipName); SetupOutputVariable(state, "Baseboard Convective Heating Rate", Constant::Units::W, elecBaseboard.ConvPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, elecBaseboard.EquipName); SetupOutputVariable(state, "Baseboard Radiant Heating Rate", Constant::Units::W, elecBaseboard.RadPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, elecBaseboard.EquipName); SetupOutputVariable(state, "Baseboard Electricity Energy", Constant::Units::J, elecBaseboard.ElecUseLoad, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, elecBaseboard.EquipName, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Heating, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Heating); SetupOutputVariable(state, "Baseboard Electricity Rate", Constant::Units::W, elecBaseboard.ElecUseRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, elecBaseboard.EquipName); SetupOutputVariable(state, "Baseboard Total Heating Energy", Constant::Units::J, elecBaseboard.TotEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, elecBaseboard.EquipName, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::Baseboard, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Baseboard); SetupOutputVariable(state, "Baseboard Convective Heating Energy", Constant::Units::J, elecBaseboard.ConvEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, elecBaseboard.EquipName); SetupOutputVariable(state, "Baseboard Radiant Heating Energy", Constant::Units::J, elecBaseboard.RadEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, elecBaseboard.EquipName); } } diff --git a/src/EnergyPlus/ElectricPowerServiceManager.cc b/src/EnergyPlus/ElectricPowerServiceManager.cc index f9efa0d1260..208727ccb5d 100644 --- a/src/EnergyPlus/ElectricPowerServiceManager.cc +++ b/src/EnergyPlus/ElectricPowerServiceManager.cc @@ -317,94 +317,91 @@ void ElectricPowerServiceManager::getPowerManagerInput(EnergyPlusData &state) "Facility Total Purchased Electricity Rate", Constant::Units::W, electPurchRate_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name_); SetupOutputVariable(state, "Facility Total Purchased Electricity Energy", Constant::Units::J, electricityPurch_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, name_, Constant::eResource::ElectricityPurchased, - OutputProcessor::SOVEndUseCat::Cogeneration, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Cogeneration); SetupOutputVariable(state, "Facility Total Surplus Electricity Rate", Constant::Units::W, electSurplusRate_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name_); SetupOutputVariable(state, "Facility Total Surplus Electricity Energy", Constant::Units::J, electricitySurplus_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, name_, Constant::eResource::ElectricitySurplusSold, - OutputProcessor::SOVEndUseCat::Cogeneration, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Cogeneration); SetupOutputVariable(state, "Facility Net Purchased Electricity Rate", Constant::Units::W, electricityNetRate_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name_); SetupOutputVariable(state, "Facility Net Purchased Electricity Energy", Constant::Units::J, electricityNet_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, name_, Constant::eResource::ElectricityNet, - OutputProcessor::SOVEndUseCat::Cogeneration, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Cogeneration); SetupOutputVariable(state, "Facility Total Building Electricity Demand Rate", Constant::Units::W, totalBldgElecDemand_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name_); SetupOutputVariable(state, "Facility Total HVAC Electricity Demand Rate", Constant::Units::W, totalHVACElecDemand_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name_); SetupOutputVariable(state, "Facility Total Electricity Demand Rate", Constant::Units::W, totalElectricDemand_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name_); SetupOutputVariable(state, "Facility Total Produced Electricity Rate", Constant::Units::W, electProdRate_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name_); SetupOutputVariable(state, "Facility Total Produced Electricity Energy", Constant::Units::J, electricityProd_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, name_); reportPVandWindCapacity(state); @@ -1132,50 +1129,50 @@ ElectPowerLoadCenter::ElectPowerLoadCenter(EnergyPlusData &state, int const obje "Electric Load Center Produced Electricity Rate", Constant::Units::W, genElectProdRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name_); SetupOutputVariable(state, "Electric Load Center Produced Electricity Energy", Constant::Units::J, genElectricProd, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, name_); SetupOutputVariable(state, "Electric Load Center Supplied Electricity Rate", Constant::Units::W, subpanelFeedInRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name_); SetupOutputVariable(state, "Electric Load Center Drawn Electricity Rate", Constant::Units::W, subpanelDrawRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name_); SetupOutputVariable(state, "Electric Load Center Produced Thermal Rate", Constant::Units::W, thermalProdRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name_); SetupOutputVariable(state, "Electric Load Center Produced Thermal Energy", Constant::Units::J, thermalProd, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, name_); SetupOutputVariable(state, "Electric Load Center Requested Electricity Rate", Constant::Units::W, totalPowerRequest_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name_); if (state.dataGlobal->AnyEnergyManagementSystemInModel && storagePresent_) { @@ -2288,8 +2285,8 @@ GeneratorController::GeneratorController(EnergyPlusData &state, "Generator Requested Electricity Rate", Constant::Units::W, powerRequestThisTimestep, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, objectName); if (state.dataGlobal->AnyEnergyManagementSystemInModel) { SetupEMSInternalVariable(state, "Generator Nominal Maximum Power", objectName, "[W]", maxPowerOut); @@ -2625,94 +2622,93 @@ DCtoACInverter::DCtoACInverter(EnergyPlusData &state, std::string const &objectN "Inverter DC to AC Efficiency", Constant::Units::None, efficiency_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name_); SetupOutputVariable(state, "Inverter DC Input Electricity Rate", Constant::Units::W, dCPowerIn_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name_); SetupOutputVariable(state, "Inverter DC Input Electricity Energy", Constant::Units::J, dCEnergyIn_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, name_); SetupOutputVariable(state, "Inverter AC Output Electricity Rate", Constant::Units::W, aCPowerOut_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name_); SetupOutputVariable(state, "Inverter AC Output Electricity Energy", Constant::Units::J, aCEnergyOut_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, name_); SetupOutputVariable(state, "Inverter Conversion Loss Power", Constant::Units::W, conversionLossPower_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name_); SetupOutputVariable(state, "Inverter Conversion Loss Energy", Constant::Units::J, conversionLossEnergy_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, name_); SetupOutputVariable(state, "Inverter Conversion Loss Decrement Energy", Constant::Units::J, conversionLossEnergyDecrement_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, name_, Constant::eResource::ElectricityProduced, - OutputProcessor::SOVEndUseCat::PowerConversion, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::PowerConversion); SetupOutputVariable(state, "Inverter Thermal Loss Rate", Constant::Units::W, thermLossRate_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name_); SetupOutputVariable(state, "Inverter Thermal Loss Energy", Constant::Units::J, thermLossEnergy_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, name_); SetupOutputVariable(state, "Inverter Ancillary AC Electricity Rate", Constant::Units::W, ancillACuseRate_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name_); SetupOutputVariable(state, "Inverter Ancillary AC Electricity Energy", Constant::Units::J, ancillACuseEnergy_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, name_, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cogeneration, - "DCtoACInverter Ancillary", - OutputProcessor::SOVGroup::Plant); // called cogeneration for end use table + OutputProcessor::Group::Plant, // called cogeneration for end use table + OutputProcessor::EndUseCat::Cogeneration, + "DCtoACInverter Ancillary"); if (zoneNum_ > 0) { switch (modelType_) { case InverterModelType::SimpleConstantEff: { @@ -3083,94 +3079,93 @@ ACtoDCConverter::ACtoDCConverter(EnergyPlusData &state, std::string const &objec "Converter AC to DC Efficiency", Constant::Units::None, efficiency_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name_); SetupOutputVariable(state, "Converter AC Input Electricity Rate", Constant::Units::W, aCPowerIn_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name_); SetupOutputVariable(state, "Converter AC Input Electricity Energy", Constant::Units::J, aCEnergyIn_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, name_); SetupOutputVariable(state, "Converter DC Output Electricity Rate", Constant::Units::W, dCPowerOut_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name_); SetupOutputVariable(state, "Converter DC Output Electricity Energy", Constant::Units::J, dCEnergyOut_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, name_); SetupOutputVariable(state, "Converter Electricity Loss Rate", Constant::Units::W, conversionLossPower_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name_); SetupOutputVariable(state, "Converter Electricity Loss Energy", Constant::Units::J, conversionLossEnergy_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, name_); SetupOutputVariable(state, "Converter Electricity Loss Decrement Energy", Constant::Units::J, conversionLossEnergyDecrement_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, name_, Constant::eResource::ElectricityProduced, - OutputProcessor::SOVEndUseCat::PowerConversion, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::PowerConversion); SetupOutputVariable(state, "Converter Thermal Loss Rate", Constant::Units::W, thermLossRate_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name_); SetupOutputVariable(state, "Converter Thermal Loss Energy", Constant::Units::J, thermLossEnergy_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, name_); SetupOutputVariable(state, "Converter Ancillary AC Electricity Rate", Constant::Units::W, ancillACuseRate_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name_); SetupOutputVariable(state, "Converter Ancillary AC Electricity Energy", Constant::Units::J, ancillACuseEnergy_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, name_, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cogeneration, - "ACtoDCConverter Ancillary", - OutputProcessor::SOVGroup::Plant); // called cogeneration for end use table + OutputProcessor::Group::Plant, // called cogeneration for end use table + OutputProcessor::EndUseCat::Cogeneration, + "ACtoDCConverter Ancillary"); if (zoneNum_ > 0) { SetupZoneInternalGain( state, zoneNum_, name_, DataHeatBalance::IntGainType::ElectricLoadCenterConverter, &qdotConvZone_, nullptr, &qdotRadZone_); @@ -3393,8 +3388,8 @@ ElectricStorage::ElectricStorage( // main constructor "Electric Storage Simple Charge State", Constant::Units::J, electEnergyinStorage_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name_); // issue #4921 break; } @@ -3649,36 +3644,36 @@ ElectricStorage::ElectricStorage( // main constructor "Electric Storage Operating Mode Index", Constant::Units::None, storageMode_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name_); SetupOutputVariable(state, "Electric Storage Battery Charge State", Constant::Units::Ah, absoluteSOC_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name_); // issue #4921 SetupOutputVariable(state, "Electric Storage Charge Fraction", Constant::Units::None, fractionSOC_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name_); SetupOutputVariable(state, "Electric Storage Total Current", Constant::Units::A, batteryCurrent_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name_); SetupOutputVariable(state, "Electric Storage Total Voltage", Constant::Units::V, batteryVoltage_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name_); if (lifeCalculation_ == BatteryDegradationModelType::LifeCalculationYes) { @@ -3686,8 +3681,8 @@ ElectricStorage::ElectricStorage( // main constructor "Electric Storage Degradation Fraction", Constant::Units::None, batteryDamage_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name_); } } @@ -3696,58 +3691,56 @@ ElectricStorage::ElectricStorage( // main constructor "Electric Storage Charge Power", Constant::Units::W, storedPower_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name_); SetupOutputVariable(state, "Electric Storage Charge Energy", Constant::Units::J, storedEnergy_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, name_); SetupOutputVariable(state, "Electric Storage Production Decrement Energy", Constant::Units::J, decrementedEnergyStored_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, name_, Constant::eResource::ElectricityProduced, - OutputProcessor::SOVEndUseCat::ElectricStorage, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::ElectricStorage); SetupOutputVariable(state, "Electric Storage Discharge Power", Constant::Units::W, drawnPower_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name_); SetupOutputVariable(state, "Electric Storage Discharge Energy", Constant::Units::J, drawnEnergy_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, name_, Constant::eResource::ElectricityProduced, - OutputProcessor::SOVEndUseCat::ElectricStorage, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::ElectricStorage); SetupOutputVariable(state, "Electric Storage Thermal Loss Rate", Constant::Units::W, thermLossRate_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name_); SetupOutputVariable(state, "Electric Storage Thermal Loss Energy", Constant::Units::J, thermLossEnergy_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, name_); if (state.dataGlobal->AnyEnergyManagementSystemInModel) { if (storageModelMode_ == StorageModelType::SimpleBucketStorage) { @@ -3761,8 +3754,8 @@ ElectricStorage::ElectricStorage( // main constructor "Electric Storage Battery Temperature", Constant::Units::C, batteryTemperature_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name_); } @@ -4862,117 +4855,115 @@ ElectricTransformer::ElectricTransformer(EnergyPlusData &state, std::string cons "Transformer Efficiency", Constant::Units::None, efficiency_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name_); SetupOutputVariable(state, "Transformer Input Electricity Rate", Constant::Units::W, powerIn_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name_); SetupOutputVariable(state, "Transformer Input Electricity Energy", Constant::Units::J, energyIn_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, name_); SetupOutputVariable(state, "Transformer Output Electricity Rate", Constant::Units::W, powerOut_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name_); SetupOutputVariable(state, "Transformer Output Electricity Energy", Constant::Units::J, energyOut_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, name_); SetupOutputVariable(state, "Transformer No Load Loss Rate", Constant::Units::W, noLoadLossRate_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name_); SetupOutputVariable(state, "Transformer No Load Loss Energy", Constant::Units::J, noLoadLossEnergy_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, name_); SetupOutputVariable(state, "Transformer Load Loss Rate", Constant::Units::W, loadLossRate_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name_); SetupOutputVariable(state, "Transformer Load Loss Energy", Constant::Units::J, loadLossEnergy_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, name_); SetupOutputVariable(state, "Transformer Thermal Loss Rate", Constant::Units::W, thermalLossRate_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name_); SetupOutputVariable(state, "Transformer Thermal Loss Energy", Constant::Units::J, thermalLossEnergy_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, name_); if (usageMode_ == TransformerUse::PowerInFromGrid) { // power losses metered as an end use exterior equipment SetupOutputVariable(state, "Transformer Distribution Electricity Loss Energy", Constant::Units::J, elecUseMeteredUtilityLosses_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, name_, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::ExteriorEquipment, - "Transformer", - OutputProcessor::SOVGroup::HVAC); // Is this correct? + OutputProcessor::Group::HVAC, // Is this correct? + OutputProcessor::EndUseCat::ExteriorEquipment, + "Transformer"); } if (usageMode_ == TransformerUse::PowerOutFromBldgToGrid) { SetupOutputVariable(state, "Transformer Cogeneration Electricity Loss Energy", Constant::Units::J, powerConversionMeteredLosses_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, name_, Constant::eResource::ElectricityProduced, - OutputProcessor::SOVEndUseCat::PowerConversion, - {}, - OutputProcessor::SOVGroup::HVAC); // Is this correct? + OutputProcessor::Group::HVAC, // Is this correct? + OutputProcessor::EndUseCat::PowerConversion); } if (usageMode_ == TransformerUse::PowerBetweenLoadCenterAndBldg) { SetupOutputVariable(state, "Transformer Conversion Electricity Loss Energy", Constant::Units::J, powerConversionMeteredLosses_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, name_, Constant::eResource::ElectricityProduced, - OutputProcessor::SOVEndUseCat::PowerConversion, - {}, - OutputProcessor::SOVGroup::HVAC); // Is this correct? + OutputProcessor::Group::HVAC, // Is this correct? + OutputProcessor::EndUseCat::PowerConversion); } if (zoneNum_ > 0) { diff --git a/src/EnergyPlus/EvaporativeCoolers.cc b/src/EnergyPlus/EvaporativeCoolers.cc index ea298d9e8a3..c249abf939f 100644 --- a/src/EnergyPlus/EvaporativeCoolers.cc +++ b/src/EnergyPlus/EvaporativeCoolers.cc @@ -324,8 +324,8 @@ void GetEvapInput(EnergyPlusData &state) "Evaporative Cooler Wet Bulb Effectiveness", Constant::Units::None, thisEvapCooler.SatEff, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisEvapCooler.Name); // A6 ; \Field Name of Water Supply Storage Tank @@ -427,15 +427,15 @@ void GetEvapInput(EnergyPlusData &state) "Evaporative Cooler Wetbulb Effectiveness", Constant::Units::None, thisEvapCooler.SatEff, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisEvapCooler.Name); SetupOutputVariable(state, "Evaporative Cooler Total Stage Effectiveness", Constant::Units::None, thisEvapCooler.StageEff, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisEvapCooler.Name); // A6 ; \Field Name of Water Supply Storage Tank @@ -557,8 +557,8 @@ void GetEvapInput(EnergyPlusData &state) "Evaporative Cooler Total Stage Effectiveness", Constant::Units::None, thisEvapCooler.StageEff, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisEvapCooler.Name); // A6 ; \Field Name of Water Supply Storage Tank @@ -775,30 +775,30 @@ void GetEvapInput(EnergyPlusData &state) "Evaporative Cooler Total Stage Effectiveness", Constant::Units::None, thisEvapCooler.StageEff, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisEvapCooler.Name); SetupOutputVariable(state, "Evaporative Cooler Part Load Ratio", Constant::Units::None, thisEvapCooler.PartLoadFract, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisEvapCooler.Name); SetupOutputVariable(state, "Evaporative Cooler Dewpoint Bound Status", Constant::Units::None, thisEvapCooler.DewPointBoundFlag, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisEvapCooler.Name); SetupOutputVariable(state, "Evaporative Cooler Operating Mode Status", Constant::Units::None, thisEvapCooler.IECOperatingStatus, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisEvapCooler.Name); } // end of Indirect Research Special cooler input loop @@ -927,8 +927,8 @@ void GetEvapInput(EnergyPlusData &state) "Evaporative Cooler Stage Effectiveness", Constant::Units::None, thisEvapCooler.StageEff, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisEvapCooler.Name); } @@ -943,19 +943,18 @@ void GetEvapInput(EnergyPlusData &state) "Evaporative Cooler Electricity Energy", Constant::Units::J, thisEvapCooler.EvapCoolerEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisEvapCooler.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); SetupOutputVariable(state, "Evaporative Cooler Electricity Rate", Constant::Units::W, thisEvapCooler.EvapCoolerPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisEvapCooler.Name); // this next report variable is setup differently depending on how the water should be metered here. if (thisEvapCooler.EvapWaterSupplyMode == WaterSupply::FromMains) { @@ -963,59 +962,54 @@ void GetEvapInput(EnergyPlusData &state) "Evaporative Cooler Water Volume", Constant::Units::m3, thisEvapCooler.EvapWaterConsump, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisEvapCooler.Name, Constant::eResource::Water, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); SetupOutputVariable(state, "Evaporative Cooler Mains Water Volume", Constant::Units::m3, thisEvapCooler.EvapWaterConsump, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisEvapCooler.Name, Constant::eResource::MainsWater, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); } else if (thisEvapCooler.EvapWaterSupplyMode == WaterSupply::FromTank) { SetupOutputVariable(state, "Evaporative Cooler Storage Tank Water Volume", Constant::Units::m3, thisEvapCooler.EvapWaterConsump, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisEvapCooler.Name, Constant::eResource::Water, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); SetupOutputVariable(state, "Evaporative Cooler Starved Water Volume", Constant::Units::m3, thisEvapCooler.EvapWaterStarvMakup, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisEvapCooler.Name, Constant::eResource::Water, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); SetupOutputVariable(state, "Evaporative Cooler Starved Mains Water Volume", Constant::Units::m3, thisEvapCooler.EvapWaterStarvMakup, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisEvapCooler.Name, Constant::eResource::MainsWater, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); } } } @@ -3669,83 +3663,82 @@ void GetInputZoneEvaporativeCoolerUnit(EnergyPlusData &state) "Zone Evaporative Cooler Unit Total Cooling Rate", Constant::Units::W, thisZoneEvapUnit.UnitTotalCoolingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisZoneEvapUnit.Name); SetupOutputVariable(state, "Zone Evaporative Cooler Unit Total Cooling Energy", Constant::Units::J, thisZoneEvapUnit.UnitTotalCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisZoneEvapUnit.Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::CoolingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::CoolingCoils); SetupOutputVariable(state, "Zone Evaporative Cooler Unit Sensible Cooling Rate", Constant::Units::W, thisZoneEvapUnit.UnitSensibleCoolingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisZoneEvapUnit.Name); SetupOutputVariable(state, "Zone Evaporative Cooler Unit Sensible Cooling Energy", Constant::Units::J, thisZoneEvapUnit.UnitSensibleCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisZoneEvapUnit.Name); SetupOutputVariable(state, "Zone Evaporative Cooler Unit Latent Heating Rate", Constant::Units::W, thisZoneEvapUnit.UnitLatentHeatingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisZoneEvapUnit.Name); SetupOutputVariable(state, "Zone Evaporative Cooler Unit Latent Heating Energy", Constant::Units::J, thisZoneEvapUnit.UnitLatentHeatingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisZoneEvapUnit.Name); SetupOutputVariable(state, "Zone Evaporative Cooler Unit Latent Cooling Rate", Constant::Units::W, thisZoneEvapUnit.UnitLatentCoolingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisZoneEvapUnit.Name); SetupOutputVariable(state, "Zone Evaporative Cooler Unit Latent Cooling Energy", Constant::Units::J, thisZoneEvapUnit.UnitLatentCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisZoneEvapUnit.Name); SetupOutputVariable(state, "Zone Evaporative Cooler Unit Fan Speed Ratio", Constant::Units::None, thisZoneEvapUnit.UnitFanSpeedRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisZoneEvapUnit.Name); SetupOutputVariable(state, "Zone Evaporative Cooler Unit Fan Availability Status", Constant::Units::None, thisZoneEvapUnit.FanAvailStatus, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisZoneEvapUnit.Name); if (thisZoneEvapUnit.ControlSchemeType != ControlType::ZoneCoolingLoadVariableSpeedFan) { SetupOutputVariable(state, "Zone Evaporative Cooler Unit Part Load Ratio", Constant::Units::None, thisZoneEvapUnit.UnitPartLoadRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisZoneEvapUnit.Name); } } diff --git a/src/EnergyPlus/EvaporativeFluidCoolers.cc b/src/EnergyPlus/EvaporativeFluidCoolers.cc index fb1009e8239..f9ed1f12420 100644 --- a/src/EnergyPlus/EvaporativeFluidCoolers.cc +++ b/src/EnergyPlus/EvaporativeFluidCoolers.cc @@ -986,8 +986,8 @@ namespace EvaporativeFluidCoolers { "Cooling Tower Bypass Fraction", Constant::Units::None, this->BypassFraction, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); } @@ -998,202 +998,196 @@ namespace EvaporativeFluidCoolers { "Cooling Tower Make Up Water Volume Flow Rate", Constant::Units::m3_s, this->MakeUpVdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Make Up Water Volume", Constant::Units::m3, this->MakeUpVol, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Cooling Tower Storage Tank Water Volume Flow Rate", Constant::Units::m3_s, this->TankSupplyVdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Storage Tank Water Volume", Constant::Units::m3, this->TankSupplyVol, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::Water, - OutputProcessor::SOVEndUseCat::HeatRejection, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::HeatRejection); SetupOutputVariable(state, "Cooling Tower Starved Storage Tank Water Volume Flow Rate", Constant::Units::m3_s, this->StarvedMakeUpVdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Starved Storage Tank Water Volume", Constant::Units::m3, this->StarvedMakeUpVol, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::Water, - OutputProcessor::SOVEndUseCat::HeatRejection, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::HeatRejection); SetupOutputVariable(state, "Cooling Tower Make Up Mains Water Volume", Constant::Units::m3, this->StarvedMakeUpVol, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::MainsWater, - OutputProcessor::SOVEndUseCat::HeatRejection, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::HeatRejection); } else { // Evaporative fluid cooler water from mains and gets metered SetupOutputVariable(state, "Cooling Tower Make Up Water Volume Flow Rate", Constant::Units::m3_s, this->MakeUpVdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Make Up Water Volume", Constant::Units::m3, this->MakeUpVol, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::Water, - OutputProcessor::SOVEndUseCat::HeatRejection, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::HeatRejection); SetupOutputVariable(state, "Cooling Tower Make Up Mains Water Volume", Constant::Units::m3, this->MakeUpVol, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::MainsWater, - OutputProcessor::SOVEndUseCat::HeatRejection, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::HeatRejection); } SetupOutputVariable(state, "Cooling Tower Inlet Temperature", Constant::Units::C, this->fluidCoolerInletWaterTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Outlet Temperature", Constant::Units::C, this->fluidCoolerOutletWaterTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Mass Flow Rate", Constant::Units::kg_s, this->WaterMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Heat Transfer Rate", Constant::Units::W, this->Qactual, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Fan Electricity Rate", Constant::Units::W, this->FanPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Fan Electricity Energy", Constant::Units::J, this->FanEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::HeatRejection, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::HeatRejection); SetupOutputVariable(state, "Cooling Tower Water Evaporation Volume Flow Rate", Constant::Units::m3_s, this->EvaporationVdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Water Evaporation Volume", Constant::Units::m3, this->EvaporationVol, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Cooling Tower Water Drift Volume Flow Rate", Constant::Units::m3_s, this->DriftVdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Water Drift Volume", Constant::Units::m3, this->DriftVol, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Cooling Tower Water Blowdown Volume Flow Rate", Constant::Units::m3_s, this->BlowdownVdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Water Blowdown Volume", Constant::Units::m3, this->BlowdownVol, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); } diff --git a/src/EnergyPlus/ExhaustAirSystemManager.cc b/src/EnergyPlus/ExhaustAirSystemManager.cc index 980175529c7..af8b2deff13 100644 --- a/src/EnergyPlus/ExhaustAirSystemManager.cc +++ b/src/EnergyPlus/ExhaustAirSystemManager.cc @@ -193,40 +193,40 @@ namespace ExhaustAirSystemManager { "Central Exhaust Fan Mass Flow Rate", Constant::Units::kg_s, thisExhSys.centralFan_MassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisExhSys.Name); SetupOutputVariable(state, "Central Exhaust Fan Volumetric Flow Rate Standard", Constant::Units::m3_s, thisExhSys.centralFan_VolumeFlowRate_Std, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisExhSys.Name); SetupOutputVariable(state, "Central Exhaust Fan Volumetric Flow Rate Current", Constant::Units::m3_s, thisExhSys.centralFan_VolumeFlowRate_Cur, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisExhSys.Name); SetupOutputVariable(state, "Central Exhaust Fan Power", Constant::Units::W, thisExhSys.centralFan_Power, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisExhSys.Name); SetupOutputVariable(state, "Central Exhaust Fan Energy", Constant::Units::J, thisExhSys.centralFan_Energy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisExhSys.Name); } else { @@ -268,40 +268,40 @@ namespace ExhaustAirSystemManager { "Central Exhaust Fan Mass Flow Rate", Constant::Units::kg_s, thisExhSys.centralFan_MassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisExhSys.Name); SetupOutputVariable(state, "Central Exhaust Fan Volumetric Flow Rate Standard", Constant::Units::m3_s, thisExhSys.centralFan_VolumeFlowRate_Std, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisExhSys.Name); SetupOutputVariable(state, "Central Exhaust Fan Volumetric Flow Rate Current", Constant::Units::m3_s, thisExhSys.centralFan_VolumeFlowRate_Cur, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisExhSys.Name); SetupOutputVariable(state, "Central Exhaust Fan Power", Constant::Units::W, thisExhSys.centralFan_Power, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisExhSys.Name); SetupOutputVariable(state, "Central Exhaust Fan Energy", Constant::Units::J, thisExhSys.centralFan_Energy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisExhSys.Name); if (errFlag) { diff --git a/src/EnergyPlus/ExteriorEnergyUse.cc b/src/EnergyPlus/ExteriorEnergyUse.cc index 262458b500f..64eede6d095 100644 --- a/src/EnergyPlus/ExteriorEnergyUse.cc +++ b/src/EnergyPlus/ExteriorEnergyUse.cc @@ -242,19 +242,20 @@ namespace ExteriorEnergyUse { "Exterior Lights Electricity Rate", Constant::Units::W, state.dataExteriorEnergyUse->ExteriorLights(Item).Power, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataExteriorEnergyUse->ExteriorLights(Item).Name); SetupOutputVariable(state, "Exterior Lights Electricity Energy", Constant::Units::J, state.dataExteriorEnergyUse->ExteriorLights(Item).CurrentUse, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataExteriorEnergyUse->ExteriorLights(Item).Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::ExteriorLights, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::ExteriorLights, EndUseSubcategoryName); // entries for predefined tables @@ -329,36 +330,38 @@ namespace ExteriorEnergyUse { "Exterior Equipment Fuel Rate", Constant::Units::W, exteriorEquip.Power, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, exteriorEquip.Name); SetupOutputVariable(state, format("Exterior Equipment {} Energy", Constant::eFuelNames[(int)exteriorEquip.FuelType]), Constant::Units::J, exteriorEquip.CurrentUse, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, exteriorEquip.Name, Constant::eFuel2eResource[(int)exteriorEquip.FuelType], - OutputProcessor::SOVEndUseCat::ExteriorEquipment, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::ExteriorEquipment, EndUseSubcategoryName); } else { SetupOutputVariable(state, "Exterior Equipment Water Volume Flow Rate", Constant::Units::m3_s, exteriorEquip.Power, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, exteriorEquip.Name); SetupOutputVariable(state, format("Exterior Equipment {} Volume", Constant::eFuelNames[(int)exteriorEquip.FuelType]), Constant::Units::m3, exteriorEquip.CurrentUse, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, exteriorEquip.Name, Constant::eFuel2eResource[(int)exteriorEquip.FuelType], - OutputProcessor::SOVEndUseCat::ExteriorEquipment, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::ExteriorEquipment, EndUseSubcategoryName); } @@ -504,29 +507,31 @@ namespace ExteriorEnergyUse { "Exterior Equipment Water Volume Flow Rate", Constant::Units::m3_s, exteriorEquip.Power, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, exteriorEquip.Name); SetupOutputVariable(state, "Exterior Equipment Water Volume", Constant::Units::m3, exteriorEquip.CurrentUse, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, exteriorEquip.Name, Constant::eResource::Water, - OutputProcessor::SOVEndUseCat::ExteriorEquipment, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::ExteriorEquipment, EndUseSubcategoryName); SetupOutputVariable(state, "Exterior Equipment Mains Water Volume", Constant::Units::m3, exteriorEquip.CurrentUse, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, exteriorEquip.Name, Constant::eResource::MainsWater, - OutputProcessor::SOVEndUseCat::ExteriorEquipment, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::ExteriorEquipment, EndUseSubcategoryName); } diff --git a/src/EnergyPlus/ExternalInterface.cc b/src/EnergyPlus/ExternalInterface.cc index 502409d65f4..b71204e00fd 100644 --- a/src/EnergyPlus/ExternalInterface.cc +++ b/src/EnergyPlus/ExternalInterface.cc @@ -2403,7 +2403,7 @@ void GetReportVariableKey( // SUBROUTINE LOCAL VARIABLE DECLARATIONS: OutputProcessor::VariableType varType(OutputProcessor::VariableType::Invalid); // 0=not found, 1=integer, 2=real, 3=meter int numKeys(0); // Number of keys found - OutputProcessor::StoreType varAvgSum(OutputProcessor::StoreType::Averaged); // Variable is Averaged=1 or Summed=2 + OutputProcessor::StoreType varAvgSum(OutputProcessor::StoreType::Average); // Variable is Averaged=1 or Summed=2 OutputProcessor::TimeStepType varStepType(OutputProcessor::TimeStepType::Zone); // Variable time step is Zone=1 or HVAC=2 Constant::Units varUnits(Constant::Units::None); // Units sting, may be blank Array1D_string keyNames; diff --git a/src/EnergyPlus/FanCoilUnits.cc b/src/EnergyPlus/FanCoilUnits.cc index a0aee8a8243..6c7915294c5 100644 --- a/src/EnergyPlus/FanCoilUnits.cc +++ b/src/EnergyPlus/FanCoilUnits.cc @@ -879,87 +879,87 @@ namespace FanCoilUnits { "Fan Coil Heating Rate", Constant::Units::W, fanCoil.HeatPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, fanCoil.Name); SetupOutputVariable(state, "Fan Coil Heating Energy", Constant::Units::J, fanCoil.HeatEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, fanCoil.Name); SetupOutputVariable(state, "Fan Coil Total Cooling Rate", Constant::Units::W, fanCoil.TotCoolPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, fanCoil.Name); SetupOutputVariable(state, "Fan Coil Total Cooling Energy", Constant::Units::J, fanCoil.TotCoolEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, fanCoil.Name); SetupOutputVariable(state, "Fan Coil Sensible Cooling Rate", Constant::Units::W, fanCoil.SensCoolPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, fanCoil.Name); SetupOutputVariable(state, "Fan Coil Sensible Cooling Energy", Constant::Units::J, fanCoil.SensCoolEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, fanCoil.Name); SetupOutputVariable(state, "Fan Coil Fan Electricity Rate", Constant::Units::W, fanCoil.ElecPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, fanCoil.Name); SetupOutputVariable(state, "Fan Coil Fan Electricity Energy", Constant::Units::J, fanCoil.ElecEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, fanCoil.Name); if (fanCoil.CapCtrlMeth_Num == CCM::CycFan || fanCoil.CapCtrlMeth_Num == CCM::MultiSpeedFan) { SetupOutputVariable(state, "Fan Coil Runtime Fraction", Constant::Units::None, fanCoil.PLR, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, fanCoil.Name); SetupOutputVariable(state, "Fan Coil Fan Speed Level", Constant::Units::None, fanCoil.SpeedFanSel, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, fanCoil.Name); if (fanCoil.CapCtrlMeth_Num == CCM::MultiSpeedFan) { SetupOutputVariable(state, "Fan Coil Speed Ratio", Constant::Units::None, fanCoil.SpeedRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, fanCoil.Name); SetupOutputVariable(state, "Fan Coil Part Load Ratio", Constant::Units::None, fanCoil.PLR, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, fanCoil.Name); } } @@ -968,16 +968,16 @@ namespace FanCoilUnits { "Fan Coil Part Load Ratio", Constant::Units::None, fanCoil.PLR, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, fanCoil.Name); } SetupOutputVariable(state, "Fan Coil Availability Status", Constant::Units::None, fanCoil.AvailStatus, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, fanCoil.Name); if (fanCoil.FanType_Num == DataHVACGlobals::FanType_SystemModelObject) { diff --git a/src/EnergyPlus/Fans.cc b/src/EnergyPlus/Fans.cc index 6c86e82c2af..1a17d76b00f 100644 --- a/src/EnergyPlus/Fans.cc +++ b/src/EnergyPlus/Fans.cc @@ -946,55 +946,55 @@ void GetFanInput(EnergyPlusData &state) "Fan Electricity Rate", Constant::Units::W, thisFan.FanPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisFan.FanName); SetupOutputVariable(state, "Fan Rise in Air Temperature", Constant::Units::deltaC, thisFan.DeltaTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisFan.FanName); SetupOutputVariable(state, "Fan Heat Gain to Air", Constant::Units::W, thisFan.PowerLossToAir, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisFan.FanName); SetupOutputVariable(state, "Fan Electricity Energy", Constant::Units::J, thisFan.FanEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisFan.FanName, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Fans, - thisFan.EndUseSubcategoryName, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Fans, + thisFan.EndUseSubcategoryName); SetupOutputVariable(state, "Fan Air Mass Flow Rate", Constant::Units::kg_s, thisFan.OutletAirMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisFan.FanName); if ((thisFan.FanType_Num == DataHVACGlobals::FanType_ZoneExhaust) && (thisFan.BalancedFractSchedNum > 0)) { SetupOutputVariable(state, "Fan Unbalanced Air Mass Flow Rate", Constant::Units::kg_s, thisFan.UnbalancedOutletMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisFan.FanName); SetupOutputVariable(state, "Fan Balanced Air Mass Flow Rate", Constant::Units::kg_s, thisFan.BalancedOutletMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisFan.FanName); } @@ -1025,8 +1025,8 @@ void GetFanInput(EnergyPlusData &state) "Fan Runtime Fraction", Constant::Units::None, Fan(FanNum).FanRuntimeFraction, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Fan(FanNum).FanName); } diff --git a/src/EnergyPlus/FaultsManager.cc b/src/EnergyPlus/FaultsManager.cc index 99e70f52453..08166b4fd69 100644 --- a/src/EnergyPlus/FaultsManager.cc +++ b/src/EnergyPlus/FaultsManager.cc @@ -1810,8 +1810,8 @@ namespace FaultsManager { "Coil Fouling Factor", Constant::Units::K_W, state.dataWaterCoils->WaterCoil(CoilNum).FaultyCoilFoulingFactor, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataWaterCoils->WaterCoil(CoilNum).Name); // Coil:Cooling:Water doesn't report UA because it's not variable, @@ -1821,48 +1821,48 @@ namespace FaultsManager { "Cooling Coil Total U Factor Times Area Value", Constant::Units::W_K, state.dataWaterCoils->WaterCoil(CoilNum).UACoilTotal, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataWaterCoils->WaterCoil(CoilNum).Name); SetupOutputVariable(state, "Cooling Coil External U Factor Times Area Value", Constant::Units::W_K, state.dataWaterCoils->WaterCoil(CoilNum).UACoilExternal, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataWaterCoils->WaterCoil(CoilNum).Name); SetupOutputVariable(state, "Cooling Coil Internal U Factor Times Area Value", Constant::Units::W_K, state.dataWaterCoils->WaterCoil(CoilNum).UACoilInternal, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataWaterCoils->WaterCoil(CoilNum).Name); SetupOutputVariable(state, "Cooling Coil Total U Factor Times Area Value Before Fouling", Constant::Units::W_K, state.dataWaterCoils->WaterCoil(CoilNum).OriginalUACoilVariable, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataWaterCoils->WaterCoil(CoilNum).Name); SetupOutputVariable(state, "Cooling Coil External U Factor Times Area Value Before Fouling", Constant::Units::W_K, state.dataWaterCoils->WaterCoil(CoilNum).OriginalUACoilExternal, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataWaterCoils->WaterCoil(CoilNum).Name); SetupOutputVariable(state, "Cooling Coil Internal U Factor Times Area Value Before Fouling", Constant::Units::W_K, state.dataWaterCoils->WaterCoil(CoilNum).OriginalUACoilInternal, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataWaterCoils->WaterCoil(CoilNum).Name); } else { @@ -1870,8 +1870,8 @@ namespace FaultsManager { "Heating Coil U Factor Times Area Value Before Fouling", Constant::Units::W_K, state.dataWaterCoils->WaterCoil(CoilNum).OriginalUACoilVariable, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataWaterCoils->WaterCoil(CoilNum).Name); } } else { diff --git a/src/EnergyPlus/FluidCoolers.cc b/src/EnergyPlus/FluidCoolers.cc index 038e7a355cc..f18b888346a 100644 --- a/src/EnergyPlus/FluidCoolers.cc +++ b/src/EnergyPlus/FluidCoolers.cc @@ -427,48 +427,47 @@ void FluidCoolerspecs::setupOutputVars(EnergyPlusData &state) "Cooling Tower Inlet Temperature", Constant::Units::C, this->InletWaterTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Outlet Temperature", Constant::Units::C, this->OutletWaterTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Mass Flow Rate", Constant::Units::kg_s, this->WaterMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Heat Transfer Rate", Constant::Units::W, this->Qactual, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Fan Electricity Rate", Constant::Units::W, this->FanPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Cooling Tower Fan Electricity Energy", Constant::Units::J, this->FanEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::HeatRejection, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::HeatRejection); } bool FluidCoolerspecs::validateSingleSpeedInputs(EnergyPlusData &state, diff --git a/src/EnergyPlus/FuelCellElectricGenerator.cc b/src/EnergyPlus/FuelCellElectricGenerator.cc index 10070a4f7f1..47a55dcc2b1 100644 --- a/src/EnergyPlus/FuelCellElectricGenerator.cc +++ b/src/EnergyPlus/FuelCellElectricGenerator.cc @@ -1100,92 +1100,89 @@ namespace FuelCellElectricGenerator { "Generator Produced AC Electricity Rate", Constant::Units::W, this->Report.ACPowerGen, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Produced AC Electricity Energy", Constant::Units::J, this->Report.ACEnergyGen, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::ElectricityProduced, - OutputProcessor::SOVEndUseCat::Cogeneration, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Cogeneration); SetupOutputVariable(state, "Generator Produced Thermal Rate", Constant::Units::W, this->Report.qHX, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Produced Thermal Energy", Constant::Units::J, this->Report.HXenergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::Cogeneration, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Cogeneration); SetupOutputVariable(state, "Generator Fuel HHV Basis Energy", Constant::Units::J, this->Report.FuelEnergyHHV, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::NaturalGas, - OutputProcessor::SOVEndUseCat::Cogeneration, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Cogeneration); SetupOutputVariable(state, "Generator Fuel HHV Basis Rate", Constant::Units::W, this->Report.FuelEnergyUseRateHHV, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Zone Sensible Heat Transfer Rate", Constant::Units::W, this->Report.SkinLossPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Zone Sensible Heat Transfer Energy", Constant::Units::J, this->Report.SkinLossEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Generator Zone Convection Heat Transfer Rate", Constant::Units::W, this->Report.SkinLossConvect, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Zone Radiation Heat Transfer Rate", Constant::Units::W, this->Report.SkinLossRadiat, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); if (this->FCPM.ZoneID > 0) { @@ -1203,376 +1200,376 @@ namespace FuelCellElectricGenerator { "Generator Air Inlet Temperature", Constant::Units::C, this->Report.TairInlet, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Power Module Entering Air Temperature", Constant::Units::C, this->Report.TairIntoFCPM, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Air Molar Flow Rate", Constant::Units::kmol_s, this->Report.NdotAir, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Power Module Entering Air Enthalpy", Constant::Units::W, this->Report.TotAirInEnthalphy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Blower Electricity Rate", Constant::Units::W, this->Report.BlowerPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Blower Electricity Energy", Constant::Units::J, this->Report.BlowerEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Generator Blower Skin Heat Loss Rate", Constant::Units::W, this->Report.BlowerSkinLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Fuel Inlet Temperature", Constant::Units::C, this->Report.TfuelInlet, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Power Module Entering Fuel Temperature", Constant::Units::C, this->Report.TfuelIntoFCPM, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Fuel Molar Flow Rate", Constant::Units::kmol_s, this->Report.NdotFuel, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Fuel Consumption LHV Basis Energy", Constant::Units::J, this->Report.FuelEnergyLHV, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Generator Fuel Consumption Rate LHV Basis", Constant::Units::W, this->Report.FuelEnergyUseRateLHV, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Power Module Entering Fuel Enthalpy", Constant::Units::W, this->Report.TotFuelInEnthalpy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Fuel Compressor Electricity Rate", Constant::Units::W, this->Report.FuelCompressPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Fuel Compressor Electricity Energy", Constant::Units::J, this->Report.FuelCompressEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Generator Fuel Compressor Skin Heat Loss Rate", Constant::Units::W, this->Report.FuelCompressSkinLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Fuel Reformer Water Inlet Temperature", Constant::Units::C, this->Report.TwaterInlet, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Power Module Entering Reforming Water Temperature", Constant::Units::C, this->Report.TwaterIntoFCPM, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Fuel Reformer Water Molar Flow Rate", Constant::Units::kmol_s, this->Report.NdotWater, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Fuel Reformer Water Pump Electricity Rate", Constant::Units::W, this->Report.WaterPumpPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Fuel Reformer Water Pump Electricity Energy", Constant::Units::J, this->Report.WaterPumpEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Generator Power Module Entering Reforming Water Enthalpy", Constant::Units::W, this->Report.WaterIntoFCPMEnthalpy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Product Gas Temperature", Constant::Units::C, this->Report.TprodGas, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Product Gas Enthalpy", Constant::Units::W, this->Report.EnthalProdGas, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Product Gas Molar Flow Rate", Constant::Units::kmol_s, this->Report.NdotProdGas, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Product Gas Ar Molar Flow Rate", Constant::Units::kmol_s, this->Report.NdotProdAr, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Product Gas CO2 Molar Flow Rate", Constant::Units::kmol_s, this->Report.NdotProdCO2, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Product Gas H2O Vapor Molar Flow Rate", Constant::Units::kmol_s, this->Report.NdotProdH2O, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Product Gas N2 Molar Flow Rate", Constant::Units::kmol_s, this->Report.NdotProdN2, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Product Gas O2 Molar Flow Rate", Constant::Units::kmol_s, this->Report.NdotProdO2, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Heat Recovery Exit Gas Temperature", Constant::Units::C, this->Report.THXexh, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Heat Recovery Exit Gas H2O Vapor Fraction", Constant::Units::None, this->Report.WaterVaporFractExh, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Heat Recovery Water Condensate Molar Flow Rate", Constant::Units::kmol_s, this->Report.CondensateRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Inverter Loss Power", Constant::Units::W, this->Report.PCUlosses, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Produced DC Electricity Rate", Constant::Units::W, this->Report.DCPowerGen, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator DC Power Efficiency", Constant::Units::None, this->Report.DCPowerEff, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Electric Storage Charge State", Constant::Units::J, this->Report.ElectEnergyinStorage, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator DC Storage Charging Power", Constant::Units::W, this->Report.StoredPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator DC Storage Charging Energy", Constant::Units::J, this->Report.StoredEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Generator DC Storage Discharging Power", Constant::Units::W, this->Report.DrawnPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator DC Storage Discharging Energy", Constant::Units::J, this->Report.DrawnEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Generator Ancillary AC Electricity Rate", Constant::Units::W, this->Report.ACancillariesPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Ancillary AC Electricity Energy", Constant::Units::J, this->Report.ACancillariesEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Generator Fuel Cell Model Iteration Count", Constant::Units::None, this->Report.SeqSubstIterations, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Generator Root Solver Iteration Count", Constant::Units::None, this->Report.RegulaFalsiIterations, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Generator Number of Cycles", Constant::Units::None, this->Report.NumCycles, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Power Module Skin Heat Loss Rate", Constant::Units::W, this->Report.FCPMSkinLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); } } diff --git a/src/EnergyPlus/Furnaces.cc b/src/EnergyPlus/Furnaces.cc index ef16657bc20..f4d01e135c7 100644 --- a/src/EnergyPlus/Furnaces.cc +++ b/src/EnergyPlus/Furnaces.cc @@ -4537,8 +4537,8 @@ namespace Furnaces { "Unitary System Fan Part Load Ratio", Constant::Units::None, thisFurnace.FanPartLoadRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisFurnace.Name); if (state.dataGlobal->AnyEnergyManagementSystemInModel) { SetupEMSActuator(state, @@ -4559,8 +4559,8 @@ namespace Furnaces { "Unitary System Fan Part Load Ratio", Constant::Units::None, thisFurnace.FanPartLoadRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisFurnace.Name); if (state.dataGlobal->AnyEnergyManagementSystemInModel) { SetupEMSActuator(state, @@ -4581,15 +4581,15 @@ namespace Furnaces { "Unitary System Fan Part Load Ratio", Constant::Units::None, thisFurnace.FanPartLoadRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisFurnace.Name); SetupOutputVariable(state, "Unitary System Compressor Part Load Ratio", Constant::Units::None, thisFurnace.CompPartLoadRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisFurnace.Name); if (state.dataGlobal->AnyEnergyManagementSystemInModel) { @@ -4634,15 +4634,15 @@ namespace Furnaces { "Unitary System Fan Part Load Ratio", Constant::Units::None, thisFurnace.FanPartLoadRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisFurnace.Name); SetupOutputVariable(state, "Unitary System Compressor Part Load Ratio", Constant::Units::None, thisFurnace.CompPartLoadRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisFurnace.Name); if (state.dataGlobal->AnyEnergyManagementSystemInModel) { SetupEMSActuator(state, @@ -4686,22 +4686,22 @@ namespace Furnaces { "Unitary System Fan Part Load Ratio", Constant::Units::None, thisFurnace.FanPartLoadRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisFurnace.Name); SetupOutputVariable(state, "Unitary System Compressor Part Load Ratio", Constant::Units::None, thisFurnace.CompPartLoadRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisFurnace.Name); SetupOutputVariable(state, "Unitary System Dehumidification Induced Heating Demand Rate", Constant::Units::W, thisFurnace.DehumidInducedHeatingDemandRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisFurnace.Name); if (state.dataGlobal->AnyEnergyManagementSystemInModel) { @@ -4725,43 +4725,43 @@ namespace Furnaces { "Unitary System Fan Part Load Ratio", Constant::Units::None, thisFurnace.FanPartLoadRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisFurnace.Name); SetupOutputVariable(state, "Unitary System Compressor Part Load Ratio", Constant::Units::None, thisFurnace.CompPartLoadRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisFurnace.Name); SetupOutputVariable(state, "Unitary System Requested Sensible Cooling Rate", Constant::Units::W, thisFurnace.CoolingCoilSensDemand, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisFurnace.Name); SetupOutputVariable(state, "Unitary System Requested Latent Cooling Rate", Constant::Units::W, thisFurnace.CoolingCoilLatentDemand, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisFurnace.Name); SetupOutputVariable(state, "Unitary System Requested Heating Rate", Constant::Units::W, thisFurnace.HeatingCoilSensDemand, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisFurnace.Name); SetupOutputVariable(state, "Unitary System Dehumidification Induced Heating Demand Rate", Constant::Units::W, thisFurnace.DehumidInducedHeatingDemandRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisFurnace.Name); if (state.dataGlobal->AnyEnergyManagementSystemInModel) { diff --git a/src/EnergyPlus/GroundHeatExchangers.cc b/src/EnergyPlus/GroundHeatExchangers.cc index 184dde80b57..7c86b973419 100644 --- a/src/EnergyPlus/GroundHeatExchangers.cc +++ b/src/EnergyPlus/GroundHeatExchangers.cc @@ -2520,50 +2520,50 @@ void GLHEBase::setupOutput(EnergyPlusData &state) "Ground Heat Exchanger Average Borehole Temperature", Constant::Units::C, this->bhTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); SetupOutputVariable(state, "Ground Heat Exchanger Heat Transfer Rate", Constant::Units::W, this->QGLHE, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); SetupOutputVariable(state, "Ground Heat Exchanger Inlet Temperature", Constant::Units::C, this->inletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); SetupOutputVariable(state, "Ground Heat Exchanger Outlet Temperature", Constant::Units::C, this->outletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); SetupOutputVariable(state, "Ground Heat Exchanger Mass Flow Rate", Constant::Units::kg_s, this->massFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); SetupOutputVariable(state, "Ground Heat Exchanger Average Fluid Temperature", Constant::Units::C, this->aveFluidTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); SetupOutputVariable(state, "Ground Heat Exchanger Farfield Ground Temperature", Constant::Units::C, this->tempGround, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); } diff --git a/src/EnergyPlus/HVACCooledBeam.cc b/src/EnergyPlus/HVACCooledBeam.cc index 694f5a58429..c3b91d764c7 100644 --- a/src/EnergyPlus/HVACCooledBeam.cc +++ b/src/EnergyPlus/HVACCooledBeam.cc @@ -375,66 +375,64 @@ namespace HVACCooledBeam { "Zone Air Terminal Beam Sensible Cooling Energy", Constant::Units::J, CoolBeam(CBNum).BeamCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, CoolBeam(CBNum).Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::CoolingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::CoolingCoils); SetupOutputVariable(state, "Zone Air Terminal Beam Chilled Water Energy", Constant::Units::J, CoolBeam(CBNum).BeamCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, CoolBeam(CBNum).Name, Constant::eResource::PlantLoopCoolingDemand, - OutputProcessor::SOVEndUseCat::CoolingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::CoolingCoils); SetupOutputVariable(state, "Zone Air Terminal Beam Sensible Cooling Rate", Constant::Units::W, CoolBeam(CBNum).BeamCoolingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, CoolBeam(CBNum).Name); SetupOutputVariable(state, "Zone Air Terminal Supply Air Sensible Cooling Energy", Constant::Units::J, CoolBeam(CBNum).SupAirCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, CoolBeam(CBNum).Name); SetupOutputVariable(state, "Zone Air Terminal Supply Air Sensible Cooling Rate", Constant::Units::W, CoolBeam(CBNum).SupAirCoolingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, CoolBeam(CBNum).Name); SetupOutputVariable(state, "Zone Air Terminal Supply Air Sensible Heating Energy", Constant::Units::J, CoolBeam(CBNum).SupAirHeatingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, CoolBeam(CBNum).Name); SetupOutputVariable(state, "Zone Air Terminal Supply Air Sensible Heating Rate", Constant::Units::W, CoolBeam(CBNum).SupAirHeatingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, CoolBeam(CBNum).Name); SetupOutputVariable(state, "Zone Air Terminal Outdoor Air Volume Flow Rate", Constant::Units::m3_s, CoolBeam(CBNum).OutdoorAirFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, CoolBeam(CBNum).Name); for (ADUNum = 1; ADUNum <= (int)state.dataDefineEquipment->AirDistUnit.size(); ++ADUNum) { diff --git a/src/EnergyPlus/HVACDXHeatPumpSystem.cc b/src/EnergyPlus/HVACDXHeatPumpSystem.cc index fe56374b8a3..5c8e4fecc3f 100644 --- a/src/EnergyPlus/HVACDXHeatPumpSystem.cc +++ b/src/EnergyPlus/HVACDXHeatPumpSystem.cc @@ -416,8 +416,8 @@ namespace HVACDXHeatPumpSystem { "Coil System Part Load Ratio", Constant::Units::None, DXHeatPumpSystem(DXHeatSysNum).PartLoadFrac, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, DXHeatPumpSystem(DXHeatSysNum).Name); } diff --git a/src/EnergyPlus/HVACFan.cc b/src/EnergyPlus/HVACFan.cc index e9531024d4c..d3d50685f6a 100644 --- a/src/EnergyPlus/HVACFan.cc +++ b/src/EnergyPlus/HVACFan.cc @@ -607,48 +607,48 @@ namespace HVACFan { "Fan Electricity Rate", Constant::Units::W, m_fanPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name); SetupOutputVariable(state, "Fan Rise in Air Temperature", Constant::Units::deltaC, m_deltaTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name); SetupOutputVariable(state, "Fan Heat Gain to Air", Constant::Units::W, m_powerLossToAir, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name); SetupOutputVariable(state, "Fan Electricity Energy", Constant::Units::J, m_fanEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Fans, - m_endUseSubcategoryName, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Fans, + m_endUseSubcategoryName); SetupOutputVariable(state, "Fan Air Mass Flow Rate", Constant::Units::kg_s, m_outletAirMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name); if (speedControl == SpeedControlMethod::Discrete && m_numSpeeds == 1) { SetupOutputVariable(state, "Fan Runtime Fraction", Constant::Units::None, m_fanRunTimeFractionAtSpeed[0], - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name); } else if (speedControl == SpeedControlMethod::Discrete && m_numSpeeds > 1) { for (int speedLoop = 0; speedLoop < m_numSpeeds; ++speedLoop) { @@ -656,8 +656,8 @@ namespace HVACFan { "Fan Runtime Fraction Speed " + fmt::to_string(speedLoop + 1), Constant::Units::None, m_fanRunTimeFractionAtSpeed[speedLoop], - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name); } } diff --git a/src/EnergyPlus/HVACFourPipeBeam.cc b/src/EnergyPlus/HVACFourPipeBeam.cc index b6d911f97a1..b70f1c94958 100644 --- a/src/EnergyPlus/HVACFourPipeBeam.cc +++ b/src/EnergyPlus/HVACFourPipeBeam.cc @@ -393,19 +393,18 @@ namespace FourPipeBeam { "Zone Air Terminal Beam Sensible Cooling Energy", Constant::Units::J, thisBeam->beamCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisBeam->name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::CoolingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::CoolingCoils); SetupOutputVariable(state, "Zone Air Terminal Beam Sensible Cooling Rate", Constant::Units::W, thisBeam->beamCoolingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisBeam->name); } if (thisBeam->beamHeatingPresent) { @@ -413,63 +412,62 @@ namespace FourPipeBeam { "Zone Air Terminal Beam Sensible Heating Energy", Constant::Units::J, thisBeam->beamHeatingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisBeam->name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::HeatingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::HeatingCoils); SetupOutputVariable(state, "Zone Air Terminal Beam Sensible Heating Rate", Constant::Units::W, thisBeam->beamHeatingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisBeam->name); } SetupOutputVariable(state, "Zone Air Terminal Primary Air Sensible Cooling Energy", Constant::Units::J, thisBeam->supAirCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisBeam->name); SetupOutputVariable(state, "Zone Air Terminal Primary Air Sensible Cooling Rate", Constant::Units::W, thisBeam->supAirCoolingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisBeam->name); SetupOutputVariable(state, "Zone Air Terminal Primary Air Sensible Heating Energy", Constant::Units::J, thisBeam->supAirHeatingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisBeam->name); SetupOutputVariable(state, "Zone Air Terminal Primary Air Sensible Heating Rate", Constant::Units::W, thisBeam->supAirHeatingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisBeam->name); SetupOutputVariable(state, "Zone Air Terminal Primary Air Flow Rate", Constant::Units::m3_s, thisBeam->primAirFlow, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisBeam->name); SetupOutputVariable(state, "Zone Air Terminal Outdoor Air Volume Flow Rate", Constant::Units::m3_s, thisBeam->OutdoorAirFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisBeam->name); airNodeFound = false; diff --git a/src/EnergyPlus/HVACInterfaceManager.cc b/src/EnergyPlus/HVACInterfaceManager.cc index 22c05ff3976..b6afe40efa1 100644 --- a/src/EnergyPlus/HVACInterfaceManager.cc +++ b/src/EnergyPlus/HVACInterfaceManager.cc @@ -1129,22 +1129,22 @@ void SetupCommonPipes(EnergyPlusData &state) "Plant Common Pipe Mass Flow Rate", Constant::Units::kg_s, thisCommonPipe.Flow, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisPlantLoop.Name); SetupOutputVariable(state, "Plant Common Pipe Temperature", Constant::Units::C, thisCommonPipe.Temp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisPlantLoop.Name); SetupOutputVariable(state, "Plant Common Pipe Flow Direction Status", Constant::Units::None, thisCommonPipe.FlowDir, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisPlantLoop.Name); if (first_supply_component_type == DataPlant::PlantEquipmentType::PumpVariableSpeed) { @@ -1161,29 +1161,29 @@ void SetupCommonPipes(EnergyPlusData &state) "Plant Common Pipe Primary Mass Flow Rate", Constant::Units::kg_s, thisCommonPipe.PriCPLegFlow, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisPlantLoop.Name); SetupOutputVariable(state, "Plant Common Pipe Secondary Mass Flow Rate", Constant::Units::kg_s, thisCommonPipe.SecCPLegFlow, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisPlantLoop.Name); SetupOutputVariable(state, "Plant Common Pipe Primary to Secondary Mass Flow Rate", Constant::Units::kg_s, thisCommonPipe.PriToSecFlow, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisPlantLoop.Name); SetupOutputVariable(state, "Plant Common Pipe Secondary to Primary Mass Flow Rate", Constant::Units::kg_s, thisCommonPipe.SecToPriFlow, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisPlantLoop.Name); // check type of pump on supply side inlet diff --git a/src/EnergyPlus/HVACManager.cc b/src/EnergyPlus/HVACManager.cc index af32f586360..e8a0d0592d5 100644 --- a/src/EnergyPlus/HVACManager.cc +++ b/src/EnergyPlus/HVACManager.cc @@ -700,29 +700,29 @@ void SimHVAC(EnergyPlusData &state) "HVAC System Solver Iteration Count", Constant::Units::None, state.dataHVACMgr->HVACManageIteration, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, "SimHVAC"); SetupOutputVariable(state, "Air System Solver Iteration Count", Constant::Units::None, state.dataHVACMgr->RepIterAir, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, "SimHVAC"); SetupOutputVariable(state, "Air System Relief Air Total Heat Loss Energy", Constant::Units::J, state.dataHeatBal->SysTotalHVACReliefHeatLoss, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, "SimHVAC"); SetupOutputVariable(state, "HVAC System Total Heat Rejection Energy", Constant::Units::J, state.dataHeatBal->SysTotalHVACRejectHeatLoss, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, "SimHVAC"); SetPointManager::ManageSetPoints(state); // need to call this before getting plant loop data so setpoint checks can complete okay PlantManager::GetPlantLoopData(state); @@ -739,15 +739,15 @@ void SimHVAC(EnergyPlusData &state) "Plant Solver Sub Iteration Count", Constant::Units::None, state.dataPlnt->PlantManageSubIterations, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, "SimHVAC"); SetupOutputVariable(state, "Plant Solver Half Loop Calls Count", Constant::Units::None, state.dataPlnt->PlantManageHalfLoopCalls, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, "SimHVAC"); for (int LoopNum = 1; LoopNum <= state.dataPlnt->TotNumLoops; ++LoopNum) { // init plant sizing numbers in main plant data structure diff --git a/src/EnergyPlus/HVACMultiSpeedHeatPump.cc b/src/EnergyPlus/HVACMultiSpeedHeatPump.cc index 2a87130f7d1..fb221c993d7 100644 --- a/src/EnergyPlus/HVACMultiSpeedHeatPump.cc +++ b/src/EnergyPlus/HVACMultiSpeedHeatPump.cc @@ -1590,157 +1590,155 @@ namespace HVACMultiSpeedHeatPump { "Unitary System Ancillary Electricity Rate", Constant::Units::W, thisMSHeatPump.AuxElecPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisMSHeatPump.Name); SetupOutputVariable(state, "Unitary System Cooling Ancillary Electricity Energy", Constant::Units::J, thisMSHPReport.AuxElecCoolConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisMSHeatPump.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); SetupOutputVariable(state, "Unitary System Heating Ancillary Electricity Energy", Constant::Units::J, thisMSHPReport.AuxElecHeatConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisMSHeatPump.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Heating, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Heating); SetupOutputVariable(state, "Unitary System Fan Part Load Ratio", Constant::Units::None, thisMSHeatPump.FanPartLoadRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisMSHeatPump.Name); SetupOutputVariable(state, "Unitary System Compressor Part Load Ratio", Constant::Units::None, thisMSHeatPump.CompPartLoadRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisMSHeatPump.Name); SetupOutputVariable(state, "Unitary System Electricity Rate", Constant::Units::W, thisMSHeatPump.ElecPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisMSHeatPump.Name); SetupOutputVariable(state, "Unitary System Electricity Energy", Constant::Units::J, thisMSHPReport.ElecPowerConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisMSHeatPump.Name); SetupOutputVariable(state, "Unitary System DX Coil Cycling Ratio", Constant::Units::None, thisMSHPReport.CycRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisMSHeatPump.Name); SetupOutputVariable(state, "Unitary System DX Coil Speed Ratio", Constant::Units::None, thisMSHPReport.SpeedRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisMSHeatPump.Name); SetupOutputVariable(state, "Unitary System DX Coil Speed Level", Constant::Units::None, thisMSHPReport.SpeedNum, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisMSHeatPump.Name); SetupOutputVariable(state, "Unitary System Total Cooling Rate", Constant::Units::W, thisMSHeatPump.TotCoolEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisMSHeatPump.Name); SetupOutputVariable(state, "Unitary System Total Heating Rate", Constant::Units::W, thisMSHeatPump.TotHeatEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisMSHeatPump.Name); SetupOutputVariable(state, "Unitary System Sensible Cooling Rate", Constant::Units::W, thisMSHeatPump.SensCoolEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisMSHeatPump.Name); SetupOutputVariable(state, "Unitary System Sensible Heating Rate", Constant::Units::W, thisMSHeatPump.SensHeatEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisMSHeatPump.Name); SetupOutputVariable(state, "Unitary System Latent Cooling Rate", Constant::Units::W, thisMSHeatPump.LatCoolEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisMSHeatPump.Name); SetupOutputVariable(state, "Unitary System Latent Heating Rate", Constant::Units::W, thisMSHeatPump.LatHeatEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisMSHeatPump.Name); if (thisMSHeatPump.HeatRecActive) { SetupOutputVariable(state, "Unitary System Heat Recovery Rate", Constant::Units::W, thisMSHeatPump.HeatRecoveryRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisMSHeatPump.Name); SetupOutputVariable(state, "Unitary System Heat Recovery Inlet Temperature", Constant::Units::C, thisMSHeatPump.HeatRecoveryInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisMSHeatPump.Name); SetupOutputVariable(state, "Unitary System Heat Recovery Outlet Temperature", Constant::Units::C, thisMSHeatPump.HeatRecoveryOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisMSHeatPump.Name); SetupOutputVariable(state, "Unitary System Heat Recovery Fluid Mass Flow Rate", Constant::Units::kg_s, thisMSHeatPump.HeatRecoveryMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisMSHeatPump.Name); SetupOutputVariable(state, "Unitary System Heat Recovery Energy", Constant::Units::J, thisMSHPReport.HeatRecoveryEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisMSHeatPump.Name); } } diff --git a/src/EnergyPlus/HVACSingleDuctInduc.cc b/src/EnergyPlus/HVACSingleDuctInduc.cc index d955d2b01b7..f00089e9577 100644 --- a/src/EnergyPlus/HVACSingleDuctInduc.cc +++ b/src/EnergyPlus/HVACSingleDuctInduc.cc @@ -445,8 +445,8 @@ namespace HVACSingleDuctInduc { "Zone Air Terminal Outdoor Air Volume Flow Rate", Constant::Units::m3_s, state.dataHVACSingleDuctInduc->IndUnit(IUNum).OutdoorAirFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHVACSingleDuctInduc->IndUnit(IUNum).Name); } diff --git a/src/EnergyPlus/HVACStandAloneERV.cc b/src/EnergyPlus/HVACStandAloneERV.cc index 5feb260f008..073696bc326 100644 --- a/src/EnergyPlus/HVACStandAloneERV.cc +++ b/src/EnergyPlus/HVACStandAloneERV.cc @@ -995,108 +995,108 @@ void GetStandAloneERV(EnergyPlusData &state) "Zone Ventilator Sensible Cooling Rate", Constant::Units::W, standAloneERV.SensCoolingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, standAloneERV.Name); SetupOutputVariable(state, "Zone Ventilator Sensible Cooling Energy", Constant::Units::J, standAloneERV.SensCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, standAloneERV.Name); SetupOutputVariable(state, "Zone Ventilator Latent Cooling Rate", Constant::Units::W, standAloneERV.LatCoolingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, standAloneERV.Name); SetupOutputVariable(state, "Zone Ventilator Latent Cooling Energy", Constant::Units::J, standAloneERV.LatCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, standAloneERV.Name); SetupOutputVariable(state, "Zone Ventilator Total Cooling Rate", Constant::Units::W, standAloneERV.TotCoolingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, standAloneERV.Name); SetupOutputVariable(state, "Zone Ventilator Total Cooling Energy", Constant::Units::J, standAloneERV.TotCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, standAloneERV.Name); SetupOutputVariable(state, "Zone Ventilator Sensible Heating Rate", Constant::Units::W, standAloneERV.SensHeatingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, standAloneERV.Name); SetupOutputVariable(state, "Zone Ventilator Sensible Heating Energy", Constant::Units::J, standAloneERV.SensHeatingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, standAloneERV.Name); SetupOutputVariable(state, "Zone Ventilator Latent Heating Rate", Constant::Units::W, standAloneERV.LatHeatingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, standAloneERV.Name); SetupOutputVariable(state, "Zone Ventilator Latent Heating Energy", Constant::Units::J, standAloneERV.LatHeatingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, standAloneERV.Name); SetupOutputVariable(state, "Zone Ventilator Total Heating Rate", Constant::Units::W, standAloneERV.TotHeatingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, standAloneERV.Name); SetupOutputVariable(state, "Zone Ventilator Total Heating Energy", Constant::Units::J, standAloneERV.TotHeatingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, standAloneERV.Name); SetupOutputVariable(state, "Zone Ventilator Electricity Rate", Constant::Units::W, standAloneERV.ElecUseRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, standAloneERV.Name); SetupOutputVariable(state, "Zone Ventilator Electricity Energy", Constant::Units::J, standAloneERV.ElecUseEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, standAloneERV.Name); SetupOutputVariable(state, "Zone Ventilator Supply Fan Availability Status", Constant::Units::None, standAloneERV.AvailStatus, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, standAloneERV.Name); } diff --git a/src/EnergyPlus/HVACUnitaryBypassVAV.cc b/src/EnergyPlus/HVACUnitaryBypassVAV.cc index 7e2a5f6f171..b3cb48f94a7 100644 --- a/src/EnergyPlus/HVACUnitaryBypassVAV.cc +++ b/src/EnergyPlus/HVACUnitaryBypassVAV.cc @@ -1200,134 +1200,134 @@ namespace HVACUnitaryBypassVAV { "Unitary System Total Heating Rate", Constant::Units::W, thisCBVAV.TotHeatEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisCBVAV.Name); SetupOutputVariable(state, "Unitary System Total Heating Energy", Constant::Units::J, thisCBVAV.TotHeatEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisCBVAV.Name); SetupOutputVariable(state, "Unitary System Total Cooling Rate", Constant::Units::W, thisCBVAV.TotCoolEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisCBVAV.Name); SetupOutputVariable(state, "Unitary System Total Cooling Energy", Constant::Units::J, thisCBVAV.TotCoolEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisCBVAV.Name); SetupOutputVariable(state, "Unitary System Sensible Heating Rate", Constant::Units::W, thisCBVAV.SensHeatEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisCBVAV.Name); SetupOutputVariable(state, "Unitary System Sensible Heating Energy", Constant::Units::J, thisCBVAV.SensHeatEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisCBVAV.Name); SetupOutputVariable(state, "Unitary System Sensible Cooling Rate", Constant::Units::W, thisCBVAV.SensCoolEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisCBVAV.Name); SetupOutputVariable(state, "Unitary System Sensible Cooling Energy", Constant::Units::J, thisCBVAV.SensCoolEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisCBVAV.Name); SetupOutputVariable(state, "Unitary System Latent Heating Rate", Constant::Units::W, thisCBVAV.LatHeatEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisCBVAV.Name); SetupOutputVariable(state, "Unitary System Latent Heating Energy", Constant::Units::J, thisCBVAV.LatHeatEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisCBVAV.Name); SetupOutputVariable(state, "Unitary System Latent Cooling Rate", Constant::Units::W, thisCBVAV.LatCoolEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisCBVAV.Name); SetupOutputVariable(state, "Unitary System Latent Cooling Energy", Constant::Units::J, thisCBVAV.LatCoolEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisCBVAV.Name); SetupOutputVariable(state, "Unitary System Electricity Rate", Constant::Units::W, thisCBVAV.ElecPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisCBVAV.Name); SetupOutputVariable(state, "Unitary System Electricity Energy", Constant::Units::J, thisCBVAV.ElecConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisCBVAV.Name); SetupOutputVariable(state, "Unitary System Fan Part Load Ratio", Constant::Units::None, thisCBVAV.FanPartLoadRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisCBVAV.Name); SetupOutputVariable(state, "Unitary System Compressor Part Load Ratio", Constant::Units::None, thisCBVAV.CompPartLoadRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisCBVAV.Name); SetupOutputVariable(state, "Unitary System Bypass Air Mass Flow Rate", Constant::Units::kg_s, thisCBVAV.BypassMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisCBVAV.Name); SetupOutputVariable(state, "Unitary System Air Outlet Setpoint Temperature", Constant::Units::C, thisCBVAV.OutletTempSetPoint, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisCBVAV.Name); SetupOutputVariable(state, "Unitary System Operating Mode Index", Constant::Units::None, thisCBVAV.HeatCoolMode, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisCBVAV.Name); } } diff --git a/src/EnergyPlus/HVACVariableRefrigerantFlow.cc b/src/EnergyPlus/HVACVariableRefrigerantFlow.cc index 185036c1e56..f9ac82149ac 100644 --- a/src/EnergyPlus/HVACVariableRefrigerantFlow.cc +++ b/src/EnergyPlus/HVACVariableRefrigerantFlow.cc @@ -4797,61 +4797,60 @@ void GetVRFInputData(EnergyPlusData &state, bool &ErrorsFound) "Zone VRF Air Terminal Cooling Electricity Rate", Constant::Units::W, thisVrfTU.ParasiticCoolElecPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisVrfTU.Name); SetupOutputVariable(state, "Zone VRF Air Terminal Cooling Electricity Energy", Constant::Units::J, thisVrfTU.ParasiticElecCoolConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisVrfTU.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); SetupOutputVariable(state, "Zone VRF Air Terminal Total Cooling Rate", Constant::Units::W, thisVrfTU.TotalCoolingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisVrfTU.Name); SetupOutputVariable(state, "Zone VRF Air Terminal Sensible Cooling Rate", Constant::Units::W, thisVrfTU.SensibleCoolingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisVrfTU.Name); SetupOutputVariable(state, "Zone VRF Air Terminal Latent Cooling Rate", Constant::Units::W, thisVrfTU.LatentCoolingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisVrfTU.Name); SetupOutputVariable(state, "Zone VRF Air Terminal Total Cooling Energy", Constant::Units::J, thisVrfTU.TotalCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisVrfTU.Name); SetupOutputVariable(state, "Zone VRF Air Terminal Sensible Cooling Energy", Constant::Units::J, thisVrfTU.SensibleCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisVrfTU.Name); SetupOutputVariable(state, "Zone VRF Air Terminal Latent Cooling Energy", Constant::Units::J, thisVrfTU.LatentCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisVrfTU.Name); } if (thisVrfTU.HeatingCoilPresent) { @@ -4859,69 +4858,68 @@ void GetVRFInputData(EnergyPlusData &state, bool &ErrorsFound) "Zone VRF Air Terminal Heating Electricity Rate", Constant::Units::W, thisVrfTU.ParasiticHeatElecPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisVrfTU.Name); SetupOutputVariable(state, "Zone VRF Air Terminal Heating Electricity Energy", Constant::Units::J, thisVrfTU.ParasiticElecHeatConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisVrfTU.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Heating, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Heating); SetupOutputVariable(state, "Zone VRF Air Terminal Total Heating Rate", Constant::Units::W, thisVrfTU.TotalHeatingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisVrfTU.Name); SetupOutputVariable(state, "Zone VRF Air Terminal Sensible Heating Rate", Constant::Units::W, thisVrfTU.SensibleHeatingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisVrfTU.Name); SetupOutputVariable(state, "Zone VRF Air Terminal Latent Heating Rate", Constant::Units::W, thisVrfTU.LatentHeatingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisVrfTU.Name); SetupOutputVariable(state, "Zone VRF Air Terminal Total Heating Energy", Constant::Units::J, thisVrfTU.TotalHeatingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisVrfTU.Name); SetupOutputVariable(state, "Zone VRF Air Terminal Sensible Heating Energy", Constant::Units::J, thisVrfTU.SensibleHeatingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisVrfTU.Name); SetupOutputVariable(state, "Zone VRF Air Terminal Latent Heating Energy", Constant::Units::J, thisVrfTU.LatentHeatingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisVrfTU.Name); } SetupOutputVariable(state, "Zone VRF Air Terminal Fan Availability Status", Constant::Units::None, thisVrfTU.AvailStatus, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisVrfTU.Name); if (state.dataGlobal->AnyEnergyManagementSystemInModel) { SetupEMSActuator(state, @@ -4937,22 +4935,22 @@ void GetVRFInputData(EnergyPlusData &state, bool &ErrorsFound) "Zone VRF Air Terminal Multispeed Fan Cycling Ratio", Constant::Units::None, thisVrfTU.CycRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisVrfTU.Name); SetupOutputVariable(state, "Zone VRF Air Terminal Multispeed Fan Speed Ratio", Constant::Units::None, thisVrfTU.SpeedRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisVrfTU.Name); SetupOutputVariable(state, "Zone VRF Air Terminal Multispeed Fan Speed Level", Constant::Units::None, thisVrfTU.SpeedNum, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisVrfTU.Name); } } @@ -4964,73 +4962,71 @@ void GetVRFInputData(EnergyPlusData &state, bool &ErrorsFound) "VRF Heat Pump Total Cooling Rate", Constant::Units::W, thisVrf.TotalCoolingCapacity, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisVrf.Name); SetupOutputVariable(state, "VRF Heat Pump Total Heating Rate", Constant::Units::W, thisVrf.TotalHeatingCapacity, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisVrf.Name); SetupOutputVariable(state, format("VRF Heat Pump Cooling {} Rate", sFuelType), Constant::Units::W, thisVrf.ElecCoolingPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisVrf.Name); SetupOutputVariable(state, format("VRF Heat Pump Cooling {} Energy", sFuelType), Constant::Units::J, thisVrf.CoolElecConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisVrf.Name, Constant::eFuel2eResource[(int)thisVrf.fuel], - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); SetupOutputVariable(state, format("VRF Heat Pump Heating {} Rate", sFuelType), Constant::Units::W, thisVrf.ElecHeatingPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisVrf.Name); SetupOutputVariable(state, format("VRF Heat Pump Heating {} Energy", sFuelType), Constant::Units::J, thisVrf.HeatElecConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisVrf.Name, Constant::eFuel2eResource[(int)thisVrf.fuel], - OutputProcessor::SOVEndUseCat::Heating, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Heating); SetupOutputVariable(state, "VRF Heat Pump Cooling COP", Constant::Units::None, thisVrf.OperatingCoolingCOP, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisVrf.Name); SetupOutputVariable(state, "VRF Heat Pump Heating COP", Constant::Units::None, thisVrf.OperatingHeatingCOP, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisVrf.Name); SetupOutputVariable(state, "VRF Heat Pump COP", Constant::Units::None, thisVrf.OperatingCOP, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisVrf.Name); if (thisVrf.VRFAlgorithmType == AlgorithmType::FluidTCtrl) { @@ -5039,92 +5035,92 @@ void GetVRFInputData(EnergyPlusData &state, bool &ErrorsFound) "VRF Heat Pump Compressor Electricity Rate", Constant::Units::W, thisVrf.Ncomp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisVrf.Name); SetupOutputVariable(state, "VRF Heat Pump Outdoor Unit Fan Power", Constant::Units::W, thisVrf.OUFanPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisVrf.Name); SetupOutputVariable(state, "VRF Heat Pump Compressor Rotating Speed", Constant::Units::rev_min, thisVrf.CompActSpeed, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisVrf.Name); SetupOutputVariable(state, "VRF Heat Pump Indoor Unit Evaporating Temperature", Constant::Units::C, thisVrf.IUEvaporatingTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisVrf.Name); SetupOutputVariable(state, "VRF Heat Pump Outdoor Unit Condensing Temperature", Constant::Units::C, thisVrf.CondensingTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisVrf.Name); SetupOutputVariable(state, "VRF Heat Pump Indoor Unit Condensing Temperature", Constant::Units::C, thisVrf.IUCondensingTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisVrf.Name); SetupOutputVariable(state, "VRF Heat Pump Outdoor Unit Evaporating Temperature", Constant::Units::C, thisVrf.EvaporatingTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisVrf.Name); SetupOutputVariable(state, "VRF Heat Pump Cooling Capacity at Max Compressor Speed", Constant::Units::W, thisVrf.CoolingCapacity, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisVrf.Name); SetupOutputVariable(state, "VRF Heat Pump Heating Capacity at Max Compressor Speed", Constant::Units::W, thisVrf.HeatingCapacity, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisVrf.Name); SetupOutputVariable(state, "VRF Heat Pump Indoor Unit Piping Correction for Cooling", Constant::Units::None, thisVrf.PipingCorrectionCooling, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisVrf.Name); SetupOutputVariable(state, "VRF Heat Pump Indoor Unit Piping Correction for Heating", Constant::Units::None, thisVrf.PipingCorrectionHeating, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisVrf.Name); SetupOutputVariable(state, "VRF Heat Pump Outdoor Unit Evaporator Heat Extract Rate", Constant::Units::W, thisVrf.OUEvapHeatRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisVrf.Name); SetupOutputVariable(state, "VRF Heat Pump Outdoor Unit Condenser Heat Release Rate", Constant::Units::W, thisVrf.OUCondHeatRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisVrf.Name); } else { @@ -5133,15 +5129,15 @@ void GetVRFInputData(EnergyPlusData &state, bool &ErrorsFound) "VRF Heat Pump Maximum Capacity Cooling Rate", Constant::Units::W, state.dataHVACVarRefFlow->MaxCoolingCapacity(NumCond), - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisVrf.Name); SetupOutputVariable(state, "VRF Heat Pump Maximum Capacity Heating Rate", Constant::Units::W, state.dataHVACVarRefFlow->MaxHeatingCapacity(NumCond), - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisVrf.Name); } @@ -5151,143 +5147,140 @@ void GetVRFInputData(EnergyPlusData &state, bool &ErrorsFound) "VRF Heat Pump Defrost Electricity Rate", Constant::Units::W, thisVrf.DefrostPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisVrf.Name); SetupOutputVariable(state, "VRF Heat Pump Defrost Electricity Energy", Constant::Units::J, thisVrf.DefrostConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisVrf.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Heating, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Heating); + } else { // defrost energy applied to fuel type SetupOutputVariable(state, format("VRF Heat Pump Defrost {} Rate", sFuelType), Constant::Units::W, thisVrf.DefrostPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisVrf.Name); SetupOutputVariable(state, format("VRF Heat Pump Defrost {} Energy", sFuelType), Constant::Units::J, thisVrf.DefrostConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisVrf.Name, Constant::eFuel2eResource[(int)thisVrf.fuel], - OutputProcessor::SOVEndUseCat::Heating, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Heating); } SetupOutputVariable(state, "VRF Heat Pump Part Load Ratio", Constant::Units::None, thisVrf.VRFCondPLR, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisVrf.Name); SetupOutputVariable(state, "VRF Heat Pump Runtime Fraction", Constant::Units::None, thisVrf.VRFCondRTF, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisVrf.Name); SetupOutputVariable(state, "VRF Heat Pump Cycling Ratio", Constant::Units::None, thisVrf.VRFCondCyclingRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisVrf.Name); SetupOutputVariable(state, "VRF Heat Pump Operating Mode", Constant::Units::None, thisVrf.OperatingMode, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisVrf.Name); SetupOutputVariable(state, "VRF Heat Pump Condenser Inlet Temperature", Constant::Units::C, thisVrf.CondenserInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisVrf.Name); SetupOutputVariable(state, "VRF Heat Pump Crankcase Heater Electricity Rate", Constant::Units::W, thisVrf.CrankCaseHeaterPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisVrf.Name); SetupOutputVariable(state, "VRF Heat Pump Crankcase Heater Electricity Energy", Constant::Units::J, thisVrf.CrankCaseHeaterElecConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisVrf.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); SetupOutputVariable(state, "VRF Heat Pump Terminal Unit Cooling Load Rate", Constant::Units::W, thisVrf.TUCoolingLoad, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisVrf.Name); SetupOutputVariable(state, "VRF Heat Pump Terminal Unit Heating Load Rate", Constant::Units::W, thisVrf.TUHeatingLoad, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisVrf.Name); if (thisVrf.HeatRecoveryUsed) { SetupOutputVariable(state, "VRF Heat Pump Heat Recovery Status Change Multiplier", Constant::Units::None, thisVrf.SUMultiplier, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisVrf.Name); SetupOutputVariable(state, "VRF Heat Pump Simultaneous Cooling and Heating Efficiency", Constant::Units::Btu_h_W, thisVrf.SCHE, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisVrf.Name); SetupOutputVariable(state, "VRF Heat Pump Heat Recovery Rate", Constant::Units::W, thisVrf.VRFHeatRec, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisVrf.Name); SetupOutputVariable(state, "VRF Heat Pump Heat Recovery Energy", Constant::Units::J, thisVrf.VRFHeatEnergyRec, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisVrf.Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::HeatRecovery, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::HeatRecovery); } if (thisVrf.CondenserType == DataHeatBalance::RefrigCondenserType::Evap) { @@ -5295,51 +5288,48 @@ void GetVRFInputData(EnergyPlusData &state, bool &ErrorsFound) "VRF Heat Pump Evaporative Condenser Water Use Volume", Constant::Units::m3, thisVrf.EvapWaterConsumpRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisVrf.Name, Constant::eResource::Water, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); SetupOutputVariable(state, "VRF Heat Pump Evaporative Condenser Pump Electricity Rate", Constant::Units::W, thisVrf.EvapCondPumpElecPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisVrf.Name); SetupOutputVariable(state, "VRF Heat Pump Evaporative Condenser Pump Electricity Energy", Constant::Units::J, thisVrf.EvapCondPumpElecConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisVrf.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); if (thisVrf.BasinHeaterPowerFTempDiff > 0.0) { SetupOutputVariable(state, "VRF Heat Pump Basin Heater Electricity Rate", Constant::Units::W, thisVrf.BasinHeaterPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisVrf.Name); SetupOutputVariable(state, "VRF Heat Pump Basin Heater Electricity Energy", Constant::Units::J, thisVrf.BasinHeaterConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisVrf.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); } } else if (thisVrf.CondenserType == DataHeatBalance::RefrigCondenserType::Water) { @@ -5347,29 +5337,29 @@ void GetVRFInputData(EnergyPlusData &state, bool &ErrorsFound) "VRF Heat Pump Condenser Outlet Temperature", Constant::Units::C, thisVrf.CondenserSideOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisVrf.Name); SetupOutputVariable(state, "VRF Heat Pump Condenser Mass Flow Rate", Constant::Units::kg_s, thisVrf.WaterCondenserMassFlow, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisVrf.Name); SetupOutputVariable(state, "VRF Heat Pump Condenser Heat Transfer Rate", Constant::Units::W, thisVrf.QCondenser, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisVrf.Name); SetupOutputVariable(state, "VRF Heat Pump Condenser Heat Transfer Energy", Constant::Units::J, thisVrf.QCondEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisVrf.Name); } diff --git a/src/EnergyPlus/HWBaseboardRadiator.cc b/src/EnergyPlus/HWBaseboardRadiator.cc index c78037fb7b5..4960757ee84 100644 --- a/src/EnergyPlus/HWBaseboardRadiator.cc +++ b/src/EnergyPlus/HWBaseboardRadiator.cc @@ -700,102 +700,100 @@ namespace HWBaseboardRadiator { "Baseboard Total Heating Rate", Constant::Units::W, thisHWBaseboard.TotPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisHWBaseboard.Name); SetupOutputVariable(state, "Baseboard Convective Heating Rate", Constant::Units::W, thisHWBaseboard.ConvPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisHWBaseboard.Name); SetupOutputVariable(state, "Baseboard Radiant Heating Rate", Constant::Units::W, thisHWBaseboard.RadPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisHWBaseboard.Name); SetupOutputVariable(state, "Baseboard Total Heating Energy", Constant::Units::J, thisHWBaseboard.TotEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisHWBaseboard.Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::Baseboard, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Baseboard); SetupOutputVariable(state, "Baseboard Convective Heating Energy", Constant::Units::J, thisHWBaseboard.ConvEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisHWBaseboard.Name); SetupOutputVariable(state, "Baseboard Radiant Heating Energy", Constant::Units::J, thisHWBaseboard.RadEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisHWBaseboard.Name); SetupOutputVariable(state, "Baseboard Hot Water Energy", Constant::Units::J, thisHWBaseboard.Energy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisHWBaseboard.Name, Constant::eResource::PlantLoopHeatingDemand, - OutputProcessor::SOVEndUseCat::Baseboard, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Baseboard); SetupOutputVariable(state, "Baseboard Hot Water Mass Flow Rate", Constant::Units::kg_s, thisHWBaseboard.WaterMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisHWBaseboard.Name); SetupOutputVariable(state, "Baseboard Air Mass Flow Rate", Constant::Units::kg_s, thisHWBaseboard.AirMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisHWBaseboard.Name); SetupOutputVariable(state, "Baseboard Air Inlet Temperature", Constant::Units::C, thisHWBaseboard.AirInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisHWBaseboard.Name); SetupOutputVariable(state, "Baseboard Air Outlet Temperature", Constant::Units::C, thisHWBaseboard.AirOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisHWBaseboard.Name); SetupOutputVariable(state, "Baseboard Water Inlet Temperature", Constant::Units::C, thisHWBaseboard.WaterInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisHWBaseboard.Name); SetupOutputVariable(state, "Baseboard Water Outlet Temperature", Constant::Units::C, thisHWBaseboard.WaterOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisHWBaseboard.Name); } } diff --git a/src/EnergyPlus/HeatBalFiniteDiffManager.cc b/src/EnergyPlus/HeatBalFiniteDiffManager.cc index 165354c8f40..2e157a13f89 100644 --- a/src/EnergyPlus/HeatBalFiniteDiffManager.cc +++ b/src/EnergyPlus/HeatBalFiniteDiffManager.cc @@ -883,8 +883,8 @@ namespace HeatBalFiniteDiffManager { "CondFD Inner Solver Loop Iteration Count", Constant::Units::None, SurfaceFD(SurfNum).GSloopCounter, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataSurface->Surface(SurfNum).Name); // Setup EMS Material Actuators for Conductivity and Specific Heat @@ -898,15 +898,15 @@ namespace HeatBalFiniteDiffManager { format("CondFD Internal Heat Source Power After Layer {}", lay), Constant::Units::W, SurfaceFD(SurfNum).heatSourceInternalFluxLayerReport(lay), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataSurface->Surface(SurfNum).Name); SetupOutputVariable(state, format("CondFD Internal Heat Source Energy After Layer {}", lay), Constant::Units::J, SurfaceFD(SurfNum).heatSourceInternalFluxEnergyLayerReport(lay), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataSurface->Surface(SurfNum).Name); } @@ -942,20 +942,19 @@ namespace HeatBalFiniteDiffManager { format("CondFD EMS Heat Source Power After Layer {}", lay), Constant::Units::W, SurfaceFD(SurfNum).heatSourceEMSFluxLayerReport(lay), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataSurface->Surface(SurfNum).Name); SetupOutputVariable(state, format("CondFD EMS Heat Source Energy After Layer {}", lay), Constant::Units::J, SurfaceFD(SurfNum).heatSourceEMSFluxEnergyLayerReport(lay), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataSurface->Surface(SurfNum).Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Heating, - {}, - OutputProcessor::SOVGroup::Building); + OutputProcessor::Group::Building, + OutputProcessor::EndUseCat::Heating); } } @@ -965,65 +964,65 @@ namespace HeatBalFiniteDiffManager { format("CondFD Surface Temperature Node {}", node), Constant::Units::C, SurfaceFD(SurfNum).TDreport(node), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataSurface->Surface(SurfNum).Name); SetupOutputVariable(state, format("CondFD Surface Heat Flux Node {}", node), Constant::Units::W_m2, SurfaceFD(SurfNum).QDreport(node), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataSurface->Surface(SurfNum).Name); SetupOutputVariable(state, format("CondFD Phase Change State {}", node), Constant::Units::None, SurfaceFD(SurfNum).PhaseChangeState(node), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataSurface->Surface(SurfNum).Name); SetupOutputVariable(state, format("CondFD Phase Change Previous State {}", node), Constant::Units::None, SurfaceFD(SurfNum).PhaseChangeStateOld(node), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataSurface->Surface(SurfNum).Name); SetupOutputVariable(state, format("CondFD Phase Change Node Temperature {}", node), Constant::Units::C, SurfaceFD(SurfNum).TDT(node), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataSurface->Surface(SurfNum).Name); SetupOutputVariable(state, format("CondFD Phase Change Node Conductivity {}", node), Constant::Units::W_mK, SurfaceFD(SurfNum).condNodeReport(node), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataSurface->Surface(SurfNum).Name); SetupOutputVariable(state, format("CondFD Phase Change Node Specific Heat {}", node), Constant::Units::J_kgK, SurfaceFD(SurfNum).specHeatNodeReport(node), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataSurface->Surface(SurfNum).Name); if (state.dataGlobal->DisplayAdvancedReportVariables) { SetupOutputVariable(state, format("CondFD Surface Heat Capacitance Outer Half Node {}", node), Constant::Units::W_m2K, SurfaceFD(SurfNum).CpDelXRhoS1(node), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataSurface->Surface(SurfNum).Name); SetupOutputVariable(state, format("CondFD Surface Heat Capacitance Inner Half Node {}", node), Constant::Units::W_m2K, SurfaceFD(SurfNum).CpDelXRhoS2(node), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataSurface->Surface(SurfNum).Name); } } diff --git a/src/EnergyPlus/HeatBalanceAirManager.cc b/src/EnergyPlus/HeatBalanceAirManager.cc index 23fc646d780..8a6b709b3f4 100644 --- a/src/EnergyPlus/HeatBalanceAirManager.cc +++ b/src/EnergyPlus/HeatBalanceAirManager.cc @@ -319,15 +319,15 @@ void GetSimpleAirModelInputs(EnergyPlusData &state, bool &ErrorsFound) // IF err "Zone Phase Change Material Melting Enthalpy", Constant::Units::J_kg, thisZnAirRpt.SumEnthalpyM, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, name); SetupOutputVariable(state, "Zone Phase Change Material Freezing Enthalpy", Constant::Units::J_kg, thisZnAirRpt.SumEnthalpyH, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, name); } @@ -335,43 +335,43 @@ void GetSimpleAirModelInputs(EnergyPlusData &state, bool &ErrorsFound) // IF err "Zone Exfiltration Heat Transfer Rate", Constant::Units::W, thisZnAirRpt.ExfilTotalLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name); SetupOutputVariable(state, "Zone Exfiltration Sensible Heat Transfer Rate", Constant::Units::W, thisZnAirRpt.ExfilSensiLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name); SetupOutputVariable(state, "Zone Exfiltration Latent Heat Transfer Rate", Constant::Units::W, thisZnAirRpt.ExfilLatentLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name); SetupOutputVariable(state, "Zone Exhaust Air Heat Transfer Rate", Constant::Units::W, thisZnAirRpt.ExhTotalLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name); SetupOutputVariable(state, "Zone Exhaust Air Sensible Heat Transfer Rate", Constant::Units::W, thisZnAirRpt.ExhSensiLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name); SetupOutputVariable(state, "Zone Exhaust Air Latent Heat Transfer Rate", Constant::Units::W, thisZnAirRpt.ExhLatentLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name); } @@ -379,15 +379,15 @@ void GetSimpleAirModelInputs(EnergyPlusData &state, bool &ErrorsFound) // IF err "Site Total Zone Exfiltration Heat Loss", Constant::Units::J, state.dataHeatBal->ZoneTotalExfiltrationHeatLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, "Environment"); SetupOutputVariable(state, "Site Total Zone Exhaust Air Heat Loss", Constant::Units::J, state.dataHeatBal->ZoneTotalExhaustHeatLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, "Environment"); std::string cCurrentModuleObject = "ZoneAirBalance:OutdoorAir"; @@ -555,104 +555,104 @@ void GetSimpleAirModelInputs(EnergyPlusData &state, bool &ErrorsFound) // IF err "Zone Combined Outdoor Air Sensible Heat Loss Energy", Constant::Units::J, state.dataHeatBal->ZnAirRpt(thisZoneAirBalance.ZonePtr).OABalanceHeatLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(thisZoneAirBalance.ZonePtr).Name); SetupOutputVariable(state, "Zone Combined Outdoor Air Sensible Heat Gain Energy", Constant::Units::J, state.dataHeatBal->ZnAirRpt(thisZoneAirBalance.ZonePtr).OABalanceHeatGain, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(thisZoneAirBalance.ZonePtr).Name); SetupOutputVariable(state, "Zone Combined Outdoor Air Latent Heat Loss Energy", Constant::Units::J, state.dataHeatBal->ZnAirRpt(thisZoneAirBalance.ZonePtr).OABalanceLatentLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(thisZoneAirBalance.ZonePtr).Name); SetupOutputVariable(state, "Zone Combined Outdoor Air Latent Heat Gain Energy", Constant::Units::J, state.dataHeatBal->ZnAirRpt(thisZoneAirBalance.ZonePtr).OABalanceLatentGain, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(thisZoneAirBalance.ZonePtr).Name); SetupOutputVariable(state, "Zone Combined Outdoor Air Total Heat Loss Energy", Constant::Units::J, state.dataHeatBal->ZnAirRpt(thisZoneAirBalance.ZonePtr).OABalanceTotalLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(thisZoneAirBalance.ZonePtr).Name); SetupOutputVariable(state, "Zone Combined Outdoor Air Total Heat Gain Energy", Constant::Units::J, state.dataHeatBal->ZnAirRpt(thisZoneAirBalance.ZonePtr).OABalanceTotalGain, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(thisZoneAirBalance.ZonePtr).Name); SetupOutputVariable(state, "Zone Combined Outdoor Air Current Density Volume Flow Rate", Constant::Units::m3_s, state.dataHeatBal->ZnAirRpt(thisZoneAirBalance.ZonePtr).OABalanceVdotCurDensity, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(thisZoneAirBalance.ZonePtr).Name); SetupOutputVariable(state, "Zone Combined Outdoor Air Standard Density Volume Flow Rate", Constant::Units::m3_s, state.dataHeatBal->ZnAirRpt(thisZoneAirBalance.ZonePtr).OABalanceVdotStdDensity, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(thisZoneAirBalance.ZonePtr).Name); SetupOutputVariable(state, "Zone Combined Outdoor Air Current Density Volume", Constant::Units::m3, state.dataHeatBal->ZnAirRpt(thisZoneAirBalance.ZonePtr).OABalanceVolumeCurDensity, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(thisZoneAirBalance.ZonePtr).Name); SetupOutputVariable(state, "Zone Combined Outdoor Air Standard Density Volume", Constant::Units::m3, state.dataHeatBal->ZnAirRpt(thisZoneAirBalance.ZonePtr).OABalanceVolumeStdDensity, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(thisZoneAirBalance.ZonePtr).Name); SetupOutputVariable(state, "Zone Combined Outdoor Air Mass", Constant::Units::kg, state.dataHeatBal->ZnAirRpt(thisZoneAirBalance.ZonePtr).OABalanceMass, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(thisZoneAirBalance.ZonePtr).Name); SetupOutputVariable(state, "Zone Combined Outdoor Air Mass Flow Rate", Constant::Units::kg_s, state.dataHeatBal->ZnAirRpt(thisZoneAirBalance.ZonePtr).OABalanceMdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(thisZoneAirBalance.ZonePtr).Name); SetupOutputVariable(state, "Zone Combined Outdoor Air Changes per Hour", Constant::Units::ach, state.dataHeatBal->ZnAirRpt(thisZoneAirBalance.ZonePtr).OABalanceAirChangeRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(thisZoneAirBalance.ZonePtr).Name); SetupOutputVariable(state, "Zone Combined Outdoor Air Fan Electricity Energy", Constant::Units::J, state.dataHeatBal->ZnAirRpt(thisZoneAirBalance.ZonePtr).OABalanceFanElec, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(thisZoneAirBalance.ZonePtr).Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Fans, + OutputProcessor::Group::Building, + OutputProcessor::EndUseCat::Fans, "Ventilation (simple)", - OutputProcessor::SOVGroup::Building, state.dataHeatBal->Zone(thisZoneAirBalance.ZonePtr).Name); } } @@ -1128,92 +1128,92 @@ void GetSimpleAirModelInputs(EnergyPlusData &state, bool &ErrorsFound) // IF err "Infiltration Sensible Heat Loss Energy", Constant::Units::J, state.dataHeatBal->Infiltration(Loop).InfilHeatLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Infiltration(Loop).Name); SetupOutputVariable(state, "Infiltration Sensible Heat Gain Energy", Constant::Units::J, state.dataHeatBal->Infiltration(Loop).InfilHeatGain, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Infiltration(Loop).Name); SetupOutputVariable(state, "Infiltration Latent Heat Loss Energy", Constant::Units::J, state.dataHeatBal->Infiltration(Loop).InfilLatentLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Infiltration(Loop).Name); SetupOutputVariable(state, "Infiltration Latent Heat Gain Energy", Constant::Units::J, state.dataHeatBal->Infiltration(Loop).InfilLatentGain, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Infiltration(Loop).Name); SetupOutputVariable(state, "Infiltration Total Heat Loss Energy", Constant::Units::J, state.dataHeatBal->Infiltration(Loop).InfilTotalLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Infiltration(Loop).Name); SetupOutputVariable(state, "Infiltration Total Heat Gain Energy", Constant::Units::J, state.dataHeatBal->Infiltration(Loop).InfilTotalGain, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Infiltration(Loop).Name); SetupOutputVariable(state, "Infiltration Current Density Volume Flow Rate", Constant::Units::m3_s, state.dataHeatBal->Infiltration(Loop).InfilVdotCurDensity, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Infiltration(Loop).Name); SetupOutputVariable(state, "Infiltration Standard Density Volume Flow Rate", Constant::Units::m3_s, state.dataHeatBal->Infiltration(Loop).InfilVdotStdDensity, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Infiltration(Loop).Name); SetupOutputVariable(state, "Infiltration Current Density Volume", Constant::Units::m3, state.dataHeatBal->Infiltration(Loop).InfilVolumeCurDensity, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Infiltration(Loop).Name); SetupOutputVariable(state, "Infiltration Standard Density Volume", Constant::Units::m3, state.dataHeatBal->Infiltration(Loop).InfilVolumeStdDensity, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Infiltration(Loop).Name); SetupOutputVariable(state, "Infiltration Mass", Constant::Units::kg, state.dataHeatBal->Infiltration(Loop).InfilMass, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Infiltration(Loop).Name); SetupOutputVariable(state, "Infiltration Mass Flow Rate", Constant::Units::kg_s, state.dataHeatBal->Infiltration(Loop).InfilMdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Infiltration(Loop).Name); SetupOutputVariable(state, "Infiltration Air Change Rate", Constant::Units::ach, state.dataHeatBal->Infiltration(Loop).InfilAirChangeRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Infiltration(Loop).Name); if (RepVarSet(state.dataHeatBal->Infiltration(Loop).ZonePtr)) { @@ -1222,92 +1222,92 @@ void GetSimpleAirModelInputs(EnergyPlusData &state, bool &ErrorsFound) // IF err "Zone Infiltration Sensible Heat Loss Energy", Constant::Units::J, state.dataHeatBal->ZnAirRpt(state.dataHeatBal->Infiltration(Loop).ZonePtr).InfilHeatLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(state.dataHeatBal->Infiltration(Loop).ZonePtr).Name); SetupOutputVariable(state, "Zone Infiltration Sensible Heat Gain Energy", Constant::Units::J, state.dataHeatBal->ZnAirRpt(state.dataHeatBal->Infiltration(Loop).ZonePtr).InfilHeatGain, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(state.dataHeatBal->Infiltration(Loop).ZonePtr).Name); SetupOutputVariable(state, "Zone Infiltration Latent Heat Loss Energy", Constant::Units::J, state.dataHeatBal->ZnAirRpt(state.dataHeatBal->Infiltration(Loop).ZonePtr).InfilLatentLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(state.dataHeatBal->Infiltration(Loop).ZonePtr).Name); SetupOutputVariable(state, "Zone Infiltration Latent Heat Gain Energy", Constant::Units::J, state.dataHeatBal->ZnAirRpt(state.dataHeatBal->Infiltration(Loop).ZonePtr).InfilLatentGain, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(state.dataHeatBal->Infiltration(Loop).ZonePtr).Name); SetupOutputVariable(state, "Zone Infiltration Total Heat Loss Energy", Constant::Units::J, state.dataHeatBal->ZnAirRpt(state.dataHeatBal->Infiltration(Loop).ZonePtr).InfilTotalLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(state.dataHeatBal->Infiltration(Loop).ZonePtr).Name); SetupOutputVariable(state, "Zone Infiltration Total Heat Gain Energy", Constant::Units::J, state.dataHeatBal->ZnAirRpt(state.dataHeatBal->Infiltration(Loop).ZonePtr).InfilTotalGain, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(state.dataHeatBal->Infiltration(Loop).ZonePtr).Name); SetupOutputVariable(state, "Zone Infiltration Current Density Volume Flow Rate", Constant::Units::m3_s, state.dataHeatBal->ZnAirRpt(state.dataHeatBal->Infiltration(Loop).ZonePtr).InfilVdotCurDensity, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(state.dataHeatBal->Infiltration(Loop).ZonePtr).Name); SetupOutputVariable(state, "Zone Infiltration Standard Density Volume Flow Rate", Constant::Units::m3_s, state.dataHeatBal->ZnAirRpt(state.dataHeatBal->Infiltration(Loop).ZonePtr).InfilVdotStdDensity, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(state.dataHeatBal->Infiltration(Loop).ZonePtr).Name); SetupOutputVariable(state, "Zone Infiltration Current Density Volume", Constant::Units::m3, state.dataHeatBal->ZnAirRpt(state.dataHeatBal->Infiltration(Loop).ZonePtr).InfilVolumeCurDensity, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(state.dataHeatBal->Infiltration(Loop).ZonePtr).Name); SetupOutputVariable(state, "Zone Infiltration Standard Density Volume", Constant::Units::m3, state.dataHeatBal->ZnAirRpt(state.dataHeatBal->Infiltration(Loop).ZonePtr).InfilVolumeStdDensity, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(state.dataHeatBal->Infiltration(Loop).ZonePtr).Name); SetupOutputVariable(state, "Zone Infiltration Mass", Constant::Units::kg, state.dataHeatBal->ZnAirRpt(state.dataHeatBal->Infiltration(Loop).ZonePtr).InfilMass, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(state.dataHeatBal->Infiltration(Loop).ZonePtr).Name); SetupOutputVariable(state, "Zone Infiltration Mass Flow Rate", Constant::Units::kg_s, state.dataHeatBal->ZnAirRpt(state.dataHeatBal->Infiltration(Loop).ZonePtr).InfilMdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(state.dataHeatBal->Infiltration(Loop).ZonePtr).Name); SetupOutputVariable(state, "Zone Infiltration Air Change Rate", Constant::Units::ach, state.dataHeatBal->ZnAirRpt(state.dataHeatBal->Infiltration(Loop).ZonePtr).InfilAirChangeRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(state.dataHeatBal->Infiltration(Loop).ZonePtr).Name); } } @@ -1907,111 +1907,111 @@ void GetSimpleAirModelInputs(EnergyPlusData &state, bool &ErrorsFound) // IF err "Zone Ventilation Sensible Heat Loss Energy", Constant::Units::J, state.dataHeatBal->ZnAirRpt(thisVentilation.ZonePtr).VentilHeatLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisZone.Name); SetupOutputVariable(state, "Zone Ventilation Sensible Heat Gain Energy", Constant::Units::J, state.dataHeatBal->ZnAirRpt(thisVentilation.ZonePtr).VentilHeatGain, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisZone.Name); SetupOutputVariable(state, "Zone Ventilation Latent Heat Loss Energy", Constant::Units::J, state.dataHeatBal->ZnAirRpt(thisVentilation.ZonePtr).VentilLatentLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisZone.Name); SetupOutputVariable(state, "Zone Ventilation Latent Heat Gain Energy", Constant::Units::J, state.dataHeatBal->ZnAirRpt(thisVentilation.ZonePtr).VentilLatentGain, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisZone.Name); SetupOutputVariable(state, "Zone Ventilation Total Heat Loss Energy", Constant::Units::J, state.dataHeatBal->ZnAirRpt(thisVentilation.ZonePtr).VentilTotalLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisZone.Name); SetupOutputVariable(state, "Zone Ventilation Total Heat Gain Energy", Constant::Units::J, state.dataHeatBal->ZnAirRpt(thisVentilation.ZonePtr).VentilTotalGain, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisZone.Name); SetupOutputVariable(state, "Zone Ventilation Current Density Volume Flow Rate", Constant::Units::m3_s, state.dataHeatBal->ZnAirRpt(thisVentilation.ZonePtr).VentilVdotCurDensity, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisZone.Name); SetupOutputVariable(state, "Zone Ventilation Standard Density Volume Flow Rate", Constant::Units::m3_s, state.dataHeatBal->ZnAirRpt(thisVentilation.ZonePtr).VentilVdotStdDensity, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisZone.Name); SetupOutputVariable(state, "Zone Ventilation Current Density Volume", Constant::Units::m3, state.dataHeatBal->ZnAirRpt(thisVentilation.ZonePtr).VentilVolumeCurDensity, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisZone.Name); SetupOutputVariable(state, "Zone Ventilation Standard Density Volume", Constant::Units::m3, state.dataHeatBal->ZnAirRpt(thisVentilation.ZonePtr).VentilVolumeStdDensity, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisZone.Name); SetupOutputVariable(state, "Zone Ventilation Mass", Constant::Units::kg, state.dataHeatBal->ZnAirRpt(thisVentilation.ZonePtr).VentilMass, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisZone.Name); SetupOutputVariable(state, "Zone Ventilation Mass Flow Rate", Constant::Units::kg_s, state.dataHeatBal->ZnAirRpt(thisVentilation.ZonePtr).VentilMdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisZone.Name); SetupOutputVariable(state, "Zone Ventilation Air Change Rate", Constant::Units::ach, state.dataHeatBal->ZnAirRpt(thisVentilation.ZonePtr).VentilAirChangeRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisZone.Name); SetupOutputVariable(state, "Zone Ventilation Fan Electricity Energy", Constant::Units::J, state.dataHeatBal->ZnAirRpt(thisVentilation.ZonePtr).VentilFanElec, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisZone.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Fans, + OutputProcessor::Group::Building, + OutputProcessor::EndUseCat::Fans, "Ventilation (simple)", - OutputProcessor::SOVGroup::Building, thisZone.Name); SetupOutputVariable(state, "Zone Ventilation Air Inlet Temperature", Constant::Units::C, state.dataHeatBal->ZnAirRpt(thisVentilation.ZonePtr).VentilAirTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisZone.Name); } } @@ -2390,111 +2390,111 @@ void GetSimpleAirModelInputs(EnergyPlusData &state, bool &ErrorsFound) // IF err "Zone Ventilation Sensible Heat Loss Energy", Constant::Units::J, state.dataHeatBal->ZnAirRpt(thisVentilation.ZonePtr).VentilHeatLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisZone.Name); SetupOutputVariable(state, "Zone Ventilation Sensible Heat Gain Energy", Constant::Units::J, state.dataHeatBal->ZnAirRpt(thisVentilation.ZonePtr).VentilHeatGain, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisZone.Name); SetupOutputVariable(state, "Zone Ventilation Latent Heat Loss Energy", Constant::Units::J, state.dataHeatBal->ZnAirRpt(thisVentilation.ZonePtr).VentilLatentLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisZone.Name); SetupOutputVariable(state, "Zone Ventilation Latent Heat Gain Energy", Constant::Units::J, state.dataHeatBal->ZnAirRpt(thisVentilation.ZonePtr).VentilLatentGain, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisZone.Name); SetupOutputVariable(state, "Zone Ventilation Total Heat Loss Energy", Constant::Units::J, state.dataHeatBal->ZnAirRpt(thisVentilation.ZonePtr).VentilTotalLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisZone.Name); SetupOutputVariable(state, "Zone Ventilation Total Heat Gain Energy", Constant::Units::J, state.dataHeatBal->ZnAirRpt(thisVentilation.ZonePtr).VentilTotalGain, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisZone.Name); SetupOutputVariable(state, "Zone Ventilation Current Density Volume Flow Rate", Constant::Units::m3_s, state.dataHeatBal->ZnAirRpt(thisVentilation.ZonePtr).VentilVdotCurDensity, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisZone.Name); SetupOutputVariable(state, "Zone Ventilation Standard Density Volume Flow Rate", Constant::Units::m3_s, state.dataHeatBal->ZnAirRpt(thisVentilation.ZonePtr).VentilVdotStdDensity, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisZone.Name); SetupOutputVariable(state, "Zone Ventilation Current Density Volume", Constant::Units::m3, state.dataHeatBal->ZnAirRpt(thisVentilation.ZonePtr).VentilVolumeCurDensity, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisZone.Name); SetupOutputVariable(state, "Zone Ventilation Standard Density Volume", Constant::Units::m3, state.dataHeatBal->ZnAirRpt(thisVentilation.ZonePtr).VentilVolumeStdDensity, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisZone.Name); SetupOutputVariable(state, "Zone Ventilation Mass", Constant::Units::kg, state.dataHeatBal->ZnAirRpt(thisVentilation.ZonePtr).VentilMass, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisZone.Name); SetupOutputVariable(state, "Zone Ventilation Mass Flow Rate", Constant::Units::kg_s, state.dataHeatBal->ZnAirRpt(thisVentilation.ZonePtr).VentilMdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisZone.Name); SetupOutputVariable(state, "Zone Ventilation Air Change Rate", Constant::Units::ach, state.dataHeatBal->ZnAirRpt(thisVentilation.ZonePtr).VentilAirChangeRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisZone.Name); SetupOutputVariable(state, "Zone Ventilation Fan Electricity Energy", Constant::Units::J, state.dataHeatBal->ZnAirRpt(thisVentilation.ZonePtr).VentilFanElec, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisZone.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Fans, + OutputProcessor::Group::Building, + OutputProcessor::EndUseCat::Fans, "Ventilation (simple)", - OutputProcessor::SOVGroup::Building, thisZone.Name); SetupOutputVariable(state, "Zone Ventilation Air Inlet Temperature", Constant::Units::C, state.dataHeatBal->ZnAirRpt(thisVentilation.ZonePtr).VentilAirTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisZone.Name); } } @@ -2956,78 +2956,78 @@ void GetSimpleAirModelInputs(EnergyPlusData &state, bool &ErrorsFound) // IF err "Zone Mixing Volume", Constant::Units::m3, state.dataHeatBal->ZnAirRpt(thisMixing.ZonePtr).MixVolume, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(thisMixing.ZonePtr).Name); SetupOutputVariable(state, "Zone Mixing Current Density Volume Flow Rate", Constant::Units::m3_s, state.dataHeatBal->ZnAirRpt(thisMixing.ZonePtr).MixVdotCurDensity, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(thisMixing.ZonePtr).Name); SetupOutputVariable(state, "Zone Mixing Standard Density Volume Flow Rate", Constant::Units::m3_s, state.dataHeatBal->ZnAirRpt(thisMixing.ZonePtr).MixVdotStdDensity, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(thisMixing.ZonePtr).Name); SetupOutputVariable(state, "Zone Mixing Mass", Constant::Units::kg, state.dataHeatBal->ZnAirRpt(thisMixing.ZonePtr).MixMass, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(thisMixing.ZonePtr).Name); SetupOutputVariable(state, "Zone Mixing Mass Flow Rate", Constant::Units::kg_s, state.dataHeatBal->ZnAirRpt(thisMixing.ZonePtr).MixMdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(thisMixing.ZonePtr).Name); SetupOutputVariable(state, "Zone Mixing Sensible Heat Loss Energy", Constant::Units::J, state.dataHeatBal->ZnAirRpt(thisMixing.ZonePtr).MixHeatLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(thisMixing.ZonePtr).Name); SetupOutputVariable(state, "Zone Mixing Sensible Heat Gain Energy", Constant::Units::J, state.dataHeatBal->ZnAirRpt(thisMixing.ZonePtr).MixHeatGain, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(thisMixing.ZonePtr).Name); SetupOutputVariable(state, "Zone Mixing Latent Heat Loss Energy", Constant::Units::J, state.dataHeatBal->ZnAirRpt(thisMixing.ZonePtr).MixLatentLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(thisMixing.ZonePtr).Name); SetupOutputVariable(state, "Zone Mixing Latent Heat Gain Energy", Constant::Units::J, state.dataHeatBal->ZnAirRpt(thisMixing.ZonePtr).MixLatentGain, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(thisMixing.ZonePtr).Name); SetupOutputVariable(state, "Zone Mixing Total Heat Loss Energy", Constant::Units::J, state.dataHeatBal->ZnAirRpt(thisMixing.ZonePtr).MixTotalLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(thisMixing.ZonePtr).Name); SetupOutputVariable(state, "Zone Mixing Total Heat Gain Energy", Constant::Units::J, state.dataHeatBal->ZnAirRpt(thisMixing.ZonePtr).MixTotalGain, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(thisMixing.ZonePtr).Name); } } @@ -3602,78 +3602,78 @@ void GetSimpleAirModelInputs(EnergyPlusData &state, bool &ErrorsFound) // IF err "Zone Mixing Volume", Constant::Units::m3, thisZnAirRpt.MixVolume, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, zoneName); SetupOutputVariable(state, "Zone Mixing Current Density Volume Flow Rate", Constant::Units::m3_s, thisZnAirRpt.MixVdotCurDensity, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, zoneName); SetupOutputVariable(state, "Zone Mixing Standard Density Volume Flow Rate", Constant::Units::m3_s, thisZnAirRpt.MixVdotStdDensity, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, zoneName); SetupOutputVariable(state, "Zone Mixing Mass", Constant::Units::kg, thisZnAirRpt.MixMass, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, zoneName); SetupOutputVariable(state, "Zone Mixing Mass Flow Rate", Constant::Units::kg_s, thisZnAirRpt.MixMdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, zoneName); SetupOutputVariable(state, "Zone Mixing Sensible Heat Loss Energy", Constant::Units::J, thisZnAirRpt.MixHeatLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, zoneName); SetupOutputVariable(state, "Zone Mixing Sensible Heat Gain Energy", Constant::Units::J, thisZnAirRpt.MixHeatGain, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, zoneName); SetupOutputVariable(state, "Zone Mixing Latent Heat Loss Energy", Constant::Units::J, thisZnAirRpt.MixLatentLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, zoneName); SetupOutputVariable(state, "Zone Mixing Latent Heat Gain Energy", Constant::Units::J, thisZnAirRpt.MixLatentGain, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, zoneName); SetupOutputVariable(state, "Zone Mixing Total Heat Loss Energy", Constant::Units::J, thisZnAirRpt.MixTotalLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, zoneName); SetupOutputVariable(state, "Zone Mixing Total Heat Gain Energy", Constant::Units::J, thisZnAirRpt.MixTotalGain, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, zoneName); } } @@ -3687,78 +3687,78 @@ void GetSimpleAirModelInputs(EnergyPlusData &state, bool &ErrorsFound) // IF err "Zone Mixing Volume", Constant::Units::m3, thisZnAirRpt.MixVolume, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, fromZoneName); SetupOutputVariable(state, "Zone Mixing Current Density Volume Flow Rate", Constant::Units::m3_s, thisZnAirRpt.MixVdotCurDensity, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, fromZoneName); SetupOutputVariable(state, "Zone Mixing Standard Density Volume Flow Rate", Constant::Units::m3_s, thisZnAirRpt.MixVdotStdDensity, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, fromZoneName); SetupOutputVariable(state, "Zone Mixing Mass", Constant::Units::kg, thisZnAirRpt.MixMass, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, fromZoneName); SetupOutputVariable(state, "Zone Mixing Mass Flow Rate", Constant::Units::kg_s, thisZnAirRpt.MixMdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, fromZoneName); SetupOutputVariable(state, "Zone Mixing Sensible Heat Loss Energy", Constant::Units::J, thisZnAirRpt.MixHeatLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, fromZoneName); SetupOutputVariable(state, "Zone Mixing Sensible Heat Gain Energy", Constant::Units::J, thisZnAirRpt.MixHeatGain, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, fromZoneName); SetupOutputVariable(state, "Zone Mixing Latent Heat Loss Energy", Constant::Units::J, thisZnAirRpt.MixLatentLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, fromZoneName); SetupOutputVariable(state, "Zone Mixing Latent Heat Gain Energy", Constant::Units::J, thisZnAirRpt.MixLatentGain, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, fromZoneName); SetupOutputVariable(state, "Zone Mixing Total Heat Loss Energy", Constant::Units::J, thisZnAirRpt.MixTotalLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, fromZoneName); SetupOutputVariable(state, "Zone Mixing Total Heat Gain Energy", Constant::Units::J, thisZnAirRpt.MixTotalGain, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, fromZoneName); } } @@ -4035,78 +4035,78 @@ void GetSimpleAirModelInputs(EnergyPlusData &state, bool &ErrorsFound) // IF err "Zone Mixing Volume", Constant::Units::m3, state.dataHeatBal->ZnAirRpt(ZoneNumA).MixVolume, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(ZoneNumA).Name); SetupOutputVariable(state, "Zone Mixing Current Density Volume Flow Rate", Constant::Units::m3_s, state.dataHeatBal->ZnAirRpt(ZoneNumA).MixVdotCurDensity, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(ZoneNumA).Name); SetupOutputVariable(state, "Zone Mixing Standard Density Volume Flow Rate", Constant::Units::m3_s, state.dataHeatBal->ZnAirRpt(ZoneNumA).MixVdotStdDensity, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(ZoneNumA).Name); SetupOutputVariable(state, "Zone Mixing Mass", Constant::Units::kg, state.dataHeatBal->ZnAirRpt(ZoneNumA).MixMass, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(ZoneNumA).Name); SetupOutputVariable(state, "Zone Mixing Mass Flow Rate", Constant::Units::kg_s, state.dataHeatBal->ZnAirRpt(ZoneNumA).MixMdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(ZoneNumA).Name); SetupOutputVariable(state, "Zone Mixing Sensible Heat Loss Energy", Constant::Units::J, state.dataHeatBal->ZnAirRpt(ZoneNumA).MixHeatLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(ZoneNumA).Name); SetupOutputVariable(state, "Zone Mixing Sensible Heat Gain Energy", Constant::Units::J, state.dataHeatBal->ZnAirRpt(ZoneNumA).MixHeatGain, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(ZoneNumA).Name); SetupOutputVariable(state, "Zone Mixing Latent Heat Loss Energy", Constant::Units::J, state.dataHeatBal->ZnAirRpt(ZoneNumA).MixLatentLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(ZoneNumA).Name); SetupOutputVariable(state, "Zone Mixing Latent Heat Gain Energy", Constant::Units::J, state.dataHeatBal->ZnAirRpt(ZoneNumA).MixLatentGain, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(ZoneNumA).Name); SetupOutputVariable(state, "Zone Mixing Total Heat Loss Energy", Constant::Units::J, state.dataHeatBal->ZnAirRpt(ZoneNumA).MixTotalLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(ZoneNumA).Name); SetupOutputVariable(state, "Zone Mixing Total Heat Gain Energy", Constant::Units::J, state.dataHeatBal->ZnAirRpt(ZoneNumA).MixTotalGain, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(ZoneNumA).Name); } } @@ -4127,78 +4127,78 @@ void GetSimpleAirModelInputs(EnergyPlusData &state, bool &ErrorsFound) // IF err "Zone Mixing Volume", Constant::Units::m3, state.dataHeatBal->ZnAirRpt(ZoneNumB).MixVolume, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(ZoneNumB).Name); SetupOutputVariable(state, "Zone Mixing Current Density Volume Flow Rate", Constant::Units::m3_s, state.dataHeatBal->ZnAirRpt(ZoneNumB).MixVdotCurDensity, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(ZoneNumB).Name); SetupOutputVariable(state, "Zone Mixing Standard Density Volume Flow Rate", Constant::Units::m3_s, state.dataHeatBal->ZnAirRpt(ZoneNumB).MixVdotStdDensity, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(ZoneNumB).Name); SetupOutputVariable(state, "Zone Mixing Mass", Constant::Units::kg, state.dataHeatBal->ZnAirRpt(ZoneNumB).MixMass, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(ZoneNumB).Name); SetupOutputVariable(state, "Zone Mixing Mass Flow Rate", Constant::Units::kg_s, state.dataHeatBal->ZnAirRpt(ZoneNumB).MixMdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(ZoneNumB).Name); SetupOutputVariable(state, "Zone Mixing Sensible Heat Loss Energy", Constant::Units::J, state.dataHeatBal->ZnAirRpt(ZoneNumB).MixHeatLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(ZoneNumB).Name); SetupOutputVariable(state, "Zone Mixing Sensible Heat Gain Energy", Constant::Units::J, state.dataHeatBal->ZnAirRpt(ZoneNumB).MixHeatGain, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(ZoneNumB).Name); SetupOutputVariable(state, "Zone Mixing Latent Heat Loss Energy", Constant::Units::J, state.dataHeatBal->ZnAirRpt(ZoneNumB).MixLatentLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(ZoneNumB).Name); SetupOutputVariable(state, "Zone Mixing Latent Heat Gain Energy", Constant::Units::J, state.dataHeatBal->ZnAirRpt(ZoneNumB).MixLatentGain, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(ZoneNumB).Name); SetupOutputVariable(state, "Zone Mixing Total Heat Loss Energy", Constant::Units::J, state.dataHeatBal->ZnAirRpt(ZoneNumB).MixTotalLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(ZoneNumB).Name); SetupOutputVariable(state, "Zone Mixing Total Heat Gain Energy", Constant::Units::J, state.dataHeatBal->ZnAirRpt(ZoneNumB).MixTotalGain, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(ZoneNumB).Name); } } @@ -4471,22 +4471,22 @@ void GetSimpleAirModelInputs(EnergyPlusData &state, bool &ErrorsFound) // IF err "Zone Air Mass Balance Supply Mass Flow Rate", Constant::Units::kg_s, state.dataHeatBal->MassConservation(ZoneNum).InMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(ZoneNum).Name); SetupOutputVariable(state, "Zone Air Mass Balance Exhaust Mass Flow Rate", Constant::Units::kg_s, state.dataHeatBal->MassConservation(ZoneNum).ExhMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(ZoneNum).Name); SetupOutputVariable(state, "Zone Air Mass Balance Return Mass Flow Rate", Constant::Units::kg_s, state.dataHeatBal->MassConservation(ZoneNum).RetMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(ZoneNum).Name); if ((state.dataHeatBal->ZoneAirMassFlow.ZoneFlowAdjustment != DataHeatBalance::AdjustmentType::NoAdjustReturnAndMixing) && ((state.dataHeatBal->MassConservation(ZoneNum).NumSourceZonesMixingObject + @@ -4495,15 +4495,15 @@ void GetSimpleAirModelInputs(EnergyPlusData &state, bool &ErrorsFound) // IF err "Zone Air Mass Balance Mixing Receiving Mass Flow Rate", Constant::Units::kg_s, state.dataHeatBal->MassConservation(ZoneNum).MixingMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(ZoneNum).Name); SetupOutputVariable(state, "Zone Air Mass Balance Mixing Source Mass Flow Rate", Constant::Units::kg_s, state.dataHeatBal->MassConservation(ZoneNum).MixingSourceMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(ZoneNum).Name); } if (state.dataHeatBal->ZoneAirMassFlow.InfiltrationTreatment != DataHeatBalance::InfiltrationFlow::No) { @@ -4514,15 +4514,15 @@ void GetSimpleAirModelInputs(EnergyPlusData &state, bool &ErrorsFound) // IF err "Zone Air Mass Balance Infiltration Mass Flow Rate", Constant::Units::kg_s, state.dataHeatBal->MassConservation(ZoneNum).InfiltrationMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(ZoneNum).Name); SetupOutputVariable(state, "Zone Air Mass Balance Infiltration Status", Constant::Units::None, state.dataHeatBal->MassConservation(ZoneNum).IncludeInfilToZoneMassBal, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(ZoneNum).Name); } } diff --git a/src/EnergyPlus/HeatBalanceHAMTManager.cc b/src/EnergyPlus/HeatBalanceHAMTManager.cc index 7a177d9f990..259be035382 100644 --- a/src/EnergyPlus/HeatBalanceHAMTManager.cc +++ b/src/EnergyPlus/HeatBalanceHAMTManager.cc @@ -944,43 +944,43 @@ namespace HeatBalanceHAMTManager { "HAMT Surface Average Water Content Ratio", Constant::Units::kg_kg, state.dataHeatBalHAMTMgr->watertot(sid), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataSurface->Surface(sid).Name); SetupOutputVariable(state, "HAMT Surface Inside Face Temperature", Constant::Units::C, state.dataHeatBalHAMTMgr->surftemp(sid), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataSurface->Surface(sid).Name); SetupOutputVariable(state, "HAMT Surface Inside Face Relative Humidity", Constant::Units::Perc, state.dataHeatBalHAMTMgr->surfrh(sid), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataSurface->Surface(sid).Name); SetupOutputVariable(state, "HAMT Surface Inside Face Vapor Pressure", Constant::Units::Pa, state.dataHeatBalHAMTMgr->surfvp(sid), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataSurface->Surface(sid).Name); SetupOutputVariable(state, "HAMT Surface Outside Face Temperature", Constant::Units::C, state.dataHeatBalHAMTMgr->surfexttemp(sid), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataSurface->Surface(sid).Name); SetupOutputVariable(state, "HAMT Surface Outside Face Relative Humidity", Constant::Units::Perc, state.dataHeatBalHAMTMgr->surfextrh(sid), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataSurface->Surface(sid).Name); // write cell origins to initialization output file @@ -1004,8 +1004,8 @@ namespace HeatBalanceHAMTManager { format("HAMT Surface Temperature Cell {}", concell), Constant::Units::C, cells(cellid).temp, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataSurface->Surface(sid).Name); } for (int cellid = state.dataHeatBalHAMTMgr->Extcell(sid), concell = 1; cellid <= state.dataHeatBalHAMTMgr->Intcell(sid); @@ -1014,8 +1014,8 @@ namespace HeatBalanceHAMTManager { format("HAMT Surface Water Content Cell {}", concell), Constant::Units::kg_kg, cells(cellid).wreport, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataSurface->Surface(sid).Name); } for (int cellid = state.dataHeatBalHAMTMgr->Extcell(sid), concell = 1; cellid <= state.dataHeatBalHAMTMgr->Intcell(sid); @@ -1024,8 +1024,8 @@ namespace HeatBalanceHAMTManager { format("HAMT Surface Relative Humidity Cell {}", concell), Constant::Units::Perc, cells(cellid).rhp, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataSurface->Surface(sid).Name); } } diff --git a/src/EnergyPlus/HeatBalanceManager.cc b/src/EnergyPlus/HeatBalanceManager.cc index 13b728e2a47..947bbe6b36e 100644 --- a/src/EnergyPlus/HeatBalanceManager.cc +++ b/src/EnergyPlus/HeatBalanceManager.cc @@ -2525,29 +2525,29 @@ namespace HeatBalanceManager { "Zone Outdoor Air Drybulb Temperature", Constant::Units::C, state.dataHeatBal->Zone(ZoneLoop).OutDryBulbTemp, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(ZoneLoop).Name); SetupOutputVariable(state, "Zone Outdoor Air Wetbulb Temperature", Constant::Units::C, state.dataHeatBal->Zone(ZoneLoop).OutWetBulbTemp, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(ZoneLoop).Name); SetupOutputVariable(state, "Zone Outdoor Air Wind Speed", Constant::Units::m_s, state.dataHeatBal->Zone(ZoneLoop).WindSpeed, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(ZoneLoop).Name); SetupOutputVariable(state, "Zone Outdoor Air Wind Direction", Constant::Units::deg, state.dataHeatBal->Zone(ZoneLoop).WindDir, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(ZoneLoop).Name); } diff --git a/src/EnergyPlus/HeatBalanceSurfaceManager.cc b/src/EnergyPlus/HeatBalanceSurfaceManager.cc index 0952daf924a..5225757a0d5 100644 --- a/src/EnergyPlus/HeatBalanceSurfaceManager.cc +++ b/src/EnergyPlus/HeatBalanceSurfaceManager.cc @@ -1498,15 +1498,15 @@ void AllocateSurfaceHeatBalArrays(EnergyPlusData &state) "Surface Inside Face Temperature", Constant::Units::C, state.dataHeatBalSurf->SurfTempIn(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Inside Face Interior Movable Insulation Temperature", Constant::Units::C, state.dataHeatBalSurf->SurfTempInMovInsRep(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); if (surface.ExtBoundCond != DataSurfaces::KivaFoundation) { @@ -1514,8 +1514,8 @@ void AllocateSurfaceHeatBalArrays(EnergyPlusData &state) "Surface Outside Face Temperature", Constant::Units::C, state.dataHeatBalSurf->SurfTempOut(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); } @@ -1523,58 +1523,58 @@ void AllocateSurfaceHeatBalArrays(EnergyPlusData &state) "Surface Inside Face Adjacent Air Temperature", Constant::Units::C, state.dataHeatBal->SurfTempEffBulkAir(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Inside Face Convection Heat Transfer Coefficient", Constant::Units::W_m2K, state.dataHeatBalSurf->SurfHConvInt(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Inside Face Convection Heat Gain Rate", Constant::Units::W, state.dataHeatBalSurf->SurfQdotConvInRep(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Inside Face Convection Heat Gain Rate per Area", Constant::Units::W_m2, state.dataHeatBalSurf->SurfQdotConvInPerArea(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Inside Face Convection Heat Gain Energy", Constant::Units::J, state.dataHeatBalSurf->SurfQConvInRep(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, surface.Name); SetupOutputVariable(state, "Surface Inside Face Net Surface Thermal Radiation Heat Gain Rate", Constant::Units::W, state.dataHeatBalSurf->SurfQdotRadNetSurfInRep(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Inside Face Net Surface Thermal Radiation Heat Gain Rate per Area", Constant::Units::W_m2, state.dataHeatBalSurf->SurfQdotRadNetLWInPerArea(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Inside Face Net Surface Thermal Radiation Heat Gain Energy", Constant::Units::J, state.dataHeatBalSurf->SurfQRadNetSurfInRep(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, surface.Name); if (surface.Class != DataSurfaces::SurfaceClass::Window) { @@ -1582,44 +1582,44 @@ void AllocateSurfaceHeatBalArrays(EnergyPlusData &state) "Surface Inside Face Solar Radiation Heat Gain Rate", Constant::Units::W, state.dataHeatBalSurf->SurfQdotRadSolarInRep(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Inside Face Solar Radiation Heat Gain Rate per Area", Constant::Units::W_m2, state.dataHeatBalSurf->SurfQdotRadSolarInRepPerArea(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Inside Face Solar Radiation Heat Gain Energy", Constant::Units::J, state.dataHeatBalSurf->SurfQRadSolarInRep(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, surface.Name); SetupOutputVariable(state, "Surface Inside Face Lights Radiation Heat Gain Rate", Constant::Units::W, state.dataHeatBalSurf->SurfQdotRadLightsInRep(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Inside Face Lights Radiation Heat Gain Rate per Area", Constant::Units::W_m2, state.dataHeatBalSurf->SurfQdotRadLightsInPerArea(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Inside Face Lights Radiation Heat Gain Energy", Constant::Units::J, state.dataHeatBalSurf->SurfQRadLightsInRep(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, surface.Name); } @@ -1627,44 +1627,44 @@ void AllocateSurfaceHeatBalArrays(EnergyPlusData &state) "Surface Inside Face Internal Gains Radiation Heat Gain Rate", Constant::Units::W, state.dataHeatBalSurf->SurfQdotRadIntGainsInRep(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Inside Face Internal Gains Radiation Heat Gain Rate per Area", Constant::Units::W_m2, state.dataHeatBal->SurfQdotRadIntGainsInPerArea(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Inside Face Internal Gains Radiation Heat Gain Energy", Constant::Units::J, state.dataHeatBalSurf->SurfQRadIntGainsInRep(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, surface.Name); SetupOutputVariable(state, "Surface Inside Face System Radiation Heat Gain Rate", Constant::Units::W, state.dataHeatBalSurf->SurfQdotRadHVACInRep(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Inside Face System Radiation Heat Gain Rate per Area", Constant::Units::W_m2, state.dataHeatBalSurf->SurfQdotRadHVACInPerArea(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Inside Face System Radiation Heat Gain Energy", Constant::Units::J, state.dataHeatBalSurf->SurfQRadHVACInRep(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, surface.Name); if (surface.ExtBoundCond == DataSurfaces::ExternalEnvironment || state.dataGlobal->DisplayAdvancedReportVariables) { @@ -1672,113 +1672,113 @@ void AllocateSurfaceHeatBalArrays(EnergyPlusData &state) "Surface Outside Face Outdoor Air Drybulb Temperature", Constant::Units::C, state.dataSurface->SurfOutDryBulbTemp(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Outside Face Outdoor Air Wetbulb Temperature", Constant::Units::C, state.dataSurface->SurfOutWetBulbTemp(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Outside Face Outdoor Air Wind Speed", Constant::Units::m_s, state.dataSurface->SurfOutWindSpeed(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Outside Face Outdoor Air Wind Direction", Constant::Units::deg, state.dataSurface->SurfOutWindDir(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Outside Face Convection Heat Gain Rate", Constant::Units::W, state.dataHeatBalSurf->SurfQdotConvOutRep(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Outside Face Convection Heat Gain Rate per Area", Constant::Units::W_m2, state.dataHeatBalSurf->SurfQdotConvOutPerArea(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Outside Face Convection Heat Gain Energy", Constant::Units::J, state.dataHeatBalSurf->SurfQConvOutReport(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, surface.Name); SetupOutputVariable(state, "Surface Outside Face Convection Heat Transfer Coefficient", Constant::Units::W_m2K, state.dataHeatBalSurf->SurfHConvExt(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Outside Face Net Thermal Radiation Heat Gain Rate", Constant::Units::W, state.dataHeatBalSurf->SurfQdotRadOutRep(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Outside Face Net Thermal Radiation Heat Gain Rate per Area", Constant::Units::W_m2, state.dataHeatBalSurf->SurfQdotRadOutRepPerArea(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Outside Face Net Thermal Radiation Heat Gain Energy", Constant::Units::J, state.dataHeatBalSurf->SurfQRadOutReport(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, surface.Name); SetupOutputVariable(state, "Surface Outside Face Thermal Radiation to Air Heat Transfer Coefficient", Constant::Units::W_m2K, state.dataHeatBalSurf->SurfHAirExt(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Outside Face Thermal Radiation to Sky Heat Transfer Coefficient", Constant::Units::W_m2K, state.dataHeatBalSurf->SurfHSkyExt(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Outside Face Thermal Radiation to Ground Heat Transfer Coefficient", Constant::Units::W_m2K, state.dataHeatBalSurf->SurfHGrdExt(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Outside Face Thermal Radiation to Air Heat Transfer Rate", Constant::Units::W, state.dataHeatBalSurf->SurfQAirExtReport(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Outside Face Heat Emission to Air Rate", Constant::Units::W, state.dataHeatBalSurf->SurfQHeatEmiReport(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); if (surface.Class != DataSurfaces::SurfaceClass::Window) { @@ -1786,22 +1786,22 @@ void AllocateSurfaceHeatBalArrays(EnergyPlusData &state) "Surface Outside Face Solar Radiation Heat Gain Rate", Constant::Units::W, state.dataHeatBal->SurfOpaqSWOutAbsTotalReport(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Outside Face Solar Radiation Heat Gain Rate per Area", Constant::Units::W_m2, state.dataHeatBalSurf->SurfOpaqQRadSWOutAbs(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Outside Face Solar Radiation Heat Gain Energy", Constant::Units::J, state.dataHeatBal->SurfOpaqSWOutAbsEnergyReport(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, surface.Name); } } @@ -1813,36 +1813,36 @@ void AllocateSurfaceHeatBalArrays(EnergyPlusData &state) "Surface Inside Face Conduction Heat Transfer Rate", Constant::Units::W, state.dataHeatBalSurf->SurfOpaqInsFaceCond(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Inside Face Conduction Heat Gain Rate", Constant::Units::W, state.dataHeatBalSurf->SurfOpaqInsFaceCondGainRep(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Inside Face Conduction Heat Loss Rate", Constant::Units::W, state.dataHeatBalSurf->SurfOpaqInsFaceCondLossRep(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Inside Face Conduction Heat Transfer Rate per Area", Constant::Units::W_m2, state.dataHeatBalSurf->SurfOpaqInsFaceCondFlux(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Inside Face Conduction Heat Transfer Energy", Constant::Units::J, state.dataHeatBalSurf->SurfOpaqInsFaceCondEnergy(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, surface.Name); if (surface.ExtBoundCond != DataSurfaces::KivaFoundation) { @@ -1850,108 +1850,108 @@ void AllocateSurfaceHeatBalArrays(EnergyPlusData &state) "Surface Outside Face Conduction Heat Transfer Rate", Constant::Units::W, state.dataHeatBalSurf->SurfOpaqOutFaceCond(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Outside Face Conduction Heat Gain Rate", Constant::Units::W, state.dataHeatBalSurf->SurfOpaqExtFaceCondGainRep(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Outside Face Conduction Heat Loss Rate", Constant::Units::W, state.dataHeatBalSurf->SurfOpaqExtFaceCondLossRep(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Outside Face Conduction Heat Transfer Rate per Area", Constant::Units::W_m2, state.dataHeatBalSurf->SurfOpaqOutFaceCondFlux(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Outside Face Conduction Heat Transfer Energy", Constant::Units::J, state.dataHeatBalSurf->SurfOpaqOutFaceCondEnergy(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, surface.Name); SetupOutputVariable(state, "Surface Average Face Conduction Heat Transfer Rate", Constant::Units::W, state.dataHeatBalSurf->SurfOpaqAvgFaceCond(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Average Face Conduction Heat Gain Rate", Constant::Units::W, state.dataHeatBalSurf->SurfOpaqAvgFaceCondGainRep(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Average Face Conduction Heat Loss Rate", Constant::Units::W, state.dataHeatBalSurf->SurfOpaqAvgFaceCondLossRep(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Average Face Conduction Heat Transfer Rate per Area", Constant::Units::W_m2, state.dataHeatBalSurf->SurfOpaqAvgFaceCondFlux(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Average Face Conduction Heat Transfer Energy", Constant::Units::J, state.dataHeatBalSurf->SurfOpaqAvgFaceCondEnergy(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, surface.Name); SetupOutputVariable(state, "Surface Heat Storage Rate", Constant::Units::W, state.dataHeatBalSurf->SurfOpaqStorageCond(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Heat Storage Gain Rate", Constant::Units::W, state.dataHeatBalSurf->SurfOpaqStorageCondGainRep(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Heat Storage Loss Rate", Constant::Units::W, state.dataHeatBalSurf->SurfOpaqStorageCondLossRep(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Heat Storage Rate per Area", Constant::Units::W_m2, state.dataHeatBalSurf->SurfOpaqStorageCondFlux(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Heat Storage Energy", Constant::Units::J, state.dataHeatBalSurf->SurfOpaqStorageCondEnergy(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, surface.Name); } @@ -1962,8 +1962,8 @@ void AllocateSurfaceHeatBalArrays(EnergyPlusData &state) "Surface Inside Face Beam Solar Radiation Heat Gain Rate", Constant::Units::W, state.dataHeatBalSurf->SurfOpaqInsFaceBeamSolAbsorbed(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); } if (state.dataConstruction->Construct(surface.Construction).SourceSinkPresent) { @@ -1971,15 +1971,15 @@ void AllocateSurfaceHeatBalArrays(EnergyPlusData &state) "Surface Internal Source Location Temperature", Constant::Units::C, state.dataHeatBalSurf->SurfTempSource(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Internal User Specified Location Temperature", Constant::Units::C, state.dataHeatBalSurf->SurfTempUserLoc(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); } @@ -1988,22 +1988,22 @@ void AllocateSurfaceHeatBalArrays(EnergyPlusData &state) "Surface Shading Device Is On Time Fraction", Constant::Units::None, state.dataSurface->SurfWinFracTimeShadingDeviceOn(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Storm Window On Off Status", Constant::Units::None, state.dataSurface->SurfWinStormWinFlag(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Window Blind Slat Angle", Constant::Units::deg, state.dataSurface->SurfWinSlatAngThisTSDeg(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); } // IF (DisplayAdvancedReportVariables) THEN !CurrentModuleObject='Opaque Surfaces(Advanced)' @@ -2011,44 +2011,44 @@ void AllocateSurfaceHeatBalArrays(EnergyPlusData &state) "Surface Inside Face Convection Classification Index", Constant::Units::None, state.dataSurface->surfIntConv(loop).convClassRpt, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Inside Face Convection Model Equation Index", Constant::Units::None, state.dataSurface->surfIntConv(loop).hcModelEqRpt, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Inside Face Convection Reference Air Index", Constant::Units::None, state.dataSurface->SurfTAirRefRpt(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); if (surface.ExtBoundCond == DataSurfaces::ExternalEnvironment) { SetupOutputVariable(state, "Surface Outside Face Convection Classification Index", Constant::Units::None, state.dataSurface->surfExtConv(loop).convClassRpt, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Outside Face Forced Convection Model Equation Index", Constant::Units::None, state.dataSurface->surfExtConv(loop).hfModelEqRpt, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Outside Face Natural Convection Model Equation Index", Constant::Units::None, state.dataSurface->surfExtConv(loop).hnModelEqRpt, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); } @@ -2056,15 +2056,15 @@ void AllocateSurfaceHeatBalArrays(EnergyPlusData &state) "Surface Inside Face Heat Source Gain Rate per Area", Constant::Units::W_m2, state.dataHeatBalSurf->SurfQAdditionalHeatSourceInside(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); SetupOutputVariable(state, "Surface Outside Face Heat Source Gain Rate per Area", Constant::Units::W_m2, state.dataHeatBalSurf->SurfQAdditionalHeatSourceOutside(loop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); // ENDIF @@ -2073,8 +2073,8 @@ void AllocateSurfaceHeatBalArrays(EnergyPlusData &state) "Surface Construction Index", Constant::Units::None, surface.Construction, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surface.Name); } } @@ -2082,8 +2082,8 @@ void AllocateSurfaceHeatBalArrays(EnergyPlusData &state) "Site Total Surface Heat Emission to Air", Constant::Units::J, state.dataHeatBalSurf->SumSurfaceHeatEmission, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Environment"); } @@ -5565,15 +5565,15 @@ void CalcThermalResilience(EnergyPlusData &state) "Zone Heat Index", Constant::Units::C, state.dataHeatBal->Resilience(ZoneNum).ZoneHeatIndex, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(ZoneNum).Name); SetupOutputVariable(state, "Zone Humidity Index", Constant::Units::None, state.dataHeatBal->Resilience(ZoneNum).ZoneHumidex, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(ZoneNum).Name); } for (auto const *reqVar : state.dataOutputProcessor->reqVars) { @@ -7517,8 +7517,8 @@ void CalcHeatBalanceInsideSurf(EnergyPlusData &state, "Surface Inside Face Heat Balance Calculation Iteration Count", Constant::Units::None, state.dataHeatBal->InsideSurfIterations, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Simulation"); } // Precompute whether CTF temperature limits will be needed diff --git a/src/EnergyPlus/HeatPumpWaterToWaterCOOLING.cc b/src/EnergyPlus/HeatPumpWaterToWaterCOOLING.cc index b971e70dec8..273cb0b0aeb 100644 --- a/src/EnergyPlus/HeatPumpWaterToWaterCOOLING.cc +++ b/src/EnergyPlus/HeatPumpWaterToWaterCOOLING.cc @@ -372,92 +372,91 @@ void GetGshpInput(EnergyPlusData &state) "Heat Pump Electricity Rate", Constant::Units::W, thisGSHP.Power, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisGSHP.Name); SetupOutputVariable(state, "Heat Pump Electricity Energy", Constant::Units::J, thisGSHP.Energy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisGSHP.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Cooling); SetupOutputVariable(state, "Heat Pump Load Side Heat Transfer Rate", Constant::Units::W, thisGSHP.QLoad, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisGSHP.Name); SetupOutputVariable(state, "Heat Pump Load Side Heat Transfer Energy", Constant::Units::J, thisGSHP.QLoadEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisGSHP.Name); SetupOutputVariable(state, "Heat Pump Source Side Heat Transfer Rate", Constant::Units::W, thisGSHP.QSource, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisGSHP.Name); SetupOutputVariable(state, "Heat Pump Source Side Heat Transfer Energy", Constant::Units::J, thisGSHP.QSourceEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisGSHP.Name); SetupOutputVariable(state, "Heat Pump Load Side Outlet Temperature", Constant::Units::C, thisGSHP.LoadSideWaterOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisGSHP.Name); SetupOutputVariable(state, "Heat Pump Load Side Inlet Temperature", Constant::Units::C, thisGSHP.LoadSideWaterInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisGSHP.Name); SetupOutputVariable(state, "Heat Pump Source Side Outlet Temperature", Constant::Units::C, thisGSHP.SourceSideWaterOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisGSHP.Name); SetupOutputVariable(state, "Heat Pump Source Side Inlet Temperature", Constant::Units::C, thisGSHP.SourceSideWaterInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisGSHP.Name); SetupOutputVariable(state, "Heat Pump Load Side Mass Flow Rate", Constant::Units::kg_s, thisGSHP.LoadSideWaterMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisGSHP.Name); SetupOutputVariable(state, "Heat Pump Source Side Mass Flow Rate", Constant::Units::kg_s, thisGSHP.SourceSideWaterMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisGSHP.Name); } } diff --git a/src/EnergyPlus/HeatPumpWaterToWaterHEATING.cc b/src/EnergyPlus/HeatPumpWaterToWaterHEATING.cc index 620856fe5a8..c50b41b9f1e 100644 --- a/src/EnergyPlus/HeatPumpWaterToWaterHEATING.cc +++ b/src/EnergyPlus/HeatPumpWaterToWaterHEATING.cc @@ -361,92 +361,91 @@ void GetGshpInput(EnergyPlusData &state) "Heat Pump Electricity Rate", Constant::Units::W, thisGSHP.Power, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisGSHP.Name); SetupOutputVariable(state, "Heat Pump Electricity Energy", Constant::Units::J, thisGSHP.Energy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisGSHP.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Heating, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Heating); SetupOutputVariable(state, "Heat Pump Load Side Heat Transfer Rate", Constant::Units::W, thisGSHP.QLoad, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisGSHP.Name); SetupOutputVariable(state, "Heat Pump Load Side Heat Transfer Energy", Constant::Units::J, thisGSHP.QLoadEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisGSHP.Name); SetupOutputVariable(state, "Heat Pump Source Side Heat Transfer Rate", Constant::Units::W, thisGSHP.QSource, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisGSHP.Name); SetupOutputVariable(state, "Heat Pump Source Side Heat Transfer Energy", Constant::Units::J, thisGSHP.QSourceEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisGSHP.Name); SetupOutputVariable(state, "Heat Pump Load Side Outlet Temperature", Constant::Units::C, thisGSHP.LoadSideWaterOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisGSHP.Name); SetupOutputVariable(state, "Heat Pump Load Side Inlet Temperature", Constant::Units::C, thisGSHP.LoadSideWaterInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisGSHP.Name); SetupOutputVariable(state, "Heat Pump Source Side Outlet Temperature", Constant::Units::C, thisGSHP.SourceSideWaterOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisGSHP.Name); SetupOutputVariable(state, "Heat Pump Source Side Inlet Temperature", Constant::Units::C, thisGSHP.SourceSideWaterInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisGSHP.Name); SetupOutputVariable(state, "Heat Pump Load Side Mass Flow Rate", Constant::Units::kg_s, thisGSHP.LoadSideWaterMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisGSHP.Name); SetupOutputVariable(state, "Heat Pump Source Side Mass Flow Rate", Constant::Units::kg_s, thisGSHP.SourceSideWaterMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisGSHP.Name); } } diff --git a/src/EnergyPlus/HeatPumpWaterToWaterSimple.cc b/src/EnergyPlus/HeatPumpWaterToWaterSimple.cc index d7e27075171..51b0726123e 100644 --- a/src/EnergyPlus/HeatPumpWaterToWaterSimple.cc +++ b/src/EnergyPlus/HeatPumpWaterToWaterSimple.cc @@ -379,26 +379,25 @@ void GshpSpecs::GetWatertoWaterHPInput(EnergyPlusData &state) "Heat Pump Electricity Energy", Constant::Units::J, thisGSHP.reportEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisGSHP.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Cooling); SetupOutputVariable(state, "Heat Pump Load Side Heat Transfer Energy", Constant::Units::J, thisGSHP.reportQLoadEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisGSHP.Name); SetupOutputVariable(state, "Heat Pump Source Side Heat Transfer Energy", Constant::Units::J, thisGSHP.reportQSourceEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisGSHP.Name); } @@ -543,26 +542,25 @@ void GshpSpecs::GetWatertoWaterHPInput(EnergyPlusData &state) "Heat Pump Electricity Energy", Constant::Units::J, thisGSHP.reportEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisGSHP.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Heating, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Heating); SetupOutputVariable(state, "Heat Pump Load Side Heat Transfer Energy", Constant::Units::J, thisGSHP.reportQLoadEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisGSHP.Name); SetupOutputVariable(state, "Heat Pump Source Side Heat Transfer Energy", Constant::Units::J, thisGSHP.reportQSourceEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisGSHP.Name); } @@ -594,64 +592,64 @@ void GshpSpecs::GetWatertoWaterHPInput(EnergyPlusData &state) "Heat Pump Electricity Rate", Constant::Units::W, thisGSHP.reportPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisGSHP.Name); SetupOutputVariable(state, "Heat Pump Load Side Heat Transfer Rate", Constant::Units::W, thisGSHP.reportQLoad, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisGSHP.Name); SetupOutputVariable(state, "Heat Pump Source Side Heat Transfer Rate", Constant::Units::W, thisGSHP.reportQSource, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisGSHP.Name); SetupOutputVariable(state, "Heat Pump Load Side Outlet Temperature", Constant::Units::C, thisGSHP.reportLoadSideOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisGSHP.Name); SetupOutputVariable(state, "Heat Pump Load Side Inlet Temperature", Constant::Units::C, thisGSHP.reportLoadSideInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisGSHP.Name); SetupOutputVariable(state, "Heat Pump Source Side Outlet Temperature", Constant::Units::C, thisGSHP.reportSourceSideOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisGSHP.Name); SetupOutputVariable(state, "Heat Pump Source Side Inlet Temperature", Constant::Units::C, thisGSHP.reportSourceSideInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisGSHP.Name); SetupOutputVariable(state, "Heat Pump Load Side Mass Flow Rate", Constant::Units::kg_s, thisGSHP.reportLoadSideMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisGSHP.Name); SetupOutputVariable(state, "Heat Pump Source Side Mass Flow Rate", Constant::Units::kg_s, thisGSHP.reportSourceSideMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisGSHP.Name); } } diff --git a/src/EnergyPlus/HeatRecovery.cc b/src/EnergyPlus/HeatRecovery.cc index 6b1f3c8344b..fb2eae965bb 100644 --- a/src/EnergyPlus/HeatRecovery.cc +++ b/src/EnergyPlus/HeatRecovery.cc @@ -1040,113 +1040,110 @@ namespace HeatRecovery { "Heat Exchanger Sensible Heating Rate", Constant::Units::W, thisExchanger.SensHeatingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisExchanger.Name); SetupOutputVariable(state, "Heat Exchanger Sensible Heating Energy", Constant::Units::J, thisExchanger.SensHeatingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisExchanger.Name); SetupOutputVariable(state, "Heat Exchanger Latent Gain Rate", Constant::Units::W, thisExchanger.LatHeatingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisExchanger.Name); SetupOutputVariable(state, "Heat Exchanger Latent Gain Energy", Constant::Units::J, thisExchanger.LatHeatingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisExchanger.Name); SetupOutputVariable(state, "Heat Exchanger Total Heating Rate", Constant::Units::W, thisExchanger.TotHeatingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisExchanger.Name); SetupOutputVariable(state, "Heat Exchanger Total Heating Energy", Constant::Units::J, thisExchanger.TotHeatingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisExchanger.Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::HeatRecoveryForHeating, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::HeatRecoveryForHeating); SetupOutputVariable(state, "Heat Exchanger Sensible Cooling Rate", Constant::Units::W, thisExchanger.SensCoolingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisExchanger.Name); SetupOutputVariable(state, "Heat Exchanger Sensible Cooling Energy", Constant::Units::J, thisExchanger.SensCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisExchanger.Name); SetupOutputVariable(state, "Heat Exchanger Latent Cooling Rate", Constant::Units::W, thisExchanger.LatCoolingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisExchanger.Name); SetupOutputVariable(state, "Heat Exchanger Latent Cooling Energy", Constant::Units::J, thisExchanger.LatCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisExchanger.Name); SetupOutputVariable(state, "Heat Exchanger Total Cooling Rate", Constant::Units::W, thisExchanger.TotCoolingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisExchanger.Name); SetupOutputVariable(state, "Heat Exchanger Total Cooling Energy", Constant::Units::J, thisExchanger.TotCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisExchanger.Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::HeatRecoveryForCooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::HeatRecoveryForCooling); SetupOutputVariable(state, "Heat Exchanger Electricity Rate", Constant::Units::W, thisExchanger.ElecUseRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisExchanger.Name); SetupOutputVariable(state, "Heat Exchanger Electricity Energy", Constant::Units::J, thisExchanger.ElecUseEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisExchanger.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::HeatRecovery, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::HeatRecovery); } // setup additional report variables for generic heat exchangers @@ -1159,36 +1156,36 @@ namespace HeatRecovery { "Heat Exchanger Sensible Effectiveness", Constant::Units::None, thisExchanger.SensEffectiveness, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisExchanger.Name); SetupOutputVariable(state, "Heat Exchanger Latent Effectiveness", Constant::Units::None, thisExchanger.LatEffectiveness, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisExchanger.Name); SetupOutputVariable(state, "Heat Exchanger Supply Air Bypass Mass Flow Rate", Constant::Units::kg_s, thisExchanger.SupBypassMassFlow, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisExchanger.Name); SetupOutputVariable(state, "Heat Exchanger Exhaust Air Bypass Mass Flow Rate", Constant::Units::kg_s, thisExchanger.SecBypassMassFlow, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisExchanger.Name); SetupOutputVariable(state, "Heat Exchanger Defrost Time Fraction", Constant::Units::None, thisExchanger.DefrostFraction, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisExchanger.Name); } diff --git a/src/EnergyPlus/HeatingCoils.cc b/src/EnergyPlus/HeatingCoils.cc index 6c64f5c40ce..0c1f129d36a 100644 --- a/src/EnergyPlus/HeatingCoils.cc +++ b/src/EnergyPlus/HeatingCoils.cc @@ -413,37 +413,35 @@ namespace HeatingCoils { "Heating Coil Heating Energy", Constant::Units::J, heatingCoil.HeatingCoilLoad, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, heatingCoil.Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::HeatingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::HeatingCoils); SetupOutputVariable(state, "Heating Coil Heating Rate", Constant::Units::W, heatingCoil.HeatingCoilRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, heatingCoil.Name); SetupOutputVariable(state, "Heating Coil Electricity Energy", Constant::Units::J, heatingCoil.ElecUseLoad, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, heatingCoil.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Heating, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Heating); SetupOutputVariable(state, "Heating Coil Electricity Rate", Constant::Units::W, heatingCoil.ElecUseRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, heatingCoil.Name); } @@ -553,37 +551,35 @@ namespace HeatingCoils { "Heating Coil Heating Energy", Constant::Units::J, heatingCoil.HeatingCoilLoad, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, heatingCoil.Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::HeatingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::HeatingCoils); SetupOutputVariable(state, "Heating Coil Heating Rate", Constant::Units::W, heatingCoil.HeatingCoilRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, heatingCoil.Name); SetupOutputVariable(state, "Heating Coil Electricity Energy", Constant::Units::J, heatingCoil.ElecUseLoad, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, heatingCoil.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Heating, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Heating); SetupOutputVariable(state, "Heating Coil Electricity Rate", Constant::Units::W, heatingCoil.ElecUseRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, heatingCoil.Name); } @@ -710,81 +706,77 @@ namespace HeatingCoils { "Heating Coil Heating Energy", Constant::Units::J, heatingCoil.HeatingCoilLoad, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, heatingCoil.Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::HeatingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::HeatingCoils); SetupOutputVariable(state, "Heating Coil Heating Rate", Constant::Units::W, heatingCoil.HeatingCoilRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, heatingCoil.Name); SetupOutputVariable(state, format("Heating Coil {} Energy", sFuelType), Constant::Units::J, heatingCoil.FuelUseLoad, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, heatingCoil.Name, Constant::eFuel2eResource[(int)heatingCoil.FuelType], - OutputProcessor::SOVEndUseCat::Heating, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Heating); SetupOutputVariable(state, format("Heating Coil {} Rate", sFuelType), Constant::Units::W, heatingCoil.FuelUseRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, heatingCoil.Name); SetupOutputVariable(state, "Heating Coil Electricity Energy", Constant::Units::J, heatingCoil.ElecUseLoad, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, heatingCoil.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Heating, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Heating); SetupOutputVariable(state, "Heating Coil Electricity Rate", Constant::Units::W, heatingCoil.ElecUseRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, heatingCoil.Name); SetupOutputVariable(state, "Heating Coil Runtime Fraction", Constant::Units::None, heatingCoil.RTF, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, heatingCoil.Name); SetupOutputVariable(state, "Heating Coil Ancillary " + sFuelType + " Rate", Constant::Units::W, heatingCoil.ParasiticFuelRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, heatingCoil.Name); SetupOutputVariable(state, "Heating Coil Ancillary " + sFuelType + " Energy", Constant::Units::J, heatingCoil.ParasiticFuelConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, heatingCoil.Name, Constant::eFuel2eResource[(int)heatingCoil.FuelType], - OutputProcessor::SOVEndUseCat::Heating, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Heating); } // Get the data for for gas multistage heating coils @@ -904,81 +896,77 @@ namespace HeatingCoils { "Heating Coil Heating Energy", Constant::Units::J, heatingCoil.HeatingCoilLoad, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, heatingCoil.Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::HeatingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::HeatingCoils); SetupOutputVariable(state, "Heating Coil Heating Rate", Constant::Units::W, heatingCoil.HeatingCoilRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, heatingCoil.Name); SetupOutputVariable(state, "Heating Coil NaturalGas Energy", Constant::Units::J, heatingCoil.FuelUseLoad, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, heatingCoil.Name, Constant::eResource::NaturalGas, - OutputProcessor::SOVEndUseCat::Heating, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Heating); SetupOutputVariable(state, "Heating Coil NaturalGas Rate", Constant::Units::W, heatingCoil.FuelUseRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, heatingCoil.Name); SetupOutputVariable(state, "Heating Coil Electricity Energy", Constant::Units::J, heatingCoil.ElecUseLoad, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, heatingCoil.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Heating, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Heating); SetupOutputVariable(state, "Heating Coil Electricity Rate", Constant::Units::W, heatingCoil.ElecUseRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, heatingCoil.Name); SetupOutputVariable(state, "Heating Coil Runtime Fraction", Constant::Units::None, heatingCoil.RTF, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, heatingCoil.Name); SetupOutputVariable(state, "Heating Coil Ancillary NaturalGas Rate", Constant::Units::W, heatingCoil.ParasiticFuelRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, heatingCoil.Name); SetupOutputVariable(state, "Heating Coil Ancillary NaturalGas Energy", Constant::Units::J, heatingCoil.ParasiticFuelConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, heatingCoil.Name, Constant::eResource::NaturalGas, - OutputProcessor::SOVEndUseCat::Heating, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Heating); } // Get the data for for desuperheater heating coils @@ -1314,44 +1302,42 @@ namespace HeatingCoils { "Heating Coil Heating Energy", Constant::Units::J, heatingCoil.HeatingCoilLoad, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, heatingCoil.Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::HeatingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::HeatingCoils); SetupOutputVariable(state, "Heating Coil Heating Rate", Constant::Units::W, heatingCoil.HeatingCoilRate, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, heatingCoil.Name); SetupOutputVariable(state, "Heating Coil Electricity Energy", Constant::Units::J, heatingCoil.ElecUseLoad, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, heatingCoil.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Heating, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Heating); SetupOutputVariable(state, "Heating Coil Electricity Rate", Constant::Units::W, heatingCoil.ElecUseRate, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, heatingCoil.Name); SetupOutputVariable(state, "Heating Coil Runtime Fraction", Constant::Units::None, heatingCoil.RTF, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, heatingCoil.Name); } diff --git a/src/EnergyPlus/HighTempRadiantSystem.cc b/src/EnergyPlus/HighTempRadiantSystem.cc index d25e2ffba58..e62fdf8294b 100644 --- a/src/EnergyPlus/HighTempRadiantSystem.cc +++ b/src/EnergyPlus/HighTempRadiantSystem.cc @@ -559,58 +559,55 @@ namespace HighTempRadiantSystem { "Zone Radiant HVAC Heating Rate", Constant::Units::W, highTempRadSys.HeatPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, highTempRadSys.Name); SetupOutputVariable(state, "Zone Radiant HVAC Heating Energy", Constant::Units::J, highTempRadSys.HeatEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, highTempRadSys.Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::HeatingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::HeatingCoils); if (highTempRadSys.HeaterType == Constant::eResource::NaturalGas) { SetupOutputVariable(state, "Zone Radiant HVAC NaturalGas Rate", Constant::Units::W, highTempRadSys.GasPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, highTempRadSys.Name); SetupOutputVariable(state, "Zone Radiant HVAC NaturalGas Energy", Constant::Units::J, highTempRadSys.GasEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, highTempRadSys.Name, Constant::eResource::NaturalGas, - OutputProcessor::SOVEndUseCat::Heating, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Heating); } else if (highTempRadSys.HeaterType == Constant::eResource::Electricity) { SetupOutputVariable(state, "Zone Radiant HVAC Electricity Rate", Constant::Units::W, highTempRadSys.ElecPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, highTempRadSys.Name); SetupOutputVariable(state, "Zone Radiant HVAC Electricity Energy", Constant::Units::J, highTempRadSys.ElecEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, highTempRadSys.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Heating, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Heating); } } } diff --git a/src/EnergyPlus/Humidifiers.cc b/src/EnergyPlus/Humidifiers.cc index ba044fc01ad..469714db3f7 100644 --- a/src/EnergyPlus/Humidifiers.cc +++ b/src/EnergyPlus/Humidifiers.cc @@ -458,158 +458,150 @@ namespace Humidifiers { "Humidifier Water Volume Flow Rate", Constant::Units::m3_s, Humidifier(HumNum).WaterConsRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Humidifier(HumNum).Name); SetupOutputVariable(state, "Humidifier Water Volume", Constant::Units::m3, Humidifier(HumNum).WaterCons, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, Humidifier(HumNum).Name); SetupOutputVariable(state, "Humidifier Storage Tank Water Volume Flow Rate", Constant::Units::m3_s, Humidifier(HumNum).TankSupplyVdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Humidifier(HumNum).Name); SetupOutputVariable(state, "Humidifier Storage Tank Water Volume", Constant::Units::m3, Humidifier(HumNum).TankSupplyVol, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, Humidifier(HumNum).Name, Constant::eResource::Water, - OutputProcessor::SOVEndUseCat::Humidification, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Humidification); SetupOutputVariable(state, "Humidifier Starved Storage Tank Water Volume Flow Rate", Constant::Units::m3_s, Humidifier(HumNum).StarvedSupplyVdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Humidifier(HumNum).Name); SetupOutputVariable(state, "Humidifier Starved Storage Tank Water Volume", Constant::Units::m3, Humidifier(HumNum).StarvedSupplyVol, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, Humidifier(HumNum).Name, Constant::eResource::Water, - OutputProcessor::SOVEndUseCat::Humidification, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Humidification); SetupOutputVariable(state, "Humidifier Mains Water Volume", Constant::Units::m3, Humidifier(HumNum).StarvedSupplyVol, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, Humidifier(HumNum).Name, Constant::eResource::MainsWater, - OutputProcessor::SOVEndUseCat::Humidification, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Humidification); } else { SetupOutputVariable(state, "Humidifier Water Volume Flow Rate", Constant::Units::m3_s, Humidifier(HumNum).WaterConsRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Humidifier(HumNum).Name); SetupOutputVariable(state, "Humidifier Water Volume", Constant::Units::m3, Humidifier(HumNum).WaterCons, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, Humidifier(HumNum).Name, Constant::eResource::Water, - OutputProcessor::SOVEndUseCat::Humidification, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Humidification); SetupOutputVariable(state, "Humidifier Mains Water Volume", Constant::Units::m3, Humidifier(HumNum).WaterCons, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, Humidifier(HumNum).Name, Constant::eResource::MainsWater, - OutputProcessor::SOVEndUseCat::Humidification, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Humidification); } if (Humidifier(HumNum).HumType == HumidType::Electric) { SetupOutputVariable(state, "Humidifier Electricity Rate", Constant::Units::W, Humidifier(HumNum).ElecUseRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Humidifier(HumNum).Name); SetupOutputVariable(state, "Humidifier Electricity Energy", Constant::Units::J, Humidifier(HumNum).ElecUseEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, Humidifier(HumNum).Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Humidification, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Humidification); } else if (Humidifier(HumNum).HumType == HumidType::Gas) { SetupOutputVariable(state, "Humidifier NaturalGas Use Thermal Efficiency", Constant::Units::None, Humidifier(HumNum).ThermalEff, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Humidifier(HumNum).Name); SetupOutputVariable(state, "Humidifier NaturalGas Rate", Constant::Units::W, Humidifier(HumNum).GasUseRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Humidifier(HumNum).Name); SetupOutputVariable(state, "Humidifier NaturalGas Energy", Constant::Units::J, Humidifier(HumNum).GasUseEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, Humidifier(HumNum).Name, Constant::eResource::NaturalGas, - OutputProcessor::SOVEndUseCat::Humidification, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Humidification); SetupOutputVariable(state, "Humidifier Auxiliary Electricity Rate", Constant::Units::W, Humidifier(HumNum).AuxElecUseRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, Humidifier(HumNum).Name); SetupOutputVariable(state, "Humidifier Auxiliary Electricity Energy", Constant::Units::J, Humidifier(HumNum).AuxElecUseEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, Humidifier(HumNum).Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Humidification, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Humidification); } } diff --git a/src/EnergyPlus/HybridModel.cc b/src/EnergyPlus/HybridModel.cc index 7405125fc66..152599c04e8 100644 --- a/src/EnergyPlus/HybridModel.cc +++ b/src/EnergyPlus/HybridModel.cc @@ -450,15 +450,15 @@ namespace HybridModel { "Zone Infiltration Hybrid Model Air Change Rate", Constant::Units::ach, state.dataHeatBal->Zone(ZonePtr).InfilOAAirChangeRateHM, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(ZonePtr).Name); SetupOutputVariable(state, "Zone Infiltration Hybrid Model Mass Flow Rate", Constant::Units::kg_s, state.dataHeatBal->Zone(ZonePtr).MCPIHM, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(ZonePtr).Name); } if (state.dataHybridModel->HybridModelZone(ZonePtr).PeopleCountCalc_T || @@ -468,8 +468,8 @@ namespace HybridModel { "Zone Hybrid Model People Count", Constant::Units::None, state.dataHeatBal->Zone(ZonePtr).NumOccHM, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(ZonePtr).Name); } diff --git a/src/EnergyPlus/HybridUnitaryAirConditioners.cc b/src/EnergyPlus/HybridUnitaryAirConditioners.cc index 482cbab4719..21e4f3dab29 100644 --- a/src/EnergyPlus/HybridUnitaryAirConditioners.cc +++ b/src/EnergyPlus/HybridUnitaryAirConditioners.cc @@ -751,507 +751,505 @@ void GetInputZoneHybridUnitaryAirConditioners(EnergyPlusData &state, bool &Error "Zone Hybrid Unitary HVAC System Total Cooling Rate", Constant::Units::W, hybridUnitaryAC.SystemTotalCoolingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC System Total Cooling Energy", Constant::Units::J, hybridUnitaryAC.SystemTotalCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, hybridUnitaryAC.Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::CoolingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::CoolingCoils); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC System Sensible Cooling Rate", Constant::Units::W, hybridUnitaryAC.SystemSensibleCoolingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC System Sensible Cooling Energy", Constant::Units::J, hybridUnitaryAC.SystemSensibleCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC System Latent Cooling Rate", Constant::Units::W, hybridUnitaryAC.SystemLatentCoolingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC System Latent Cooling Energy", Constant::Units::J, hybridUnitaryAC.SystemLatentCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Zone Total Cooling Rate", Constant::Units::W, hybridUnitaryAC.UnitTotalCoolingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Zone Total Cooling Energy", Constant::Units::J, hybridUnitaryAC.UnitTotalCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Zone Sensible Cooling Rate", Constant::Units::W, hybridUnitaryAC.UnitSensibleCoolingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Zone Sensible Cooling Energy", Constant::Units::J, hybridUnitaryAC.UnitSensibleCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Zone Latent Cooling Rate", Constant::Units::W, hybridUnitaryAC.UnitLatentCoolingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Zone Latent Cooling Energy", Constant::Units::J, hybridUnitaryAC.UnitLatentCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC System Total Heating Rate", Constant::Units::W, hybridUnitaryAC.SystemTotalHeatingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC System Total Heating Energy", Constant::Units::J, hybridUnitaryAC.SystemTotalHeatingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, hybridUnitaryAC.Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::HeatingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::HeatingCoils); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC System Sensible Heating Rate", Constant::Units::W, hybridUnitaryAC.SystemSensibleHeatingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC System Sensible Heating Energy", Constant::Units::J, hybridUnitaryAC.SystemSensibleHeatingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC System Latent Heating Rate", Constant::Units::W, hybridUnitaryAC.SystemLatentHeatingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC System Latent Heating Energy", Constant::Units::J, hybridUnitaryAC.SystemLatentHeatingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Zone Total Heating Rate", Constant::Units::W, hybridUnitaryAC.UnitTotalHeatingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Zone Total Heating Energy", Constant::Units::J, hybridUnitaryAC.UnitTotalHeatingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Zone Sensible Heating Rate", Constant::Units::W, hybridUnitaryAC.UnitSensibleHeatingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Zone Sensible Heating Energy", Constant::Units::J, hybridUnitaryAC.UnitSensibleHeatingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Zone Latent Heating Rate", Constant::Units::W, hybridUnitaryAC.UnitLatentHeatingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Zone Latent Heating Energy", Constant::Units::J, hybridUnitaryAC.UnitLatentHeatingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Predicted Sensible Load to Setpoint Heat Transfer Rate", Constant::Units::W, hybridUnitaryAC.RequestedLoadToCoolingSetpoint, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Error Code", Constant::Units::None, hybridUnitaryAC.ErrorCode, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Supply Air Temperature", Constant::Units::C, hybridUnitaryAC.OutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Return Air Temperature", Constant::Units::C, hybridUnitaryAC.InletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Outdoor Air Temperature", Constant::Units::C, hybridUnitaryAC.SecInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Relief Air Temperature", Constant::Units::C, hybridUnitaryAC.SecOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Supply Air Humidity Ratio", Constant::Units::kgWater_kgDryAir, hybridUnitaryAC.OutletHumRat, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Return Air Humidity Ratio", Constant::Units::kgWater_kgDryAir, hybridUnitaryAC.InletHumRat, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Outdoor Air Humidity Ratio", Constant::Units::kgWater_kgDryAir, hybridUnitaryAC.SecInletHumRat, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Relief Air Humidity Ratio", Constant::Units::kgWater_kgDryAir, hybridUnitaryAC.SecOutletHumRat, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Supply Air Relative Humidity", Constant::Units::Perc, hybridUnitaryAC.OutletRH, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Return Air Relative Humidity", Constant::Units::Perc, hybridUnitaryAC.InletRH, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Outdoor Air Relative Humidity", Constant::Units::Perc, hybridUnitaryAC.SecInletRH, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Relief Air Relative Humidity", Constant::Units::Perc, hybridUnitaryAC.SecOutletRH, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Supply Air Mass Flow Rate", Constant::Units::kg_s, hybridUnitaryAC.OutletMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Supply Air Standard Density Volume Flow Rate", Constant::Units::m3_s, hybridUnitaryAC.OutletVolumetricFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Return Air Mass Flow Rate", Constant::Units::kg_s, hybridUnitaryAC.InletMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Return Air Standard Density Volume Flow Rate", Constant::Units::m3_s, hybridUnitaryAC.InletVolumetricFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Relief Air Mass Flow Rate", Constant::Units::kg_s, hybridUnitaryAC.SecOutletMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Relief Air Standard Density Volume Flow Rate", Constant::Units::m3_s, hybridUnitaryAC.SecOutletVolumetricFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Ventilation Air Standard Density Volume Flow Rate", Constant::Units::m3_s, hybridUnitaryAC.SupplyVentilationVolume, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Electricity Rate", Constant::Units::W, hybridUnitaryAC.FinalElectricalPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Electricity Energy", Constant::Units::J, hybridUnitaryAC.FinalElectricalEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, hybridUnitaryAC.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cooling, - "Hybrid HVAC Cooling", - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling, + "Hybrid HVAC Cooling"); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Requested Outdoor Air Ventilation Mass Flow Rate", Constant::Units::kg_s, hybridUnitaryAC.MinOA_Msa, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Ventilation Air Mass Flow Rate", Constant::Units::kg_s, hybridUnitaryAC.SupplyVentilationAir, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Availability Status", Constant::Units::None, hybridUnitaryAC.UnitOn, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Outdoor Air Fraction", Constant::Units::None, hybridUnitaryAC.averageOSAF, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Dehumidification Load to Humidistat Setpoint Moisture Transfer Rate", Constant::Units::kg_s, hybridUnitaryAC.RequestedDeHumdificationMass, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Dehumidification Load to Humidistat Setpoint Heat Transfer Rate", Constant::Units::W, hybridUnitaryAC.RequestedDeHumdificationLoad, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC DehumidificationLoad to Humidistat Setpoint Heat Tansfer Energy", Constant::Units::J, hybridUnitaryAC.RequestedDeHumdificationEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Humidification Load to Humidistat Setpoint Moisture Transfer Rate", Constant::Units::kg_s, hybridUnitaryAC.RequestedHumdificationMass, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Humidification Load to Humidistat Setpoint Heat Transfer Rate", Constant::Units::W, hybridUnitaryAC.RequestedHumdificationLoad, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Humidification Load to Humidistat Setpoint Heat Tansfer Energy", Constant::Units::J, hybridUnitaryAC.RequestedHumdificationEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Supply Fan Electricity Rate", Constant::Units::W, hybridUnitaryAC.SupplyFanElectricPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Supply Fan Electricity Energy", Constant::Units::J, hybridUnitaryAC.SupplyFanElectricEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, hybridUnitaryAC.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Fans, - "Hybrid HVAC Fans", - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Fans, + "Hybrid HVAC Fans"); if (hybridUnitaryAC.secondFuel != Constant::eFuel::Invalid) { SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Secondary Fuel Consumption Rate", Constant::Units::W, hybridUnitaryAC.SecondaryFuelConsumptionRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Secondary Fuel Consumption", Constant::Units::J, hybridUnitaryAC.SecondaryFuelConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, hybridUnitaryAC.Name, Constant::eFuel2eResource[(int)hybridUnitaryAC.secondFuel], - OutputProcessor::SOVEndUseCat::Cooling, - "Hybrid HVAC Cooling", - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling, + "Hybrid HVAC Cooling"); } if (hybridUnitaryAC.thirdFuel != Constant::eFuel::Invalid) { SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Third Fuel Consumption Rate", Constant::Units::W, hybridUnitaryAC.ThirdFuelConsumptionRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Third Fuel Consumption", Constant::Units::J, hybridUnitaryAC.ThirdFuelConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, hybridUnitaryAC.Name, Constant::eFuel2eResource[(int)hybridUnitaryAC.thirdFuel], - OutputProcessor::SOVEndUseCat::Cooling, - "Hybrid HVAC Cooling", - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling, + "Hybrid HVAC Cooling"); } SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Water Consumption Rate", Constant::Units::kgWater_s, hybridUnitaryAC.WaterConsumptionRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Water Consumption", Constant::Units::m3, hybridUnitaryAC.WaterConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, hybridUnitaryAC.Name, Constant::eResource::Water, - OutputProcessor::SOVEndUseCat::Cooling, - "Hybrid HVAC Cooling", - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling, + "Hybrid HVAC Cooling"); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC External Static Pressure", Constant::Units::Pa, hybridUnitaryAC.ExternalStaticPressure, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); if (hybridUnitaryAC.FanHeatGain) { @@ -1259,15 +1257,15 @@ void GetInputZoneHybridUnitaryAirConditioners(EnergyPlusData &state, bool &Error "Zone Hybrid Unitary HVAC Fan Rise in Air Temperature", Constant::Units::deltaC, hybridUnitaryAC.FanHeatTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, "Zone Hybrid Unitary HVAC Fan Heat Gain to Air", Constant::Units::W, hybridUnitaryAC.PowerLossToAir, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); } @@ -1278,36 +1276,36 @@ void GetInputZoneHybridUnitaryAirConditioners(EnergyPlusData &state, bool &Error format("Zone Hybrid Unitary HVAC Runtime Fraction in Setting {}", index), Constant::Units::None, thisSetting.Runtime_Fraction, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, format("Zone Hybrid Unitary HVAC Mode in Setting {}", index), Constant::Units::None, thisSetting.Mode, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, format("Zone Hybrid Unitary HVAC Outdoor Air Fraction in Setting {}", index), Constant::Units::kg_s, thisSetting.Outdoor_Air_Fraction, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, format("Zone Hybrid Unitary HVAC Supply Air Mass Flow Rate in Setting {}", index), Constant::Units::kg_s, thisSetting.Unscaled_Supply_Air_Mass_Flow_Rate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); SetupOutputVariable(state, format("Zone Hybrid Unitary HVAC Supply Air Mass Flow Rate Ratio in Setting {}", index), Constant::Units::None, thisSetting.Supply_Air_Mass_Flow_Rate_Ratio, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, hybridUnitaryAC.Name); index++; } diff --git a/src/EnergyPlus/ICEngineElectricGenerator.cc b/src/EnergyPlus/ICEngineElectricGenerator.cc index 5d505c2125e..0a69998a723 100644 --- a/src/EnergyPlus/ICEngineElectricGenerator.cc +++ b/src/EnergyPlus/ICEngineElectricGenerator.cc @@ -314,73 +314,71 @@ namespace ICEngineElectricGenerator { "Generator Produced AC Electricity Rate", Constant::Units::W, this->ElecPowerGenerated, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Produced AC Electricity Energy", Constant::Units::J, this->ElecEnergyGenerated, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::ElectricityProduced, - OutputProcessor::SOVEndUseCat::Cogeneration, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Cogeneration); SetupOutputVariable(state, format("Generator {} Rate", sFuelType), Constant::Units::W, this->FuelEnergyUseRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, format("Generator {} Energy", sFuelType), Constant::Units::J, this->FuelEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eFuel2eResource[(int)this->FuelType], - OutputProcessor::SOVEndUseCat::Cogeneration, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Cogeneration); // general fuel use report to match other generators. SetupOutputVariable(state, "Generator Fuel HHV Basis Rate", Constant::Units::W, this->FuelEnergyUseRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Fuel HHV Basis Energy", Constant::Units::J, this->FuelEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, format("Generator {} Mass Flow Rate", sFuelType), Constant::Units::kg_s, this->FuelMdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Exhaust Air Temperature", Constant::Units::C, this->ExhaustStackTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); if (this->HeatRecActive) { @@ -388,100 +386,97 @@ namespace ICEngineElectricGenerator { "Generator Heat Recovery Mass Flow Rate", Constant::Units::kg_s, this->HeatRecMdotActual, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Jacket Heat Recovery Rate", Constant::Units::W, this->QJacketRecovered, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Jacket Heat Recovery Energy", Constant::Units::J, this->JacketEnergyRec, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::HeatRecovery, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::HeatRecovery); SetupOutputVariable(state, "Generator Lube Heat Recovery Rate", Constant::Units::W, this->QLubeOilRecovered, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Lube Heat Recovery Energy", Constant::Units::J, this->LubeOilEnergyRec, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::HeatRecovery, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::HeatRecovery); SetupOutputVariable(state, "Generator Exhaust Heat Recovery Rate", Constant::Units::W, this->QExhaustRecovered, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Exhaust Heat Recovery Energy", Constant::Units::J, this->ExhaustEnergyRec, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::HeatRecovery, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::HeatRecovery); SetupOutputVariable(state, "Generator Produced Thermal Rate", Constant::Units::W, this->QTotalHeatRecovered, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Produced Thermal Energy", Constant::Units::J, this->TotalHeatEnergyRec, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Generator Heat Recovery Inlet Temperature", Constant::Units::C, this->HeatRecInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Heat Recovery Outlet Temperature", Constant::Units::C, this->HeatRecOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); } } diff --git a/src/EnergyPlus/IceThermalStorage.cc b/src/EnergyPlus/IceThermalStorage.cc index 5f9a806b6b2..7b1aed106ae 100644 --- a/src/EnergyPlus/IceThermalStorage.cc +++ b/src/EnergyPlus/IceThermalStorage.cc @@ -1083,72 +1083,72 @@ namespace IceThermalStorage { "Ice Thermal Storage Requested Load", Constant::Units::W, this->MyLoad, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Ice Thermal Storage End Fraction", Constant::Units::None, this->IceFracRemain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Ice Thermal Storage Mass Flow Rate", Constant::Units::kg_s, this->ITSmdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Ice Thermal Storage Inlet Temperature", Constant::Units::C, this->ITSInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Ice Thermal Storage Outlet Temperature", Constant::Units::C, this->ITSOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Ice Thermal Storage Cooling Discharge Rate", Constant::Units::W, this->ITSCoolingRate_rep, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Ice Thermal Storage Cooling Discharge Energy", Constant::Units::J, this->ITSCoolingEnergy_rep, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Ice Thermal Storage Cooling Charge Rate", Constant::Units::W, this->ITSChargingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Ice Thermal Storage Cooling Charge Energy", Constant::Units::J, this->ITSChargingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); } @@ -1158,133 +1158,132 @@ namespace IceThermalStorage { "Ice Thermal Storage Cooling Rate", Constant::Units::W, this->CompLoad, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Ice Thermal Storage Change Fraction", Constant::Units::None, this->IceFracChange, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Ice Thermal Storage End Fraction", Constant::Units::None, this->IceFracRemaining, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Ice Thermal Storage On Coil Fraction", Constant::Units::None, this->IceFracOnCoil, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Ice Thermal Storage Mass Flow Rate", Constant::Units::kg_s, this->MassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Ice Thermal Storage Bypass Mass Flow Rate", Constant::Units::kg_s, this->BypassMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Ice Thermal Storage Tank Mass Flow Rate", Constant::Units::kg_s, this->TankMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Ice Thermal Storage Fluid Inlet Temperature", Constant::Units::C, this->InletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Ice Thermal Storage Blended Outlet Temperature", Constant::Units::C, this->OutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Ice Thermal Storage Tank Outlet Temperature", Constant::Units::C, this->TankOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Ice Thermal Storage Cooling Discharge Rate", Constant::Units::W, this->DischargingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Ice Thermal Storage Cooling Discharge Energy", Constant::Units::J, this->DischargingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Ice Thermal Storage Cooling Charge Rate", Constant::Units::W, this->ChargingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Ice Thermal Storage Cooling Charge Energy", Constant::Units::J, this->ChargingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Ice Thermal Storage Ancillary Electricity Rate", Constant::Units::W, this->ParasiticElecRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Ice Thermal Storage Ancillary Electricity Energy", Constant::Units::J, this->ParasiticElecEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Invalid, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Invalid); } void DetailedIceStorageData::oneTimeInit(EnergyPlusData &state) diff --git a/src/EnergyPlus/IndoorGreen.cc b/src/EnergyPlus/IndoorGreen.cc index 7c798d56e97..0d941afc143 100644 --- a/src/EnergyPlus/IndoorGreen.cc +++ b/src/EnergyPlus/IndoorGreen.cc @@ -374,89 +374,87 @@ namespace IndoorGreen { "Indoor Living Wall Plant Surface Temperature", Constant::Units::C, state.dataHeatBalSurf->SurfTempIn(ig.SurfPtr), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, ig.Name); SetupOutputVariable( state, "Indoor Living Wall Sensible Heat Gain Rate", Constant::Units::W, state.dataHeatBalSurf->SurfQConvInRep(ig.SurfPtr), // positive sign: heat loss from plants; negative sign: heat gain from plants - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, ig.Name); SetupOutputVariable(state, "Indoor Living Wall Latent Heat Gain Rate", Constant::Units::W, ig.LatentRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, ig.Name); SetupOutputVariable(state, "Indoor Living Wall Evapotranspiration Rate", Constant::Units::kg_m2s, ig.ETRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, ig.Name); SetupOutputVariable(state, "Indoor Living Wall Energy Required For Evapotranspiration Per Unit Area", Constant::Units::W_m2, ig.LambdaET, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, ig.Name); SetupOutputVariable(state, "Indoor Living Wall LED Operational PPFD", Constant::Units::umol_m2s, ig.LEDActualPPFD, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, ig.Name); SetupOutputVariable(state, "Indoor Living Wall PPFD", Constant::Units::umol_m2s, ig.ZPPFD, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, ig.Name); SetupOutputVariable(state, "Indoor Living Wall Vapor Pressure Deficit", Constant::Units::Pa, ig.ZVPD, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, ig.Name); SetupOutputVariable(state, "Indoor Living Wall LED Sensible Heat Gain Rate", Constant::Units::W, ig.SensibleRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, ig.Name); SetupOutputVariable(state, "Indoor Living Wall LED Operational Power", Constant::Units::W, ig.LEDActualEleP, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, ig.Name); SetupOutputVariable(state, "Indoor Living Wall LED Electricity Energy", Constant::Units::J, ig.LEDActualEleCon, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, ig.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::InteriorLights, + OutputProcessor::Group::Building, + OutputProcessor::EndUseCat::InteriorLights, "IndoorLivingWall", // End Use subcategory - OutputProcessor::SOVGroup::Building, state.dataHeatBal->Zone(ig.ZonePtr).Name, state.dataHeatBal->Zone(ig.ZonePtr).Multiplier, state.dataHeatBal->Zone(ig.ZonePtr).ListMultiplier, - {}, - {}, state.dataHeatBal->space(ig.SpacePtr).spaceType); } } diff --git a/src/EnergyPlus/IntegratedHeatPump.cc b/src/EnergyPlus/IntegratedHeatPump.cc index e95fadc1392..eebb1f28047 100644 --- a/src/EnergyPlus/IntegratedHeatPump.cc +++ b/src/EnergyPlus/IntegratedHeatPump.cc @@ -1088,106 +1088,106 @@ void GetIHPInput(EnergyPlusData &state) "Integrated Heat Pump Air Loop Mass Flow Rate", Constant::Units::kg_s, ihp.AirLoopFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ihp.Name); SetupOutputVariable(state, "Integrated Heat Pump Condenser Water Mass Flow Rate", Constant::Units::kg_s, ihp.TankSourceWaterMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ihp.Name); SetupOutputVariable(state, "Integrated Heat Pump Air Total Cooling Rate", Constant::Units::W, ihp.TotalCoolingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ihp.Name); SetupOutputVariable(state, "Integrated Heat Pump Air Heating Rate", Constant::Units::W, ihp.TotalSpaceHeatingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ihp.Name); SetupOutputVariable(state, "Integrated Heat Pump Water Heating Rate", Constant::Units::W, ihp.TotalWaterHeatingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ihp.Name); SetupOutputVariable(state, "Integrated Heat Pump Electricity Rate", Constant::Units::W, ihp.TotalPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ihp.Name); SetupOutputVariable(state, "Integrated Heat Pump Air Latent Cooling Rate", Constant::Units::W, ihp.TotalLatentLoad, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ihp.Name); SetupOutputVariable(state, "Integrated Heat Pump Source Heat Transfer Rate", Constant::Units::W, ihp.Qsource, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ihp.Name); SetupOutputVariable(state, "Integrated Heat Pump COP", Constant::Units::None, ihp.TotalCOP, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ihp.Name); SetupOutputVariable(state, "Integrated Heat Pump Electricity Energy", Constant::Units::J, ihp.Energy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, ihp.Name); SetupOutputVariable(state, "Integrated Heat Pump Air Total Cooling Energy", Constant::Units::J, ihp.EnergyLoadTotalCooling, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, ihp.Name); SetupOutputVariable(state, "Integrated Heat Pump Air Heating Energy", Constant::Units::J, ihp.EnergyLoadTotalHeating, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, ihp.Name); SetupOutputVariable(state, "Integrated Heat Pump Water Heating Energy", Constant::Units::J, ihp.EnergyLoadTotalWaterHeating, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, ihp.Name); SetupOutputVariable(state, "Integrated Heat Pump Air Latent Cooling Energy", Constant::Units::J, ihp.EnergyLatent, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, ihp.Name); SetupOutputVariable(state, "Integrated Heat Pump Source Heat Transfer Energy", Constant::Units::J, ihp.EnergySource, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, ihp.Name); } } diff --git a/src/EnergyPlus/InternalHeatGains.cc b/src/EnergyPlus/InternalHeatGains.cc index 56ec302a021..2a574f95dcf 100644 --- a/src/EnergyPlus/InternalHeatGains.cc +++ b/src/EnergyPlus/InternalHeatGains.cc @@ -3605,8 +3605,8 @@ namespace InternalHeatGains { "Contaminant Source or Sink CO2 Gain Volume Flow Rate", Constant::Units::m3_s, state.dataHeatBal->ZoneCO2Gen(Loop).CO2GainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->ZoneCO2Gen(Loop).Name); // Zone total report variables @@ -3617,8 +3617,8 @@ namespace InternalHeatGains { "Zone Contaminant Source or Sink CO2 Gain Volume Flow Rate", Constant::Units::m3_s, state.dataHeatBal->ZoneRpt(state.dataHeatBal->ZoneCO2Gen(Loop).ZonePtr).CO2Rate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(state.dataHeatBal->ZoneCO2Gen(Loop).ZonePtr).Name); } @@ -4279,71 +4279,71 @@ namespace InternalHeatGains { "Zone Total Internal Radiant Heating Energy", Constant::Units::J, state.dataHeatBal->ZoneRpt(zoneNum).TotRadiantGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Total Internal Radiant Heating Rate", Constant::Units::W, state.dataHeatBal->ZoneRpt(zoneNum).TotRadiantGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Total Internal Visible Radiation Heating Energy", Constant::Units::J, state.dataHeatBal->ZoneRpt(zoneNum).TotVisHeatGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Total Internal Visible Radiation Heating Rate", Constant::Units::W, state.dataHeatBal->ZoneRpt(zoneNum).TotVisHeatGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Total Internal Convective Heating Energy", Constant::Units::J, state.dataHeatBal->ZoneRpt(zoneNum).TotConvectiveGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Total Internal Convective Heating Rate", Constant::Units::W, state.dataHeatBal->ZoneRpt(zoneNum).TotConvectiveGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Total Internal Latent Gain Energy", Constant::Units::J, state.dataHeatBal->ZoneRpt(zoneNum).TotLatentGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Total Internal Latent Gain Rate", Constant::Units::W, state.dataHeatBal->ZoneRpt(zoneNum).TotLatentGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Total Internal Total Heating Energy", Constant::Units::J, state.dataHeatBal->ZoneRpt(zoneNum).TotTotalHeatGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Total Internal Total Heating Rate", Constant::Units::W, state.dataHeatBal->ZoneRpt(zoneNum).TotTotalHeatGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); } @@ -4353,71 +4353,71 @@ namespace InternalHeatGains { "Space Total Internal Radiant Heating Energy", Constant::Units::J, state.dataHeatBal->spaceRpt(spaceNum).TotRadiantGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Total Internal Radiant Heating Rate", Constant::Units::W, state.dataHeatBal->spaceRpt(spaceNum).TotRadiantGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Total Internal Visible Radiation Heating Energy", Constant::Units::J, state.dataHeatBal->spaceRpt(spaceNum).TotVisHeatGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Total Internal Visible Radiation Heating Rate", Constant::Units::W, state.dataHeatBal->spaceRpt(spaceNum).TotVisHeatGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Total Internal Convective Heating Energy", Constant::Units::J, state.dataHeatBal->spaceRpt(spaceNum).TotConvectiveGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Total Internal Convective Heating Rate", Constant::Units::W, state.dataHeatBal->spaceRpt(spaceNum).TotConvectiveGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Total Internal Latent Gain Energy", Constant::Units::J, state.dataHeatBal->spaceRpt(spaceNum).TotLatentGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Total Internal Latent Gain Rate", Constant::Units::W, state.dataHeatBal->spaceRpt(spaceNum).TotLatentGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Total Internal Total Heating Energy", Constant::Units::J, state.dataHeatBal->spaceRpt(spaceNum).TotTotalHeatGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Total Internal Total Heating Rate", Constant::Units::W, state.dataHeatBal->spaceRpt(spaceNum).TotTotalHeatGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); } @@ -4436,92 +4436,92 @@ namespace InternalHeatGains { "People Occupant Count", Constant::Units::None, state.dataHeatBal->People(peopleNum).NumOcc, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->People(peopleNum).Name); SetupOutputVariable(state, "People Radiant Heating Energy", Constant::Units::J, state.dataHeatBal->People(peopleNum).RadGainEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->People(peopleNum).Name); SetupOutputVariable(state, "People Radiant Heating Rate", Constant::Units::W, state.dataHeatBal->People(peopleNum).RadGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->People(peopleNum).Name); SetupOutputVariable(state, "People Convective Heating Energy", Constant::Units::J, state.dataHeatBal->People(peopleNum).ConGainEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->People(peopleNum).Name); SetupOutputVariable(state, "People Convective Heating Rate", Constant::Units::W, state.dataHeatBal->People(peopleNum).ConGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->People(peopleNum).Name); SetupOutputVariable(state, "People Sensible Heating Energy", Constant::Units::J, state.dataHeatBal->People(peopleNum).SenGainEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->People(peopleNum).Name); SetupOutputVariable(state, "People Sensible Heating Rate", Constant::Units::W, state.dataHeatBal->People(peopleNum).SenGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->People(peopleNum).Name); SetupOutputVariable(state, "People Latent Gain Energy", Constant::Units::J, state.dataHeatBal->People(peopleNum).LatGainEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->People(peopleNum).Name); SetupOutputVariable(state, "People Latent Gain Rate", Constant::Units::W, state.dataHeatBal->People(peopleNum).LatGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->People(peopleNum).Name); SetupOutputVariable(state, "People Total Heating Energy", Constant::Units::J, state.dataHeatBal->People(peopleNum).TotGainEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->People(peopleNum).Name); SetupOutputVariable(state, "People Total Heating Rate", Constant::Units::W, state.dataHeatBal->People(peopleNum).TotGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->People(peopleNum).Name); SetupOutputVariable(state, "People Air Temperature", Constant::Units::C, state.dataHeatBal->People(peopleNum).TemperatureInZone, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->People(peopleNum).Name); SetupOutputVariable(state, "People Air Relative Humidity", Constant::Units::Perc, state.dataHeatBal->People(peopleNum).RelativeHumidityInZone, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->People(peopleNum).Name); } @@ -4532,78 +4532,78 @@ namespace InternalHeatGains { "Zone People Occupant Count", Constant::Units::None, state.dataHeatBal->ZoneRpt(zoneNum).PeopleNumOcc, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone People Radiant Heating Energy", Constant::Units::J, state.dataHeatBal->ZoneRpt(zoneNum).PeopleRadGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone People Radiant Heating Rate", Constant::Units::W, state.dataHeatBal->ZoneRpt(zoneNum).PeopleRadGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone People Convective Heating Energy", Constant::Units::J, state.dataHeatBal->ZoneRpt(zoneNum).PeopleConGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone People Convective Heating Rate", Constant::Units::W, state.dataHeatBal->ZoneRpt(zoneNum).PeopleConGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone People Sensible Heating Energy", Constant::Units::J, state.dataHeatBal->ZoneRpt(zoneNum).PeopleSenGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone People Sensible Heating Rate", Constant::Units::W, state.dataHeatBal->ZoneRpt(zoneNum).PeopleSenGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone People Latent Gain Energy", Constant::Units::J, state.dataHeatBal->ZoneRpt(zoneNum).PeopleLatGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone People Latent Gain Rate", Constant::Units::W, state.dataHeatBal->ZoneRpt(zoneNum).PeopleLatGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone People Total Heating Energy", Constant::Units::J, state.dataHeatBal->ZoneRpt(zoneNum).PeopleTotGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone People Total Heating Rate", Constant::Units::W, state.dataHeatBal->ZoneRpt(zoneNum).PeopleTotGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); } // Reset zone output flag @@ -4617,78 +4617,78 @@ namespace InternalHeatGains { "Space People Occupant Count", Constant::Units::None, state.dataHeatBal->spaceRpt(spaceNum).PeopleNumOcc, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space People Radiant Heating Energy", Constant::Units::J, state.dataHeatBal->spaceRpt(spaceNum).PeopleRadGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space People Radiant Heating Rate", Constant::Units::W, state.dataHeatBal->spaceRpt(spaceNum).PeopleRadGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space People Convective Heating Energy", Constant::Units::J, state.dataHeatBal->spaceRpt(spaceNum).PeopleConGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space People Convective Heating Rate", Constant::Units::W, state.dataHeatBal->spaceRpt(spaceNum).PeopleConGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space People Sensible Heating Energy", Constant::Units::J, state.dataHeatBal->spaceRpt(spaceNum).PeopleSenGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space People Sensible Heating Rate", Constant::Units::W, state.dataHeatBal->spaceRpt(spaceNum).PeopleSenGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space People Latent Gain Energy", Constant::Units::J, state.dataHeatBal->spaceRpt(spaceNum).PeopleLatGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space People Latent Gain Rate", Constant::Units::W, state.dataHeatBal->spaceRpt(spaceNum).PeopleLatGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space People Total Heating Energy", Constant::Units::J, state.dataHeatBal->spaceRpt(spaceNum).PeopleTotGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space People Total Heating Rate", Constant::Units::W, state.dataHeatBal->spaceRpt(spaceNum).PeopleTotGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); } // Reset space output flag @@ -4704,97 +4704,95 @@ namespace InternalHeatGains { "Lights Electricity Rate", Constant::Units::W, state.dataHeatBal->Lights(lightsNum).Power, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Lights(lightsNum).Name); SetupOutputVariable(state, "Lights Radiant Heating Energy", Constant::Units::J, state.dataHeatBal->Lights(lightsNum).RadGainEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Lights(lightsNum).Name); SetupOutputVariable(state, "Lights Radiant Heating Rate", Constant::Units::W, state.dataHeatBal->Lights(lightsNum).RadGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Lights(lightsNum).Name); SetupOutputVariable(state, "Lights Visible Radiation Heating Energy", Constant::Units::J, state.dataHeatBal->Lights(lightsNum).VisGainEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Lights(lightsNum).Name); SetupOutputVariable(state, "Lights Visible Radiation Heating Rate", Constant::Units::W, state.dataHeatBal->Lights(lightsNum).VisGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Lights(lightsNum).Name); SetupOutputVariable(state, "Lights Convective Heating Energy", Constant::Units::J, state.dataHeatBal->Lights(lightsNum).ConGainEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Lights(lightsNum).Name); SetupOutputVariable(state, "Lights Convective Heating Rate", Constant::Units::W, state.dataHeatBal->Lights(lightsNum).ConGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Lights(lightsNum).Name); SetupOutputVariable(state, "Lights Return Air Heating Energy", Constant::Units::J, state.dataHeatBal->Lights(lightsNum).RetAirGainEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Lights(lightsNum).Name); SetupOutputVariable(state, "Lights Return Air Heating Rate", Constant::Units::W, state.dataHeatBal->Lights(lightsNum).RetAirGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Lights(lightsNum).Name); SetupOutputVariable(state, "Lights Total Heating Energy", Constant::Units::J, state.dataHeatBal->Lights(lightsNum).TotGainEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Lights(lightsNum).Name); SetupOutputVariable(state, "Lights Total Heating Rate", Constant::Units::W, state.dataHeatBal->Lights(lightsNum).TotGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Lights(lightsNum).Name); SetupOutputVariable(state, "Lights Electricity Energy", Constant::Units::J, state.dataHeatBal->Lights(lightsNum).Consumption, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Lights(lightsNum).Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::InteriorLights, + OutputProcessor::Group::Building, + OutputProcessor::EndUseCat::InteriorLights, state.dataHeatBal->Lights(lightsNum).EndUseSubcategory, - OutputProcessor::SOVGroup::Building, state.dataHeatBal->Zone(state.dataHeatBal->Lights(lightsNum).ZonePtr).Name, state.dataHeatBal->Zone(state.dataHeatBal->Lights(lightsNum).ZonePtr).Multiplier, state.dataHeatBal->Zone(state.dataHeatBal->Lights(lightsNum).ZonePtr).ListMultiplier, - {}, - {}, state.dataHeatBal->space(state.dataHeatBal->Lights(lightsNum).spaceIndex).spaceType); } @@ -4805,85 +4803,85 @@ namespace InternalHeatGains { "Zone Lights Electricity Rate", Constant::Units::W, state.dataHeatBal->ZoneRpt(zoneNum).LtsPower, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Lights Electricity Energy", Constant::Units::J, state.dataHeatBal->ZoneRpt(zoneNum).LtsElecConsump, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Lights Radiant Heating Energy", Constant::Units::J, state.dataHeatBal->ZoneRpt(zoneNum).LtsRadGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Lights Radiant Heating Rate", Constant::Units::W, state.dataHeatBal->ZoneRpt(zoneNum).LtsRadGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Lights Visible Radiation Heating Energy", Constant::Units::J, state.dataHeatBal->ZoneRpt(zoneNum).LtsVisGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Lights Visible Radiation Heating Rate", Constant::Units::W, state.dataHeatBal->ZoneRpt(zoneNum).LtsVisGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Lights Convective Heating Energy", Constant::Units::J, state.dataHeatBal->ZoneRpt(zoneNum).LtsConGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Lights Convective Heating Rate", Constant::Units::W, state.dataHeatBal->ZoneRpt(zoneNum).LtsConGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Lights Return Air Heating Energy", Constant::Units::J, state.dataHeatBal->ZoneRpt(zoneNum).LtsRetAirGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Lights Return Air Heating Rate", Constant::Units::W, state.dataHeatBal->ZoneRpt(zoneNum).LtsRetAirGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Lights Total Heating Energy", Constant::Units::J, state.dataHeatBal->ZoneRpt(zoneNum).LtsTotGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Lights Total Heating Rate", Constant::Units::W, state.dataHeatBal->ZoneRpt(zoneNum).LtsTotGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); } // Reset zone output flag @@ -4897,85 +4895,85 @@ namespace InternalHeatGains { "Space Lights Electricity Rate", Constant::Units::W, state.dataHeatBal->spaceRpt(spaceNum).LtsPower, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Lights Electricity Energy", Constant::Units::J, state.dataHeatBal->spaceRpt(spaceNum).LtsElecConsump, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Lights Radiant Heating Energy", Constant::Units::J, state.dataHeatBal->spaceRpt(spaceNum).LtsRadGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Lights Radiant Heating Rate", Constant::Units::W, state.dataHeatBal->spaceRpt(spaceNum).LtsRadGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Lights Visible Radiation Heating Energy", Constant::Units::J, state.dataHeatBal->spaceRpt(spaceNum).LtsVisGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Lights Visible Radiation Heating Rate", Constant::Units::W, state.dataHeatBal->spaceRpt(spaceNum).LtsVisGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Lights Convective Heating Energy", Constant::Units::J, state.dataHeatBal->spaceRpt(spaceNum).LtsConGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Lights Convective Heating Rate", Constant::Units::W, state.dataHeatBal->spaceRpt(spaceNum).LtsConGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Lights Return Air Heating Energy", Constant::Units::J, state.dataHeatBal->spaceRpt(spaceNum).LtsRetAirGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Lights Return Air Heating Rate", Constant::Units::W, state.dataHeatBal->spaceRpt(spaceNum).LtsRetAirGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Lights Total Heating Energy", Constant::Units::J, state.dataHeatBal->spaceRpt(spaceNum).LtsTotGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Lights Total Heating Rate", Constant::Units::W, state.dataHeatBal->spaceRpt(spaceNum).LtsTotGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); } // Reset space output flag @@ -4990,96 +4988,94 @@ namespace InternalHeatGains { "Electric Equipment Electricity Rate", Constant::Units::W, state.dataHeatBal->ZoneElectric(elecEqNum).Power, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->ZoneElectric(elecEqNum).Name); SetupOutputVariable(state, "Electric Equipment Electricity Energy", Constant::Units::J, state.dataHeatBal->ZoneElectric(elecEqNum).Consumption, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->ZoneElectric(elecEqNum).Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::InteriorEquipment, + OutputProcessor::Group::Building, + OutputProcessor::EndUseCat::InteriorEquipment, state.dataHeatBal->ZoneElectric(elecEqNum).EndUseSubcategory, - OutputProcessor::SOVGroup::Building, state.dataHeatBal->Zone(state.dataHeatBal->ZoneElectric(elecEqNum).ZonePtr).Name, state.dataHeatBal->Zone(state.dataHeatBal->ZoneElectric(elecEqNum).ZonePtr).Multiplier, state.dataHeatBal->Zone(state.dataHeatBal->ZoneElectric(elecEqNum).ZonePtr).ListMultiplier, - {}, - {}, state.dataHeatBal->space(state.dataHeatBal->ZoneElectric(elecEqNum).spaceIndex).spaceType); SetupOutputVariable(state, "Electric Equipment Radiant Heating Energy", Constant::Units::J, state.dataHeatBal->ZoneElectric(elecEqNum).RadGainEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->ZoneElectric(elecEqNum).Name); SetupOutputVariable(state, "Electric Equipment Radiant Heating Rate", Constant::Units::W, state.dataHeatBal->ZoneElectric(elecEqNum).RadGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->ZoneElectric(elecEqNum).Name); SetupOutputVariable(state, "Electric Equipment Convective Heating Energy", Constant::Units::J, state.dataHeatBal->ZoneElectric(elecEqNum).ConGainEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->ZoneElectric(elecEqNum).Name); SetupOutputVariable(state, "Electric Equipment Convective Heating Rate", Constant::Units::W, state.dataHeatBal->ZoneElectric(elecEqNum).ConGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->ZoneElectric(elecEqNum).Name); SetupOutputVariable(state, "Electric Equipment Latent Gain Energy", Constant::Units::J, state.dataHeatBal->ZoneElectric(elecEqNum).LatGainEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->ZoneElectric(elecEqNum).Name); SetupOutputVariable(state, "Electric Equipment Latent Gain Rate", Constant::Units::W, state.dataHeatBal->ZoneElectric(elecEqNum).LatGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->ZoneElectric(elecEqNum).Name); SetupOutputVariable(state, "Electric Equipment Lost Heat Energy", Constant::Units::J, state.dataHeatBal->ZoneElectric(elecEqNum).LostEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->ZoneElectric(elecEqNum).Name); SetupOutputVariable(state, "Electric Equipment Lost Heat Rate", Constant::Units::W, state.dataHeatBal->ZoneElectric(elecEqNum).LostRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->ZoneElectric(elecEqNum).Name); SetupOutputVariable(state, "Electric Equipment Total Heating Energy", Constant::Units::J, state.dataHeatBal->ZoneElectric(elecEqNum).TotGainEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->ZoneElectric(elecEqNum).Name); SetupOutputVariable(state, "Electric Equipment Total Heating Rate", Constant::Units::W, state.dataHeatBal->ZoneElectric(elecEqNum).TotGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->ZoneElectric(elecEqNum).Name); } @@ -5090,86 +5086,86 @@ namespace InternalHeatGains { "Zone Electric Equipment Electricity Rate", Constant::Units::W, state.dataHeatBal->ZoneRpt(zoneNum).ElecPower, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Electric Equipment Electricity Energy", Constant::Units::J, state.dataHeatBal->ZoneRpt(zoneNum).ElecConsump, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Electric Equipment Radiant Heating Energy", Constant::Units::J, state.dataHeatBal->ZoneRpt(zoneNum).ElecRadGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Electric Equipment Radiant Heating Rate", Constant::Units::W, state.dataHeatBal->ZoneRpt(zoneNum).ElecRadGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Electric Equipment Convective Heating Energy", Constant::Units::J, state.dataHeatBal->ZoneRpt(zoneNum).ElecConGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Electric Equipment Convective Heating Rate", Constant::Units::W, state.dataHeatBal->ZoneRpt(zoneNum).ElecConGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Electric Equipment Latent Gain Energy", Constant::Units::J, state.dataHeatBal->ZoneRpt(zoneNum).ElecLatGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Electric Equipment Latent Gain Rate", Constant::Units::W, state.dataHeatBal->ZoneRpt(zoneNum).ElecLatGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Electric Equipment Lost Heat Energy", Constant::Units::J, state.dataHeatBal->ZoneRpt(zoneNum).ElecLost, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Electric Equipment Lost Heat Rate", Constant::Units::W, state.dataHeatBal->ZoneRpt(zoneNum).ElecLostRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Electric Equipment Total Heating Energy", Constant::Units::J, state.dataHeatBal->ZoneRpt(zoneNum).ElecTotGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Electric Equipment Total Heating Rate", Constant::Units::W, state.dataHeatBal->ZoneRpt(zoneNum).ElecTotGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); } // Reset zone output flag @@ -5183,86 +5179,86 @@ namespace InternalHeatGains { "Space Electric Equipment Electricity Rate", Constant::Units::W, state.dataHeatBal->spaceRpt(spaceNum).ElecPower, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Electric Equipment Electricity Energy", Constant::Units::J, state.dataHeatBal->spaceRpt(spaceNum).ElecConsump, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Electric Equipment Radiant Heating Energy", Constant::Units::J, state.dataHeatBal->spaceRpt(spaceNum).ElecRadGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Electric Equipment Radiant Heating Rate", Constant::Units::W, state.dataHeatBal->spaceRpt(spaceNum).ElecRadGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Electric Equipment Convective Heating Energy", Constant::Units::J, state.dataHeatBal->spaceRpt(spaceNum).ElecConGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Electric Equipment Convective Heating Rate", Constant::Units::W, state.dataHeatBal->spaceRpt(spaceNum).ElecConGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Electric Equipment Latent Gain Energy", Constant::Units::J, state.dataHeatBal->spaceRpt(spaceNum).ElecLatGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Electric Equipment Latent Gain Rate", Constant::Units::W, state.dataHeatBal->spaceRpt(spaceNum).ElecLatGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Electric Equipment Lost Heat Energy", Constant::Units::J, state.dataHeatBal->spaceRpt(spaceNum).ElecLost, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Electric Equipment Lost Heat Rate", Constant::Units::W, state.dataHeatBal->spaceRpt(spaceNum).ElecLostRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Electric Equipment Total Heating Energy", Constant::Units::J, state.dataHeatBal->spaceRpt(spaceNum).ElecTotGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Electric Equipment Total Heating Rate", Constant::Units::W, state.dataHeatBal->spaceRpt(spaceNum).ElecTotGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); } // Reset space output flag @@ -5277,96 +5273,94 @@ namespace InternalHeatGains { "Gas Equipment NaturalGas Rate", Constant::Units::W, state.dataHeatBal->ZoneGas(gasEqNum).Power, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->ZoneGas(gasEqNum).Name); SetupOutputVariable(state, "Gas Equipment NaturalGas Energy", Constant::Units::J, state.dataHeatBal->ZoneGas(gasEqNum).Consumption, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->ZoneGas(gasEqNum).Name, Constant::eResource::NaturalGas, - OutputProcessor::SOVEndUseCat::InteriorEquipment, + OutputProcessor::Group::Building, + OutputProcessor::EndUseCat::InteriorEquipment, state.dataHeatBal->ZoneGas(gasEqNum).EndUseSubcategory, - OutputProcessor::SOVGroup::Building, state.dataHeatBal->Zone(state.dataHeatBal->ZoneGas(gasEqNum).ZonePtr).Name, state.dataHeatBal->Zone(state.dataHeatBal->ZoneGas(gasEqNum).ZonePtr).Multiplier, state.dataHeatBal->Zone(state.dataHeatBal->ZoneGas(gasEqNum).ZonePtr).ListMultiplier, - {}, - {}, state.dataHeatBal->space(state.dataHeatBal->ZoneGas(gasEqNum).spaceIndex).spaceType); SetupOutputVariable(state, "Gas Equipment Radiant Heating Energy", Constant::Units::J, state.dataHeatBal->ZoneGas(gasEqNum).RadGainEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->ZoneGas(gasEqNum).Name); SetupOutputVariable(state, "Gas Equipment Convective Heating Energy", Constant::Units::J, state.dataHeatBal->ZoneGas(gasEqNum).ConGainEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->ZoneGas(gasEqNum).Name); SetupOutputVariable(state, "Gas Equipment Latent Gain Energy", Constant::Units::J, state.dataHeatBal->ZoneGas(gasEqNum).LatGainEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->ZoneGas(gasEqNum).Name); SetupOutputVariable(state, "Gas Equipment Lost Heat Energy", Constant::Units::J, state.dataHeatBal->ZoneGas(gasEqNum).LostEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->ZoneGas(gasEqNum).Name); SetupOutputVariable(state, "Gas Equipment Total Heating Energy", Constant::Units::J, state.dataHeatBal->ZoneGas(gasEqNum).TotGainEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->ZoneGas(gasEqNum).Name); SetupOutputVariable(state, "Gas Equipment Radiant Heating Rate", Constant::Units::W, state.dataHeatBal->ZoneGas(gasEqNum).RadGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->ZoneGas(gasEqNum).Name); SetupOutputVariable(state, "Gas Equipment Convective Heating Rate", Constant::Units::W, state.dataHeatBal->ZoneGas(gasEqNum).ConGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->ZoneGas(gasEqNum).Name); SetupOutputVariable(state, "Gas Equipment Latent Gain Rate", Constant::Units::W, state.dataHeatBal->ZoneGas(gasEqNum).LatGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->ZoneGas(gasEqNum).Name); SetupOutputVariable(state, "Gas Equipment Lost Heat Rate", Constant::Units::W, state.dataHeatBal->ZoneGas(gasEqNum).LostRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->ZoneGas(gasEqNum).Name); SetupOutputVariable(state, "Gas Equipment Total Heating Rate", Constant::Units::W, state.dataHeatBal->ZoneGas(gasEqNum).TotGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->ZoneGas(gasEqNum).Name); } @@ -5378,86 +5372,86 @@ namespace InternalHeatGains { "Zone Gas Equipment NaturalGas Rate", Constant::Units::W, state.dataHeatBal->ZoneRpt(zoneNum).GasPower, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Gas Equipment NaturalGas Energy", Constant::Units::J, state.dataHeatBal->ZoneRpt(zoneNum).GasConsump, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Gas Equipment Radiant Heating Energy", Constant::Units::J, state.dataHeatBal->ZoneRpt(zoneNum).GasRadGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Gas Equipment Radiant Heating Rate", Constant::Units::W, state.dataHeatBal->ZoneRpt(zoneNum).GasRadGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Gas Equipment Convective Heating Energy", Constant::Units::J, state.dataHeatBal->ZoneRpt(zoneNum).GasConGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Gas Equipment Convective Heating Rate", Constant::Units::W, state.dataHeatBal->ZoneRpt(zoneNum).GasConGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Gas Equipment Latent Gain Energy", Constant::Units::J, state.dataHeatBal->ZoneRpt(zoneNum).GasLatGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Gas Equipment Latent Gain Rate", Constant::Units::W, state.dataHeatBal->ZoneRpt(zoneNum).GasLatGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Gas Equipment Lost Heat Energy", Constant::Units::J, state.dataHeatBal->ZoneRpt(zoneNum).GasLost, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Gas Equipment Lost Heat Rate", Constant::Units::W, state.dataHeatBal->ZoneRpt(zoneNum).GasLostRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Gas Equipment Total Heating Energy", Constant::Units::J, state.dataHeatBal->ZoneRpt(zoneNum).GasTotGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Gas Equipment Total Heating Rate", Constant::Units::W, state.dataHeatBal->ZoneRpt(zoneNum).GasTotGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); } // Reset zone output flag @@ -5472,86 +5466,86 @@ namespace InternalHeatGains { "Space Gas Equipment NaturalGas Rate", Constant::Units::W, state.dataHeatBal->spaceRpt(spaceNum).GasPower, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Gas Equipment NaturalGas Energy", Constant::Units::J, state.dataHeatBal->spaceRpt(spaceNum).GasConsump, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Gas Equipment Radiant Heating Energy", Constant::Units::J, state.dataHeatBal->spaceRpt(spaceNum).GasRadGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Gas Equipment Radiant Heating Rate", Constant::Units::W, state.dataHeatBal->spaceRpt(spaceNum).GasRadGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Gas Equipment Convective Heating Energy", Constant::Units::J, state.dataHeatBal->spaceRpt(spaceNum).GasConGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Gas Equipment Convective Heating Rate", Constant::Units::W, state.dataHeatBal->spaceRpt(spaceNum).GasConGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Gas Equipment Latent Gain Energy", Constant::Units::J, state.dataHeatBal->spaceRpt(spaceNum).GasLatGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Gas Equipment Latent Gain Rate", Constant::Units::W, state.dataHeatBal->spaceRpt(spaceNum).GasLatGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Gas Equipment Lost Heat Energy", Constant::Units::J, state.dataHeatBal->spaceRpt(spaceNum).GasLost, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Gas Equipment Lost Heat Rate", Constant::Units::W, state.dataHeatBal->spaceRpt(spaceNum).GasLostRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Gas Equipment Total Heating Energy", Constant::Units::J, state.dataHeatBal->spaceRpt(spaceNum).GasTotGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Gas Equipment Total Heating Rate", Constant::Units::W, state.dataHeatBal->spaceRpt(spaceNum).GasTotGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); } // Reset space output flag @@ -5567,96 +5561,94 @@ namespace InternalHeatGains { "Hot Water Equipment District Heating Rate", Constant::Units::W, state.dataHeatBal->ZoneHWEq(hwEqNum).Power, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->ZoneHWEq(hwEqNum).Name); SetupOutputVariable(state, "Hot Water Equipment District Heating Energy", Constant::Units::J, state.dataHeatBal->ZoneHWEq(hwEqNum).Consumption, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->ZoneHWEq(hwEqNum).Name, Constant::eResource::DistrictHeatingWater, - OutputProcessor::SOVEndUseCat::InteriorEquipment, + OutputProcessor::Group::Building, + OutputProcessor::EndUseCat::InteriorEquipment, state.dataHeatBal->ZoneHWEq(hwEqNum).EndUseSubcategory, - OutputProcessor::SOVGroup::Building, state.dataHeatBal->Zone(state.dataHeatBal->ZoneHWEq(hwEqNum).ZonePtr).Name, state.dataHeatBal->Zone(state.dataHeatBal->ZoneHWEq(hwEqNum).ZonePtr).Multiplier, state.dataHeatBal->Zone(state.dataHeatBal->ZoneHWEq(hwEqNum).ZonePtr).ListMultiplier, - {}, - {}, state.dataHeatBal->space(state.dataHeatBal->ZoneHWEq(hwEqNum).spaceIndex).spaceType); SetupOutputVariable(state, "Hot Water Equipment Radiant Heating Energy", Constant::Units::J, state.dataHeatBal->ZoneHWEq(hwEqNum).RadGainEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->ZoneHWEq(hwEqNum).Name); SetupOutputVariable(state, "Hot Water Equipment Radiant Heating Rate", Constant::Units::W, state.dataHeatBal->ZoneHWEq(hwEqNum).RadGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->ZoneHWEq(hwEqNum).Name); SetupOutputVariable(state, "Hot Water Equipment Convective Heating Energy", Constant::Units::J, state.dataHeatBal->ZoneHWEq(hwEqNum).ConGainEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->ZoneHWEq(hwEqNum).Name); SetupOutputVariable(state, "Hot Water Equipment Convective Heating Rate", Constant::Units::W, state.dataHeatBal->ZoneHWEq(hwEqNum).ConGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->ZoneHWEq(hwEqNum).Name); SetupOutputVariable(state, "Hot Water Equipment Latent Gain Energy", Constant::Units::J, state.dataHeatBal->ZoneHWEq(hwEqNum).LatGainEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->ZoneHWEq(hwEqNum).Name); SetupOutputVariable(state, "Hot Water Equipment Latent Gain Rate", Constant::Units::W, state.dataHeatBal->ZoneHWEq(hwEqNum).LatGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->ZoneHWEq(hwEqNum).Name); SetupOutputVariable(state, "Hot Water Equipment Lost Heat Energy", Constant::Units::J, state.dataHeatBal->ZoneHWEq(hwEqNum).LostEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->ZoneHWEq(hwEqNum).Name); SetupOutputVariable(state, "Hot Water Equipment Lost Heat Rate", Constant::Units::W, state.dataHeatBal->ZoneHWEq(hwEqNum).LostRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->ZoneHWEq(hwEqNum).Name); SetupOutputVariable(state, "Hot Water Equipment Total Heating Energy", Constant::Units::J, state.dataHeatBal->ZoneHWEq(hwEqNum).TotGainEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->ZoneHWEq(hwEqNum).Name); SetupOutputVariable(state, "Hot Water Equipment Total Heating Rate", Constant::Units::W, state.dataHeatBal->ZoneHWEq(hwEqNum).TotGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->ZoneHWEq(hwEqNum).Name); } @@ -5667,86 +5659,86 @@ namespace InternalHeatGains { "Zone Hot Water Equipment District Heating Rate", Constant::Units::W, state.dataHeatBal->ZoneRpt(zoneNum).HWPower, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Hot Water Equipment District Heating Energy", Constant::Units::J, state.dataHeatBal->ZoneRpt(zoneNum).HWConsump, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Hot Water Equipment Radiant Heating Energy", Constant::Units::J, state.dataHeatBal->ZoneRpt(zoneNum).HWRadGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Hot Water Equipment Radiant Heating Rate", Constant::Units::W, state.dataHeatBal->ZoneRpt(zoneNum).HWRadGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Hot Water Equipment Convective Heating Energy", Constant::Units::J, state.dataHeatBal->ZoneRpt(zoneNum).HWConGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Hot Water Equipment Convective Heating Rate", Constant::Units::W, state.dataHeatBal->ZoneRpt(zoneNum).HWConGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Hot Water Equipment Latent Gain Energy", Constant::Units::J, state.dataHeatBal->ZoneRpt(zoneNum).HWLatGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Hot Water Equipment Latent Gain Rate", Constant::Units::W, state.dataHeatBal->ZoneRpt(zoneNum).HWLatGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Hot Water Equipment Lost Heat Energy", Constant::Units::J, state.dataHeatBal->ZoneRpt(zoneNum).HWLost, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Hot Water Equipment Lost Heat Rate", Constant::Units::W, state.dataHeatBal->ZoneRpt(zoneNum).HWLostRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Hot Water Equipment Total Heating Energy", Constant::Units::J, state.dataHeatBal->ZoneRpt(zoneNum).HWTotGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Hot Water Equipment Total Heating Rate", Constant::Units::W, state.dataHeatBal->ZoneRpt(zoneNum).HWTotGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); } // Reset zone output flag @@ -5760,86 +5752,86 @@ namespace InternalHeatGains { "Space Hot Water Equipment District Heating Rate", Constant::Units::W, state.dataHeatBal->spaceRpt(spaceNum).HWPower, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Hot Water Equipment District Heating Energy", Constant::Units::J, state.dataHeatBal->spaceRpt(spaceNum).HWConsump, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Hot Water Equipment Radiant Heating Energy", Constant::Units::J, state.dataHeatBal->spaceRpt(spaceNum).HWRadGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Hot Water Equipment Radiant Heating Rate", Constant::Units::W, state.dataHeatBal->spaceRpt(spaceNum).HWRadGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Hot Water Equipment Convective Heating Energy", Constant::Units::J, state.dataHeatBal->spaceRpt(spaceNum).HWConGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Hot Water Equipment Convective Heating Rate", Constant::Units::W, state.dataHeatBal->spaceRpt(spaceNum).HWConGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Hot Water Equipment Latent Gain Energy", Constant::Units::J, state.dataHeatBal->spaceRpt(spaceNum).HWLatGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Hot Water Equipment Latent Gain Rate", Constant::Units::W, state.dataHeatBal->spaceRpt(spaceNum).HWLatGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Hot Water Equipment Lost Heat Energy", Constant::Units::J, state.dataHeatBal->spaceRpt(spaceNum).HWLost, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Hot Water Equipment Lost Heat Rate", Constant::Units::W, state.dataHeatBal->spaceRpt(spaceNum).HWLostRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Hot Water Equipment Total Heating Energy", Constant::Units::J, state.dataHeatBal->spaceRpt(spaceNum).HWTotGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Hot Water Equipment Total Heating Rate", Constant::Units::W, state.dataHeatBal->spaceRpt(spaceNum).HWTotGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); } // Reset space output flag @@ -5855,96 +5847,94 @@ namespace InternalHeatGains { "Steam Equipment District Heating Rate", Constant::Units::W, state.dataHeatBal->ZoneSteamEq(stmEqNum).Power, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->ZoneSteamEq(stmEqNum).Name); SetupOutputVariable(state, "Steam Equipment District Heating Energy", Constant::Units::J, state.dataHeatBal->ZoneSteamEq(stmEqNum).Consumption, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->ZoneSteamEq(stmEqNum).Name, Constant::eResource::DistrictHeatingSteam, - OutputProcessor::SOVEndUseCat::InteriorEquipment, + OutputProcessor::Group::Building, + OutputProcessor::EndUseCat::InteriorEquipment, state.dataHeatBal->ZoneSteamEq(stmEqNum).EndUseSubcategory, - OutputProcessor::SOVGroup::Building, state.dataHeatBal->Zone(state.dataHeatBal->ZoneSteamEq(stmEqNum).ZonePtr).Name, state.dataHeatBal->Zone(state.dataHeatBal->ZoneSteamEq(stmEqNum).ZonePtr).Multiplier, state.dataHeatBal->Zone(state.dataHeatBal->ZoneSteamEq(stmEqNum).ZonePtr).ListMultiplier, - -999, - {}, state.dataHeatBal->space(state.dataHeatBal->ZoneSteamEq(stmEqNum).spaceIndex).spaceType); SetupOutputVariable(state, "Steam Equipment Radiant Heating Energy", Constant::Units::J, state.dataHeatBal->ZoneSteamEq(stmEqNum).RadGainEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->ZoneSteamEq(stmEqNum).Name); SetupOutputVariable(state, "Steam Equipment Radiant Heating Rate", Constant::Units::W, state.dataHeatBal->ZoneSteamEq(stmEqNum).RadGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->ZoneSteamEq(stmEqNum).Name); SetupOutputVariable(state, "Steam Equipment Convective Heating Energy", Constant::Units::J, state.dataHeatBal->ZoneSteamEq(stmEqNum).ConGainEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->ZoneSteamEq(stmEqNum).Name); SetupOutputVariable(state, "Steam Equipment Convective Heating Rate", Constant::Units::W, state.dataHeatBal->ZoneSteamEq(stmEqNum).ConGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->ZoneSteamEq(stmEqNum).Name); SetupOutputVariable(state, "Steam Equipment Latent Gain Energy", Constant::Units::J, state.dataHeatBal->ZoneSteamEq(stmEqNum).LatGainEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->ZoneSteamEq(stmEqNum).Name); SetupOutputVariable(state, "Steam Equipment Latent Gain Rate", Constant::Units::W, state.dataHeatBal->ZoneSteamEq(stmEqNum).LatGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->ZoneSteamEq(stmEqNum).Name); SetupOutputVariable(state, "Steam Equipment Lost Heat Energy", Constant::Units::J, state.dataHeatBal->ZoneSteamEq(stmEqNum).LostEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->ZoneSteamEq(stmEqNum).Name); SetupOutputVariable(state, "Steam Equipment Lost Heat Rate", Constant::Units::W, state.dataHeatBal->ZoneSteamEq(stmEqNum).LostRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->ZoneSteamEq(stmEqNum).Name); SetupOutputVariable(state, "Steam Equipment Total Heating Energy", Constant::Units::J, state.dataHeatBal->ZoneSteamEq(stmEqNum).TotGainEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->ZoneSteamEq(stmEqNum).Name); SetupOutputVariable(state, "Steam Equipment Total Heating Rate", Constant::Units::W, state.dataHeatBal->ZoneSteamEq(stmEqNum).TotGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->ZoneSteamEq(stmEqNum).Name); } @@ -5955,86 +5945,86 @@ namespace InternalHeatGains { "Zone Steam Equipment District Heating Rate", Constant::Units::W, state.dataHeatBal->ZoneRpt(zoneNum).SteamPower, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Steam Equipment District Heating Energy", Constant::Units::J, state.dataHeatBal->ZoneRpt(zoneNum).SteamConsump, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Steam Equipment Radiant Heating Energy", Constant::Units::J, state.dataHeatBal->ZoneRpt(zoneNum).SteamRadGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Steam Equipment Radiant Heating Rate", Constant::Units::W, state.dataHeatBal->ZoneRpt(zoneNum).SteamRadGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Steam Equipment Convective Heating Energy", Constant::Units::J, state.dataHeatBal->ZoneRpt(zoneNum).SteamConGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Steam Equipment Convective Heating Rate", Constant::Units::W, state.dataHeatBal->ZoneRpt(zoneNum).SteamConGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Steam Equipment Latent Gain Energy", Constant::Units::J, state.dataHeatBal->ZoneRpt(zoneNum).SteamLatGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Steam Equipment Latent Gain Rate", Constant::Units::W, state.dataHeatBal->ZoneRpt(zoneNum).SteamLatGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Steam Equipment Lost Heat Energy", Constant::Units::J, state.dataHeatBal->ZoneRpt(zoneNum).SteamLost, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Steam Equipment Lost Heat Rate", Constant::Units::W, state.dataHeatBal->ZoneRpt(zoneNum).SteamLostRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Steam Equipment Total Heating Energy", Constant::Units::J, state.dataHeatBal->ZoneRpt(zoneNum).SteamTotGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Steam Equipment Total Heating Rate", Constant::Units::W, state.dataHeatBal->ZoneRpt(zoneNum).SteamTotGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); } // Reset zone output flag @@ -6048,86 +6038,86 @@ namespace InternalHeatGains { "Space Steam Equipment District Heating Rate", Constant::Units::W, state.dataHeatBal->spaceRpt(spaceNum).SteamPower, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Steam Equipment District Heating Energy", Constant::Units::J, state.dataHeatBal->spaceRpt(spaceNum).SteamConsump, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Steam Equipment Radiant Heating Energy", Constant::Units::J, state.dataHeatBal->spaceRpt(spaceNum).SteamRadGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Steam Equipment Radiant Heating Rate", Constant::Units::W, state.dataHeatBal->spaceRpt(spaceNum).SteamRadGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Steam Equipment Convective Heating Energy", Constant::Units::J, state.dataHeatBal->spaceRpt(spaceNum).SteamConGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Steam Equipment Convective Heating Rate", Constant::Units::W, state.dataHeatBal->spaceRpt(spaceNum).SteamConGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Steam Equipment Latent Gain Energy", Constant::Units::J, state.dataHeatBal->spaceRpt(spaceNum).SteamLatGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Steam Equipment Latent Gain Rate", Constant::Units::W, state.dataHeatBal->spaceRpt(spaceNum).SteamLatGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Steam Equipment Lost Heat Energy", Constant::Units::J, state.dataHeatBal->spaceRpt(spaceNum).SteamLost, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Steam Equipment Lost Heat Rate", Constant::Units::W, state.dataHeatBal->spaceRpt(spaceNum).SteamLostRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Steam Equipment Total Heating Energy", Constant::Units::J, state.dataHeatBal->spaceRpt(spaceNum).SteamTotGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Steam Equipment Total Heating Rate", Constant::Units::W, state.dataHeatBal->spaceRpt(spaceNum).SteamTotGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); } // Reset space output flag @@ -6146,25 +6136,23 @@ namespace InternalHeatGains { format("Other Equipment {} Rate", Constant::eFuelNames[(int)zoneOtherEq.OtherEquipFuelType]), Constant::Units::W, zoneOtherEq.Power, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, zoneOtherEq.Name); SetupOutputVariable(state, format("Other Equipment {} Energy", Constant::eFuelNames[(int)zoneOtherEq.OtherEquipFuelType]), Constant::Units::J, zoneOtherEq.Consumption, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, zoneOtherEq.Name, Constant::eFuel2eResource[(int)zoneOtherEq.OtherEquipFuelType], - OutputProcessor::SOVEndUseCat::InteriorEquipment, + OutputProcessor::Group::Building, + OutputProcessor::EndUseCat::InteriorEquipment, zoneOtherEq.EndUseSubcategory, - OutputProcessor::SOVGroup::Building, state.dataHeatBal->Zone(zoneOtherEq.ZonePtr).Name, state.dataHeatBal->Zone(zoneOtherEq.ZonePtr).Multiplier, state.dataHeatBal->Zone(zoneOtherEq.ZonePtr).ListMultiplier, - -999, - {}, state.dataHeatBal->space(zoneOtherEq.spaceIndex).spaceType); } @@ -6172,71 +6160,71 @@ namespace InternalHeatGains { "Other Equipment Radiant Heating Energy", Constant::Units::J, zoneOtherEq.RadGainEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, zoneOtherEq.Name); SetupOutputVariable(state, "Other Equipment Radiant Heating Rate", Constant::Units::W, zoneOtherEq.RadGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, zoneOtherEq.Name); SetupOutputVariable(state, "Other Equipment Convective Heating Energy", Constant::Units::J, zoneOtherEq.ConGainEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, zoneOtherEq.Name); SetupOutputVariable(state, "Other Equipment Convective Heating Rate", Constant::Units::W, zoneOtherEq.ConGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, zoneOtherEq.Name); SetupOutputVariable(state, "Other Equipment Latent Gain Energy", Constant::Units::J, zoneOtherEq.LatGainEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, zoneOtherEq.Name); SetupOutputVariable(state, "Other Equipment Latent Gain Rate", Constant::Units::W, zoneOtherEq.LatGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, zoneOtherEq.Name); SetupOutputVariable(state, "Other Equipment Lost Heat Energy", Constant::Units::J, zoneOtherEq.LostEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, zoneOtherEq.Name); SetupOutputVariable(state, "Other Equipment Lost Heat Rate", Constant::Units::W, zoneOtherEq.LostRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, zoneOtherEq.Name); SetupOutputVariable(state, "Other Equipment Total Heating Energy", Constant::Units::J, zoneOtherEq.TotGainEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, zoneOtherEq.Name); SetupOutputVariable(state, "Other Equipment Total Heating Rate", Constant::Units::W, zoneOtherEq.TotGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, zoneOtherEq.Name); } @@ -6253,15 +6241,15 @@ namespace InternalHeatGains { format("Zone Other Equipment {} Rate", fuelName), Constant::Units::W, state.dataHeatBal->ZoneRpt(zoneNum).OtherPower[(int)fuelType], - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, format("Zone Other Equipment {} Energy", fuelName), Constant::Units::J, state.dataHeatBal->ZoneRpt(zoneNum).OtherConsump[(int)fuelType], - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); } @@ -6269,71 +6257,71 @@ namespace InternalHeatGains { "Zone Other Equipment Radiant Heating Energy", Constant::Units::J, state.dataHeatBal->ZoneRpt(zoneNum).OtherRadGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Other Equipment Radiant Heating Rate", Constant::Units::W, state.dataHeatBal->ZoneRpt(zoneNum).OtherRadGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Other Equipment Convective Heating Energy", Constant::Units::J, state.dataHeatBal->ZoneRpt(zoneNum).OtherConGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Other Equipment Convective Heating Rate", Constant::Units::W, state.dataHeatBal->ZoneRpt(zoneNum).OtherConGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Other Equipment Latent Gain Energy", Constant::Units::J, state.dataHeatBal->ZoneRpt(zoneNum).OtherLatGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Other Equipment Latent Gain Rate", Constant::Units::W, state.dataHeatBal->ZoneRpt(zoneNum).OtherLatGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Other Equipment Lost Heat Energy", Constant::Units::J, state.dataHeatBal->ZoneRpt(zoneNum).OtherLost, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Other Equipment Lost Heat Rate", Constant::Units::W, state.dataHeatBal->ZoneRpt(zoneNum).OtherLostRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Other Equipment Total Heating Energy", Constant::Units::J, state.dataHeatBal->ZoneRpt(zoneNum).OtherTotGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Other Equipment Total Heating Rate", Constant::Units::W, state.dataHeatBal->ZoneRpt(zoneNum).OtherTotGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); } // Reset zone output flag @@ -6351,15 +6339,15 @@ namespace InternalHeatGains { format("Space Other Equipment {} Rate", Constant::eFuelNames[(int)fuelType]), Constant::Units::W, state.dataHeatBal->spaceRpt(spaceNum).OtherPower[(int)fuelType], - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, format("Space Other Equipment {} Energy", Constant::eFuelNames[(int)fuelType]), Constant::Units::J, state.dataHeatBal->spaceRpt(spaceNum).OtherConsump[(int)fuelType], - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); } @@ -6367,71 +6355,71 @@ namespace InternalHeatGains { "Space Other Equipment Radiant Heating Energy", Constant::Units::J, state.dataHeatBal->spaceRpt(spaceNum).OtherRadGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Other Equipment Radiant Heating Rate", Constant::Units::W, state.dataHeatBal->spaceRpt(spaceNum).OtherRadGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Other Equipment Convective Heating Energy", Constant::Units::J, state.dataHeatBal->spaceRpt(spaceNum).OtherConGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Other Equipment Convective Heating Rate", Constant::Units::W, state.dataHeatBal->spaceRpt(spaceNum).OtherConGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Other Equipment Latent Gain Energy", Constant::Units::J, state.dataHeatBal->spaceRpt(spaceNum).OtherLatGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Other Equipment Latent Gain Rate", Constant::Units::W, state.dataHeatBal->spaceRpt(spaceNum).OtherLatGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Other Equipment Lost Heat Energy", Constant::Units::J, state.dataHeatBal->spaceRpt(spaceNum).OtherLost, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Other Equipment Lost Heat Rate", Constant::Units::W, state.dataHeatBal->spaceRpt(spaceNum).OtherLostRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Other Equipment Total Heating Energy", Constant::Units::J, state.dataHeatBal->spaceRpt(spaceNum).OtherTotGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Other Equipment Total Heating Rate", Constant::Units::W, state.dataHeatBal->spaceRpt(spaceNum).OtherTotGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); } // Reset space output flag @@ -6457,8 +6445,8 @@ namespace InternalHeatGains { PowerOutputVariableStrings[i], Constant::Units::W, state.dataHeatBal->ZoneITEq(itEqNum).PowerRpt[i], - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->ZoneITEq(itEqNum).Name); } @@ -6466,231 +6454,225 @@ namespace InternalHeatGains { "ITE CPU Electricity Energy", Constant::Units::J, state.dataHeatBal->ZoneITEq(itEqNum).EnergyRpt[(int)PERptVars::CPU], - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->ZoneITEq(itEqNum).Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::InteriorEquipment, + OutputProcessor::Group::Building, + OutputProcessor::EndUseCat::InteriorEquipment, state.dataHeatBal->ZoneITEq(itEqNum).EndUseSubcategoryCPU, - OutputProcessor::SOVGroup::Building, state.dataHeatBal->Zone(state.dataHeatBal->ZoneITEq(itEqNum).ZonePtr).Name, state.dataHeatBal->Zone(state.dataHeatBal->ZoneITEq(itEqNum).ZonePtr).Multiplier, state.dataHeatBal->Zone(state.dataHeatBal->ZoneITEq(itEqNum).ZonePtr).ListMultiplier, - -999, - {}, state.dataHeatBal->space(state.dataHeatBal->ZoneITEq(itEqNum).spaceIndex).spaceType); SetupOutputVariable(state, "ITE Fan Electricity Energy", Constant::Units::J, state.dataHeatBal->ZoneITEq(itEqNum).EnergyRpt[(int)PERptVars::Fan], - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->ZoneITEq(itEqNum).Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::InteriorEquipment, + OutputProcessor::Group::Building, + OutputProcessor::EndUseCat::InteriorEquipment, state.dataHeatBal->ZoneITEq(itEqNum).EndUseSubcategoryFan, - OutputProcessor::SOVGroup::Building, state.dataHeatBal->Zone(state.dataHeatBal->ZoneITEq(itEqNum).ZonePtr).Name, state.dataHeatBal->Zone(state.dataHeatBal->ZoneITEq(itEqNum).ZonePtr).Multiplier, state.dataHeatBal->Zone(state.dataHeatBal->ZoneITEq(itEqNum).ZonePtr).ListMultiplier, - -999, - {}, state.dataHeatBal->space(state.dataHeatBal->ZoneITEq(itEqNum).spaceIndex).spaceType); SetupOutputVariable(state, "ITE UPS Electricity Energy", Constant::Units::J, state.dataHeatBal->ZoneITEq(itEqNum).EnergyRpt[(int)PERptVars::UPS], - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->ZoneITEq(itEqNum).Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::InteriorEquipment, + OutputProcessor::Group::Building, + OutputProcessor::EndUseCat::InteriorEquipment, state.dataHeatBal->ZoneITEq(itEqNum).EndUseSubcategoryUPS, - OutputProcessor::SOVGroup::Building, state.dataHeatBal->Zone(state.dataHeatBal->ZoneITEq(itEqNum).ZonePtr).Name, state.dataHeatBal->Zone(state.dataHeatBal->ZoneITEq(itEqNum).ZonePtr).Multiplier, state.dataHeatBal->Zone(state.dataHeatBal->ZoneITEq(itEqNum).ZonePtr).ListMultiplier, - -999, - {}, state.dataHeatBal->space(state.dataHeatBal->ZoneITEq(itEqNum).spaceIndex).spaceType); SetupOutputVariable(state, "ITE CPU Electricity Energy at Design Inlet Conditions", Constant::Units::J, state.dataHeatBal->ZoneITEq(itEqNum).EnergyRpt[(int)PERptVars::CPUAtDesign], - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->ZoneITEq(itEqNum).Name); SetupOutputVariable(state, "ITE Fan Electricity Energy at Design Inlet Conditions", Constant::Units::J, state.dataHeatBal->ZoneITEq(itEqNum).EnergyRpt[(int)PERptVars::FanAtDesign], - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->ZoneITEq(itEqNum).Name); SetupOutputVariable(state, "ITE UPS Heat Gain to Zone Energy", Constant::Units::J, state.dataHeatBal->ZoneITEq(itEqNum).EnergyRpt[(int)PERptVars::UPSGainToZone], - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->ZoneITEq(itEqNum).Name); SetupOutputVariable(state, "ITE Total Heat Gain to Zone Energy", Constant::Units::J, state.dataHeatBal->ZoneITEq(itEqNum).EnergyRpt[(int)PERptVars::ConGainToZone], - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->ZoneITEq(itEqNum).Name); SetupOutputVariable(state, "ITE Standard Density Air Volume Flow Rate", Constant::Units::m3_s, state.dataHeatBal->ZoneITEq(itEqNum).AirVolFlowStdDensity, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->ZoneITEq(itEqNum).Name); SetupOutputVariable(state, "ITE Current Density Air Volume Flow Rate", Constant::Units::m3_s, state.dataHeatBal->ZoneITEq(itEqNum).AirVolFlowCurDensity, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->ZoneITEq(itEqNum).Name); SetupOutputVariable(state, "ITE Air Mass Flow Rate", Constant::Units::kg_s, state.dataHeatBal->ZoneITEq(itEqNum).AirMassFlow, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->ZoneITEq(itEqNum).Name); SetupOutputVariable(state, "ITE Air Inlet Dry-Bulb Temperature", Constant::Units::C, state.dataHeatBal->ZoneITEq(itEqNum).AirInletDryBulbT, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->ZoneITEq(itEqNum).Name); SetupOutputVariable(state, "ITE Air Inlet Dewpoint Temperature", Constant::Units::C, state.dataHeatBal->ZoneITEq(itEqNum).AirInletDewpointT, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->ZoneITEq(itEqNum).Name); SetupOutputVariable(state, "ITE Air Inlet Relative Humidity", Constant::Units::Perc, state.dataHeatBal->ZoneITEq(itEqNum).AirInletRelHum, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->ZoneITEq(itEqNum).Name); SetupOutputVariable(state, "ITE Air Outlet Dry-Bulb Temperature", Constant::Units::C, state.dataHeatBal->ZoneITEq(itEqNum).AirOutletDryBulbT, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->ZoneITEq(itEqNum).Name); if (state.dataHeatBal->ZoneITEq(itEqNum).SupplyAirNodeNum != 0) { SetupOutputVariable(state, "ITE Supply Heat Index", Constant::Units::None, state.dataHeatBal->ZoneITEq(itEqNum).SHI, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->ZoneITEq(itEqNum).Name); } SetupOutputVariable(state, "ITE Air Inlet Operating Range Exceeded Time", Constant::Units::hr, state.dataHeatBal->ZoneITEq(itEqNum).TimeOutOfOperRange, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->ZoneITEq(itEqNum).Name); SetupOutputVariable(state, "ITE Air Inlet Dry-Bulb Temperature Above Operating Range Time", Constant::Units::hr, state.dataHeatBal->ZoneITEq(itEqNum).TimeAboveDryBulbT, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->ZoneITEq(itEqNum).Name); SetupOutputVariable(state, "ITE Air Inlet Dry-Bulb Temperature Below Operating Range Time", Constant::Units::hr, state.dataHeatBal->ZoneITEq(itEqNum).TimeBelowDryBulbT, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->ZoneITEq(itEqNum).Name); SetupOutputVariable(state, "ITE Air Inlet Dewpoint Temperature Above Operating Range Time", Constant::Units::hr, state.dataHeatBal->ZoneITEq(itEqNum).TimeAboveDewpointT, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->ZoneITEq(itEqNum).Name); SetupOutputVariable(state, "ITE Air Inlet Dewpoint Temperature Below Operating Range Time", Constant::Units::hr, state.dataHeatBal->ZoneITEq(itEqNum).TimeBelowDewpointT, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->ZoneITEq(itEqNum).Name); SetupOutputVariable(state, "ITE Air Inlet Relative Humidity Above Operating Range Time", Constant::Units::hr, state.dataHeatBal->ZoneITEq(itEqNum).TimeAboveRH, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->ZoneITEq(itEqNum).Name); SetupOutputVariable(state, "ITE Air Inlet Relative Humidity Below Operating Range Time", Constant::Units::hr, state.dataHeatBal->ZoneITEq(itEqNum).TimeBelowRH, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->ZoneITEq(itEqNum).Name); SetupOutputVariable(state, "ITE Air Inlet Dry-Bulb Temperature Difference Above Operating Range", Constant::Units::deltaC, state.dataHeatBal->ZoneITEq(itEqNum).DryBulbTAboveDeltaT, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->ZoneITEq(itEqNum).Name); SetupOutputVariable(state, "ITE Air Inlet Dry-Bulb Temperature Difference Below Operating Range", Constant::Units::deltaC, state.dataHeatBal->ZoneITEq(itEqNum).DryBulbTBelowDeltaT, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->ZoneITEq(itEqNum).Name); SetupOutputVariable(state, "ITE Air Inlet Dewpoint Temperature Difference Above Operating Range", Constant::Units::deltaC, state.dataHeatBal->ZoneITEq(itEqNum).DewpointTAboveDeltaT, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->ZoneITEq(itEqNum).Name); SetupOutputVariable(state, "ITE Air Inlet Dewpoint Temperature Difference Below Operating Range", Constant::Units::deltaC, state.dataHeatBal->ZoneITEq(itEqNum).DewpointTBelowDeltaT, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->ZoneITEq(itEqNum).Name); SetupOutputVariable(state, "ITE Air Inlet Relative Humidity Difference Above Operating Range", Constant::Units::Perc, state.dataHeatBal->ZoneITEq(itEqNum).RHAboveDeltaRH, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->ZoneITEq(itEqNum).Name); SetupOutputVariable(state, "ITE Air Inlet Relative Humidity Difference Below Operating Range", Constant::Units::Perc, state.dataHeatBal->ZoneITEq(itEqNum).RHBelowDeltaRH, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->ZoneITEq(itEqNum).Name); } @@ -6712,8 +6694,8 @@ namespace InternalHeatGains { PowerOutputVariableStrings[i], Constant::Units::W, state.dataHeatBal->ZoneRpt(zoneNum).PowerRpt[i], - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); } @@ -6721,8 +6703,8 @@ namespace InternalHeatGains { "Zone ITE Adjusted Return Air Temperature", Constant::Units::W, state.dataHeatBal->ZoneRpt(zoneNum).ITEAdjReturnTemp, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); constexpr std::array EnergyOutputVariableStrings = { @@ -6739,8 +6721,8 @@ namespace InternalHeatGains { EnergyOutputVariableStrings[i], Constant::Units::J, state.dataHeatBal->ZoneRpt(zoneNum).EnergyRpt[i], - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); } @@ -6748,71 +6730,71 @@ namespace InternalHeatGains { "Zone ITE Standard Density Air Volume Flow Rate", Constant::Units::m3_s, state.dataHeatBal->ZoneRpt(zoneNum).ITEqAirVolFlowStdDensity, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone ITE Air Mass Flow Rate", Constant::Units::kg_s, state.dataHeatBal->ZoneRpt(zoneNum).ITEqAirMassFlow, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone ITE Average Supply Heat Index", Constant::Units::None, state.dataHeatBal->ZoneRpt(zoneNum).ITEqSHI, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone ITE Any Air Inlet Operating Range Exceeded Time", Constant::Units::hr, state.dataHeatBal->ZoneRpt(zoneNum).ITEqTimeOutOfOperRange, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone ITE Any Air Inlet Dry-Bulb Temperature Above Operating Range Time", Constant::Units::hr, state.dataHeatBal->ZoneRpt(zoneNum).ITEqTimeAboveDryBulbT, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone ITE Any Air Inlet Dry-Bulb Temperature Below Operating Range Time", Constant::Units::hr, state.dataHeatBal->ZoneRpt(zoneNum).ITEqTimeBelowDryBulbT, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone ITE Any Air Inlet Dewpoint Temperature Above Operating Range Time", Constant::Units::hr, state.dataHeatBal->ZoneRpt(zoneNum).ITEqTimeAboveDewpointT, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone ITE Any Air Inlet Dewpoint Temperature Below Operating Range Time", Constant::Units::hr, state.dataHeatBal->ZoneRpt(zoneNum).ITEqTimeBelowDewpointT, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone ITE Any Air Inlet Relative Humidity Above Operating Range Time", Constant::Units::hr, state.dataHeatBal->ZoneRpt(zoneNum).ITEqTimeAboveRH, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone ITE Any Air Inlet Relative Humidity Below Operating Range Time", Constant::Units::hr, state.dataHeatBal->ZoneRpt(zoneNum).ITEqTimeBelowRH, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); } // Reset zone output flag @@ -6836,8 +6818,8 @@ namespace InternalHeatGains { PowerOutputVariableStrings[i], Constant::Units::W, state.dataHeatBal->spaceRpt(spaceNum).PowerRpt[i], - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); } @@ -6846,8 +6828,8 @@ namespace InternalHeatGains { // "Space ITE Adjusted Return Air Temperature", // Constant::Units::W, // state.dataHeatBal->spaceRpt(spaceNum).ITEAdjReturnTemp, - // OutputProcessor::SOVTimeStepType::Zone, - // OutputProcessor::SOVStoreType::Average, + // OutputProcessor::TimeStepType::Zone, + // OutputProcessor::StoreType::Average, // state.dataHeatBal->space(spaceNum).Name); constexpr std::array EnergyOutputVariableStrings = { @@ -6864,8 +6846,8 @@ namespace InternalHeatGains { EnergyOutputVariableStrings[i], Constant::Units::J, state.dataHeatBal->spaceRpt(spaceNum).EnergyRpt[i], - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); } @@ -6873,71 +6855,71 @@ namespace InternalHeatGains { "Space ITE Standard Density Air Volume Flow Rate", Constant::Units::m3_s, state.dataHeatBal->spaceRpt(spaceNum).ITEqAirVolFlowStdDensity, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space ITE Air Mass Flow Rate", Constant::Units::kg_s, state.dataHeatBal->spaceRpt(spaceNum).ITEqAirMassFlow, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space ITE Average Supply Heat Index", Constant::Units::None, state.dataHeatBal->spaceRpt(spaceNum).ITEqSHI, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space ITE Any Air Inlet Operating Range Exceeded Time", Constant::Units::hr, state.dataHeatBal->spaceRpt(spaceNum).ITEqTimeOutOfOperRange, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space ITE Any Air Inlet Dry-Bulb Temperature Above Operating Range Time", Constant::Units::hr, state.dataHeatBal->spaceRpt(spaceNum).ITEqTimeAboveDryBulbT, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space ITE Any Air Inlet Dry-Bulb Temperature Below Operating Range Time", Constant::Units::hr, state.dataHeatBal->spaceRpt(spaceNum).ITEqTimeBelowDryBulbT, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space ITE Any Air Inlet Dewpoint Temperature Above Operating Range Time", Constant::Units::hr, state.dataHeatBal->spaceRpt(spaceNum).ITEqTimeAboveDewpointT, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space ITE Any Air Inlet Dewpoint Temperature Below Operating Range Time", Constant::Units::hr, state.dataHeatBal->spaceRpt(spaceNum).ITEqTimeBelowDewpointT, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space ITE Any Air Inlet Relative Humidity Above Operating Range Time", Constant::Units::hr, state.dataHeatBal->spaceRpt(spaceNum).ITEqTimeAboveRH, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space ITE Any Air Inlet Relative Humidity Below Operating Range Time", Constant::Units::hr, state.dataHeatBal->spaceRpt(spaceNum).ITEqTimeBelowRH, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); } // Reset space output flag @@ -6953,68 +6935,66 @@ namespace InternalHeatGains { "Baseboard Electricity Rate", Constant::Units::W, state.dataHeatBal->ZoneBBHeat(bbHeatNum).Power, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->ZoneBBHeat(bbHeatNum).Name); SetupOutputVariable(state, "Baseboard Electricity Energy", Constant::Units::J, state.dataHeatBal->ZoneBBHeat(bbHeatNum).Consumption, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->ZoneBBHeat(bbHeatNum).Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::InteriorEquipment, + OutputProcessor::Group::Building, + OutputProcessor::EndUseCat::InteriorEquipment, state.dataHeatBal->ZoneBBHeat(bbHeatNum).EndUseSubcategory, - OutputProcessor::SOVGroup::Building, state.dataHeatBal->Zone(state.dataHeatBal->ZoneBBHeat(bbHeatNum).ZonePtr).Name, state.dataHeatBal->Zone(state.dataHeatBal->ZoneBBHeat(bbHeatNum).ZonePtr).Multiplier, state.dataHeatBal->Zone(state.dataHeatBal->ZoneBBHeat(bbHeatNum).ZonePtr).ListMultiplier, - -999, - {}, state.dataHeatBal->space(state.dataHeatBal->ZoneBBHeat(bbHeatNum).spaceIndex).spaceType); SetupOutputVariable(state, "Baseboard Radiant Heating Energy", Constant::Units::J, state.dataHeatBal->ZoneBBHeat(bbHeatNum).RadGainEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->ZoneBBHeat(bbHeatNum).Name); SetupOutputVariable(state, "Baseboard Radiant Heating Rate", Constant::Units::W, state.dataHeatBal->ZoneBBHeat(bbHeatNum).RadGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->ZoneBBHeat(bbHeatNum).Name); SetupOutputVariable(state, "Baseboard Convective Heating Energy", Constant::Units::J, state.dataHeatBal->ZoneBBHeat(bbHeatNum).ConGainEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->ZoneBBHeat(bbHeatNum).Name); SetupOutputVariable(state, "Baseboard Convective Heating Rate", Constant::Units::W, state.dataHeatBal->ZoneBBHeat(bbHeatNum).ConGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->ZoneBBHeat(bbHeatNum).Name); SetupOutputVariable(state, "Baseboard Total Heating Energy", Constant::Units::J, state.dataHeatBal->ZoneBBHeat(bbHeatNum).TotGainEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->ZoneBBHeat(bbHeatNum).Name); SetupOutputVariable(state, "Baseboard Total Heating Rate", Constant::Units::W, state.dataHeatBal->ZoneBBHeat(bbHeatNum).TotGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->ZoneBBHeat(bbHeatNum).Name); } @@ -7025,58 +7005,58 @@ namespace InternalHeatGains { "Zone Baseboard Electricity Rate", Constant::Units::W, state.dataHeatBal->ZoneRpt(zoneNum).BaseHeatPower, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Baseboard Electricity Energy", Constant::Units::J, state.dataHeatBal->ZoneRpt(zoneNum).BaseHeatElecCons, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Baseboard Radiant Heating Energy", Constant::Units::J, state.dataHeatBal->ZoneRpt(zoneNum).BaseHeatRadGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Baseboard Radiant Heating Rate", Constant::Units::W, state.dataHeatBal->ZoneRpt(zoneNum).BaseHeatRadGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Baseboard Convective Heating Energy", Constant::Units::J, state.dataHeatBal->ZoneRpt(zoneNum).BaseHeatConGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Baseboard Convective Heating Rate", Constant::Units::W, state.dataHeatBal->ZoneRpt(zoneNum).BaseHeatConGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Baseboard Total Heating Energy", Constant::Units::J, state.dataHeatBal->ZoneRpt(zoneNum).BaseHeatTotGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneNum).Name); SetupOutputVariable(state, "Zone Baseboard Total Heating Rate", Constant::Units::W, state.dataHeatBal->ZoneRpt(zoneNum).BaseHeatTotGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneNum).Name); } // Reset zone output flag @@ -7090,58 +7070,58 @@ namespace InternalHeatGains { "Space Baseboard Electricity Rate", Constant::Units::W, state.dataHeatBal->spaceRpt(spaceNum).BaseHeatPower, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Baseboard Electricity Energy", Constant::Units::J, state.dataHeatBal->spaceRpt(spaceNum).BaseHeatElecCons, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Baseboard Radiant Heating Energy", Constant::Units::J, state.dataHeatBal->spaceRpt(spaceNum).BaseHeatRadGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Baseboard Radiant Heating Rate", Constant::Units::W, state.dataHeatBal->spaceRpt(spaceNum).BaseHeatRadGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Baseboard Convective Heating Energy", Constant::Units::J, state.dataHeatBal->spaceRpt(spaceNum).BaseHeatConGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Baseboard Convective Heating Rate", Constant::Units::W, state.dataHeatBal->spaceRpt(spaceNum).BaseHeatConGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Baseboard Total Heating Energy", Constant::Units::J, state.dataHeatBal->spaceRpt(spaceNum).BaseHeatTotGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->space(spaceNum).Name); SetupOutputVariable(state, "Space Baseboard Total Heating Rate", Constant::Units::W, state.dataHeatBal->spaceRpt(spaceNum).BaseHeatTotGainRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->space(spaceNum).Name); } // Reset space output flag diff --git a/src/EnergyPlus/LowTempRadiantSystem.cc b/src/EnergyPlus/LowTempRadiantSystem.cc index ca6b2314b26..233905984d9 100644 --- a/src/EnergyPlus/LowTempRadiantSystem.cc +++ b/src/EnergyPlus/LowTempRadiantSystem.cc @@ -1435,95 +1435,91 @@ namespace LowTempRadiantSystem { "Zone Radiant HVAC Heating Rate", Constant::Units::W, thisHydrSys.HeatPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisHydrSys.Name); SetupOutputVariable(state, "Zone Radiant HVAC Heating Energy", Constant::Units::J, thisHydrSys.HeatEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisHydrSys.Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::HeatingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::HeatingCoils); SetupOutputVariable(state, "Zone Radiant HVAC Heating Fluid Energy", Constant::Units::J, thisHydrSys.HeatEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisHydrSys.Name, Constant::eResource::PlantLoopHeatingDemand, - OutputProcessor::SOVEndUseCat::HeatingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::HeatingCoils); SetupOutputVariable(state, "Zone Radiant HVAC Cooling Rate", Constant::Units::W, thisHydrSys.CoolPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisHydrSys.Name); SetupOutputVariable(state, "Zone Radiant HVAC Cooling Energy", Constant::Units::J, thisHydrSys.CoolEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisHydrSys.Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::CoolingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::CoolingCoils); SetupOutputVariable(state, "Zone Radiant HVAC Cooling Fluid Energy", Constant::Units::J, thisHydrSys.CoolEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisHydrSys.Name, Constant::eResource::PlantLoopCoolingDemand, - OutputProcessor::SOVEndUseCat::CoolingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::CoolingCoils); SetupOutputVariable(state, "Zone Radiant HVAC Mass Flow Rate", Constant::Units::kg_s, thisHydrSys.WaterMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisHydrSys.Name); SetupOutputVariable(state, "Zone Radiant HVAC Inlet Temperature", Constant::Units::C, thisHydrSys.WaterInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisHydrSys.Name); SetupOutputVariable(state, "Zone Radiant HVAC Outlet Temperature", Constant::Units::C, thisHydrSys.WaterOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisHydrSys.Name); SetupOutputVariable(state, "Zone Radiant HVAC Moisture Condensation Time", Constant::Units::s, thisHydrSys.CondCausedTimeOff, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisHydrSys.Name); SetupOutputVariable(state, "Zone Radiant HVAC Operation Mode", Constant::Units::None, thisHydrSys.OperatingMode, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisHydrSys.Name); if (state.dataGlobal->AnyEnergyManagementSystemInModel) { SetupEMSInternalVariable(state, @@ -1556,176 +1552,171 @@ namespace LowTempRadiantSystem { "Zone Radiant HVAC Heating Rate", Constant::Units::W, thisCFloSys.HeatPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisCFloSys.Name); SetupOutputVariable(state, "Zone Radiant HVAC Heating Energy", Constant::Units::J, thisCFloSys.HeatEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisCFloSys.Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::HeatingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::HeatingCoils); SetupOutputVariable(state, "Zone Radiant HVAC Heating Fluid Heat Transfer Energy", Constant::Units::J, thisCFloSys.HeatEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisCFloSys.Name, Constant::eResource::PlantLoopHeatingDemand, - OutputProcessor::SOVEndUseCat::HeatingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::HeatingCoils); SetupOutputVariable(state, "Zone Radiant HVAC Cooling Rate", Constant::Units::W, thisCFloSys.CoolPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisCFloSys.Name); SetupOutputVariable(state, "Zone Radiant HVAC Cooling Energy", Constant::Units::J, thisCFloSys.CoolEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisCFloSys.Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::CoolingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::CoolingCoils); SetupOutputVariable(state, "Zone Radiant HVAC Cooling Fluid Heat Transfer Energy", Constant::Units::J, thisCFloSys.CoolEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisCFloSys.Name, Constant::eResource::PlantLoopCoolingDemand, - OutputProcessor::SOVEndUseCat::CoolingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::CoolingCoils); SetupOutputVariable(state, "Zone Radiant HVAC Mass Flow Rate", Constant::Units::kg_s, thisCFloSys.WaterMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisCFloSys.Name); SetupOutputVariable(state, "Zone Radiant HVAC Injection Mass Flow Rate", Constant::Units::kg_s, thisCFloSys.WaterInjectionRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisCFloSys.Name); SetupOutputVariable(state, "Zone Radiant HVAC Recirculation Mass Flow Rate", Constant::Units::kg_s, thisCFloSys.WaterRecircRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisCFloSys.Name); SetupOutputVariable(state, "Zone Radiant HVAC Inlet Temperature", Constant::Units::C, thisCFloSys.WaterInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisCFloSys.Name); SetupOutputVariable(state, "Zone Radiant HVAC Outlet Temperature", Constant::Units::C, thisCFloSys.WaterOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisCFloSys.Name); SetupOutputVariable(state, "Zone Radiant HVAC Pump Inlet Temperature", Constant::Units::C, thisCFloSys.PumpInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisCFloSys.Name); SetupOutputVariable(state, "Zone Radiant HVAC Pump Electricity Rate", Constant::Units::W, thisCFloSys.PumpPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisCFloSys.Name); SetupOutputVariable(state, "Zone Radiant HVAC Pump Electricity Energy", Constant::Units::J, thisCFloSys.PumpEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisCFloSys.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Pumps, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Pumps); SetupOutputVariable(state, "Zone Radiant HVAC Pump Mass Flow Rate", Constant::Units::kg_s, thisCFloSys.PumpMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisCFloSys.Name); SetupOutputVariable(state, "Zone Radiant HVAC Pump Fluid Heat Gain Rate", Constant::Units::W, thisCFloSys.PumpHeattoFluid, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisCFloSys.Name); SetupOutputVariable(state, "Zone Radiant HVAC Pump Fluid Heat Gain Energy", Constant::Units::J, thisCFloSys.PumpHeattoFluidEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisCFloSys.Name); SetupOutputVariable(state, "Zone Radiant HVAC Moisture Condensation Time", Constant::Units::s, thisCFloSys.CondCausedTimeOff, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisCFloSys.Name); SetupOutputVariable(state, "Zone Radiant HVAC Operation Mode", Constant::Units::None, thisCFloSys.OperatingMode, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisCFloSys.Name); if (state.dataLowTempRadSys->anyRadiantSystemUsingRunningMeanAverage) { SetupOutputVariable(state, "Zone Radiant HVAC Running Mean Outdoor Dry-Bulb Temperature", Constant::Units::C, thisCFloSys.todayRunningMeanOutdoorDryBulbTemperature, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisCFloSys.Name); SetupOutputVariable(state, "Zone Radiant HVAC Previous Day Running Mean Outdoor Dry-Bulb Temperature", Constant::Units::C, thisCFloSys.yesterdayRunningMeanOutdoorDryBulbTemperature, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisCFloSys.Name); SetupOutputVariable(state, "Zone Radiant HVAC Previous Day Average Outdoor Dry-Bulb Temperature", Constant::Units::C, thisCFloSys.yesterdayAverageOutdoorDryBulbTemperature, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisCFloSys.Name); } if (state.dataGlobal->AnyEnergyManagementSystemInModel) { @@ -1751,38 +1742,36 @@ namespace LowTempRadiantSystem { "Zone Radiant HVAC Electricity Rate", Constant::Units::W, thisElecSys.ElecPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisElecSys.Name); SetupOutputVariable(state, "Zone Radiant HVAC Electricity Energy", Constant::Units::J, thisElecSys.ElecEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisElecSys.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Heating, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Heating); SetupOutputVariable(state, "Zone Radiant HVAC Heating Rate", Constant::Units::W, thisElecSys.HeatPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisElecSys.Name); SetupOutputVariable(state, "Zone Radiant HVAC Heating Energy", Constant::Units::J, thisElecSys.HeatEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisElecSys.Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::HeatingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::HeatingCoils); } } diff --git a/src/EnergyPlus/MicroCHPElectricGenerator.cc b/src/EnergyPlus/MicroCHPElectricGenerator.cc index 78b3cf8a363..409b3df0f3c 100644 --- a/src/EnergyPlus/MicroCHPElectricGenerator.cc +++ b/src/EnergyPlus/MicroCHPElectricGenerator.cc @@ -403,168 +403,166 @@ void MicroCHPDataStruct::setupOutputVars(EnergyPlusData &state) "Generator Off Mode Time", Constant::Units::s, this->A42Model.OffModeTime, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Generator Standby Mode Time", Constant::Units::s, this->A42Model.StandyByModeTime, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Generator Warm Up Mode Time", Constant::Units::s, this->A42Model.WarmUpModeTime, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Generator Normal Operating Mode Time", Constant::Units::s, this->A42Model.NormalModeTime, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Generator Cool Down Mode Time", Constant::Units::s, this->A42Model.CoolDownModeTime, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Generator Produced AC Electricity Rate", Constant::Units::W, this->A42Model.ACPowerGen, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Produced AC Electricity Energy", Constant::Units::J, this->A42Model.ACEnergyGen, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::ElectricityProduced, - OutputProcessor::SOVEndUseCat::Cogeneration, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Cogeneration); SetupOutputVariable(state, "Generator Produced Thermal Rate", Constant::Units::W, this->A42Model.QdotHR, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Produced Thermal Energy", Constant::Units::J, this->A42Model.TotalHeatEnergyRec, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::Cogeneration, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Cogeneration); SetupOutputVariable(state, "Generator Electric Efficiency", Constant::Units::None, this->A42Model.ElecEff, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Thermal Efficiency", Constant::Units::None, this->A42Model.ThermEff, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Gross Input Heat Rate", Constant::Units::W, this->A42Model.Qgross, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Steady State Engine Heat Generation Rate", Constant::Units::W, this->A42Model.Qgenss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Engine Heat Exchange Rate", Constant::Units::W, this->A42Model.QdotHX, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Air Mass Flow Rate", Constant::Units::kg_s, this->A42Model.MdotAir, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Fuel Molar Flow Rate", Constant::Units::kmol_s, this->A42Model.NdotFuel, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Fuel Mass Flow Rate", Constant::Units::kg_s, this->A42Model.MdotFuel, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Engine Temperature", Constant::Units::C, this->A42Model.Teng, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Coolant Inlet Temperature", Constant::Units::C, this->A42Model.HeatRecInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Coolant Outlet Temperature", Constant::Units::C, this->A42Model.HeatRecOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); // this next one needs to be reconciled with non-gas fuel constituents. @@ -573,92 +571,91 @@ void MicroCHPDataStruct::setupOutputVars(EnergyPlusData &state) "Generator Fuel HHV Basis Energy", Constant::Units::J, this->A42Model.FuelEnergyHHV, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::NaturalGas, - OutputProcessor::SOVEndUseCat::Cogeneration, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Cogeneration); SetupOutputVariable(state, "Generator Fuel HHV Basis Rate", Constant::Units::W, this->A42Model.FuelEnergyUseRateHHV, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Fuel LHV Basis Energy", Constant::Units::J, this->A42Model.FuelEnergyLHV, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Generator Fuel LHV Basis Rate", Constant::Units::W, this->A42Model.FuelEnergyUseRateLHV, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Fuel Compressor Electricity Rate", Constant::Units::W, this->A42Model.FuelCompressPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Fuel Compressor Electricity Energy", Constant::Units::J, this->A42Model.FuelCompressEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Generator Fuel Compressor Skin Heat Loss Rate", Constant::Units::W, this->A42Model.FuelCompressSkinLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Zone Sensible Heat Transfer Rate", Constant::Units::W, this->A42Model.SkinLossPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Zone Sensible Heat Transfer Energy", Constant::Units::J, this->A42Model.SkinLossEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Generator Zone Convection Heat Transfer Rate", Constant::Units::W, this->A42Model.SkinLossConvect, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Zone Radiation Heat Transfer Rate", Constant::Units::W, this->A42Model.SkinLossRadiat, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); if (this->ZoneID > 0) { diff --git a/src/EnergyPlus/MicroturbineElectricGenerator.cc b/src/EnergyPlus/MicroturbineElectricGenerator.cc index e82701f498b..7fec013cf98 100644 --- a/src/EnergyPlus/MicroturbineElectricGenerator.cc +++ b/src/EnergyPlus/MicroturbineElectricGenerator.cc @@ -904,28 +904,27 @@ void MTGeneratorSpecs::setupOutputVars(EnergyPlusData &state) "Generator Produced AC Electricity Rate", Constant::Units::W, this->ElecPowerGenerated, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Produced AC Electricity Energy", Constant::Units::J, this->EnergyGen, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::ElectricityProduced, - OutputProcessor::SOVEndUseCat::Cogeneration, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Cogeneration); SetupOutputVariable(state, "Generator LHV Basis Electric Efficiency", Constant::Units::None, this->ElectricEfficiencyLHV, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); // Fuel specific report variables @@ -933,28 +932,27 @@ void MTGeneratorSpecs::setupOutputVars(EnergyPlusData &state) format("Generator {} HHV Basis Rate", sFuelType), Constant::Units::W, this->FuelEnergyUseRateHHV, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, format("Generator {} HHV Basis Energy", sFuelType), Constant::Units::J, this->FuelEnergyHHV, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eFuel2eResource[(int)this->FuelType], - OutputProcessor::SOVEndUseCat::Cogeneration, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Cogeneration); SetupOutputVariable(state, format("Generator {} Mass Flow Rate", sFuelType), Constant::Units::kg_s, this->FuelMdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); // general fuel use report (to match other generators) @@ -962,16 +960,16 @@ void MTGeneratorSpecs::setupOutputVars(EnergyPlusData &state) "Generator Fuel HHV Basis Rate", Constant::Units::W, this->FuelEnergyUseRateHHV, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Fuel HHV Basis Energy", Constant::Units::J, this->FuelEnergyHHV, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); // Heat recovery (to water) report variables @@ -981,52 +979,51 @@ void MTGeneratorSpecs::setupOutputVars(EnergyPlusData &state) "Generator Produced Thermal Rate", Constant::Units::W, this->QHeatRecovered, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Produced Thermal Energy", Constant::Units::J, this->ExhaustEnergyRec, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::HeatRecovery, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::HeatRecovery); SetupOutputVariable(state, "Generator Thermal Efficiency LHV Basis", Constant::Units::None, this->ThermalEfficiencyLHV, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Heat Recovery Inlet Temperature", Constant::Units::C, this->HeatRecInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Heat Recovery Outlet Temperature", Constant::Units::C, this->HeatRecOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Heat Recovery Water Mass Flow Rate", Constant::Units::kg_s, this->HeatRecMdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); } @@ -1035,21 +1032,20 @@ void MTGeneratorSpecs::setupOutputVars(EnergyPlusData &state) "Generator Standby Electricity Rate", Constant::Units::W, this->StandbyPowerRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Standby Electricity Energy", Constant::Units::J, this->StandbyEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cogeneration, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Cogeneration); } if (this->AncillaryPower > 0.0) { // Report Ancillary Power if entered by user @@ -1057,16 +1053,16 @@ void MTGeneratorSpecs::setupOutputVars(EnergyPlusData &state) "Generator Ancillary Electricity Rate", Constant::Units::W, this->AncillaryPowerRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Ancillary Electricity Energy", Constant::Units::J, this->AncillaryEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); } @@ -1076,16 +1072,16 @@ void MTGeneratorSpecs::setupOutputVars(EnergyPlusData &state) "Generator Exhaust Air Mass Flow Rate", Constant::Units::kg_s, this->ExhaustAirMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator Exhaust Air Temperature", Constant::Units::C, this->ExhaustAirTemperature, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); } } diff --git a/src/EnergyPlus/MixedAir.cc b/src/EnergyPlus/MixedAir.cc index 2d2e4035d60..a3193ac1013 100644 --- a/src/EnergyPlus/MixedAir.cc +++ b/src/EnergyPlus/MixedAir.cc @@ -2973,103 +2973,103 @@ void InitOAController(EnergyPlusData &state, int const OAControllerNum, bool con "Air System Outdoor Air Economizer Status", Constant::Units::None, loopOAController.EconomizerStatus, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, airloopName); SetupOutputVariable(state, "Air System Outdoor Air Heat Recovery Bypass Status", Constant::Units::None, loopOAController.HeatRecoveryBypassStatus, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, airloopName); SetupOutputVariable(state, "Air System Outdoor Air Heat Recovery Bypass Heating Coil Activity Status", Constant::Units::None, loopOAController.HRHeatingCoilActive, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, airloopName); SetupOutputVariable(state, "Air System Outdoor Air Heat Recovery Bypass Minimum Outdoor Air Mixed Air Temperature", Constant::Units::C, loopOAController.MixedAirTempAtMinOAFlow, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, airloopName); SetupOutputVariable(state, "Air System Outdoor Air High Humidity Control Status", Constant::Units::None, loopOAController.HighHumCtrlStatus, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, airloopName); SetupOutputVariable(state, "Air System Outdoor Air Limiting Factor", Constant::Units::None, loopOAController.OALimitingFactorReport, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, airloopName); SetupOutputVariable(state, "Air System Outdoor Air Flow Fraction", Constant::Units::None, loopOAController.OAFractionRpt, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, airloopName); SetupOutputVariable(state, "Air System Outdoor Air Minimum Flow Fraction", Constant::Units::None, loopOAController.MinOAFracLimit, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, airloopName); SetupOutputVariable(state, "Air System Outdoor Air Mass Flow Rate", Constant::Units::kg_s, loopOAController.OAMassFlow, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, airloopName); SetupOutputVariable(state, "Air System Mixed Air Mass Flow Rate", Constant::Units::kg_s, loopOAController.MixMassFlow, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, airloopName); SetupOutputVariable(state, "Air System Relief Air Heat Transfer Rate", Constant::Units::W, loopOAController.RelTotalLossRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, airloopName); SetupOutputVariable(state, "Air System Relief Air Sensible Heat Transfer Rate", Constant::Units::W, loopOAController.RelSensiLossRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, airloopName); SetupOutputVariable(state, "Air System Relief Air Latent Heat Transfer Rate", Constant::Units::W, loopOAController.RelLatentLossRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, airloopName); if (loopOAController.MixedAirSPMNum > 0) { @@ -3077,8 +3077,8 @@ void InitOAController(EnergyPlusData &state, int const OAControllerNum, bool con "Air System Outdoor Air Maximum Flow Fraction", Constant::Units::None, loopOAController.MaxOAFracBySetPoint, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, airloopName); } @@ -3101,8 +3101,8 @@ void InitOAController(EnergyPlusData &state, int const OAControllerNum, bool con "Air System Outdoor Air Mechanical Ventilation Requested Mass Flow Rate", Constant::Units::kg_s, loopOAController.MechVentOAMassFlowRequest, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, airloopName); if (!state.dataMixedAir->VentilationMechanical(loopOAController.VentMechObjectNum).DCVFlag) { state.dataAirLoop->AirLoopControlInfo(airLoopNum).AirLoopDCVFlag = false; diff --git a/src/EnergyPlus/MoistureBalanceEMPDManager.cc b/src/EnergyPlus/MoistureBalanceEMPDManager.cc index 1a423807fa5..c3957c87ec6 100644 --- a/src/EnergyPlus/MoistureBalanceEMPDManager.cc +++ b/src/EnergyPlus/MoistureBalanceEMPDManager.cc @@ -396,64 +396,64 @@ void InitMoistureBalanceEMPD(EnergyPlusData &state) "EMPD Surface Inside Face Water Vapor Density", Constant::Units::kg_m3, rvd.rv_surface, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf_name); SetupOutputVariable(state, "EMPD Surface Layer Moisture Content", Constant::Units::kg_m3, rvd.u_surface_layer, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf_name); SetupOutputVariable(state, "EMPD Deep Layer Moisture Content", Constant::Units::kg_m3, rvd.u_deep_layer, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf_name); SetupOutputVariable(state, "EMPD Surface Layer Equivalent Relative Humidity", Constant::Units::Perc, rvd.RH_surface_layer, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf_name); SetupOutputVariable(state, "EMPD Deep Layer Equivalent Relative Humidity", Constant::Units::Perc, rvd.RH_deep_layer, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf_name); SetupOutputVariable(state, "EMPD Surface Layer Equivalent Humidity Ratio", Constant::Units::kgWater_kgDryAir, rvd.w_surface_layer, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf_name); SetupOutputVariable(state, "EMPD Deep Layer Equivalent Humidity Ratio", Constant::Units::kgWater_kgDryAir, rvd.w_deep_layer, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf_name); SetupOutputVariable(state, "EMPD Surface Moisture Flux to Zone", Constant::Units::kg_m2s, rvd.mass_flux_zone, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf_name); SetupOutputVariable(state, "EMPD Deep Layer Moisture Flux", Constant::Units::kg_m2s, rvd.mass_flux_deep, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf_name); } diff --git a/src/EnergyPlus/MundtSimMgr.cc b/src/EnergyPlus/MundtSimMgr.cc index 6e88647be84..7daab626aad 100644 --- a/src/EnergyPlus/MundtSimMgr.cc +++ b/src/EnergyPlus/MundtSimMgr.cc @@ -271,8 +271,8 @@ namespace RoomAir { "Room Air Node Air Temperature", Constant::Units::C, state.dataMundtSimMgr->LineNode(NodeNum, MundtZoneIndex).Temp, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataMundtSimMgr->LineNode(NodeNum, MundtZoneIndex).AirNodeName); AirNodeBeginNum = AirNodeNum + 1; diff --git a/src/EnergyPlus/NodeInputManager.cc b/src/EnergyPlus/NodeInputManager.cc index 630e0b1c9d8..5f67b91ad73 100644 --- a/src/EnergyPlus/NodeInputManager.cc +++ b/src/EnergyPlus/NodeInputManager.cc @@ -215,85 +215,85 @@ void SetupNodeVarsForReporting(EnergyPlusData &state) "System Node Temperature", Constant::Units::C, state.dataLoopNodes->Node(NumNode).Temp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, NodeID(NumNode)); SetupOutputVariable(state, "System Node Mass Flow Rate", Constant::Units::kg_s, Node(NumNode).MassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, NodeID(NumNode)); SetupOutputVariable(state, "System Node Humidity Ratio", Constant::Units::kgWater_kgDryAir, Node(NumNode).HumRat, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, NodeID(NumNode)); SetupOutputVariable(state, "System Node Setpoint Temperature", Constant::Units::C, Node(NumNode).TempSetPoint, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, NodeID(NumNode)); SetupOutputVariable(state, "System Node Setpoint High Temperature", Constant::Units::C, Node(NumNode).TempSetPointHi, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, NodeID(NumNode)); SetupOutputVariable(state, "System Node Setpoint Low Temperature", Constant::Units::C, Node(NumNode).TempSetPointLo, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, NodeID(NumNode)); SetupOutputVariable(state, "System Node Setpoint Humidity Ratio", Constant::Units::kgWater_kgDryAir, Node(NumNode).HumRatSetPoint, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, NodeID(NumNode)); SetupOutputVariable(state, "System Node Setpoint Minimum Humidity Ratio", Constant::Units::kgWater_kgDryAir, Node(NumNode).HumRatMin, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, NodeID(NumNode)); SetupOutputVariable(state, "System Node Setpoint Maximum Humidity Ratio", Constant::Units::kgWater_kgDryAir, Node(NumNode).HumRatMax, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, NodeID(NumNode)); SetupOutputVariable(state, "System Node Relative Humidity", Constant::Units::Perc, state.dataLoopNodes->MoreNodeInfo(NumNode).RelHumidity, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, NodeID(NumNode)); SetupOutputVariable(state, "System Node Pressure", Constant::Units::Pa, Node(NumNode).Press, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, NodeID(NumNode)); SetupOutputVariable(state, "System Node Standard Density Volume Flow Rate", Constant::Units::m3_s, state.dataLoopNodes->MoreNodeInfo(NumNode).VolFlowRateStdRho, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, NodeID(NumNode)); if (Node(NumNode).FluidType == DataLoopNode::NodeFluidType::Air || Node(NumNode).FluidType == DataLoopNode::NodeFluidType::Water) { // setup volume flow rate report for actual/current density @@ -301,22 +301,22 @@ void SetupNodeVarsForReporting(EnergyPlusData &state) "System Node Current Density Volume Flow Rate", Constant::Units::m3_s, state.dataLoopNodes->MoreNodeInfo(NumNode).VolFlowRateCrntRho, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, NodeID(NumNode)); SetupOutputVariable(state, "System Node Current Density", Constant::Units::kg_m3, state.dataLoopNodes->MoreNodeInfo(NumNode).Density, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, NodeID(NumNode)); SetupOutputVariable(state, "System Node Specific Heat", Constant::Units::J_kgK, state.dataLoopNodes->MoreNodeInfo(NumNode).SpecificHeat, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, NodeID(NumNode)); } @@ -324,121 +324,121 @@ void SetupNodeVarsForReporting(EnergyPlusData &state) "System Node Enthalpy", Constant::Units::J_kg, state.dataLoopNodes->MoreNodeInfo(NumNode).ReportEnthalpy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, NodeID(NumNode)); SetupOutputVariable(state, "System Node Wetbulb Temperature", Constant::Units::C, state.dataLoopNodes->MoreNodeInfo(NumNode).WetBulbTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, NodeID(NumNode)); SetupOutputVariable(state, "System Node Dewpoint Temperature", Constant::Units::C, state.dataLoopNodes->MoreNodeInfo(NumNode).AirDewPointTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, NodeID(NumNode)); SetupOutputVariable(state, "System Node Wind Speed", Constant::Units::m_s, Node(NumNode).OutAirWindSpeed, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, NodeID(NumNode)); SetupOutputVariable(state, "System Node Wind Direction", Constant::Units::deg, Node(NumNode).OutAirWindDir, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, NodeID(NumNode)); SetupOutputVariable(state, "System Node Quality", Constant::Units::None, Node(NumNode).Quality, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, NodeID(NumNode)); SetupOutputVariable(state, "System Node Height", Constant::Units::m, Node(NumNode).Height, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, NodeID(NumNode)); if (state.dataGlobal->DisplayAdvancedReportVariables) { SetupOutputVariable(state, "System Node Minimum Temperature", Constant::Units::C, Node(NumNode).TempMin, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, NodeID(NumNode)); SetupOutputVariable(state, "System Node Maximum Temperature", Constant::Units::C, Node(NumNode).TempMax, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, NodeID(NumNode)); SetupOutputVariable(state, "System Node Minimum Limit Mass Flow Rate", Constant::Units::kg_s, Node(NumNode).MassFlowRateMin, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, NodeID(NumNode)); SetupOutputVariable(state, "System Node Maximum Limit Mass Flow Rate", Constant::Units::kg_s, Node(NumNode).MassFlowRateMax, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, NodeID(NumNode)); SetupOutputVariable(state, "System Node Minimum Available Mass Flow Rate", Constant::Units::kg_s, Node(NumNode).MassFlowRateMinAvail, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, NodeID(NumNode)); SetupOutputVariable(state, "System Node Maximum Available Mass Flow Rate", Constant::Units::kg_s, Node(NumNode).MassFlowRateMaxAvail, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, NodeID(NumNode)); SetupOutputVariable(state, "System Node Setpoint Mass Flow Rate", Constant::Units::kg_s, Node(NumNode).MassFlowRateSetPoint, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, NodeID(NumNode)); SetupOutputVariable(state, "System Node Requested Mass Flow Rate", Constant::Units::kg_s, Node(NumNode).MassFlowRateRequest, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, NodeID(NumNode)); SetupOutputVariable(state, "System Node Last Timestep Temperature", Constant::Units::C, Node(NumNode).TempLastTimestep, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, NodeID(NumNode)); SetupOutputVariable(state, "System Node Last Timestep Enthalpy", Constant::Units::J_kg, Node(NumNode).EnthalpyLastTimestep, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, NodeID(NumNode)); } if (state.dataContaminantBalance->Contaminant.CO2Simulation) { @@ -446,8 +446,8 @@ void SetupNodeVarsForReporting(EnergyPlusData &state) "System Node CO2 Concentration", Constant::Units::ppm, Node(NumNode).CO2, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, NodeID(NumNode)); } if (state.dataContaminantBalance->Contaminant.GenericContamSimulation) { @@ -455,8 +455,8 @@ void SetupNodeVarsForReporting(EnergyPlusData &state) "System Node Generic Air Contaminant Concentration", Constant::Units::ppm, Node(NumNode).GenContam, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, NodeID(NumNode)); } } diff --git a/src/EnergyPlus/OutdoorAirUnit.cc b/src/EnergyPlus/OutdoorAirUnit.cc index 1e8f92fa00f..9d04a5cfaf0 100644 --- a/src/EnergyPlus/OutdoorAirUnit.cc +++ b/src/EnergyPlus/OutdoorAirUnit.cc @@ -1017,113 +1017,113 @@ namespace OutdoorAirUnit { "Zone Outdoor Air Unit Total Heating Rate", Constant::Units::W, thisOutAirUnit.TotHeatingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisOutAirUnit.Name); SetupOutputVariable(state, "Zone Outdoor Air Unit Total Heating Energy", Constant::Units::J, thisOutAirUnit.TotHeatingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisOutAirUnit.Name); SetupOutputVariable(state, "Zone Outdoor Air Unit Sensible Heating Rate", Constant::Units::W, thisOutAirUnit.SensHeatingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisOutAirUnit.Name); SetupOutputVariable(state, "Zone Outdoor Air Unit Sensible Heating Energy", Constant::Units::J, thisOutAirUnit.SensHeatingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisOutAirUnit.Name); SetupOutputVariable(state, "Zone Outdoor Air Unit Latent Heating Rate", Constant::Units::W, thisOutAirUnit.LatHeatingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisOutAirUnit.Name); SetupOutputVariable(state, "Zone Outdoor Air Unit Latent Heating Energy", Constant::Units::J, thisOutAirUnit.LatHeatingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisOutAirUnit.Name); SetupOutputVariable(state, "Zone Outdoor Air Unit Total Cooling Rate", Constant::Units::W, thisOutAirUnit.TotCoolingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisOutAirUnit.Name); SetupOutputVariable(state, "Zone Outdoor Air Unit Total Cooling Energy", Constant::Units::J, thisOutAirUnit.TotCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisOutAirUnit.Name); SetupOutputVariable(state, "Zone Outdoor Air Unit Sensible Cooling Rate", Constant::Units::W, thisOutAirUnit.SensCoolingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisOutAirUnit.Name); SetupOutputVariable(state, "Zone Outdoor Air Unit Sensible Cooling Energy", Constant::Units::J, thisOutAirUnit.SensCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisOutAirUnit.Name); SetupOutputVariable(state, "Zone Outdoor Air Unit Latent Cooling Rate", Constant::Units::W, thisOutAirUnit.LatCoolingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisOutAirUnit.Name); SetupOutputVariable(state, "Zone Outdoor Air Unit Latent Cooling Energy", Constant::Units::J, thisOutAirUnit.LatCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisOutAirUnit.Name); SetupOutputVariable(state, "Zone Outdoor Air Unit Air Mass Flow Rate", Constant::Units::kg_s, thisOutAirUnit.AirMassFlow, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisOutAirUnit.Name); SetupOutputVariable(state, "Zone Outdoor Air Unit Fan Electricity Rate", Constant::Units::W, thisOutAirUnit.ElecFanRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisOutAirUnit.Name); SetupOutputVariable(state, "Zone Outdoor Air Unit Fan Electricity Energy", Constant::Units::J, thisOutAirUnit.ElecFanEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisOutAirUnit.Name); SetupOutputVariable(state, "Zone Outdoor Air Unit Fan Availability Status", Constant::Units::None, thisOutAirUnit.AvailStatus, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisOutAirUnit.Name); //! Note that the outdoor air unit fan electric is NOT metered because this value is already metered through the fan component } diff --git a/src/EnergyPlus/OutputProcessor.cc b/src/EnergyPlus/OutputProcessor.cc index 1e7f4434856..11f04dd6102 100644 --- a/src/EnergyPlus/OutputProcessor.cc +++ b/src/EnergyPlus/OutputProcessor.cc @@ -187,7 +187,7 @@ namespace OutputProcessor { state.files.mtd.ensure_open(state, "InitializeMeters", state.files.outputControl.mtd); } // InitializeOutput() - void addEndUseSubcategory(EnergyPlusData &state, SOVEndUseCat sovEndUseCat, std::string_view const endUseSubName) + void addEndUseSubcategory(EnergyPlusData &state, EndUseCat endUseCat, std::string_view const endUseSubName) { // SUBROUTINE INFORMATION: // AUTHOR Peter Graham Ellis @@ -199,37 +199,37 @@ namespace OutputProcessor { // SUBROUTINE LOCAL VARIABLE DECLARATIONS: auto &op = state.dataOutputProcessor; - Constant::EndUse endUse = sovEndUseCat2endUse[(int)sovEndUseCat]; + Constant::EndUse endUse = endUseCat2endUse[(int)endUseCat]; if (endUse == Constant::EndUse::Invalid) { - ShowSevereError(state, format("Nonexistent end use passed to addEndUseSpaceType={}", sovEndUseCatNames[(int)sovEndUseCat])); + ShowSevereError(state, format("Nonexistent end use passed to addEndUseSpaceType={}", endUseCatNames[(int)endUseCat])); return; } - auto &endUseCat = op->EndUseCategory((int)endUse + 1); + auto &endUseCategory = op->EndUseCategory((int)endUse + 1); - for (int EndUseSubNum = 1; EndUseSubNum <= endUseCat.NumSubcategories; ++EndUseSubNum) { - if (Util::SameString(endUseCat.SubcategoryName(EndUseSubNum), endUseSubName)) { + for (int EndUseSubNum = 1; EndUseSubNum <= endUseCategory.NumSubcategories; ++EndUseSubNum) { + if (Util::SameString(endUseCategory.SubcategoryName(EndUseSubNum), endUseSubName)) { return; // Subcategory already exists, no further action required } } // Add the subcategory by reallocating the array - endUseCat.SubcategoryName.redimension(++endUseCat.NumSubcategories); - endUseCat.SubcategoryName(endUseCat.NumSubcategories) = endUseSubName; + endUseCategory.SubcategoryName.redimension(++endUseCategory.NumSubcategories); + endUseCategory.SubcategoryName(endUseCategory.NumSubcategories) = endUseSubName; - if (endUseCat.NumSubcategories > op->MaxNumSubcategories) { - op->MaxNumSubcategories = endUseCat.NumSubcategories; + if (endUseCategory.NumSubcategories > op->MaxNumSubcategories) { + op->MaxNumSubcategories = endUseCategory.NumSubcategories; } } // addEndUseSubcategory() - void addEndUseSpaceType(EnergyPlusData &state, OutputProcessor::SOVEndUseCat sovEndUseCat, std::string_view const EndUseSpaceTypeName) + void addEndUseSpaceType(EnergyPlusData &state, OutputProcessor::EndUseCat sovEndUseCat, std::string_view const EndUseSpaceTypeName) { auto &op = state.dataOutputProcessor; - Constant::EndUse endUse = sovEndUseCat2endUse[(int)sovEndUseCat]; + Constant::EndUse endUse = endUseCat2endUse[(int)sovEndUseCat]; if (endUse == Constant::EndUse::Invalid) { - ShowSevereError(state, format("Nonexistent end use passed to addEndUseSpaceType={}", sovEndUseCatNames[(int)sovEndUseCat])); + ShowSevereError(state, format("Nonexistent end use passed to addEndUseSpaceType={}", endUseCatNames[(int)sovEndUseCat])); return; } @@ -251,8 +251,8 @@ namespace OutputProcessor { } // addEndUseSpaceType() void SetupTimePointers(EnergyPlusData &state, - SOVTimeStepType const sovTimeStep, // Which timestep is being set up, 'Zone'=1, 'HVAC'=2 - Real64 &TimeStep // The timestep variable. Used to get the address + TimeStepType const timeStep, // Which timestep is being set up, 'Zone'=1, 'HVAC'=2 + Real64 &TimeStep // The timestep variable. Used to get the address ) { @@ -272,10 +272,8 @@ namespace OutputProcessor { // SUBROUTINE LOCAL VARIABLE DECLARATIONS: // ValidateTimeStepType will throw a Fatal if not valid - TimeStepType timeStep = sovTimeStep2TimeStep[(int)sovTimeStep]; - if (state.dataOutputProcessor->TimeValue[(int)timeStep].TimeStep != nullptr) { - ShowFatalError(state, format("SetupTimePointers was already called for {}", sovTimeStepTypeStrings[(int)sovTimeStep])); + ShowFatalError(state, format("SetupTimePointers was already called for {}", timeStepTypeNames[(int)timeStep])); } state.dataOutputProcessor->TimeValue[(int)timeStep].TimeStep = &TimeStep; } @@ -547,9 +545,8 @@ namespace OutputProcessor { } } - void ProduceMinMaxString(std::string &String, // Current value - int const DateValue, // Date of min/max - ReportFreq const ReportFreq // Reporting Frequency + std::string produceDateString(int const date, // Date of min/max + ReportFreq const freq // Reporting Frequency ) { @@ -565,32 +562,24 @@ namespace OutputProcessor { // Prior to calling this routine, the basic value string will be // produced, but DecodeMonDayHrMin will not have been called. - // SUBROUTINE PARAMETER DEFINITIONS: - static constexpr std::string_view DayFormat("{},{:2},{:2}"); - static constexpr std::string_view MonthFormat("{},{:2},{:2},{:2}"); - static constexpr std::string_view EnvrnFormat("{},{:2},{:2},{:2},{:2}"); - // SUBROUTINE LOCAL VARIABLE DECLARATIONS: int Mon; int Day; int Hour; int Minute; - General::DecodeMonDayHrMin(DateValue, Mon, Day, Hour, Minute); - switch (ReportFreq) { + General::DecodeMonDayHrMin(date, Mon, Day, Hour, Minute); + + switch (freq) { case ReportFreq::Day: - String = format(DayFormat, strip(String), Hour, Minute); - return; + return format("{:2},{:2}", Hour, Minute); case ReportFreq::Month: - String = format(MonthFormat, strip(String), Day, Hour, Minute); - return; + return format("{:2},{:2},{:2}", Day, Hour, Minute); case ReportFreq::Year: case ReportFreq::Simulation: - String = format(EnvrnFormat, strip(String), Mon, Day, Hour, Minute); - return; - default: // Each, TimeStep, Hourly dont have this - String = std::string(); - return; + return format("{:2},{:2},{:2},{:2}", Mon, Day, Hour, Minute); + default: + return std::string(); } } @@ -813,7 +802,7 @@ namespace OutputProcessor { auto *srcDDVar = op->ddOutVars[srcDDVarNum]; // Has to be a summed variable - if (srcDDVar->storeType != StoreType::Summed) { + if (srcDDVar->storeType != StoreType::Sum) { ShowWarningCustomMessage(state, eoh, format(R"(Meter:Custom="{}", variable not summed variable {}="{}".)", @@ -1135,7 +1124,7 @@ namespace OutputProcessor { auto *srcDDVar = op->ddOutVars[srcDDVarNum]; // Has to be a summed variable - if (srcDDVar->storeType != StoreType::Summed) { + if (srcDDVar->storeType != StoreType::Sum) { ShowWarningCustomMessage(state, eoh, format(R"(Meter:Custom="{}", variable not summed variable {}="{}".)", @@ -1347,9 +1336,9 @@ namespace OutputProcessor { std::string const &Name, // Name for the meter Constant::Units const units, // Units for the meter Constant::eResource resource, // ResourceType for the meter - SOVEndUseCat sovEndUseCat, // EndUse for the meter + EndUseCat endUseCat, // EndUse for the meter std::string_view const EndUseSub, // EndUse subcategory for the meter - SOVGroup sovGroup, + Group group, int outVarNum) // Variable index { @@ -1382,9 +1371,9 @@ namespace OutputProcessor { meter->type = MeterType::Normal; meter->resource = resource; - meter->sovEndUseCat = sovEndUseCat; + meter->endUseCat = endUseCat; meter->EndUseSub = EndUseSub; - meter->sovGroup = sovGroup; + meter->group = group; meter->units = units; meter->CurTSValue = 0.0; @@ -1421,9 +1410,9 @@ namespace OutputProcessor { void AttachMeters(EnergyPlusData &state, Constant::Units const units, // Units for this meter Constant::eResource resource, // Electricity, Gas, etc. - SOVEndUseCat sovEndUseCat, // End-use category (Lights, Heating, etc.) + EndUseCat endUseCat, // End-use category (Lights, Heating, etc.) std::string_view const EndUseSub, // End-use subcategory (user-defined, e.g., General Lights, Task Lights, etc.) - SOVGroup sovGroup, // Group key (Facility, Zone, Building, etc.) + Group group, // Group key (Facility, Zone, Building, etc.) std::string const &ZoneName, // Zone key only applicable for Building group std::string const &SpaceType, // Space Type key only applicable for Building group int const outVarNum // Number of this report variable @@ -1440,74 +1429,74 @@ namespace OutputProcessor { std::string_view resourceName = Constant::eResourceNames[(int)resource]; - std::string endUseSub = standardizeEndUseSub(sovEndUseCat, EndUseSub); + std::string endUseSub = standardizeEndUseSub(endUseCat, EndUseSub); - if (!endUseSub.empty()) addEndUseSubcategory(state, sovEndUseCat, endUseSub); + if (!endUseSub.empty()) addEndUseSubcategory(state, endUseCat, endUseSub); - if (!SpaceType.empty()) addEndUseSpaceType(state, sovEndUseCat, SpaceType); + if (!SpaceType.empty()) addEndUseSpaceType(state, endUseCat, SpaceType); std::string meterName = format("{}:Facility", resourceName); - AddMeter(state, meterName, units, resource, SOVEndUseCat::Invalid, "", SOVGroup::Invalid, outVarNum); + AddMeter(state, meterName, units, resource, EndUseCat::Invalid, "", Group::Invalid, outVarNum); - if (sovGroup != SOVGroup::Invalid) { - std::string groupMeterName = format("{}:{}", resourceName, sovGroupNames[(int)sovGroup]); - AddMeter(state, groupMeterName, units, resource, SOVEndUseCat::Invalid, "", sovGroup, outVarNum); + if (group != Group::Invalid) { + std::string groupMeterName = format("{}:{}", resourceName, groupNames[(int)group]); + AddMeter(state, groupMeterName, units, resource, EndUseCat::Invalid, "", group, outVarNum); - if (sovGroup == SOVGroup::Building) { + if (group == Group::Building) { if (!ZoneName.empty()) { std::string zoneMeterName = format("{}:Zone:{}", resourceName, ZoneName); - AddMeter(state, zoneMeterName, units, resource, SOVEndUseCat::Invalid, "", SOVGroup::Zone, outVarNum); + AddMeter(state, zoneMeterName, units, resource, EndUseCat::Invalid, "", Group::Zone, outVarNum); } if (!SpaceType.empty()) { std::string spaceMeterName = format("{}:SpaceType:{}", resourceName, SpaceType); - AddMeter(state, spaceMeterName, units, resource, SOVEndUseCat::Invalid, "", SOVGroup::SpaceType, outVarNum); + AddMeter(state, spaceMeterName, units, resource, EndUseCat::Invalid, "", Group::SpaceType, outVarNum); } } // if (Group == "Building") } //!! Following if we do EndUse by ResourceType - if (sovEndUseCat != SOVEndUseCat::Invalid) { - std::string_view sovEndUseCatName = sovEndUseCatNames[(int)sovEndUseCat]; - std::string enduseMeterName = format("{}:{}", sovEndUseCatName, resourceName); - AddMeter(state, enduseMeterName, units, resource, sovEndUseCat, "", SOVGroup::Invalid, outVarNum); + if (endUseCat != EndUseCat::Invalid) { + std::string_view endUseCatName = endUseCatNames[(int)endUseCat]; + std::string enduseMeterName = format("{}:{}", endUseCatName, resourceName); + AddMeter(state, enduseMeterName, units, resource, endUseCat, "", Group::Invalid, outVarNum); - if (sovGroup == SOVGroup::Building) { // Match to Zone and Space + if (group == Group::Building) { // Match to Zone and Space if (!ZoneName.empty()) { - std::string enduseZoneMeterName = format("{}:{}:Zone:{}", sovEndUseCatName, resourceName, ZoneName); - AddMeter(state, enduseZoneMeterName, units, resource, sovEndUseCat, "", SOVGroup::Zone, outVarNum); + std::string enduseZoneMeterName = format("{}:{}:Zone:{}", endUseCatName, resourceName, ZoneName); + AddMeter(state, enduseZoneMeterName, units, resource, endUseCat, "", Group::Zone, outVarNum); } if (!SpaceType.empty()) { - std::string enduseSpaceMeterName = format("{}:{}:SpaceType:{}", sovEndUseCatName, resourceName, SpaceType); - AddMeter(state, enduseSpaceMeterName, units, resource, sovEndUseCat, "", SOVGroup::SpaceType, outVarNum); + std::string enduseSpaceMeterName = format("{}:{}:SpaceType:{}", endUseCatName, resourceName, SpaceType); + AddMeter(state, enduseSpaceMeterName, units, resource, endUseCat, "", Group::SpaceType, outVarNum); } } // End-Use Subcategories if (!endUseSub.empty()) { - std::string subEnduseMeterName = format("{}:{}:{}", endUseSub, sovEndUseCatNames[(int)sovEndUseCat], resourceName); - AddMeter(state, subEnduseMeterName, units, resource, sovEndUseCat, endUseSub, SOVGroup::Invalid, outVarNum); + std::string subEnduseMeterName = format("{}:{}:{}", endUseSub, endUseCatNames[(int)endUseCat], resourceName); + AddMeter(state, subEnduseMeterName, units, resource, endUseCat, endUseSub, Group::Invalid, outVarNum); - if (sovGroup == SOVGroup::Building) { // Match to Zone and Space + if (group == Group::Building) { // Match to Zone and Space if (!ZoneName.empty()) { - std::string subEnduseZoneMeterName = format("{}:{}:{}:Zone:{}", endUseSub, sovEndUseCatName, resourceName, ZoneName); - AddMeter(state, subEnduseZoneMeterName, units, resource, sovEndUseCat, endUseSub, SOVGroup::Zone, outVarNum); + std::string subEnduseZoneMeterName = format("{}:{}:{}:Zone:{}", endUseSub, endUseCatName, resourceName, ZoneName); + AddMeter(state, subEnduseZoneMeterName, units, resource, endUseCat, endUseSub, Group::Zone, outVarNum); } if (!SpaceType.empty()) { - std::string subEnduseSpaceMeterName = format("{}:{}:{}:SpaceType:{}", endUseSub, sovEndUseCatName, resourceName, SpaceType); - AddMeter(state, subEnduseSpaceMeterName, units, resource, sovEndUseCat, endUseSub, SOVGroup::SpaceType, outVarNum); + std::string subEnduseSpaceMeterName = format("{}:{}:{}:SpaceType:{}", endUseSub, endUseCatName, resourceName, SpaceType); + AddMeter(state, subEnduseSpaceMeterName, units, resource, endUseCat, endUseSub, Group::SpaceType, outVarNum); } } // if (sovGroup == Building) } // if (!endUseSub.empty()) } // if (sovEndUseCat != Invalid) } // AttachMeters() - std::string standardizeEndUseSub(SOVEndUseCat sovEndUseCat, std::string_view endUseSubName) + std::string standardizeEndUseSub(EndUseCat endUseCat, std::string_view endUseSubName) { if (!endUseSubName.empty()) { return std::string(endUseSubName); - } else if (sovEndUseCat == SOVEndUseCat::Invalid) { + } else if (endUseCat == EndUseCat::Invalid) { return ""; - } else if (sovEndUseCat2endUse[(int)sovEndUseCat] != Constant::EndUse::Invalid) { + } else if (endUseCat2endUse[(int)endUseCat] != Constant::EndUse::Invalid) { return "General"; } else { return ""; @@ -1812,15 +1801,7 @@ namespace OutputProcessor { } if (periodTS.Rpt) { - WriteReportMeterData(state, - periodTS.RptNum, - periodTS.Value, - ReportFreq::TimeStep, - -1.0, // MinValue - -1, // MinValueDate - -1.0, // MaxValue - -1, // MaxValueDate - periodTS.RptFO); + periodTS.WriteReportData(state, ReportFreq::TimeStep); rfMetersTS.pushVariableValue(periodTS.RptNum, periodTS.Value); } @@ -1953,16 +1934,7 @@ namespace OutputProcessor { } if (period.Rpt) { - WriteReportMeterData(state, - period.RptNum, - period.Value, - freq, - (freq == ReportFreq::Hour) ? -1.0 : period.MinVal, - (freq == ReportFreq::Hour) ? -1 : period.MinValDate, - (freq == ReportFreq::Hour) ? -1.0 : period.MaxVal, - (freq == ReportFreq::Hour) ? -1 : period.MaxValDate, - period.RptFO); // EnergyMeters(Loop)%HRMinVal, EnergyMeters(Loop)%HRMinValDate, & | - // EnergyMeters(Loop)%HRMaxVal, EnergyMeters(Loop)%HRMaxValDate, & + period.WriteReportData(state, freq); rfMeters.pushVariableValue(period.RptNum, period.Value); period.Value = 0.0; @@ -2233,11 +2205,11 @@ namespace OutputProcessor { if (meter->resource != Constant::eResource::Invalid) { print(state.files.mtd, ", ResourceType={}", Constant::eResourceNames[(int)meter->resource]); } - if (meter->sovEndUseCat != SOVEndUseCat::Invalid) { - print(state.files.mtd, ", EndUse={}", sovEndUseCatNames[(int)meter->sovEndUseCat]); + if (meter->endUseCat != EndUseCat::Invalid) { + print(state.files.mtd, ", EndUse={}", endUseCatNames[(int)meter->endUseCat]); } - if (meter->sovGroup != SOVGroup::Invalid) { - print(state.files.mtd, ", Group={}", sovGroupNames[(int)meter->sovGroup]); + if (meter->group != Group::Invalid) { + print(state.files.mtd, ", Group={}", groupNames[(int)meter->group]); } print(state.files.mtd, ", contents are:\n"); @@ -2438,18 +2410,7 @@ namespace OutputProcessor { } } // WriteYearlyTimeStamp() - void WriteReportVariableDictionaryItem(EnergyPlusData &state, - ReportFreq const freq, // The reporting interval (e.g., hourly, daily) - StoreType const storeType, - int const reportID, // The reporting ID for the data - [[maybe_unused]] int const indexGroupKey, // The reporting group (e.g., Zone, Plant Loop, etc.) - std::string const &indexGroup, // The reporting group (e.g., Zone, Plant Loop, etc.) - std::string_view const keyedValue, // The key name for the data - std::string_view const variableName, // The variable's actual name - TimeStepType const timeStepType, - Constant::Units const units, // The variables units - std::string_view const customUnitName, - std::string_view const ScheduleName) + void OutVar::writeReportDictionaryItem(EnergyPlusData &state) { // SUBROUTINE INFORMATION: @@ -2467,21 +2428,23 @@ namespace OutputProcessor { auto &rf = state.dataResultsFramework->resultsFramework; auto &sql = state.dataSQLiteProcedures->sqlite; - std::string_view unitsString = (units == Constant::Units::customEMS && !customUnitName.empty()) - ? customUnitName + std::string_view unitsString = (units == Constant::Units::customEMS && !unitNameCustomEMS.empty()) + ? unitNameCustomEMS : ((units == Constant::Units::Invalid) ? "" : Constant::unitNames[(int)units]); + std::string schedString = (SchedPtr != 0) ? state.dataScheduleMgr->Schedule(SchedPtr).Name : ""; + if (state.files.eso.good()) { print(state.files.eso, "{},{},{},{} [{}]{}{}{}\n", - reportID, + ReportID, reportFreqArbitraryInts[(int)freq], - keyedValue, - variableName, + key, + name, unitsString, reportingFrequencyNoticeStrings[(int)freq], - !ScheduleName.empty() ? "," : "", - ScheduleName); + !schedString.empty() ? "," : "", + schedString); } if (freq == ReportFreq::Hour || freq == ReportFreq::Day || freq == ReportFreq::Month || freq == ReportFreq::Year || @@ -2489,25 +2452,23 @@ namespace OutputProcessor { op->freqTrackingVariables[(int)freq] = true; if (sql) { - sql->createSQLiteReportDictionaryRecord( - reportID, storeType, indexGroup, keyedValue, variableName, timeStepType, unitsString, freq, false, ScheduleName); + sql->createSQLiteReportDictionaryRecord(ReportID, storeType, indexGroup, key, name, timeStepType, unitsString, freq, false, schedString); } // add to ResultsFramework for output variable list, need to check RVI/MVI later - rf->addReportVariable(keyedValue, variableName, unitsString, freq); + rf->addReportVariable(key, name, unitsString, freq); - } // WriteReportVariableDictionaryItem() + } // OutVar::WriteReportDictionaryItem() void WriteMeterDictionaryItem(EnergyPlusData &state, ReportFreq const freq, // The reporting interval (e.g., hourly, daily) StoreType const storeType, - int const reportID, // The reporting ID in for the variable - [[maybe_unused]] int const indexGroupKey, // The reporting group for the variable - std::string const &indexGroup, // The reporting group for the variable - std::string const &meterName, // The variable's meter name - Constant::Units const units, // The variables units - bool const cumulativeMeterFlag, // A flag indicating cumulative data - bool const meterFileOnlyFlag // A flag indicating whether the data is to be written to standard output + int const reportID, // The reporting ID in for the variable + std::string const &indexGroup, // The reporting group for the variable + std::string const &meterName, // The variable's meter name + Constant::Units const units, // The variables units + bool const cumulativeMeterFlag, // A flag indicating cumulative data + bool const meterFileOnlyFlag // A flag indicating whether the data is to be written to standard output ) { @@ -2565,9 +2526,8 @@ namespace OutputProcessor { } // WriteMeterDictionaryItem() - void WriteRealVariableOutput(EnergyPlusData &state, - OutVarReal *realVar, // Real variable to write out - ReportFreq const reportFreq // The report type or interval (e.g., hourly) + void OutVar::writeOutput(EnergyPlusData &state, + ReportFreq const reportFreq // The report type or interval (e.g., hourly) ) { @@ -2583,116 +2543,21 @@ namespace OutputProcessor { // of the UpdateDataandReport subroutine. The code was moved to facilitate // easier maintenance and writing of data to the SQL database. - if (realVar->Report && realVar->freq == reportFreq && realVar->Stored) { - if (realVar->NumStored > 0.0) { - WriteReportRealData(state, - realVar->ReportID, - realVar->StoreValue, - realVar->storeType, - realVar->NumStored, - realVar->freq, - realVar->MinValue, - realVar->minValueDate, - realVar->MaxValue, - realVar->maxValueDate); - ++state.dataGlobal->StdOutputRecordCount; - } - - realVar->StoreValue = 0.0; - realVar->NumStored = 0.0; - realVar->MinValue = MinSetValue; - realVar->MaxValue = MaxSetValue; - realVar->Stored = false; - } - } // WriteRealVariableOutput() - - void WriteReportRealData(EnergyPlusData &state, - int const reportID, - Real64 const repValue, - StoreType const storeType, - Real64 const numOfItemsStored, - ReportFreq const freq, - Real64 const minValue, - int const minValueDate, - Real64 const MaxValue, - int const maxValueDate) - { - - // SUBROUTINE INFORMATION: - // AUTHOR Greg Stark - // DATE WRITTEN July 2008 - // MODIFIED April 2011; Linda Lawrie - // RE-ENGINEERED na - - // PURPOSE OF THIS SUBROUTINE: - // This subroutine writes the average real data to the output files and - // SQL database. It supports the WriteRealVariableOutput subroutine. - // Much of the code here was an included in earlier versions - // of the UpdateDataandReport subroutine. The code was moved to facilitate - // easier maintenance and writing of data to the SQL database. - - std::string NumberOut; // Character for producing "number out" - Real64 repVal(repValue); // The variable's value - auto &rf = state.dataResultsFramework->resultsFramework; - auto &sql = state.dataSQLiteProcedures->sqlite; - - if (storeType == StoreType::Averaged) { - repVal /= numOfItemsStored; - } - if (repVal == 0.0) { - NumberOut = "0.0"; - } else { - char realData[129]; - dtoa(repVal, realData); - NumberOut = std::string(realData); - } + if (state.dataSysVars->UpdateDataDuringWarmupExternalInterface && !state.dataSysVars->ReportDuringWarmup) return; - if (rf->timeSeriesEnabled()) { - //// The others (<= hourly) are handled inline with the code - if (freq == ReportFreq::Day || freq == ReportFreq::Month || freq == ReportFreq::Year || freq == ReportFreq::Simulation) { - rf->freqTSData[(int)freq].pushVariableValue(reportID, repVal); - } - } + if (!Report || freq != reportFreq || !Stored) return; - if (sql) { - sql->createSQLiteReportDataRecord(reportID, repVal, freq, minValue, minValueDate, MaxValue, maxValueDate); + if (NumStored > 0.0) { + writeReportData(state); + ++state.dataGlobal->StdOutputRecordCount; } - if ((freq == ReportFreq::EachCall) || (freq == ReportFreq::TimeStep) || (freq == ReportFreq::Hour)) { // -1, 0, 1 - if (state.files.eso.good()) { - print(state.files.eso, "{},{}\n", reportID, NumberOut); - } - - } else { // if ( ( reportingInterval == ReportFreq::Daily ) || ( reportingInterval == ReportFreq::Monthly ) || ( - // reportingInterval == ReportFreq::Simulation ) ) { // 2, 3, 4, 5 - std::string MaxOut; // Character for Max out string - std::string MinOut; // Character for Min out string - - if (MaxValue == 0.0) { - MaxOut = "0.0"; - } else { - char realData[129]; - dtoa(MaxValue, realData); - MaxOut = std::string(realData); - } - - if (minValue == 0.0) { - MinOut = "0.0"; - } else { - char realData[129]; - dtoa(minValue, realData); - MinOut = std::string(realData); - } - - // Append the min and max strings with date information - ProduceMinMaxString(MinOut, minValueDate, freq); - ProduceMinMaxString(MaxOut, maxValueDate, freq); - - if (state.files.eso.good()) { - print(state.files.eso, "{},{},{},{}\n", reportID, NumberOut, MinOut, MaxOut); - } - } - } // WriteReportRealData() + StoreValue = 0.0; + NumStored = 0.0; + MinValue = MinSetValue; + MaxValue = MaxSetValue; + Stored = false; + } // OutVar::WriteOutput() void WriteCumulativeReportMeterData(EnergyPlusData &state, int const reportID, // The variable's report ID @@ -2735,89 +2600,63 @@ namespace OutputProcessor { } } // WriteCumulativeReportMeterData() - void WriteReportMeterData(EnergyPlusData &state, - int const reportID, // The variable's report ID - Real64 const repValue, // The variable's value - ReportFreq const freq, // The variable's reporting interval (e.g., hourly) - Real64 const minValue, // The variable's minimum value during the reporting interval - int const minValueDate, // The date the minimum value occurred - Real64 const MaxValue, // The variable's maximum value during the reporting interval - int const maxValueDate, // The date of the maximum value - bool const meterOnlyFlag // Indicates whether the data is for the meter file only - ) + void MeterPeriod::WriteReportData(EnergyPlusData &state, ReportFreq const freq) { // SUBROUTINE INFORMATION: // AUTHOR Greg Stark // DATE WRITTEN July 2008 - // MODIFIED na - // RE-ENGINEERED na // PURPOSE OF THIS SUBROUTINE: // This subroutine writes for the non-cumulative meter data to the output files and // SQL database. - std::string NumberOut; // Character for producing "number out" auto &sql = state.dataSQLiteProcedures->sqlite; - if (repValue == 0.0) { + std::string NumberOut; + + if (Value == 0.0) { NumberOut = "0.0"; } else { - char meterData[129]; - dtoa(repValue, meterData); - NumberOut = std::string(meterData); + char tmp[128]; + dtoa(Value, tmp); + NumberOut = std::string(tmp); } if (sql) { - sql->createSQLiteReportDataRecord( - reportID, repValue, freq, minValue, minValueDate, MaxValue, maxValueDate, state.dataGlobal->MinutesPerTimeStep); + sql->createSQLiteReportDataRecord(RptNum, Value, freq, MinVal, MinValDate, MaxVal, MaxValDate, state.dataGlobal->MinutesPerTimeStep); } if ((freq == ReportFreq::EachCall) || (freq == ReportFreq::TimeStep) || (freq == ReportFreq::Hour)) { // -1, 0, 1 if (state.files.mtr.good()) { - print(state.files.mtr, "{},{}\n", reportID, NumberOut); + print(state.files.mtr, "{},{}\n", RptNum, NumberOut); } ++state.dataGlobal->StdMeterRecordCount; - if (state.files.eso.good() && !meterOnlyFlag) { - print(state.files.eso, "{},{}\n", reportID, NumberOut); + if (state.files.eso.good() && !RptFO) { + print(state.files.eso, "{},{}\n", RptNum, NumberOut); ++state.dataGlobal->StdOutputRecordCount; } } else { // if ( ( reportingInterval == ReportDaily ) || ( reportingInterval == ReportMonthly ) || ( reportingInterval == ReportSim ) ) { // // 2, 3, 4 - std::string MaxOut; // Character for Max out string - std::string MinOut; // Character for Min out string - - if (MaxValue == 0.0) { - MaxOut = "0.0"; - } else { - char meterData[129]; - dtoa(MaxValue, meterData); - MaxOut = std::string(meterData); - } - - if (minValue == 0.0) { - MinOut = "0.0"; - } else { - char meterData[129]; - dtoa(minValue, meterData); - MinOut = std::string(meterData); - } - // Append the min and max strings with date information - ProduceMinMaxString(MinOut, minValueDate, freq); - ProduceMinMaxString(MaxOut, maxValueDate, freq); + char minValString[128], maxValString[128]; + dtoa(MinVal, minValString); + dtoa(MaxVal, maxValString); + + std::string minDateString = produceDateString(MinValDate, freq); + std::string maxDateString = produceDateString(MaxValDate, freq); if (state.files.mtr.good()) { - print(state.files.mtr, "{},{},{},{}\n", reportID, NumberOut, MinOut, MaxOut); + print(state.files.mtr, "{},{},{},{},{},{}\n", RptNum, NumberOut, minValString, minDateString, maxValString, maxDateString); } ++state.dataGlobal->StdMeterRecordCount; - if (state.files.eso.good() && !meterOnlyFlag) { - print(state.files.eso, "{},{},{},{}\n", reportID, NumberOut, MinOut, MaxOut); + if (state.files.eso.good() && !RptFO) { + print(state.files.eso, "{},{},{},{},{},{}\n", RptNum, NumberOut, minValString, minDateString, maxValString, maxDateString); ++state.dataGlobal->StdOutputRecordCount; } } - } // WriteReportMeterData() + } // MeterPeriod::WriteReportData() void WriteNumericData(EnergyPlusData &state, int const reportID, // The variable's reporting ID @@ -2885,67 +2724,10 @@ namespace OutputProcessor { } } // WriteNumericData() - void WriteIntegerVariableOutput(EnergyPlusData &state, - OutVarInt *intVar, // Integer variable to write out - ReportFreq const reportFreq // The report type (i.e., the reporting interval) - ) - { - - // SUBROUTINE INFORMATION: - // AUTHOR Greg Stark - // DATE WRITTEN August 2008 - // MODIFIED April 2011; Linda Lawrie, December 2017; Jason DeGraw - // RE-ENGINEERED na - - // PURPOSE OF THIS SUBROUTINE: - // This subroutine writes integer report variable data to the output file and - // SQL database. Much of the code here was an included in earlier versions - // of the UpdateDataandReport subroutine. The code was moved to facilitate - // easier maintenance and writing of data to the SQL database. - - if (state.dataSysVars->UpdateDataDuringWarmupExternalInterface && !state.dataSysVars->ReportDuringWarmup) return; - - if (intVar->Report && intVar->freq == reportFreq && intVar->Stored) { - if (intVar->NumStored > 0.0) { - WriteReportIntegerData(state, - intVar->ReportID, - intVar->StoreValue, - intVar->storeType, - intVar->NumStored, - intVar->freq, - intVar->MinValue, - intVar->minValueDate, - intVar->MaxValue, - intVar->maxValueDate); - ++state.dataGlobal->StdOutputRecordCount; - } - - intVar->StoreValue = 0.0; - intVar->NumStored = 0.0; - intVar->MinValue = IMinSetValue; - intVar->MaxValue = IMaxSetValue; - intVar->Stored = false; - } - } // WriteIntegerVariableOutput() - - void WriteReportIntegerData(EnergyPlusData &state, - int const reportID, // The variable's reporting ID - Real64 const repValue, // The variable's value - StoreType const storeType, // Type of item (averaged or summed) - Real64 const numOfItemsStored, // The number of items (hours or timesteps) of data stored - ReportFreq const freq, // The reporting interval (e.g., monthly) - int const minValue, // The variable's minimum value during the reporting interval - int const minValueDate, // The date the minimum value occurred - int const MaxValue, // The variable's maximum value during the reporting interval - int const maxValueDate // The date the maximum value occurred - ) + void OutVar::writeReportData(EnergyPlusData &state) { // SUBROUTINE INFORMATION: - // AUTHOR Greg Stark - // DATE WRITTEN July 2008 - // MODIFIED April 2011; Linda Lawrie - // RE-ENGINEERED na // PURPOSE OF THIS SUBROUTINE: // This subroutine writes averaged integer data to the output files and @@ -2955,54 +2737,51 @@ namespace OutputProcessor { // easier maintenance and writing of data to the SQL database. // SUBROUTINE LOCAL VARIABLE DECLARATIONS: - std::string NumberOut; // Character for producing "number out" - std::string MaxOut; // Character for Max out string - std::string MinOut; // Character for Min out string - Real64 rmaxValue; - Real64 rminValue; - Real64 repVal; // The variable's value + std::string MaxOut; // Character for Max out string + std::string MinOut; // Character for Min out string auto &rf = state.dataResultsFramework->resultsFramework; auto &sql = state.dataSQLiteProcedures->sqlite; - repVal = repValue; - if (storeType == StoreType::Averaged) { - repVal /= numOfItemsStored; - } - if (repValue == 0.0) { - NumberOut = "0.0"; - } else { - NumberOut = format("{:f}", repVal); - } + Real64 repVal = (storeType == StoreType::Average) ? (StoreValue / NumStored) : StoreValue; // Append the min and max strings with date information - MinOut = fmt::to_string(minValue); - MaxOut = fmt::to_string(MaxValue); - ProduceMinMaxString(MinOut, minValueDate, freq); - ProduceMinMaxString(MaxOut, maxValueDate, freq); - if (rf->timeSeriesEnabled() && (freq == ReportFreq::Day || freq == ReportFreq::Month || freq == ReportFreq::Year || freq == ReportFreq::Simulation)) { // add to daily TS data store - rf->freqTSData[(int)freq].pushVariableValue(reportID, repVal); + rf->freqTSData[(int)freq].pushVariableValue(ReportID, repVal); } - rminValue = minValue; - rmaxValue = MaxValue; if (sql) { - sql->createSQLiteReportDataRecord(reportID, repVal, freq, rminValue, minValueDate, rmaxValue, maxValueDate); + sql->createSQLiteReportDataRecord(ReportID, repVal, freq, MinValue, minValueDate, MaxValue, maxValueDate); } - if ((freq == ReportFreq::EachCall) || (freq == ReportFreq::TimeStep) || (freq == ReportFreq::Hour)) { // -1, 0, 1 - if (state.files.eso.good()) { - print(state.files.eso, "{},{}\n", reportID, NumberOut); + if (state.files.eso.good()) { + std::string NumberOut; + if (varType == VariableType::Real) { + char tmp[128]; + dtoa(repVal, tmp); + NumberOut = std::string(tmp); + } else { + // Can someone explain why we are printing integers as + // floats and why we are doing it differently than + // floats? + NumberOut = (repVal == 0.0) ? "0.0" : format("{:f}", repVal); } - } else { // if ( ( reportingInterval == ReportDaily ) || ( reportingInterval == ReportMonthly ) || ( reportingInterval == ReportSim ) ) { - // // 2, 3, 4 - if (state.files.eso.good()) { - print(state.files.eso, "{},{},{},{}\n", reportID, NumberOut, MinOut, MaxOut); + + if ((freq == ReportFreq::EachCall) || (freq == ReportFreq::TimeStep) || (freq == ReportFreq::Hour)) { // -1, 0, 1 + print(state.files.eso, "{},{}\n", ReportID, NumberOut); + } else { + char minValString[128], maxValString[128]; + dtoa(MinValue, minValString); + dtoa(MaxValue, maxValString); + + std::string minDateString = produceDateString(minValueDate, freq); + std::string maxDateString = produceDateString(maxValueDate, freq); + + print(state.files.eso, "{},{},{},{},{},{}\n", ReportID, NumberOut, minValString, minDateString, maxValString, maxDateString); } } - } // WriteReportIntegerData() + } // OutVar::WriteReportData() int DetermineIndexGroupKeyFromMeterName([[maybe_unused]] EnergyPlusData &state, std::string const &meterName) // the meter name { @@ -3070,8 +2849,8 @@ namespace OutputProcessor { // Return value std::string indexGroup; - if (meter->sovGroup != SOVGroup::Invalid) { - indexGroup = sovGroupNames[(int)meter->sovGroup]; + if (meter->group != Group::Invalid) { + indexGroup = groupNames[(int)meter->group]; } else { indexGroup = "Facility"; } @@ -3080,8 +2859,8 @@ namespace OutputProcessor { indexGroup += format(":{}", Constant::eResourceNames[(int)meter->resource]); } - if (meter->sovEndUseCat != SOVEndUseCat::Invalid) { - indexGroup += format(":{}", sovEndUseCatNames[(int)meter->sovEndUseCat]); + if (meter->endUseCat != EndUseCat::Invalid) { + indexGroup += format(":{}", endUseCatNames[(int)meter->endUseCat]); } if (len(meter->EndUseSub) > 0) { @@ -3142,23 +2921,23 @@ namespace OutputProcessor { // TODO: Probably move these to a different location void SetupOutputVariable(EnergyPlusData &state, - std::string_view const name, // String Name of variable (with units) - Constant::Units const units, // Actual units corresponding to the actual variable - Real64 &ActualVariable, // Actual Variable, used to set up pointer - OutputProcessor::SOVTimeStepType sovTimeStep, // Zone, HeatBalance=1, HVAC, System, Plant=2 - OutputProcessor::SOVStoreType sovStore, // State, Average=1, NonState, Sum=2 - std::string const &key, // Associated Key for this variable - Constant::eResource resource, // Meter Resource Type (Electricity, Gas, etc) - OutputProcessor::SOVEndUseCat sovEndUseCat, // Meter End Use Key (Lights, Heating, Cooling, etc) - std::string_view const EndUseSub, // Meter End Use Sub Key (General Lights, Task Lights, etc) - OutputProcessor::SOVGroup sovGroup, // Meter Super Group Key (Building, System, Plant) - std::string const &zone, // Meter Zone Key (zone name) - int const ZoneMult, // Zone Multiplier, defaults to 1 - int const ZoneListMult, // Zone List Multiplier, defaults to 1 - int const indexGroupKey, // Group identifier for SQL output - std::string_view const customUnitName, // the custom name for the units from EMS definition of units - std::string const &spaceType, // Space type (applicable for Building group only) - OutputProcessor::ReportFreq freq // Internal use -- causes reporting at this frequency + std::string_view const name, // String Name of variable (with units) + Constant::Units const units, // Actual units corresponding to the actual variable + Real64 &ActualVariable, // Actual Variable, used to set up pointer + OutputProcessor::TimeStepType timeStep, // Zone, HeatBalance=1, HVAC, System, Plant=2 + OutputProcessor::StoreType store, // State, Average=1, NonState, Sum=2 + std::string const &key, // Associated Key for this variable + Constant::eResource resource, // Meter Resource Type (Electricity, Gas, etc) + OutputProcessor::Group group, // Meter Super Group Key (Building, System, Plant) + OutputProcessor::EndUseCat endUseCat, // Meter End Use Key (Lights, Heating, Cooling, etc) + std::string_view const EndUseSub, // Meter End Use Sub Key (General Lights, Task Lights, etc) + std::string const &zone, // Meter Zone Key (zone name) + int const ZoneMult, // Zone Multiplier, defaults to 1 + int const ZoneListMult, // Zone List Multiplier, defaults to 1 + std::string const &spaceType, // Space type (applicable for Building group only) + int const indexGroupKey, // Group identifier for SQL output + std::string_view const customUnitName, // the custom name for the units from EMS definition of units + OutputProcessor::ReportFreq freq // Internal use -- causes reporting at this frequency ) { @@ -3193,13 +2972,10 @@ void SetupOutputVariable(EnergyPlusData &state, // Is this redundant with CheckReportVariable? bool const ThisOneOnTheList = DataOutputs::FindItemInVariableList(state, key, name); - TimeStepType timeStep = sovTimeStep2TimeStep[(int)sovTimeStep]; - StoreType store = sovStoreType2StoreType[(int)sovStore]; - - bool OnMeter = (resource != Constant::eResource::Invalid) || (sovEndUseCat != SOVEndUseCat::Invalid) || (!EndUseSub.empty()) || - (sovGroup != SOVGroup::Invalid) || (!zone.empty()) || (!spaceType.empty()); + bool OnMeter = (resource != Constant::eResource::Invalid) || (endUseCat != EndUseCat::Invalid) || (!EndUseSub.empty()) || + (group != Group::Invalid) || (!zone.empty()) || (!spaceType.empty()); - if (OnMeter && store == StoreType::Averaged) { + if (OnMeter && store == StoreType::Average) { ShowSevereError(state, "Meters can only be \"Summed\" variables"); ShowContinueError(state, fmt::format("..reference variable={}:{}", key, name)); OnMeter = false; @@ -3217,7 +2993,7 @@ void SetupOutputVariable(EnergyPlusData &state, if (!OnMeter && !ThisOneOnTheList) return; - if (store == StoreType::Summed) ++op->NumOfRVariable_Sum; + if (store == StoreType::Sum) ++op->NumOfRVariable_Sum; if (OnMeter) ++op->NumOfRVariable_Meter; for (int reqVarNum : reqVarNums) { @@ -3236,6 +3012,7 @@ void SetupOutputVariable(EnergyPlusData &state, var->storeType = store; var->name = name; var->nameUC = Util::makeUPPER(var->name); + var->key = key; var->keyUC = Util::makeUPPER(key); var->keyColonName = fmt::format("{}:{}", key, name); var->keyColonNameUC = Util::makeUPPER(var->keyColonName); @@ -3247,12 +3024,14 @@ void SetupOutputVariable(EnergyPlusData &state, var->Which = &ActualVariable; var->ZoneMult = ZoneMult; var->ZoneListMult = ZoneListMult; + var->indexGroupKey = indexGroupKey; + var->indexGroup = timeStepTypeNames[(int)var->timeStepType]; // This is only done for the first variable in the list. It // could be moved out of this loop entirely but then some // numberings in unit tests would not line up if (OnMeter) { - AttachMeters(state, units, resource, sovEndUseCat, EndUseSub, sovGroup, zone, spaceType, firstAddedOutVarNum); + AttachMeters(state, units, resource, endUseCat, EndUseSub, group, zone, spaceType, firstAddedOutVarNum); OnMeter = false; } @@ -3267,31 +3046,20 @@ void SetupOutputVariable(EnergyPlusData &state, var->SchedPtr = op->reqVars[reqVarNum]->SchedPtr; } - WriteReportVariableDictionaryItem(state, - var->freq, - var->storeType, - var->ReportID, - indexGroupKey, - std::string(sovTimeStepTypeStrings[(int)sovTimeStep]), - key, - name, - var->timeStepType, - var->units, - var->unitNameCustomEMS, - (var->SchedPtr != 0) ? state.dataScheduleMgr->Schedule(var->SchedPtr).Name : ""); + var->writeReportDictionaryItem(state); } } // SetupOutputVariable() void SetupOutputVariable(EnergyPlusData &state, - std::string_view const name, // String Name of variable - Constant::Units const units, // Actual units corresponding to the actual variable - int &ActualVariable, // Actual Variable, used to set up pointer - OutputProcessor::SOVTimeStepType sovTimeStepType, // Zone, HeatBalance=1, HVAC, System, Plant=2 - OutputProcessor::SOVStoreType sovStoreType, // State, Average=1, NonState, Sum=2 - std::string const &key, // Associated Key for this variable - int const indexGroupKey, // Group identifier for SQL output - OutputProcessor::ReportFreq freq // Internal use -- causes reporting at this freqency + std::string_view const name, // String Name of variable + Constant::Units const units, // Actual units corresponding to the actual variable + int &ActualVariable, // Actual Variable, used to set up pointer + OutputProcessor::TimeStepType timeStepType, // Zone, HeatBalance=1, HVAC, System, Plant=2 + OutputProcessor::StoreType storeType, // State, Average=1, NonState, Sum=2 + std::string const &key, // Associated Key for this variable + int const indexGroupKey, // Group identifier for SQL output + OutputProcessor::ReportFreq freq // Internal use -- causes reporting at this freqency ) { @@ -3323,9 +3091,6 @@ void SetupOutputVariable(EnergyPlusData &state, reqVarNums.push_back(-1); } - TimeStepType timeStepType = sovTimeStep2TimeStep[(int)sovTimeStepType]; - StoreType storeType = sovStoreType2StoreType[(int)sovStoreType]; - // DataOutputs::OutputVariablesForSimulation is case-insentitive int ddOutVarNum = AddDDOutVar(state, name, timeStepType, storeType, VariableType::Integer, units); auto *ddOutVar = op->ddOutVars[ddOutVarNum]; @@ -3336,7 +3101,7 @@ void SetupOutputVariable(EnergyPlusData &state, bool ThisOneOnTheList = DataOutputs::FindItemInVariableList(state, key, name); if (!ThisOneOnTheList) return; - if (storeType == StoreType::Summed) { + if (storeType == StoreType::Sum) { ++op->NumOfIVariable_Sum; } @@ -3354,12 +3119,14 @@ void SetupOutputVariable(EnergyPlusData &state, var->storeType = storeType; var->name = name; var->nameUC = Util::makeUPPER(var->name); + var->key = key; var->keyUC = Util::makeUPPER(key); var->keyColonName = fmt::format("{}:{}", key, name); var->keyColonNameUC = Util::makeUPPER(var->keyColonName); var->units = units; var->ReportID = ++op->ReportNumberCounter; var->Which = &ActualVariable; + var->indexGroupKey = -1; if (reqVarNum == -1) continue; @@ -3373,17 +3140,7 @@ void SetupOutputVariable(EnergyPlusData &state, var->SchedPtr = op->reqVars[reqVarNum]->SchedPtr; } - WriteReportVariableDictionaryItem(state, - var->freq, - var->storeType, - var->ReportID, - indexGroupKey, - std::string(sovTimeStepTypeStrings[(int)sovTimeStepType]), - key, - name, - var->timeStepType, - var->units, - (var->SchedPtr != 0) ? state.dataScheduleMgr->Schedule(var->SchedPtr).Name : ""); + var->writeReportDictionaryItem(state); } } // SetOutputVariable() @@ -3453,168 +3210,96 @@ void UpdateDataandReport(EnergyPlusData &state, OutputProcessor::TimeStepType co // Main "Record Keeping" Loops for R and I variables for (auto *var : op->outVars) { - if (var->varType != VariableType::Real) continue; if (var->timeStepType != t_TimeStepTypeKey) continue; - OutVarReal *rVar = dynamic_cast(var); - assert(rVar != nullptr); + Real64 value = (var->varType == VariableType::Real) ? *(dynamic_cast(var))->Which : *(dynamic_cast(var))->Which; - rVar->Stored = true; - if (rVar->storeType == StoreType::Averaged) { - Real64 CurVal = (*rVar->Which) * rxTime; - // CALL SetMinMax(RVar%Which,MDHM,RVar%MaxValue,RVar%maxValueDate,RVar%MinValue,RVar%minValueDate) - if ((*rVar->Which) > rVar->MaxValue) { - rVar->MaxValue = (*rVar->Which); - rVar->maxValueDate = MDHM; - } - if ((*rVar->Which) < rVar->MinValue) { - rVar->MinValue = (*rVar->Which); - rVar->minValueDate = MDHM; + var->Stored = true; + + if (var->storeType == StoreType::Average) { + Real64 CurVal = value * rxTime; + // TODO: Is this correct? Integer logic is different + if (var->varType == VariableType::Real) { + if (value > var->MaxValue) { + var->MaxValue = value; + var->maxValueDate = MDHM; + } + if (value < var->MinValue) { + var->MinValue = value; + var->minValueDate = MDHM; + } + } else { // var->varType == VariableType::Integer + if (CurVal > var->MaxValue) { + var->MaxValue = CurVal; + var->maxValueDate = MDHM; + } + if (CurVal < var->MinValue) { + var->MinValue = CurVal; + var->minValueDate = MDHM; + } } - rVar->TSValue += CurVal; - rVar->EITSValue = rVar->TSValue; // CR - 8481 fix - 09/06/2011 + var->TSValue += CurVal; + var->EITSValue = var->TSValue; // CR - 8481 fix - 09/06/2011 } else { - // CurVal=RVar%Which - if ((*rVar->Which) > rVar->MaxValue) { - rVar->MaxValue = (*rVar->Which); - rVar->maxValueDate = MDHM; + if (value > var->MaxValue) { + var->MaxValue = value; + var->maxValueDate = MDHM; } - if ((*rVar->Which) < rVar->MinValue) { - rVar->MinValue = (*rVar->Which); - rVar->minValueDate = MDHM; + if (value < var->MinValue) { + var->MinValue = value; + var->minValueDate = MDHM; } - rVar->TSValue += (*rVar->Which); - rVar->EITSValue = rVar->TSValue; // CR - 8481 fix - 09/06/2011 + var->TSValue += value; + var->EITSValue = var->TSValue; // CR - 8481 fix - 09/06/2011 } // End of "record keeping" Report if applicable - if (!rVar->Report) continue; - bool ReportNow = true; - if (rVar->SchedPtr > 0) ReportNow = (GetCurrentScheduleValue(state, rVar->SchedPtr) != 0.0); // SetReportNow(RVar%SchedPtr) - if (!ReportNow) continue; - rVar->tsStored = true; - if (!rVar->thisTSStored) { - ++rVar->thisTSCount; - rVar->thisTSStored = true; - } + if (!var->Report) continue; - if (rVar->freq == ReportFreq::EachCall) { - if (TimePrint) { - if (op->LHourP != state.dataGlobal->HourOfDay || std::abs(op->LStartMin - StartMinute) > 0.001 || - std::abs(op->LEndMin - op->TimeValue[(int)t_TimeStepTypeKey].CurMinute) > 0.001) { - int CurDayType = state.dataEnvrn->DayOfWeek; - if (state.dataEnvrn->HolidayIndex > 0) { - CurDayType = state.dataEnvrn->HolidayIndex; - } - WriteTimeStampFormatData(state, - state.files.eso, - ReportFreq::EachCall, - op->freqStampReportNums[(int)ReportFreq::TimeStep], - state.dataGlobal->DayOfSimChr, - true, - state.dataEnvrn->Month, - state.dataEnvrn->DayOfMonth, - state.dataGlobal->HourOfDay, - op->TimeValue[(int)t_TimeStepTypeKey].CurMinute, - StartMinute, - state.dataEnvrn->DSTIndicator, - ScheduleManager::dayTypeNames[CurDayType]); - op->LHourP = state.dataGlobal->HourOfDay; - op->LStartMin = StartMinute; - op->LEndMin = op->TimeValue[(int)t_TimeStepTypeKey].CurMinute; - } - TimePrint = false; - } - WriteNumericData(state, rVar->ReportID, *rVar->Which); - ++state.dataGlobal->StdOutputRecordCount; + if (var->SchedPtr > 0 && GetCurrentScheduleValue(state, var->SchedPtr) == 0.0) continue; - if (rf->timeSeriesEnabled()) { - rf->detailedTSData[(int)t_TimeStepTypeKey].pushVariableValue(rVar->ReportID, *rVar->Which); - } + var->tsStored = true; + if (!var->thisTSStored) { + ++var->thisTSCount; + var->thisTSStored = true; } - } - for (auto *var : op->outVars) { - if (var->varType != VariableType::Integer) continue; - if (var->timeStepType != t_TimeStepTypeKey) continue; + if (var->freq != ReportFreq::EachCall) continue; - // Act on the IVariables variable - auto *iVar = dynamic_cast(var); - assert(iVar != nullptr); - - iVar->Stored = true; - // ICurVal=IVar%Which - if (iVar->storeType == StoreType::Averaged) { - Real64 ICurVal = (*iVar->Which) * rxTime; - iVar->TSValue += ICurVal; - iVar->EITSValue = iVar->TSValue; // CR - 8481 fix - 09/06/2011 - if (nint(ICurVal) > iVar->MaxValue) { - iVar->MaxValue = nint(ICurVal); // Record keeping for date and time go here too - iVar->maxValueDate = MDHM; //+ TimeValue.at(t_TimeStepTypeKey)%TimeStep - } - if (nint(ICurVal) < iVar->MinValue) { - iVar->MinValue = nint(ICurVal); - iVar->minValueDate = MDHM; //+ TimeValue.at(t_TimeStepTypeKey)%TimeStep - } - } else { - if ((*iVar->Which) > iVar->MaxValue) { - iVar->MaxValue = (*iVar->Which); // Record keeping for date and time go here too - iVar->maxValueDate = MDHM; //+ TimeValue(TimeStepType)%TimeStep - } - if ((*iVar->Which) < iVar->MinValue) { - iVar->MinValue = (*iVar->Which); - iVar->minValueDate = MDHM; //+ TimeValue(TimeStepType)%TimeStep + if (TimePrint) { + if (op->LHourP != state.dataGlobal->HourOfDay || std::abs(op->LStartMin - StartMinute) > 0.001 || + std::abs(op->LEndMin - op->TimeValue[(int)t_TimeStepTypeKey].CurMinute) > 0.001) { + int CurDayType = state.dataEnvrn->DayOfWeek; + if (state.dataEnvrn->HolidayIndex > 0) { + CurDayType = state.dataEnvrn->HolidayIndex; + } + WriteTimeStampFormatData(state, + state.files.eso, + ReportFreq::EachCall, + op->freqStampReportNums[(int)ReportFreq::TimeStep], + state.dataGlobal->DayOfSimChr, + true, + state.dataEnvrn->Month, + state.dataEnvrn->DayOfMonth, + state.dataGlobal->HourOfDay, + op->TimeValue[(int)t_TimeStepTypeKey].CurMinute, + StartMinute, + state.dataEnvrn->DSTIndicator, + ScheduleManager::dayTypeNames[CurDayType]); + op->LHourP = state.dataGlobal->HourOfDay; + op->LStartMin = StartMinute; + op->LEndMin = op->TimeValue[(int)t_TimeStepTypeKey].CurMinute; } - iVar->TSValue += (*iVar->Which); - iVar->EITSValue = iVar->TSValue; // CR - 8481 fix - 09/06/2011 - } - - if (!iVar->Report) continue; - bool ReportNow = true; - if (iVar->SchedPtr > 0) ReportNow = (GetCurrentScheduleValue(state, iVar->SchedPtr) != 0.0); // SetReportNow(IVar%SchedPtr) - if (!ReportNow) continue; - iVar->tsStored = true; - if (!iVar->thisTSStored) { - ++iVar->thisTSCount; - iVar->thisTSStored = true; + TimePrint = false; } - if (iVar->freq == ReportFreq::EachCall) { - if (TimePrint) { - if (op->LHourP != state.dataGlobal->HourOfDay || std::abs(op->LStartMin - StartMinute) > 0.001 || - std::abs(op->LEndMin - op->TimeValue[(int)t_TimeStepTypeKey].CurMinute) > 0.001) { - int CurDayType = state.dataEnvrn->DayOfWeek; - if (state.dataEnvrn->HolidayIndex > 0) { - CurDayType = state.dataEnvrn->HolidayIndex; - } - WriteTimeStampFormatData(state, - state.files.eso, - ReportFreq::EachCall, - op->freqStampReportNums[(int)ReportFreq::TimeStep], - state.dataGlobal->DayOfSimChr, - true, - state.dataEnvrn->Month, - state.dataEnvrn->DayOfMonth, - state.dataGlobal->HourOfDay, - op->TimeValue[(int)t_TimeStepTypeKey].CurMinute, - StartMinute, - state.dataEnvrn->DSTIndicator, - ScheduleManager::dayTypeNames[CurDayType]); - op->LHourP = state.dataGlobal->HourOfDay; - op->LStartMin = StartMinute; - op->LEndMin = op->TimeValue[(int)t_TimeStepTypeKey].CurMinute; - } - TimePrint = false; - } - // only time integer vars actual report as integer only is "detailed" - WriteNumericData(state, iVar->ReportID, *iVar->Which); - ++state.dataGlobal->StdOutputRecordCount; + WriteNumericData(state, var->ReportID, value); + ++state.dataGlobal->StdOutputRecordCount; - if (rf->timeSeriesEnabled()) { - rf->detailedTSData[(int)t_TimeStepTypeKey].pushVariableValue(iVar->ReportID, *iVar->Which); - } + if (rf->timeSeriesEnabled()) { + rf->detailedTSData[(int)t_TimeStepTypeKey].pushVariableValue(var->ReportID, value); } - } + } // for (var) if (t_TimeStepTypeKey == TimeStepType::System) return; // All other stuff happens at the "zone" time step call to this routine. @@ -3664,70 +3349,6 @@ void UpdateDataandReport(EnergyPlusData &state, OutputProcessor::TimeStepType co for (auto *var : op->outVars) { if (var->timeStepType != TimeStepType::Zone && var->timeStepType != TimeStepType::System) continue; - if (var->varType != VariableType::Real) continue; - // auto *rVar = dynamic_cast(var); - // assert(rVar != nullptr); - - bool ReportNow = true; - if (var->SchedPtr > 0) ReportNow = (GetCurrentScheduleValue(state, var->SchedPtr) != 0.0); // SetReportNow(RVar%SchedPtr) - if (!ReportNow || !var->Report) { - var->TSValue = 0.0; - } - // IF (RVar%StoreType == AveragedVar) THEN - // RVar%Value=RVar%Value+RVar%TSValue/NumOfTimeStepInHour - // ELSE - var->Value += var->TSValue; - // ENDIF - - if (!ReportNow || !var->Report) continue; - - if (var->freq == ReportFreq::TimeStep) { - if (TimePrint) { - if (op->LHourP != state.dataGlobal->HourOfDay || std::abs(op->LStartMin - StartMinute) > 0.001 || - std::abs(op->LEndMin - op->TimeValue[(int)var->timeStepType].CurMinute) > 0.001) { - int CurDayType = state.dataEnvrn->DayOfWeek; - if (state.dataEnvrn->HolidayIndex > 0) { - CurDayType = state.dataEnvrn->HolidayIndex; - } - WriteTimeStampFormatData(state, - state.files.eso, - ReportFreq::EachCall, - op->freqStampReportNums[(int)ReportFreq::TimeStep], - state.dataGlobal->DayOfSimChr, - true, - state.dataEnvrn->Month, - state.dataEnvrn->DayOfMonth, - state.dataGlobal->HourOfDay, - op->TimeValue[(int)var->timeStepType].CurMinute, - StartMinute, - state.dataEnvrn->DSTIndicator, - ScheduleManager::dayTypeNames[CurDayType]); - op->LHourP = state.dataGlobal->HourOfDay; - op->LStartMin = StartMinute; - op->LEndMin = op->TimeValue[(int)var->timeStepType].CurMinute; - } - TimePrint = false; - } // if (TimePrint) - - WriteNumericData(state, var->ReportID, var->TSValue); - ++state.dataGlobal->StdOutputRecordCount; - - if (rf->timeSeriesEnabled()) { - rf->freqTSData[(int)ReportFreq::TimeStep].pushVariableValue(var->ReportID, var->TSValue); - } - } - var->TSValue = 0.0; - var->thisTSStored = false; - } // for (var) - - // Have to replicate this loop twice so that all integer - // variables appear after all real variables to avoid spurious - // diffs in ESO files. After this PR is merged can go ahead and delete this. - for (auto *var : op->outVars) { - if (var->timeStepType != TimeStepType::Zone && var->timeStepType != TimeStepType::System) continue; - if (var->varType != VariableType::Integer) continue; - // auto *rVar = dynamic_cast(var); - // assert(rVar != nullptr); bool ReportNow = true; if (var->SchedPtr > 0) ReportNow = (GetCurrentScheduleValue(state, var->SchedPtr) != 0.0); // SetReportNow(RVar%SchedPtr) @@ -3822,38 +3443,7 @@ void UpdateDataandReport(EnergyPlusData &state, OutputProcessor::TimeStepType co op->TimeValue[(int)TimeStepType::System].CurMinute = 0.0; for (auto *var : op->outVars) { - if (var->varType != VariableType::Real) continue; - if (var->timeStepType != TimeStepType::Zone && var->timeStepType != TimeStepType::System) continue; - - // ReportNow=.TRUE. - // IF (RVar%SchedPtr > 0) & - // ReportNow=(GetCurrentScheduleValue(state, RVar%SchedPtr) /= 0.0) !SetReportNow(RVar%SchedPtr) - - // IF (ReportNow) THEN - if (var->tsStored) { - if (var->storeType == StoreType::Averaged) { - var->Value /= double(var->thisTSCount); - } - if (var->Report && var->freq == ReportFreq::Hour && var->Stored) { - WriteNumericData(state, var->ReportID, var->Value); - ++state.dataGlobal->StdOutputRecordCount; - var->Stored = false; - // add time series value for hourly to data store - if (rf->timeSeriesEnabled()) { - rf->freqTSData[(int)ReportFreq::Hour].pushVariableValue(var->ReportID, var->Value); - } - } - var->StoreValue += var->Value; - ++var->NumStored; - } - var->tsStored = false; - var->thisTSStored = false; - var->thisTSCount = 0; - var->Value = 0.0; - } // for (var) - for (auto *var : op->outVars) { - if (var->varType != VariableType::Integer) continue; if (var->timeStepType != TimeStepType::Zone && var->timeStepType != TimeStepType::System) continue; // ReportNow=.TRUE. @@ -3862,7 +3452,7 @@ void UpdateDataandReport(EnergyPlusData &state, OutputProcessor::TimeStepType co // IF (ReportNow) THEN if (var->tsStored) { - if (var->storeType == StoreType::Averaged) { + if (var->storeType == StoreType::Average) { var->Value /= double(var->thisTSCount); } if (var->Report && var->freq == ReportFreq::Hour && var->Stored) { @@ -3921,14 +3511,7 @@ void UpdateDataandReport(EnergyPlusData &state, OutputProcessor::TimeStepType co op->NumHoursInMonth += 24; for (auto *var : op->outVars) { if (var->timeStepType != TimeStepType::Zone && var->timeStepType != TimeStepType::System) continue; - if (var->varType != VariableType::Real) continue; - WriteRealVariableOutput(state, dynamic_cast(var), ReportFreq::Day); - } - - for (auto *var : op->outVars) { - if (var->timeStepType != TimeStepType::Zone && var->timeStepType != TimeStepType::System) continue; - if (var->varType != VariableType::Integer) continue; - WriteIntegerVariableOutput(state, dynamic_cast(var), ReportFreq::Day); + var->writeOutput(state, ReportFreq::Day); } ReportMeters(state, ReportFreq::Day, TimePrint); @@ -3963,16 +3546,9 @@ void UpdateDataandReport(EnergyPlusData &state, OutputProcessor::TimeStepType co state.dataEnvrn->EndMonthFlag = false; for (auto *var : op->outVars) { if (var->timeStepType != TimeStepType::Zone && var->timeStepType != TimeStepType::System) continue; - if (var->varType != VariableType::Real) continue; - WriteRealVariableOutput(state, dynamic_cast(var), ReportFreq::Month); + var->writeOutput(state, ReportFreq::Month); } - for (auto *var : op->outVars) { - if (var->timeStepType != TimeStepType::Zone && var->timeStepType != TimeStepType::System) continue; - if (var->varType != VariableType::Integer) continue; - WriteIntegerVariableOutput(state, dynamic_cast(var), ReportFreq::Month); - } // for (var) - ReportMeters(state, ReportFreq::Month, TimePrint); op->NumHoursInMonth = 0; @@ -4000,16 +3576,9 @@ void UpdateDataandReport(EnergyPlusData &state, OutputProcessor::TimeStepType co for (auto *var : op->outVars) { if (var->timeStepType != TimeStepType::Zone && var->timeStepType != TimeStepType::System) continue; - if (var->varType != VariableType::Real) continue; - WriteRealVariableOutput(state, dynamic_cast(var), ReportFreq::Simulation); + var->writeOutput(state, ReportFreq::Simulation); } - for (auto *var : op->outVars) { - if (var->timeStepType != TimeStepType::Zone && var->timeStepType != TimeStepType::System) continue; - if (var->varType != VariableType::Integer) continue; - WriteIntegerVariableOutput(state, dynamic_cast(var), ReportFreq::Simulation); - } // Number of I Variables - ReportMeters(state, ReportFreq::Simulation, TimePrint); op->NumHoursInSim = 0; @@ -4031,16 +3600,9 @@ void UpdateDataandReport(EnergyPlusData &state, OutputProcessor::TimeStepType co for (auto *var : op->outVars) { if (var->timeStepType != TimeStepType::Zone && var->timeStepType != TimeStepType::System) continue; - if (var->varType != VariableType::Real) continue; - WriteRealVariableOutput(state, dynamic_cast(var), ReportFreq::Year); + var->writeOutput(state, ReportFreq::Year); } - for (auto *var : op->outVars) { - if (var->timeStepType != TimeStepType::Zone && var->timeStepType != TimeStepType::System) continue; - if (var->varType != VariableType::Integer) continue; - WriteIntegerVariableOutput(state, dynamic_cast(var), ReportFreq::Year); - } // Number of I Variables - ReportMeters(state, ReportFreq::Year, TimePrint); state.dataGlobal->CalendarYear += 1; @@ -4341,7 +3903,6 @@ void SetInitialMeterReportingAndOutputNames(EnergyPlusData &state, using namespace OutputProcessor; // SUBROUTINE LOCAL VARIABLE DECLARATIONS: - std::string indexGroup; auto &op = state.dataOutputProcessor; auto *meter = op->meters[WhichMeter]; @@ -4361,10 +3922,10 @@ void SetInitialMeterReportingAndOutputNames(EnergyPlusData &state, period.RptFO = true; else op->freqTrackingVariables[(int)freq] = true; - int indexGroupKey = DetermineIndexGroupKeyFromMeterName(state, meter->Name); - std::string indexGroup = DetermineIndexGroupFromMeterGroup(meter); + // int indexGroupKey = DetermineIndexGroupKeyFromMeterName(state, meter->Name); + meter->indexGroup = DetermineIndexGroupFromMeterGroup(meter); WriteMeterDictionaryItem( - state, freq, StoreType::Summed, period.RptNum, indexGroupKey, indexGroup, meter->Name, meter->units, false, MeterFileOnlyIndicator); + state, freq, StoreType::Sum, period.RptNum, meter->indexGroup, meter->Name, meter->units, false, MeterFileOnlyIndicator); } } else { // !CumulativeIndicator if (MeterFileOnlyIndicator && period.accRpt) { @@ -4379,10 +3940,10 @@ void SetInitialMeterReportingAndOutputNames(EnergyPlusData &state, if (!period.accRpt) { period.accRpt = true; if (MeterFileOnlyIndicator) period.accRptFO = true; - int indexGroupKey = DetermineIndexGroupKeyFromMeterName(state, meter->Name); - std::string indexGroup = DetermineIndexGroupFromMeterGroup(op->meters[WhichMeter]); + // int indexGroupKey = DetermineIndexGroupKeyFromMeterName(state, meter->Name); + meter->indexGroup = DetermineIndexGroupFromMeterGroup(op->meters[WhichMeter]); WriteMeterDictionaryItem( - state, freq, StoreType::Summed, period.accRptNum, indexGroupKey, indexGroup, meter->Name, meter->units, true, MeterFileOnlyIndicator); + state, freq, StoreType::Sum, period.accRptNum, meter->indexGroup, meter->Name, meter->units, true, MeterFileOnlyIndicator); } } // if (CumulativeIndicator) } // SetInitialMeterReportingAndOutputNames() @@ -4669,13 +4230,13 @@ int GetMeteredVariables(EnergyPlusData &state, bool foundGroup = false; for (int meterNum : var->meterNums) { auto *meter = op->meters[meterNum]; - if (!foundEndUse && meter->sovEndUseCat != SOVEndUseCat::Invalid) { - meteredVar.sovEndUseCat = meter->sovEndUseCat; + if (!foundEndUse && meter->endUseCat != EndUseCat::Invalid) { + meteredVar.endUseCat = meter->endUseCat; foundEndUse = true; } - if (!foundGroup && meter->sovGroup != SOVGroup::Invalid) { - meteredVar.sovGroup = meter->sovGroup; + if (!foundGroup && meter->group != Group::Invalid) { + meteredVar.group = meter->group; foundGroup = true; } @@ -4728,9 +4289,9 @@ void GetVariableKeyCountandType(EnergyPlusData &state, // SUBROUTINE LOCAL VARIABLE DECLARATIONS: auto &op = state.dataOutputProcessor; - varType = VariableType::NotFound; + varType = VariableType::Invalid; numKeys = 0; - storeType = StoreType::Averaged; + storeType = StoreType::Average; timeStepType = TimeStepType::Zone; units = Constant::Units::None; // Why is this None and not Invalid? @@ -4753,7 +4314,7 @@ void GetVariableKeyCountandType(EnergyPlusData &state, numKeys = 1; varType = VariableType::Meter; units = op->meters[meterNum]->units; - storeType = StoreType::Summed; + storeType = StoreType::Sum; timeStepType = TimeStepType::Zone; } else { @@ -4765,7 +4326,7 @@ void GetVariableKeyCountandType(EnergyPlusData &state, numKeys = 1; varType = VariableType::Schedule; units = static_cast(getEnumValue(Constant::unitNamesUC, Util::makeUPPER(GetScheduleType(state, schedNum)))); - storeType = StoreType::Averaged; + storeType = StoreType::Average; timeStepType = TimeStepType::Zone; } } @@ -4940,15 +4501,14 @@ void InitPollutionMeterReporting(EnergyPlusData &state, OutputProcessor::ReportF auto *meter = op->meters[found->second]; auto &period = meter->periods[(int)freq]; - int indexGroupKey = DetermineIndexGroupKeyFromMeterName(state, meter->Name); - std::string indexGroup = DetermineIndexGroupFromMeterGroup(meter); + // int indexGroupKey = DetermineIndexGroupKeyFromMeterName(state, meter->Name); + meter->indexGroup = DetermineIndexGroupFromMeterGroup(meter); // All of the specified meters are checked and the headers printed to the meter file if this // has not been done previously if (!period.Rpt) { period.Rpt = true; - WriteMeterDictionaryItem( - state, freq, StoreType::Summed, period.RptNum, indexGroupKey, indexGroup, meter->Name, meter->units, false, false); + WriteMeterDictionaryItem(state, freq, StoreType::Sum, period.RptNum, meter->indexGroup, meter->Name, meter->units, false, false); op->freqTrackingVariables[(int)freq] = true; } } @@ -5031,7 +4591,8 @@ void ProduceRDDMDD(EnergyPlusData &state) if (ddVar->ReportedOnDDFile) continue; - std::string_view timeStepName = timeStepNames[(int)ddVar->timeStepType]; + static constexpr std::array timeStepNamesLocal = {"Zone", "HVAC"}; + std::string_view timeStepName = timeStepNamesLocal[(int)ddVar->timeStepType]; std::string_view storeTypeName = storeTypeNames[(int)ddVar->storeType]; std::string_view varName = ddVar->name; std::string_view unitName = @@ -5049,7 +4610,7 @@ void ProduceRDDMDD(EnergyPlusData &state) while (ddVar->Next != -1) { ddVar = op->ddOutVars[ddVar->Next]; - std::string_view timeStepName = timeStepNames[(int)ddVar->timeStepType]; + std::string_view timeStepName = timeStepTypeNames[(int)ddVar->timeStepType]; std::string_view storeTypeName = storeTypeNames[(int)ddVar->storeType]; std::string_view varName = ddVar->name; std::string_view unitName = diff --git a/src/EnergyPlus/OutputProcessor.hh b/src/EnergyPlus/OutputProcessor.hh index 58a9139136e..48a2adab8f7 100644 --- a/src/EnergyPlus/OutputProcessor.hh +++ b/src/EnergyPlus/OutputProcessor.hh @@ -75,29 +75,6 @@ struct EnergyPlusData; namespace OutputProcessor { - // enumerations for SetupOutputVariable calls -- for now these are direct mappings from the original strings, no change in functionality - enum class SOVTimeStepType - { - Invalid = -1, - System, - HVAC, - Zone, - Plant, - Num - }; - static constexpr std::array sovTimeStepTypeStrings = {"System", "HVAC", "Zone", "Plant"}; - - enum class SOVStoreType - { - Invalid = -1, - State, - NonState, - Summed, - Average, - Num - }; - static constexpr std::array sovStoreTypeStrings = {"State", "NonState", "Summed", "Average"}; - enum class ReportVDD { Invalid = -1, @@ -115,7 +92,7 @@ namespace OutputProcessor { enum class VariableType { Invalid = -1, - NotFound, // ref: GetVariableKeyCountandType, 0 = not found // TODO: This is actually used separately from Invalid, need to get rid of it + // NotFound, // ref: GetVariableKeyCountandType, 0 = not found // TODO: This is actually used separately from Invalid, need to get rid of it Integer, // ref: GetVariableKeyCountandType, 1 = integer Real, // ref: GetVariableKeyCountandType, 2 = real Meter, // ref: GetVariableKeyCountandType, 3 = meter @@ -135,10 +112,6 @@ namespace OutputProcessor { constexpr int N_WriteTimeStampFormatData(100); - constexpr int RVarAllocInc(1000); - constexpr int LVarAllocInc(1000); - constexpr int IVarAllocInc(10); - // For IP Units (tabular reports) certain resources will be put in sub-tables enum class RT_IPUnits { @@ -193,42 +166,32 @@ namespace OutputProcessor { enum class StoreType { Invalid = -1, - Averaged = 1, // Type value for "averaged" variables // TODO: is this just for printing annual tables - Summed, // Type value for "summed" variables + Average, // Type value for "averaged" variables // TODO: is this just for printing annual tables + Sum, // Type value for "summed" variables Num }; constexpr std::array storeTypeNames = { - "UNUSED", + // "UNUSED", "Average", // Averaged "Sum" // Summed }; - constexpr std::array sovStoreType2StoreType = {StoreType::Averaged, // State - StoreType::Summed, // Non-state - StoreType::Summed, // Sum - StoreType::Averaged}; // Average - enum class TimeStepType { Invalid = -1, - Zone = 1, // Type value for "zone" timestep variables // TODO: is this just for printing Annual tables? - System, // Type value for "system" timestep variables + Zone, // Type value for "zone" timestep variables // TODO: is this just for printing Annual tables? + System, // Type value for "system" timestep variables Num }; - constexpr std::array timeStepNames = { - "UNUSED", - "Zone", // Zone - "HVAC" // System + constexpr std::array timeStepTypeNames = { + // "UNUSED", + "Zone", // Zone + "System" // System }; - static constexpr std::array sovTimeStep2TimeStep = {TimeStepType::System, // System - TimeStepType::System, // HVAC - TimeStepType::Zone, // Zone - TimeStepType::System}; // Plant - - enum class SOVEndUseCat + enum class EndUseCat { Invalid = -1, Heating, @@ -284,109 +247,109 @@ namespace OutputProcessor { Num }; - static constexpr std::array sovEndUseCatNames = {"Heating", - "Cooling", - "InteriorLights", - "ExteriorLights", - "InteriorEquipment", - "ExteriorEquipment", - "Fans", - "Pumps", - "HeatRejection", - "Humidifier", - "HeatRecovery", - "WaterSystems", - "Refrigeration", - "Cogeneration", - "Baseboard", - "Boilers", - "CarbonEquivalentEmissions", - "Chillers", - "CoalEmissions", - "ColdStorageCharge", - "ColdStorageDischarge", - "Condensate", - "CoolingCoils", - "CoolingPanel", - "DieselEmissions", - "DistrictChilledWater", - "DistrictHotWater", - "ElectricityEmissions", - "ElectricStorage", - "FreeCooling", - "FuelOilNo1Emissions", - "FuelOilNo2Emissions", - "GasolineEmissions", - "HeatingCoils", - "HeatProduced", - "HeatRecoveryForCooling", - "HeatRecoveryForHeating", - "LoopToLoop", - "MainsWater", - "NaturalGasEmissions", - "OtherFuel1Emissions", - "OtherFuel2Emissions", - "Photovoltaic", - "PowerConversion", - "PropaneEmissions", - "PurchasedElectricityEmissions", - "RainWater", - "SoldElectricityEmissions", - "WellWater", - "WindTurbine"}; - - static constexpr std::array sovEndUseCatNamesUC = {"HEATING", - "COOLING", - "INTERIORLIGHTS", - "EXTERIORLIGHTS", - "INTERIOREQUIPMENT", - "EXTERIOREQUIPMENT", - "FANS", - "PUMPS", - "HEATREJECTION", - "HUMIDIFIER", - "HEATRECOVERY", - "WATERSYSTEMS", - "REFRIGERATION", - "COGENERATION", - "BASEBOARD", - "BOILERS", - "CARBONEQUIVALENTEMISSIONS", - "CHILLERS", - "COALEMISSIONS", - "COLDSTORAGECHARGE", - "COLDSTORAGEDISCHARGE", - "CONDENSATE", - "COOLINGCOILS", - "COOLINGPANEL", - "DIESELEMISSIONS", - "DISTRICTCHILLEDWATER", - "DISTRICTHOTWATER", - "ELECTRICITYEMISSIONS", - "ELECTRICSTORAGE", - "FREECOOLING", - "FUELOILNO1EMISSIONS", - "FUELOILNO2EMISSIONS", - "GASOLINEEMISSIONS", - "HEATINGCOILS", - "HEATPRODUCED", - "HEATRECOVERYFORCOOLING", - "HEATRECOVERYFORHEATING", - "LOOPTOLOOP", - "MAINSWATER", - "NATURALGASEMISSIONS", - "OTHERFUEL1EMISSIONS", - "OTHERFUEL2EMISSIONS", - "PHOTOVOLTAIC", - "POWERCONVERSION", - "PROPANEEMISSIONS", - "PURCHASEDELECTRICITYEMISSIONS", - "RAINWATER", - "SOLDELECTRICITYEMISSIONS", - "WELLWATER", - "WINDTURBINE"}; - - static constexpr std::array sovEndUseCat2endUse = { + static constexpr std::array endUseCatNames = {"Heating", + "Cooling", + "InteriorLights", + "ExteriorLights", + "InteriorEquipment", + "ExteriorEquipment", + "Fans", + "Pumps", + "HeatRejection", + "Humidifier", + "HeatRecovery", + "WaterSystems", + "Refrigeration", + "Cogeneration", + "Baseboard", + "Boilers", + "CarbonEquivalentEmissions", + "Chillers", + "CoalEmissions", + "ColdStorageCharge", + "ColdStorageDischarge", + "Condensate", + "CoolingCoils", + "CoolingPanel", + "DieselEmissions", + "DistrictChilledWater", + "DistrictHotWater", + "ElectricityEmissions", + "ElectricStorage", + "FreeCooling", + "FuelOilNo1Emissions", + "FuelOilNo2Emissions", + "GasolineEmissions", + "HeatingCoils", + "HeatProduced", + "HeatRecoveryForCooling", + "HeatRecoveryForHeating", + "LoopToLoop", + "MainsWater", + "NaturalGasEmissions", + "OtherFuel1Emissions", + "OtherFuel2Emissions", + "Photovoltaic", + "PowerConversion", + "PropaneEmissions", + "PurchasedElectricityEmissions", + "RainWater", + "SoldElectricityEmissions", + "WellWater", + "WindTurbine"}; + + static constexpr std::array endUseCatNamesUC = {"HEATING", + "COOLING", + "INTERIORLIGHTS", + "EXTERIORLIGHTS", + "INTERIOREQUIPMENT", + "EXTERIOREQUIPMENT", + "FANS", + "PUMPS", + "HEATREJECTION", + "HUMIDIFIER", + "HEATRECOVERY", + "WATERSYSTEMS", + "REFRIGERATION", + "COGENERATION", + "BASEBOARD", + "BOILERS", + "CARBONEQUIVALENTEMISSIONS", + "CHILLERS", + "COALEMISSIONS", + "COLDSTORAGECHARGE", + "COLDSTORAGEDISCHARGE", + "CONDENSATE", + "COOLINGCOILS", + "COOLINGPANEL", + "DIESELEMISSIONS", + "DISTRICTCHILLEDWATER", + "DISTRICTHOTWATER", + "ELECTRICITYEMISSIONS", + "ELECTRICSTORAGE", + "FREECOOLING", + "FUELOILNO1EMISSIONS", + "FUELOILNO2EMISSIONS", + "GASOLINEEMISSIONS", + "HEATINGCOILS", + "HEATPRODUCED", + "HEATRECOVERYFORCOOLING", + "HEATRECOVERYFORHEATING", + "LOOPTOLOOP", + "MAINSWATER", + "NATURALGASEMISSIONS", + "OTHERFUEL1EMISSIONS", + "OTHERFUEL2EMISSIONS", + "PHOTOVOLTAIC", + "POWERCONVERSION", + "PROPANEEMISSIONS", + "PURCHASEDELECTRICITYEMISSIONS", + "RAINWATER", + "SOLDELECTRICITYEMISSIONS", + "WELLWATER", + "WINDTURBINE"}; + + static constexpr std::array endUseCat2endUse = { Constant::EndUse::Heating, // Heating Constant::EndUse::Cooling, // Cooling Constant::EndUse::InteriorLights, // InteriorLights @@ -439,7 +402,7 @@ namespace OutputProcessor { Constant::EndUse::Invalid, // WindTurbine, }; - enum class SOVGroup + enum class Group { Invalid = -1, Building, @@ -450,8 +413,8 @@ namespace OutputProcessor { Num }; - static constexpr std::array sovGroupNames = {"Building", "HVAC", "Plant", "Zone", "SpaceType"}; - static constexpr std::array sovGroupNamesUC = {"BUILDING", "HVAC", "PLANT", "ZONE", "SPACETYPE"}; + static constexpr std::array groupNames = {"Building", "HVAC", "Plant", "Zone", "SpaceType"}; + static constexpr std::array groupNamesUC = {"BUILDING", "HVAC", "PLANT", "ZONE", "SPACETYPE"}; struct TimeSteps { @@ -464,7 +427,7 @@ namespace OutputProcessor { int ddVarNum = -1; VariableType varType = VariableType::Invalid; TimeStepType timeStepType = TimeStepType::Zone; // Zone or System - StoreType storeType = StoreType::Averaged; // Variable Type (Summed/Non-Static or Average/Static) + StoreType storeType = StoreType::Average; // Variable Type (Summed/Non-Static or Average/Static) Real64 Value = 0.0; // Current Value of the variable (to resolution of Zone Time Step) Real64 TSValue = 0.0; // Value of this variable at the Zone Time Step Real64 EITSValue = 0.0; // Value of this variable at the Zone Time Step for external interface @@ -476,6 +439,8 @@ namespace OutputProcessor { bool thisTSStored = false; // if stored for this zone timestep int thisTSCount = 0; ReportFreq freq = ReportFreq::Hour; // How often to report this variable + Real64 MaxValue = -9999.0; // Maximum reporting (only for Averaged variables, and those greater than Time Step) + Real64 MinValue = 9999.0; // Minimum reporting (only for Averaged variables, and those greater than Time Step) int maxValueDate = 0; // Date stamp of maximum int minValueDate = 0; // Date stamp of minimum int ReportID = 0; // Report variable ID number @@ -487,23 +452,32 @@ namespace OutputProcessor { std::string keyColonNameUC = ""; // Name of Variable (Uppercase) std::string name = ""; // Name of Variable std::string nameUC = ""; // Name of Variable with out key in uppercase + std::string key = ""; // Name of key only std::string keyUC = ""; // Name of key only witht out variable in uppercase Constant::Units units = Constant::Units::Invalid; // Units for Variable std::string unitNameCustomEMS; // name of units when customEMS is used for EMS variables that are unusual + std::string indexGroup = ""; + int indexGroupKey = -1; // Is this thing even used? + std::vector meterNums; // Meter Numbers virtual ~OutVar(){}; std::string multiplierString() const; + + void writeReportData(EnergyPlusData &state); + + void writeOutput(EnergyPlusData &state, // Real variable to write out + ReportFreq const freq); + + void writeReportDictionaryItem(EnergyPlusData &state); }; struct OutVarReal : public OutVar { - Real64 *Which = nullptr; // Pointer to the actual variable holding the value - Real64 MaxValue = -9999.0; // Maximum reporting (only for Averaged variables, and those greater than Time Step) - Real64 MinValue = 9999.0; // Minimum reporting (only for Averaged variables, and those greater than Time Step) + Real64 *Which = nullptr; // Pointer to the actual variable holding the value OutVarReal() { @@ -515,8 +489,6 @@ namespace OutputProcessor { { // Members int *Which = nullptr; // The POINTER to the actual variable holding the value - int MaxValue = -9999; // Maximum reporting (only for Averaged variables, and those greater than Time Step) - int MinValue = 9999; // Minimum reporting (only for Averaged variables, and those greater than Time Step) OutVarInt() { @@ -576,6 +548,8 @@ namespace OutputProcessor { MinVal = MinSetValue; MinValDate = 0; } + + void WriteReportData(EnergyPlusData &state, ReportFreq freq); }; struct Meter @@ -584,14 +558,16 @@ namespace OutputProcessor { std::string Name = ""; // Name of the meter MeterType type = MeterType::Invalid; // type of meter Constant::eResource resource = Constant::eResource::Invalid; // Resource Type of the meter - SOVEndUseCat sovEndUseCat = SOVEndUseCat::Invalid; // End Use of the meter + EndUseCat endUseCat = EndUseCat::Invalid; // End Use of the meter std::string EndUseSub = ""; // End Use subcategory of the meter - SOVGroup sovGroup = SOVGroup::Invalid; // Group of the meter + Group group = Group::Invalid; // Group of the meter Constant::Units units = Constant::Units::Invalid; // Units for the Meter RT_IPUnits RT_forIPUnits; // Resource type number for IP Units (tabular) reporting Real64 CurTSValue = 0.0; // Current TimeStep Value (internal access) + std::string indexGroup = ""; + std::array periods; MeterPeriod periodLastSM; @@ -617,8 +593,8 @@ namespace OutputProcessor { Constant::Units units = Constant::Units::Invalid; VariableType varType = VariableType::Invalid; TimeStepType timeStepType = TimeStepType::Invalid; - SOVEndUseCat sovEndUseCat = SOVEndUseCat::Invalid; - SOVGroup sovGroup = SOVGroup::Invalid; + EndUseCat endUseCat = EndUseCat::Invalid; + Group group = Group::Invalid; int rptNum = -1; }; @@ -651,8 +627,8 @@ namespace OutputProcessor { void InitializeOutput(EnergyPlusData &state); void SetupTimePointers(EnergyPlusData &state, - OutputProcessor::SOVTimeStepType IndexKey, // Which timestep is being set up, 'Zone'=1, 'HVAC'=2 - Real64 &TimeStep // The timestep variable. Used to get the address + OutputProcessor::TimeStepType timeStepType, // Which timestep is being set up, 'Zone'=1, 'HVAC'=2 + Real64 &TimeStep // The timestep variable. Used to get the address ); void CheckReportVariable(EnergyPlusData &state, @@ -664,9 +640,8 @@ namespace OutputProcessor { ReportFreq determineFrequency(EnergyPlusData &state, std::string_view const FreqString); - void ProduceMinMaxString(std::string &String, // Current value - int DateValue, // Date of min/max - ReportFreq freq // Reporting Frequency + std::string produceDateString(int DateValue, // Date of min/max + ReportFreq freq // Reporting Frequency ); // ***************************************************************************** @@ -679,17 +654,17 @@ namespace OutputProcessor { std::string const &Name, // Name for the meter Constant::Units units, // Units for the meter Constant::eResource resource, // ResourceType for the meter - SOVEndUseCat sovEndUseCat, // EndUse for the meter + EndUseCat endUseCat, // EndUse for the meter std::string_view const EndUseSub, // EndUse subcategory for the meter - SOVGroup sovGroup, // Group for the meter + Group group, // Group for the meter int outVarNum); void AttachMeters(EnergyPlusData &state, Constant::Units units, // Units for this meter Constant::eResource resource, // Electricity, Gas, etc. - SOVEndUseCat sovEndUseCat, // End-use category (Lights, Heating, etc.) + EndUseCat endUseCat, // End-use category (Lights, Heating, etc.) std::string_view const EndUseSub, // End-use subcategory (user-defined, e.g., General Lights, Task Lights, etc.) - SOVGroup sovGroup, // Group key (Facility, Zone, Building, etc.) + Group group, // Group key (Facility, Zone, Building, etc.) std::string const &ZoneName, // Zone key only applicable for Building group std::string const &SpaceTypeName, // Space Type key only applicable for Building group int RepVarNum // Number of this report variable @@ -744,24 +719,10 @@ namespace OutputProcessor { std::string const &yearOfSimChr, // the year of the simulation bool writeToSQL); - void WriteReportVariableDictionaryItem(EnergyPlusData &state, - ReportFreq freq, // The reporting interval (e.g., hourly, daily) - StoreType storeType, - int reportID, // The reporting ID for the data - int indexGroupKey, // The reporting group (e.g., Zone, Plant Loop, etc.) - std::string const &indexGroup, // The reporting group (e.g., Zone, Plant Loop, etc.) - std::string_view const keyedValue, // The key name for the data - std::string_view const variableName, // The variable's actual name - TimeStepType timeStepType, - Constant::Units units, // The variables units - std::string_view const customUnitName = {}, - std::string_view const ScheduleName = {}); - void WriteMeterDictionaryItem(EnergyPlusData &state, ReportFreq freq, // The reporting interval (e.g., hourly, daily) StoreType storeType, int reportID, // The reporting ID in for the variable - int indexGroupKey, // The reporting group for the variable std::string const &indexGroup, // The reporting group for the variable std::string const &meterName, // The variable's meter name Constant::Units unit, // The variables units @@ -769,39 +730,12 @@ namespace OutputProcessor { bool meterFileOnlyFlag // A flag indicating whether the data is to be written to standard output ); - void WriteRealVariableOutput(EnergyPlusData &state, - OutVarReal *realVar, // Real variable to write out - ReportFreq freq // The report type or interval (e.g., hourly) - ); - - void WriteReportRealData(EnergyPlusData &state, - int reportID, - Real64 repValue, - StoreType storeType, - Real64 numOfItemsStored, - ReportFreq freq, - Real64 minValue, - int minValueDate, - Real64 MaxValue, - int maxValueDate); - void WriteCumulativeReportMeterData(EnergyPlusData &state, int reportID, // The variable's report ID Real64 repValue, // The variable's value bool meterOnlyFlag // A flag that indicates if the data should be written to standard output ); - void WriteReportMeterData(EnergyPlusData &state, - int reportID, // The variable's report ID - Real64 repValue, // The variable's value - ReportFreq freq, // The variable's reporting interval (e.g., hourly) - Real64 minValue, // The variable's minimum value during the reporting interval - int minValueDate, // The date the minimum value occurred - Real64 MaxValue, // The variable's maximum value during the reporting interval - int maxValueDate, // The date of the maximum value - bool meterOnlyFlag // Indicates whether the data is for the meter file only - ); - void WriteNumericData(EnergyPlusData &state, int reportID, // The variable's reporting ID Real64 repValue // The variable's value @@ -812,23 +746,6 @@ namespace OutputProcessor { int32_t repValue // The variable's value ); - void WriteIntegerVariableOutput(EnergyPlusData &state, - OutVarInt *intVar, // Integer variable to write out - ReportFreq freq // The report type (i.e., the reporting interval) - ); - - void WriteReportIntegerData(EnergyPlusData &state, - int reportID, // The variable's reporting ID - Real64 repValue, // The variable's value - StoreType storeType, // Type of item (averaged or summed) - Real64 numOfItemsStored, // The number of items (hours or timesteps) of data stored - ReportFreq freq, // The reporting interval (e.g., monthly) - int minValue, // The variable's minimum value during the reporting interval - int minValueDate, // The date the minimum value occurred - int MaxValue, // The variable's maximum value during the reporting interval - int maxValueDate // The date the maximum value occurred - ); - int DetermineIndexGroupKeyFromMeterName(EnergyPlusData &state, std::string const &meterName); // the meter name std::string DetermineIndexGroupFromMeterGroup(Meter const *meter); // the meter @@ -849,9 +766,9 @@ namespace OutputProcessor { std::string varKey; }; - std::string standardizeEndUseSub(SOVEndUseCat sovEndUseCat, std::string_view const endUseSub); - void addEndUseSubcategory(EnergyPlusData &state, SOVEndUseCat sovEndUseCat, std::string_view const endUseSubName); - void addEndUseSpaceType(EnergyPlusData &state, SOVEndUseCat sovEndUseCat, std::string_view const endUseSpTypeName); + std::string standardizeEndUseSub(EndUseCat endUseCat, std::string_view const endUseSubCat); + void addEndUseSubcategory(EnergyPlusData &state, EndUseCat endUseCat, std::string_view const endUseSubCat); + void addEndUseSpaceType(EnergyPlusData &state, EndUseCat endUseCat, std::string_view const endUseSpTypeName); } // namespace OutputProcessor //============================================================================================== @@ -864,31 +781,31 @@ namespace OutputProcessor { void SetupOutputVariable( EnergyPlusData &state, - std::string_view const name, // String Name of variable (with units) - Constant::Units units, // Actual units corresponding to the actual variable - Real64 &ActualVariable, // Actual Variable, used to set up pointer - OutputProcessor::SOVTimeStepType timeStepType, // Zone, HeatBalance=1, HVAC, System, Plant=2 - OutputProcessor::SOVStoreType variableType, // State, Average=1, NonState, Sum=2 - std::string const &key, // Associated Key for this variable - Constant::eResource resource = Constant::eResource::Invalid, // Meter Resource Type (Electricity, Gas, etc) - OutputProcessor::SOVEndUseCat sovEndUseCat = OutputProcessor::SOVEndUseCat::Invalid, // Meter End Use Key (Lights, Heating, etc) - std::string_view const endUseSub = {}, // Meter End Use Sub Key (General Lights, Task Lights, etc) - OutputProcessor::SOVGroup sovGroup = OutputProcessor::SOVGroup::Invalid, // Meter Super Group Key (Building, System, Plant) - std::string const &zone = {}, // Meter Zone Key (zone name) - int const zoneMult = 1, // Zone Multiplier, defaults to 1 - int const zoneListMult = 1, // Zone List Multiplier, defaults to 1 - int const indexGroupKey = -999, // Group identifier for SQL output - std::string_view const customUnitName = {}, // the custom name for the units from EMS definition of units - std::string const &spaceType = {}, // Space type (applicable for Building group only) - OutputProcessor::ReportFreq reportFreq = OutputProcessor::ReportFreq::Hour // Internal use -- causes reporting at this freqency + std::string_view const name, // String Name of variable (with units) + Constant::Units units, // Actual units corresponding to the actual variable + Real64 &ActualVariable, // Actual Variable, used to set up pointer + OutputProcessor::TimeStepType timeStepType, // Zone, HeatBalance=1, HVAC, System, Plant=2 + OutputProcessor::StoreType variableType, // State, Average=1, NonState, Sum=2 + std::string const &key, // Associated Key for this variable + Constant::eResource resource = Constant::eResource::Invalid, // Meter Resource Type (Electricity, Gas, etc) + OutputProcessor::Group group = OutputProcessor::Group::Invalid, // Meter Super Group Key (Building, System, Plant) + OutputProcessor::EndUseCat endUseCat = OutputProcessor::EndUseCat::Invalid, // Meter End Use Key (Lights, Heating, etc) + std::string_view const endUseSub = {}, // Meter End Use Sub Key (General Lights, Task Lights, etc) + std::string const &zone = {}, // Meter Zone Key (zone name) + int const zoneMult = 1, // Zone Multiplier, defaults to 1 + int const zoneListMult = 1, // Zone List Multiplier, defaults to 1 + std::string const &spaceType = {}, // Space type (applicable for Building group only) + int const indexGroupKey = -999, // Group identifier for SQL output + std::string_view const customUnitName = {}, // the custom name for the units from EMS definition of units + OutputProcessor::ReportFreq reportFreq = OutputProcessor::ReportFreq::Hour // Internal use -- causes reporting at this freqency ); void SetupOutputVariable(EnergyPlusData &state, std::string_view const VariableName, // String Name of variable Constant::Units VariableUnit, // Actual units corresponding to the actual variable int &ActualVariable, // Actual Variable, used to set up pointer - OutputProcessor::SOVTimeStepType TimeStepTypeKey, // Zone, HeatBalance=1, HVAC, System, Plant=2 - OutputProcessor::SOVStoreType VariableTypeKey, // State, Average=1, NonState, Sum=2 + OutputProcessor::TimeStepType TimeStepType, // Zone, HeatBalance=1, HVAC, System, Plant=2 + OutputProcessor::StoreType VariableType, // State, Average=1, NonState, Sum=2 std::string const &KeyedValue, // Associated Key for this variable int const indexGroupKey = -999, // Group identifier for SQL output OutputProcessor::ReportFreq freq = OutputProcessor::ReportFreq::Hour // Internal use -- causes reporting at this freqency diff --git a/src/EnergyPlus/OutputReportData.hh b/src/EnergyPlus/OutputReportData.hh index 66c415079da..620895c9461 100644 --- a/src/EnergyPlus/OutputReportData.hh +++ b/src/EnergyPlus/OutputReportData.hh @@ -94,7 +94,7 @@ public: // default constructor AnnualFieldSet() : m_variMeter(""), m_colHead(""), m_aggregate(sumOrAvg), m_varUnits(Constant::Units::None), - m_typeOfVar(OutputProcessor::VariableType::Invalid), m_keyCount(0), m_varAvgSum(OutputProcessor::StoreType::Averaged), m_bottomBinValue(0), + m_typeOfVar(OutputProcessor::VariableType::Invalid), m_keyCount(0), m_varAvgSum(OutputProcessor::StoreType::Average), m_bottomBinValue(0), m_topBinValue(0) { } diff --git a/src/EnergyPlus/OutputReportTabular.cc b/src/EnergyPlus/OutputReportTabular.cc index 39bc1d971cd..5ec4fef2146 100644 --- a/src/EnergyPlus/OutputReportTabular.cc +++ b/src/EnergyPlus/OutputReportTabular.cc @@ -623,7 +623,7 @@ void InitializeTabularMonthly(EnergyPlusData &state) // call the key count function but only need count during this pass int KeyCount = 0; GetVariableKeyCountandType(state, curVariMeter, KeyCount, TypeVar, AvgSumVar, StepTypeVar, UnitsVar); - if (TypeVar == OutputProcessor::VariableType::NotFound) { // TODO: This NotFound thing has to go + if (TypeVar == OutputProcessor::VariableType::Invalid) { // TODO: This NotFound thing has to go if (!ort->MonthlyInput(TabNum).isNamedMonthly) { ++state.dataOutRptTab->ErrCount1; } @@ -723,7 +723,7 @@ void InitializeTabularMonthly(EnergyPlusData &state) e.varName.clear(); e.varNum = 0; e.typeOfVar = OutputProcessor::VariableType::Invalid; - e.avgSum = OutputProcessor::StoreType::Averaged; + e.avgSum = OutputProcessor::StoreType::Average; e.stepType = OutputProcessor::TimeStepType::Zone; e.units = Constant::Units::None; e.aggType = AggType::Invalid; @@ -934,7 +934,7 @@ void InitializeTabularMonthly(EnergyPlusData &state) ort->MonthlyColumns(mColumn).varName = curVariMeter; ort->MonthlyColumns(mColumn).varNum = 0; ort->MonthlyColumns(mColumn).typeOfVar = OutputProcessor::VariableType::Invalid; - ort->MonthlyColumns(mColumn).avgSum = OutputProcessor::StoreType::Averaged; + ort->MonthlyColumns(mColumn).avgSum = OutputProcessor::StoreType::Average; ort->MonthlyColumns(mColumn).stepType = OutputProcessor::TimeStepType::Zone; ort->MonthlyColumns(mColumn).units = Constant::Units::None; ort->MonthlyColumns(mColumn).aggType = AggType::SumOrAvg; @@ -3493,7 +3493,7 @@ void GatherBinResultsForTimestep(EnergyPlusData &state, OutputProcessor::TimeSte // put actual value from OutputProcesser arrays Real64 curValue = GetInternalVariableValue(state, curTypeOfVar, ort->BinObjVarID(repIndex).varMeterNum); // per MJW when a summed variable is used divide it by the length of the time step - if (ort->OutputTableBinned(iInObj).avgSum == OutputProcessor::StoreType::Summed) { // if it is a summed variable + if (ort->OutputTableBinned(iInObj).avgSum == OutputProcessor::StoreType::Sum) { // if it is a summed variable curValue /= (elapsedTime * Constant::SecInHour); } // round the value to the number of signficant digits used in the final output report @@ -3623,7 +3623,7 @@ void GatherMonthlyResultsForTimestep(EnergyPlusData &state, OutputProcessor::Tim // use next lines since it is faster was: SELECT CASE (MonthlyColumns(curCol)%aggType) switch (state.dataOutRptTab->MonthlyColumnsAggType(curCol)) { case AggType::SumOrAvg: { - if (ort->MonthlyColumns(curCol).avgSum == OutputProcessor::StoreType::Summed) { // if it is a summed variable + if (ort->MonthlyColumns(curCol).avgSum == OutputProcessor::StoreType::Sum) { // if it is a summed variable newResultValue = oldResultValue + curValue; } else { newResultValue = oldResultValue + curValue * elapsedTime; // for averaging - weight by elapsed time @@ -3633,7 +3633,7 @@ void GatherMonthlyResultsForTimestep(EnergyPlusData &state, OutputProcessor::Tim } break; case AggType::Maximum: { // per MJW when a summed variable is used divide it by the length of the time step - if (ort->MonthlyColumns(curCol).avgSum == OutputProcessor::StoreType::Summed) { // if it is a summed variable + if (ort->MonthlyColumns(curCol).avgSum == OutputProcessor::StoreType::Sum) { // if it is a summed variable if (t_timeStepType == OutputProcessor::TimeStepType::System) { curValue /= TimeStepSysSec; } else { @@ -3651,7 +3651,7 @@ void GatherMonthlyResultsForTimestep(EnergyPlusData &state, OutputProcessor::Tim } break; case AggType::Minimum: { // per MJW when a summed variable is used divide it by the length of the time step - if (ort->MonthlyColumns(curCol).avgSum == OutputProcessor::StoreType::Summed) { // if it is a summed variable + if (ort->MonthlyColumns(curCol).avgSum == OutputProcessor::StoreType::Sum) { // if it is a summed variable if (t_timeStepType == OutputProcessor::TimeStepType::System) { curValue /= TimeStepSysSec; } else { @@ -3756,7 +3756,7 @@ void GatherMonthlyResultsForTimestep(EnergyPlusData &state, OutputProcessor::Tim int const scanVarNum = ort->MonthlyColumns(scanColumn).varNum; Real64 scanValue = GetInternalVariableValue(state, scanTypeOfVar, scanVarNum); // When a summed variable is used divide it by the length of the time step - if (ort->MonthlyColumns(scanColumn).avgSum == OutputProcessor::StoreType::Summed) { // if it is a summed variable + if (ort->MonthlyColumns(scanColumn).avgSum == OutputProcessor::StoreType::Sum) { // if it is a summed variable if (t_timeStepType == OutputProcessor::TimeStepType::System) { scanValue /= TimeStepSysSec; } else { @@ -3790,7 +3790,7 @@ void GatherMonthlyResultsForTimestep(EnergyPlusData &state, OutputProcessor::Tim break; // do case AggType::SumOrAverageHoursShown: { // this case is when the value should be set - if (ort->MonthlyColumns(scanColumn).avgSum == OutputProcessor::StoreType::Summed) { // if it is a summed variable + if (ort->MonthlyColumns(scanColumn).avgSum == OutputProcessor::StoreType::Sum) { // if it is a summed variable ort->MonthlyColumns(scanColumn).reslt(state.dataEnvrn->Month) = oldScanValue + scanValue; } else { // for averaging - weight by elapsed time @@ -3799,7 +3799,7 @@ void GatherMonthlyResultsForTimestep(EnergyPlusData &state, OutputProcessor::Tim ort->MonthlyColumns(scanColumn).duration(state.dataEnvrn->Month) += elapsedTime; } break; case AggType::MaximumDuringHoursShown: { - if (ort->MonthlyColumns(scanColumn).avgSum == OutputProcessor::StoreType::Summed) { // if it is a summed variable + if (ort->MonthlyColumns(scanColumn).avgSum == OutputProcessor::StoreType::Sum) { // if it is a summed variable if (t_timeStepType == OutputProcessor::TimeStepType::System) { scanValue /= TimeStepSysSec; } else { @@ -3812,7 +3812,7 @@ void GatherMonthlyResultsForTimestep(EnergyPlusData &state, OutputProcessor::Tim } } break; case AggType::MinimumDuringHoursShown: { - if (ort->MonthlyColumns(scanColumn).avgSum == OutputProcessor::StoreType::Summed) { // if it is a summed variable + if (ort->MonthlyColumns(scanColumn).avgSum == OutputProcessor::StoreType::Sum) { // if it is a summed variable if (t_timeStepType == OutputProcessor::TimeStepType::System) { scanValue /= TimeStepSysSec; } else { @@ -7087,7 +7087,7 @@ void WriteMonthlyTables(EnergyPlusData &state) maxVal = storedMinVal; for (lMonth = 1; lMonth <= 12; ++lMonth) { if (ort->MonthlyColumns(curCol).avgSum == - OutputProcessor::StoreType::Averaged) { // if it is a average variable divide by duration + OutputProcessor::StoreType::Average) { // if it is a average variable divide by duration if (ort->MonthlyColumns(curCol).duration(lMonth) != 0) { curVal = ((ort->MonthlyColumns(curCol).reslt(lMonth) / ort->MonthlyColumns(curCol).duration(lMonth)) * curConversionFactor) + @@ -7112,7 +7112,7 @@ void WriteMonthlyTables(EnergyPlusData &state) } // lMonth // add the summary to bottom if (ort->MonthlyColumns(curCol).avgSum == - OutputProcessor::StoreType::Averaged) { // if it is a average variable divide by duration + OutputProcessor::StoreType::Average) { // if it is a average variable divide by duration if (sumDuration > 0) { tableBody(columnRecount, 14) = RealToStr(sumVal / sumDuration, digitsShown); } else { @@ -7162,7 +7162,7 @@ void WriteMonthlyTables(EnergyPlusData &state) } break; case AggType::ValueWhenMaxMin: { ++columnRecount; - if (ort->MonthlyColumns(curCol).avgSum == OutputProcessor::StoreType::Summed) { + if (ort->MonthlyColumns(curCol).avgSum == OutputProcessor::StoreType::Sum) { curUnits += "/s"; } if (Util::SameString(curUnits, "J/s")) { @@ -7220,7 +7220,7 @@ void WriteMonthlyTables(EnergyPlusData &state) case AggType::MinimumDuringHoursShown: { columnRecount += 2; // put in the name of the variable for the column - if (ort->MonthlyColumns(curCol).avgSum == OutputProcessor::StoreType::Summed) { // if it is a summed variable + if (ort->MonthlyColumns(curCol).avgSum == OutputProcessor::StoreType::Sum) { // if it is a summed variable curUnits += "/s"; } if (Util::SameString(curUnits, "J/s")) { @@ -7299,7 +7299,7 @@ void WriteMonthlyTables(EnergyPlusData &state) } // KColumn if (produceTabular) { WriteReportHeaders( - state, ort->MonthlyInput(iInput).name, ort->MonthlyTables(curTable).keyValue, OutputProcessor::StoreType::Averaged); + state, ort->MonthlyInput(iInput).name, ort->MonthlyTables(curTable).keyValue, OutputProcessor::StoreType::Average); WriteSubtitle(state, "Custom Monthly Report"); WriteTable(state, tableBody, rowHead, columnHead, columnWidth, true); // transpose monthly XML tables. } @@ -7674,7 +7674,7 @@ void WriteBEPSTable(EnergyPlusData &state) // show the headers of the report if (ort->displayTabularBEPS) { - WriteReportHeaders(state, "Annual Building Utility Performance Summary", "Entire Facility", OutputProcessor::StoreType::Averaged); + WriteReportHeaders(state, "Annual Building Utility Performance Summary", "Entire Facility", OutputProcessor::StoreType::Average); // show the number of hours that the table applies to WriteTextLine(state, "Values gathered over " + RealToStr(ort->gatherElapsedTimeBEPS, 2) + " hours", true); if (ort->gatherElapsedTimeBEPS < 8759.0) { // might not add up to 8760 exactly but can't be more than 1 hour diff. @@ -9782,7 +9782,7 @@ void WriteSourceEnergyEndUseSummary(EnergyPlusData &state) Array3D collapsedEndUseSub(state.dataOutputProcessor->MaxNumSubcategories, static_cast(Constant::EndUse::Num), 14); // show the headers of the report - WriteReportHeaders(state, "Source Energy End Use Components Summary", "Entire Facility", OutputProcessor::StoreType::Averaged); + WriteReportHeaders(state, "Source Energy End Use Components Summary", "Entire Facility", OutputProcessor::StoreType::Average); // show the number of hours that the table applies to WriteTextLine(state, "Values gathered over " + RealToStr(ort->gatherElapsedTimeBEPS, 2) + " hours", true); if (ort->gatherElapsedTimeBEPS < 8759.0) { // might not add up to 8760 exactly but can't be more than 1 hour diff. @@ -10191,7 +10191,7 @@ void WriteDemandEndUseSummary(EnergyPlusData &state) Array2D endUseSubOther(14, static_cast(Constant::EndUse::Num)); // show the headers of the report - WriteReportHeaders(state, "Demand End Use Components Summary", "Entire Facility", OutputProcessor::StoreType::Averaged); + WriteReportHeaders(state, "Demand End Use Components Summary", "Entire Facility", OutputProcessor::StoreType::Average); Real64 ipElectricityConversion = 1.0; // declare here so that last one used is correct for LEEED section for (int iUnitSystem = 0; iUnitSystem <= 1; iUnitSystem++) { @@ -10699,7 +10699,7 @@ void WriteCompCostTable(EnergyPlusData &state) Array1D_string rowHead; Array2D_string tableBody; - WriteReportHeaders(state, "Component Cost Economics Summary", "Entire Facility", OutputProcessor::StoreType::Averaged); + WriteReportHeaders(state, "Component Cost Economics Summary", "Entire Facility", OutputProcessor::StoreType::Average); // compute floor area if no ABUPS if (ort->buildingConditionedFloorArea == 0.0) { @@ -11006,7 +11006,7 @@ void WriteVeriSumTable(EnergyPlusData &state) // show the headers of the report if (produceTabular) { - WriteReportHeaders(state, "Input Verification and Results Summary", "Entire Facility", OutputProcessor::StoreType::Averaged); + WriteReportHeaders(state, "Input Verification and Results Summary", "Entire Facility", OutputProcessor::StoreType::Average); } // Moved these initializations into the loop @@ -12176,7 +12176,7 @@ void WriteAdaptiveComfortTable(EnergyPlusData &state) rowHead.allocate(ort->numPeopleAdaptive); tableBody.allocate(5, ort->numPeopleAdaptive); - WriteReportHeaders(state, "Adaptive Comfort Summary", "Entire Facility", OutputProcessor::StoreType::Averaged); + WriteReportHeaders(state, "Adaptive Comfort Summary", "Entire Facility", OutputProcessor::StoreType::Average); WriteSubtitle(state, "Time Not Meeting the Adaptive Comfort Models during Occupied Hours"); Array1D_int columnWidth; @@ -12242,7 +12242,7 @@ void WriteReportHeaderReportingPeriod(EnergyPlusData &state, state, fmt::format("{} Resilience Summary for Reporting Period {}: {}", reportKeyWord, periodIdx, ReportPeriodInputData(periodIdx).title), "Entire Facility", - OutputProcessor::StoreType::Averaged); + OutputProcessor::StoreType::Average); WriteSubtitle(state, format("Reporting period: {} -- {}, Total Electricity Usage: {:.2R} kWh", @@ -12279,7 +12279,7 @@ void WriteReportPeriodTimeConsumption(EnergyPlusData &state) int constexpr reportperiodEnd(5); int constexpr reportperiodElectricity(6); - WriteReportHeaders(state, "Reporting Period Summary", "Entire Facility", OutputProcessor::StoreType::Averaged); + WriteReportHeaders(state, "Reporting Period Summary", "Entire Facility", OutputProcessor::StoreType::Average); columnHead(reportperiodType) = "Report Type"; columnHead(reportperiodId) = "Report Index"; @@ -13109,7 +13109,7 @@ void WriteThermalResilienceTables(EnergyPlusData &state) degreeHourConversion = 1.0; } - WriteReportHeaders(state, "Annual Thermal Resilience Summary", "Entire Facility", OutputProcessor::StoreType::Averaged); + WriteReportHeaders(state, "Annual Thermal Resilience Summary", "Entire Facility", OutputProcessor::StoreType::Average); Array1D_int columnWidth; columnWidth.allocate(numColumnThermalTbl); @@ -13517,7 +13517,7 @@ void WriteHeatEmissionTable(EnergyPlusData &state) if (produceDualUnitsFlags(iUnitSystem, ort->unitsStyle, ort->unitsStyle_SQLite, unitsStyle_cur, produceTabular, produceSQLite)) break; if (produceTabular) { - WriteReportHeaders(state, "Annual Heat Emissions Report", "Entire Facility", OutputProcessor::StoreType::Averaged); + WriteReportHeaders(state, "Annual Heat Emissions Report", "Entire Facility", OutputProcessor::StoreType::Average); WriteSubtitle(state, "Annual Heat Emissions Summary"); } @@ -13665,7 +13665,7 @@ void WritePredefinedTables(EnergyPlusData &state) WriteReportHeaders(state, state.dataOutRptPredefined->reportName(iReportName).namewithspaces, "Entire Facility", - OutputProcessor::StoreType::Averaged); + OutputProcessor::StoreType::Average); } // loop through the subtables and include those that are associated with this report for (int jSubTable = 1, jSubTable_end = state.dataOutRptPredefined->numSubTable; jSubTable <= jSubTable_end; ++jSubTable) { @@ -13871,7 +13871,7 @@ void WriteComponentSizing(EnergyPlusData &state) int iTableEntry; int jUnique; - WriteReportHeaders(state, "Component Sizing Summary", "Entire Facility", OutputProcessor::StoreType::Averaged); + WriteReportHeaders(state, "Component Sizing Summary", "Entire Facility", OutputProcessor::StoreType::Average); for (int iUnitSystem = 0; iUnitSystem <= 1; iUnitSystem++) { UnitsStyle unitsStyle_cur = ort->unitsStyle; @@ -14149,7 +14149,7 @@ void WriteSurfaceShadowing(EnergyPlusData &state) } assert(numreceivingfields == state.dataOutRptPredefined->numShadowRelate); - WriteReportHeaders(state, "Surface Shadowing Summary", "Entire Facility", OutputProcessor::StoreType::Averaged); + WriteReportHeaders(state, "Surface Shadowing Summary", "Entire Facility", OutputProcessor::StoreType::Average); unique.allocate(state.dataOutRptPredefined->numShadowRelate); // do entire process twice, once with surfaces receiving, once with subsurfaces receiving for (int iKindRec = recKindSurface; iKindRec <= recKindSubsurface; ++iKindRec) { @@ -14254,7 +14254,7 @@ void WriteEioTables(EnergyPlusData &state) Array1D_int colUnitConv; // setting up report header - WriteReportHeaders(state, "Initialization Summary", "Entire Facility", OutputProcessor::StoreType::Averaged); + WriteReportHeaders(state, "Initialization Summary", "Entire Facility", OutputProcessor::StoreType::Average); std::vector headerLines; // holds the lines that describe each type of records - each starts with ! symbol std::vector bodyLines; // holds the data records only @@ -16524,7 +16524,7 @@ void OutputCompLoadSummary(EnergyPlusData &state, Array2D_string tableBody; //(row, column) if (produceTabular_para) { - WriteReportHeaders(state, reportName, zoneAirLoopFacilityName, OutputProcessor::StoreType::Averaged); + WriteReportHeaders(state, reportName, zoneAirLoopFacilityName, OutputProcessor::StoreType::Average); } std::string peakLoadCompName; std::string peakCondName; @@ -16832,7 +16832,7 @@ void WriteReportHeaders(EnergyPlusData &state, // Write the first few lines of each report with headers to the output // file for tabular reports. - std::string const modifiedReportName(reportName + (averageOrSum == OutputProcessor::StoreType::Summed ? " per second" : "")); + std::string const modifiedReportName(reportName + (averageOrSum == OutputProcessor::StoreType::Sum ? " per second" : "")); auto &ort = state.dataOutRptTab; for (int iStyle = 1; iStyle <= ort->numStyles; ++iStyle) { diff --git a/src/EnergyPlus/OutputReportTabular.hh b/src/EnergyPlus/OutputReportTabular.hh index 1396d191af1..3fd6b218731 100644 --- a/src/EnergyPlus/OutputReportTabular.hh +++ b/src/EnergyPlus/OutputReportTabular.hh @@ -265,12 +265,12 @@ namespace OutputReportTabular { // the lowest bin and above the value of the last bin are also shown. int resIndex = 0; // result index - pointer to BinResults array int numTables = 0; - OutputProcessor::VariableType typeOfVar = OutputProcessor::VariableType::NotFound; - OutputProcessor::StoreType avgSum = OutputProcessor::StoreType::Averaged; // Variable is Averaged=1 or Summed=2 - OutputProcessor::TimeStepType stepType = OutputProcessor::TimeStepType::Zone; // Variable time step is Zone=1 or HVAC=2 - Constant::Units units = Constant::Units::Invalid; // the units enumeration - std::string ScheduleName; // the name of the schedule - int scheduleIndex = 0; // index to the schedule specified - if no schedule use zero + OutputProcessor::VariableType typeOfVar = OutputProcessor::VariableType::Invalid; // Was NotFound + OutputProcessor::StoreType avgSum = OutputProcessor::StoreType::Average; // Variable is Averaged=1 or Summed=2 + OutputProcessor::TimeStepType stepType = OutputProcessor::TimeStepType::Zone; // Variable time step is Zone=1 or HVAC=2 + Constant::Units units = Constant::Units::Invalid; // the units enumeration + std::string ScheduleName; // the name of the schedule + int scheduleIndex = 0; // index to the schedule specified - if no schedule use zero }; struct BinResultsType @@ -354,7 +354,7 @@ namespace OutputReportTabular { // Default Constructor MonthlyFieldSetInputType() : aggregate(AggType::Invalid), varUnits(Constant::Units::None), typeOfVar(OutputProcessor::VariableType::Invalid), keyCount(0), - varAvgSum(OutputProcessor::StoreType::Averaged), varStepType(OutputProcessor::TimeStepType::Zone) + varAvgSum(OutputProcessor::StoreType::Average), varStepType(OutputProcessor::TimeStepType::Zone) { } }; @@ -391,7 +391,7 @@ namespace OutputReportTabular { // Default Constructor MonthlyColumnsType() - : varNum(0), typeOfVar(OutputProcessor::VariableType::Invalid), avgSum(OutputProcessor::StoreType::Averaged), + : varNum(0), typeOfVar(OutputProcessor::VariableType::Invalid), avgSum(OutputProcessor::StoreType::Average), stepType(OutputProcessor::TimeStepType::Zone), units(Constant::Units::None), aggType(AggType::Invalid), reslt(12, 0.0), duration(12, 0.0), timeStamp(12, 0), aggForStep(0.0) { diff --git a/src/EnergyPlus/OutputReportTabularAnnual.cc b/src/EnergyPlus/OutputReportTabularAnnual.cc index 208e778b7a9..fe42ff37954 100644 --- a/src/EnergyPlus/OutputReportTabularAnnual.cc +++ b/src/EnergyPlus/OutputReportTabularAnnual.cc @@ -372,7 +372,7 @@ void AnnualTable::gatherForTimestep(EnergyPlusData &state, OutputProcessor::Time // noAggregation, valueWhenMaxMin, sumOrAverageHoursShown, maximumDuringHoursShown, minimumDuringHoursShown: switch (fldStIt->m_aggregate) { case AnnualFieldSet::AggregationKind::sumOrAvg: - if (fldStIt->m_varAvgSum == OutputProcessor::StoreType::Summed) { // if it is a summed variable + if (fldStIt->m_varAvgSum == OutputProcessor::StoreType::Sum) { // if it is a summed variable newResultValue = oldResultValue + curValue; } else { newResultValue = oldResultValue + curValue * elapsedTime; // for averaging - weight by elapsed time @@ -382,7 +382,7 @@ void AnnualTable::gatherForTimestep(EnergyPlusData &state, OutputProcessor::Time break; case AnnualFieldSet::AggregationKind::maximum: // per MJW when a summed variable is used divide it by the length of the time step - if (fldStIt->m_varAvgSum == OutputProcessor::StoreType::Summed) { // if it is a summed variable + if (fldStIt->m_varAvgSum == OutputProcessor::StoreType::Sum) { // if it is a summed variable curValue /= secondsInTimeStep; } if (curValue > oldResultValue) { @@ -396,7 +396,7 @@ void AnnualTable::gatherForTimestep(EnergyPlusData &state, OutputProcessor::Time break; case AnnualFieldSet::AggregationKind::minimum: // per MJW when a summed variable is used divide it by the length of the time step - if (fldStIt->m_varAvgSum == OutputProcessor::StoreType::Summed) { // if it is a summed variable + if (fldStIt->m_varAvgSum == OutputProcessor::StoreType::Sum) { // if it is a summed variable curValue /= secondsInTimeStep; } if (curValue < oldResultValue) { @@ -469,7 +469,7 @@ void AnnualTable::gatherForTimestep(EnergyPlusData &state, OutputProcessor::Time case AnnualFieldSet::AggregationKind::hoursInTenBinsPlusMinusTwoStdDev: case AnnualFieldSet::AggregationKind::hoursInTenBinsPlusMinusThreeStdDev: // for all of the binning options add the value to the deferred - if (fldStIt->m_varAvgSum == OutputProcessor::StoreType::Summed) { // if it is a summed variable + if (fldStIt->m_varAvgSum == OutputProcessor::StoreType::Sum) { // if it is a summed variable fldStIt->m_cell[row].deferredResults.push_back(curValue /= secondsInTimeStep); // divide by time just like max and min } else { fldStIt->m_cell[row].deferredResults.push_back(curValue); @@ -513,7 +513,7 @@ void AnnualTable::gatherForTimestep(EnergyPlusData &state, OutputProcessor::Time if (scanVarNum > -1) { Real64 scanValue = GetInternalVariableValue(state, scanTypeOfVar, scanVarNum); // When a summed variable is used divide it by the length of the time step - if (fldStRemainIt->m_varAvgSum == OutputProcessor::StoreType::Summed) { // if it is a summed variable + if (fldStRemainIt->m_varAvgSum == OutputProcessor::StoreType::Sum) { // if it is a summed variable scanValue /= secondsInTimeStep; } fldStRemainIt->m_cell[row].result = scanValue; @@ -542,7 +542,7 @@ void AnnualTable::gatherForTimestep(EnergyPlusData &state, OutputProcessor::Time // end scanning since these might reset break; // for fldStRemainIt } else if (fldStRemainIt->m_aggregate == AnnualFieldSet::AggregationKind::sumOrAverageHoursShown) { - if (fldStIt->m_varAvgSum == OutputProcessor::StoreType::Summed) { // if it is a summed variable + if (fldStIt->m_varAvgSum == OutputProcessor::StoreType::Sum) { // if it is a summed variable fldStRemainIt->m_cell[row].result = oldScanValue + scanValue; } else { fldStRemainIt->m_cell[row].result = @@ -550,7 +550,7 @@ void AnnualTable::gatherForTimestep(EnergyPlusData &state, OutputProcessor::Time } fldStRemainIt->m_cell[row].duration += elapsedTime; } else if (fldStRemainIt->m_aggregate == AnnualFieldSet::AggregationKind::minimumDuringHoursShown) { - if (fldStRemainIt->m_varAvgSum == OutputProcessor::StoreType::Summed) { // if it is a summed variable + if (fldStRemainIt->m_varAvgSum == OutputProcessor::StoreType::Sum) { // if it is a summed variable scanValue /= secondsInTimeStep; } if (scanValue < oldScanValue) { @@ -558,7 +558,7 @@ void AnnualTable::gatherForTimestep(EnergyPlusData &state, OutputProcessor::Time fldStRemainIt->m_cell[row].timeStamp = timestepTimeStamp; } } else if (fldStRemainIt->m_aggregate == AnnualFieldSet::AggregationKind::maximumDuringHoursShown) { - if (fldStRemainIt->m_varAvgSum == OutputProcessor::StoreType::Summed) { // if it is a summed variable + if (fldStRemainIt->m_varAvgSum == OutputProcessor::StoreType::Sum) { // if it is a summed variable scanValue /= secondsInTimeStep; } if (scanValue > oldScanValue) { @@ -751,7 +751,7 @@ void AnnualTable::writeTable(EnergyPlusData &state, OutputReportTabular::UnitsSt for (unsigned int row = 0; row != m_objectNames.size(); row++) { // loop through by row. if (fldStIt->m_cell[row].indexesForKeyVar >= 0) { - if (fldStIt->m_varAvgSum == OutputProcessor::StoreType::Averaged) { // if it is a average variable divide by duration + if (fldStIt->m_varAvgSum == OutputProcessor::StoreType::Average) { // if it is a average variable divide by duration if (fldStIt->m_cell[row].duration != 0.0) { curVal = ((fldStIt->m_cell[row].result / fldStIt->m_cell[row].duration) * curConversionFactor) + curConversionOffset; } else { @@ -772,7 +772,7 @@ void AnnualTable::writeTable(EnergyPlusData &state, OutputReportTabular::UnitsSt } // row // add the summary to bottom - if (fldStIt->m_varAvgSum == OutputProcessor::StoreType::Averaged) { // if it is a average variable divide by duration + if (fldStIt->m_varAvgSum == OutputProcessor::StoreType::Average) { // if it is a average variable divide by duration if (sumDuration > 0) { tableBody(columnRecount, rowSumAvg) = OutputReportTabular::RealToStr(sumVal / sumDuration, fldStIt->m_showDigits); } else { @@ -812,7 +812,7 @@ void AnnualTable::writeTable(EnergyPlusData &state, OutputReportTabular::UnitsSt tableBody(columnRecount, rowMin) = OutputReportTabular::RealToStr(maxVal, fldStIt->m_showDigits); } } else if (curAgg == AnnualFieldSet::AggregationKind::valueWhenMaxMin) { - if (fldStIt->m_varAvgSum == OutputProcessor::StoreType::Summed) { + if (fldStIt->m_varAvgSum == OutputProcessor::StoreType::Sum) { curUnits += "/s"; } fixUnitsPerSecond(curUnits, curConversionFactor); @@ -837,7 +837,7 @@ void AnnualTable::writeTable(EnergyPlusData &state, OutputReportTabular::UnitsSt (curAgg == AnnualFieldSet::AggregationKind::maximumDuringHoursShown) || (curAgg == AnnualFieldSet::AggregationKind::minimumDuringHoursShown)) { // put in the name of the variable for the column - if (fldStIt->m_varAvgSum == OutputProcessor::StoreType::Summed) { // if it is a summed variable + if (fldStIt->m_varAvgSum == OutputProcessor::StoreType::Sum) { // if it is a summed variable curUnits += "/s"; } fixUnitsPerSecond(curUnits, curConversionFactor); @@ -879,7 +879,7 @@ void AnnualTable::writeTable(EnergyPlusData &state, OutputReportTabular::UnitsSt } } else if (curAgg == AnnualFieldSet::AggregationKind::hoursInTenBinsMinToMax) { // put in the name of the variable for the column - if (fldStIt->m_varAvgSum == OutputProcessor::StoreType::Summed) { // if it is a summed variable + if (fldStIt->m_varAvgSum == OutputProcessor::StoreType::Sum) { // if it is a summed variable curUnits += "/s"; } fixUnitsPerSecond(curUnits, curConversionFactor); @@ -896,7 +896,7 @@ void AnnualTable::writeTable(EnergyPlusData &state, OutputReportTabular::UnitsSt createBinRangeTable = true; } else if (curAgg == AnnualFieldSet::AggregationKind::hoursInTenBinsZeroToMax) { // put in the name of the variable for the column - if (fldStIt->m_varAvgSum == OutputProcessor::StoreType::Summed) { // if it is a summed variable + if (fldStIt->m_varAvgSum == OutputProcessor::StoreType::Sum) { // if it is a summed variable curUnits += "/s"; } fixUnitsPerSecond(curUnits, curConversionFactor); @@ -919,7 +919,7 @@ void AnnualTable::writeTable(EnergyPlusData &state, OutputReportTabular::UnitsSt createBinRangeTable = true; } else if (curAgg == AnnualFieldSet::AggregationKind::hoursInTenBinsMinToZero) { // put in the name of the variable for the column - if (fldStIt->m_varAvgSum == OutputProcessor::StoreType::Summed) { // if it is a summed variable + if (fldStIt->m_varAvgSum == OutputProcessor::StoreType::Sum) { // if it is a summed variable curUnits += "/s"; } fixUnitsPerSecond(curUnits, curConversionFactor); @@ -945,7 +945,7 @@ void AnnualTable::writeTable(EnergyPlusData &state, OutputReportTabular::UnitsSt } } // fldStIt if (produceTabular_para) { - OutputReportTabular::WriteReportHeaders(state, m_name, "Entire Facility", OutputProcessor::StoreType::Averaged); + OutputReportTabular::WriteReportHeaders(state, m_name, "Entire Facility", OutputProcessor::StoreType::Average); OutputReportTabular::WriteSubtitle(state, "Custom Annual Report"); OutputReportTabular::WriteTable(state, tableBody, rowHead, columnHead, columnWidth, true); // transpose annual XML tables. } @@ -1318,7 +1318,7 @@ void AnnualTable::convertUnitForDeferredResults(EnergyPlusData &state, curConversionOffset = 0.0; } } - if (fldStIt->m_varAvgSum == OutputProcessor::StoreType::Summed) { + if (fldStIt->m_varAvgSum == OutputProcessor::StoreType::Sum) { curUnits += "/s"; } fixUnitsPerSecond(curUnits, curConversionFactor); diff --git a/src/EnergyPlus/OutsideEnergySources.cc b/src/EnergyPlus/OutsideEnergySources.cc index ee91dab4bc7..452a0703452 100644 --- a/src/EnergyPlus/OutsideEnergySources.cc +++ b/src/EnergyPlus/OutsideEnergySources.cc @@ -541,56 +541,55 @@ void OutsideEnergySourceSpecs::oneTimeInit_new(EnergyPlusData &state) PlantUtilities::RegisterPlantCompDesignFlow(state, this->InletNodeNum, loop.MaxVolFlowRate); std::string reportVarPrefix = "District Heating Water "; - OutputProcessor::SOVEndUseCat heatingOrCooling = OutputProcessor::SOVEndUseCat::Heating; + OutputProcessor::EndUseCat heatingOrCooling = OutputProcessor::EndUseCat::Heating; Constant::eResource meterTypeKey = Constant::eResource::DistrictHeatingWater; if (this->EnergyType == DataPlant::PlantEquipmentType::PurchChilledWater) { reportVarPrefix = "District Cooling Water "; - heatingOrCooling = OutputProcessor::SOVEndUseCat::Cooling; + heatingOrCooling = OutputProcessor::EndUseCat::Cooling; meterTypeKey = Constant::eResource::DistrictCooling; } else if (this->EnergyType == DataPlant::PlantEquipmentType::PurchSteam) { reportVarPrefix = "District Heating Steam "; - heatingOrCooling = OutputProcessor::SOVEndUseCat::Heating; + heatingOrCooling = OutputProcessor::EndUseCat::Heating; meterTypeKey = Constant::eResource::DistrictHeatingSteam; } SetupOutputVariable(state, format("{}Energy", reportVarPrefix), Constant::Units::J, this->EnergyTransfer, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, meterTypeKey, - heatingOrCooling, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + heatingOrCooling); SetupOutputVariable(state, format("{}Rate", reportVarPrefix), Constant::Units::W, this->EnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, format("{}Inlet Temperature", reportVarPrefix), Constant::Units::C, this->InletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, format("{}Outlet Temperature", reportVarPrefix), Constant::Units::C, this->OutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, format("{}Mass Flow Rate", reportVarPrefix), Constant::Units::kg_s, this->MassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); } diff --git a/src/EnergyPlus/PVWatts.cc b/src/EnergyPlus/PVWatts.cc index d152071b31b..e53d76f6cd6 100644 --- a/src/EnergyPlus/PVWatts.cc +++ b/src/EnergyPlus/PVWatts.cc @@ -177,40 +177,39 @@ namespace PVWatts { "Generator Produced DC Electricity Rate", Constant::Units::W, outputDCPower_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name_); SetupOutputVariable(state, "Generator Produced DC Electricity Energy", Constant::Units::J, outputDCEnergy_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, name_, Constant::eResource::ElectricityProduced, - OutputProcessor::SOVEndUseCat::Photovoltaic, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Photovoltaic); SetupOutputVariable(state, "Generator PV Cell Temperature", Constant::Units::C, cellTemperature_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name_); SetupOutputVariable(state, "Plane of Array Irradiance", Constant::Units::W_m2, planeOfArrayIrradiance_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name_); SetupOutputVariable(state, "Shaded Percent", Constant::Units::Perc, shadedPercent_, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name_); } diff --git a/src/EnergyPlus/PackagedThermalStorageCoil.cc b/src/EnergyPlus/PackagedThermalStorageCoil.cc index 752ea691d6e..2673a17307c 100644 --- a/src/EnergyPlus/PackagedThermalStorageCoil.cc +++ b/src/EnergyPlus/PackagedThermalStorageCoil.cc @@ -1590,8 +1590,8 @@ void GetTESCoilInput(EnergyPlusData &state) "Cooling Coil Operating Mode Index", Constant::Units::None, thisTESCoil.curControlModeReport, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisTESCoil.Name); // cCurrentModuleObject = "Coil:Cooling:DX:SingleSpeed:ThermalStorage" @@ -1599,123 +1599,121 @@ void GetTESCoilInput(EnergyPlusData &state) "Cooling Coil Total Cooling Rate", Constant::Units::W, thisTESCoil.EvapTotCoolingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisTESCoil.Name); SetupOutputVariable(state, "Cooling Coil Total Cooling Energy", Constant::Units::J, thisTESCoil.EvapTotCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisTESCoil.Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::CoolingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::CoolingCoils); SetupOutputVariable(state, "Cooling Coil Sensible Cooling Rate", Constant::Units::W, thisTESCoil.EvapSensCoolingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisTESCoil.Name); SetupOutputVariable(state, "Cooling Coil Sensible Cooling Energy", Constant::Units::J, thisTESCoil.EvapSensCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisTESCoil.Name); SetupOutputVariable(state, "Cooling Coil Latent Cooling Rate", Constant::Units::W, thisTESCoil.EvapLatCoolingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisTESCoil.Name); SetupOutputVariable(state, "Cooling Coil Latent Cooling Energy", Constant::Units::J, thisTESCoil.EvapLatCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisTESCoil.Name); SetupOutputVariable(state, "Cooling Coil Electricity Rate", Constant::Units::W, thisTESCoil.ElecCoolingPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisTESCoil.Name); SetupOutputVariable(state, "Cooling Coil Electricity Energy", Constant::Units::J, thisTESCoil.ElecCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisTESCoil.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); SetupOutputVariable(state, "Cooling Coil Runtime Fraction", Constant::Units::None, thisTESCoil.RuntimeFraction, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisTESCoil.Name); SetupOutputVariable(state, "Cooling Coil Cold Weather Protection Electricity Energy", Constant::Units::J, thisTESCoil.ElectColdWeatherEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisTESCoil.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cooling, - "Thermal Protection", - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling, + "Thermal Protection"); SetupOutputVariable(state, "Cooling Coil Cold Weather Protection Electricity Rate", Constant::Units::W, thisTESCoil.ElectColdWeatherPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisTESCoil.Name); SetupOutputVariable(state, "Cooling Coil Thermal Storage Mechanical Heat Transfer Rate", Constant::Units::W, thisTESCoil.QdotTES, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisTESCoil.Name); SetupOutputVariable(state, "Cooling Coil Thermal Storage Mechanical Heat Transfer Energy", Constant::Units::J, thisTESCoil.Q_TES, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisTESCoil.Name); SetupOutputVariable(state, "Cooling Coil Thermal Storage Ambient Heat Transfer Rate", Constant::Units::W, thisTESCoil.QdotAmbient, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisTESCoil.Name); SetupOutputVariable(state, "Cooling Coil Thermal Storage Ambient Heat Transfer Energy", Constant::Units::J, thisTESCoil.Q_Ambient, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisTESCoil.Name); if (thisTESCoil.TESPlantConnectionAvailable) { @@ -1723,15 +1721,15 @@ void GetTESCoilInput(EnergyPlusData &state) "Cooling Coil Thermal Storage Plant Heat Transfer Rate", Constant::Units::W, thisTESCoil.QdotPlant, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisTESCoil.Name); SetupOutputVariable(state, "Cooling Coil Thermal Storage Plant Heat Transfer Energy", Constant::Units::J, thisTESCoil.Q_Plant, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisTESCoil.Name); } @@ -1740,8 +1738,8 @@ void GetTESCoilInput(EnergyPlusData &state) "Cooling Coil Condenser Inlet Temperature", Constant::Units::C, thisTESCoil.CondInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisTESCoil.Name); if (thisTESCoil.EvapWaterSupplyMode == EvapWaterSupply::WaterSupplyFromMains) { @@ -1749,97 +1747,91 @@ void GetTESCoilInput(EnergyPlusData &state) "Cooling Coil Evaporative Condenser Water Volume", Constant::Units::m3, thisTESCoil.EvapWaterConsump, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisTESCoil.Name, Constant::eResource::Water, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); SetupOutputVariable(state, "Cooling Coil Evaporative Condenser Mains Supply Water Volume", Constant::Units::m3, thisTESCoil.EvapWaterConsump, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisTESCoil.Name, Constant::eResource::MainsWater, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); } else if (thisTESCoil.EvapWaterSupplyMode == EvapWaterSupply::WaterSupplyFromTank) { SetupOutputVariable(state, "Cooling Coil Evaporative Condenser Storage Tank Water Volume", Constant::Units::m3, thisTESCoil.EvapWaterConsump, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisTESCoil.Name, Constant::eResource::Water, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); SetupOutputVariable(state, "Cooling Coil Evaporative Condenser Starved Water Volume", Constant::Units::m3, thisTESCoil.EvapWaterStarvMakup, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisTESCoil.Name, Constant::eResource::Water, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); SetupOutputVariable(state, "Cooling Coil Evaporative Condenser Starved Mains Water Volume", Constant::Units::m3, thisTESCoil.EvapWaterStarvMakup, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisTESCoil.Name, Constant::eResource::MainsWater, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); } SetupOutputVariable(state, "Cooling Coil Evaporative Condenser Pump Electricity Rate", Constant::Units::W, thisTESCoil.EvapCondPumpElecPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisTESCoil.Name); SetupOutputVariable(state, "Cooling Coil Evaporative Condenser Pump Electricity Energy", Constant::Units::J, thisTESCoil.EvapCondPumpElecConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisTESCoil.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); SetupOutputVariable(state, "Cooling Coil Basin Heater Electricity Rate", Constant::Units::W, thisTESCoil.ElectEvapCondBasinHeaterPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisTESCoil.Name); SetupOutputVariable(state, "Cooling Coil Basin Heater Electricity Energy", Constant::Units::J, thisTESCoil.ElectEvapCondBasinHeaterEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisTESCoil.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cooling, - "Thermal Protection", - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling, + "Thermal Protection"); } switch (thisTESCoil.StorageMedia) { @@ -1849,8 +1841,8 @@ void GetTESCoilInput(EnergyPlusData &state) "Cooling Coil Fluid Thermal Storage End Temperature", Constant::Units::C, thisTESCoil.FluidTankTempFinal, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisTESCoil.Name); break; case MediaType::Ice: @@ -1858,8 +1850,8 @@ void GetTESCoilInput(EnergyPlusData &state) "Cooling Coil Ice Thermal Storage End Fraction", Constant::Units::None, thisTESCoil.IceFracRemain, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisTESCoil.Name); break; default: diff --git a/src/EnergyPlus/PhotovoltaicThermalCollectors.cc b/src/EnergyPlus/PhotovoltaicThermalCollectors.cc index 221fc6d04ce..c9f3418c171 100644 --- a/src/EnergyPlus/PhotovoltaicThermalCollectors.cc +++ b/src/EnergyPlus/PhotovoltaicThermalCollectors.cc @@ -532,8 +532,8 @@ namespace PhotovoltaicThermalCollectors { "Generator Produced Thermal Rate", Constant::Units::W, this->Report.ThermPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); if (this->WorkingFluidType == WorkingFluidEnum::LIQUID) { @@ -541,33 +541,31 @@ namespace PhotovoltaicThermalCollectors { "Generator Produced Thermal Energy", Constant::Units::J, this->Report.ThermEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::SolarWater, - OutputProcessor::SOVEndUseCat::HeatProduced, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::HeatProduced); } else if (this->WorkingFluidType == WorkingFluidEnum::AIR) { SetupOutputVariable(state, "Generator Produced Thermal Energy", Constant::Units::J, this->Report.ThermEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::SolarAir, - OutputProcessor::SOVEndUseCat::HeatProduced, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::HeatProduced); SetupOutputVariable(state, "Generator PVT Fluid Bypass Status", Constant::Units::None, this->Report.BypassStatus, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); } @@ -575,24 +573,24 @@ namespace PhotovoltaicThermalCollectors { "Generator PVT Fluid Inlet Temperature", Constant::Units::C, this->Report.TinletWorkFluid, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator PVT Fluid Outlet Temperature", Constant::Units::C, this->Report.ToutletWorkFluid, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Generator PVT Fluid Mass Flow Rate", Constant::Units::kg_s, this->Report.MdotWorkFluid, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); } diff --git a/src/EnergyPlus/Photovoltaics.cc b/src/EnergyPlus/Photovoltaics.cc index 46cbee821b3..c0915d7d42a 100644 --- a/src/EnergyPlus/Photovoltaics.cc +++ b/src/EnergyPlus/Photovoltaics.cc @@ -685,26 +685,25 @@ namespace Photovoltaics { "Generator Produced DC Electricity Rate", Constant::Units::W, state.dataPhotovoltaic->PVarray(PVnum).Report.DCPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataPhotovoltaic->PVarray(PVnum).Name); SetupOutputVariable(state, "Generator Produced DC Electricity Energy", Constant::Units::J, state.dataPhotovoltaic->PVarray(PVnum).Report.DCEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataPhotovoltaic->PVarray(PVnum).Name, Constant::eResource::ElectricityProduced, - OutputProcessor::SOVEndUseCat::Photovoltaic, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Photovoltaic); SetupOutputVariable(state, "Generator PV Array Efficiency", Constant::Units::None, state.dataPhotovoltaic->PVarray(PVnum).Report.ArrayEfficiency, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataPhotovoltaic->PVarray(PVnum).Name); // CurrentModuleObject='Equiv1Diode or Sandia Photovoltaics' @@ -714,22 +713,22 @@ namespace Photovoltaics { "Generator PV Cell Temperature", Constant::Units::C, state.dataPhotovoltaic->PVarray(PVnum).Report.CellTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataPhotovoltaic->PVarray(PVnum).Name); SetupOutputVariable(state, "Generator PV Short Circuit Current", Constant::Units::A, state.dataPhotovoltaic->PVarray(PVnum).Report.ArrayIsc, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataPhotovoltaic->PVarray(PVnum).Name); SetupOutputVariable(state, "Generator PV Open Circuit Voltage", Constant::Units::V, state.dataPhotovoltaic->PVarray(PVnum).Report.ArrayVoc, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataPhotovoltaic->PVarray(PVnum).Name); } diff --git a/src/EnergyPlus/PipeHeatTransfer.cc b/src/EnergyPlus/PipeHeatTransfer.cc index 26ec094ee87..f8761f3275c 100644 --- a/src/EnergyPlus/PipeHeatTransfer.cc +++ b/src/EnergyPlus/PipeHeatTransfer.cc @@ -753,15 +753,15 @@ void GetPipesHeatTransfer(EnergyPlusData &state) "Pipe Fluid Heat Transfer Rate", Constant::Units::W, state.dataPipeHT->PipeHT(Item).FluidHeatLossRate, - OutputProcessor::SOVTimeStepType::Plant, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataPipeHT->PipeHT(Item).Name); SetupOutputVariable(state, "Pipe Fluid Heat Transfer Energy", Constant::Units::J, state.dataPipeHT->PipeHT(Item).FluidHeatLossEnergy, - OutputProcessor::SOVTimeStepType::Plant, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataPipeHT->PipeHT(Item).Name); if (state.dataPipeHT->PipeHT(Item).EnvironmentPtr == EnvrnPtr::ZoneEnv) { @@ -769,15 +769,15 @@ void GetPipesHeatTransfer(EnergyPlusData &state) "Pipe Ambient Heat Transfer Rate", Constant::Units::W, state.dataPipeHT->PipeHT(Item).EnvironmentHeatLossRate, - OutputProcessor::SOVTimeStepType::Plant, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataPipeHT->PipeHT(Item).Name); SetupOutputVariable(state, "Pipe Ambient Heat Transfer Energy", Constant::Units::J, state.dataPipeHT->PipeHT(Item).EnvHeatLossEnergy, - OutputProcessor::SOVTimeStepType::Plant, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataPipeHT->PipeHT(Item).Name); SetupZoneInternalGain(state, @@ -791,29 +791,29 @@ void GetPipesHeatTransfer(EnergyPlusData &state) "Pipe Mass Flow Rate", Constant::Units::kg_s, state.dataPipeHT->PipeHT(Item).MassFlowRate, - OutputProcessor::SOVTimeStepType::Plant, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataPipeHT->PipeHT(Item).Name); SetupOutputVariable(state, "Pipe Volume Flow Rate", Constant::Units::m3_s, state.dataPipeHT->PipeHT(Item).VolumeFlowRate, - OutputProcessor::SOVTimeStepType::Plant, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataPipeHT->PipeHT(Item).Name); SetupOutputVariable(state, "Pipe Inlet Temperature", Constant::Units::C, state.dataPipeHT->PipeHT(Item).FluidInletTemp, - OutputProcessor::SOVTimeStepType::Plant, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataPipeHT->PipeHT(Item).Name); SetupOutputVariable(state, "Pipe Outlet Temperature", Constant::Units::C, state.dataPipeHT->PipeHT(Item).FluidOutletTemp, - OutputProcessor::SOVTimeStepType::Plant, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataPipeHT->PipeHT(Item).Name); } } diff --git a/src/EnergyPlus/Plant/EquipAndOperations.cc b/src/EnergyPlus/Plant/EquipAndOperations.cc index 45c080c8324..ddf743722d3 100644 --- a/src/EnergyPlus/Plant/EquipAndOperations.cc +++ b/src/EnergyPlus/Plant/EquipAndOperations.cc @@ -76,44 +76,44 @@ namespace DataPlant { "Supervisory Plant Heat Pump Operation Mode", Constant::Units::unknown, this->Report.AirSourcePlant_OpMode, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Supervisory Plant Auxiliary Boiler Mode", Constant::Units::unknown, this->Report.BoilerAux_OpMode, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Supervisory Plant Operation Polled Building Heating Load", Constant::Units::W, this->Report.BuildingPolledHeatingLoad, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Supervisory Plant Operation Polled Building Cooling Load", Constant::Units::W, this->Report.BuildingPolledCoolingLoad, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Supervisory Plant Operation Primary Plant Heating Load", Constant::Units::W, this->Report.PrimaryPlantHeatingLoad, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Supervisory Plant Operation Primary Plant Cooling Load", Constant::Units::W, this->Report.PrimaryPlantCoolingLoad, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); // routine for setup of chiller heater supervisory plant operation scheme @@ -788,22 +788,22 @@ namespace DataPlant { "Supervisory Plant Heat Recovery Operation Mode", Constant::Units::unknown, this->Report.DedicHR_OpMode, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Supervisory Plant Operation Secondary Plant Heating Load", Constant::Units::W, this->Report.SecondaryPlantHeatingLoad, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Supervisory Plant Operation Secondary Plant Cooling Load", Constant::Units::W, this->Report.SecondaryPlantCoolingLoad, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); } } diff --git a/src/EnergyPlus/Plant/PlantManager.cc b/src/EnergyPlus/Plant/PlantManager.cc index 7a841a988a3..33a4bab43db 100644 --- a/src/EnergyPlus/Plant/PlantManager.cc +++ b/src/EnergyPlus/Plant/PlantManager.cc @@ -739,8 +739,8 @@ void GetPlantLoopData(EnergyPlusData &state) "Plant System Cycle On Off Status", Constant::Units::None, state.dataPlnt->PlantAvailMgr(LoopNum).AvailStatus, - OutputProcessor::SOVTimeStepType::Plant, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataPlnt->PlantLoop(LoopNum).Name); } } @@ -1919,66 +1919,66 @@ void SetupReports(EnergyPlusData &state) "Plant Supply Side Cooling Demand Rate", Constant::Units::W, loop.CoolingDemand, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataPlnt->PlantLoop(LoopNum).Name); SetupOutputVariable(state, "Plant Supply Side Heating Demand Rate", Constant::Units::W, loop.HeatingDemand, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataPlnt->PlantLoop(LoopNum).Name); SetupOutputVariable(state, "Plant Supply Side Inlet Mass Flow Rate", Constant::Units::kg_s, loop.InletNodeFlowrate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataPlnt->PlantLoop(LoopNum).Name); SetupOutputVariable(state, "Plant Supply Side Inlet Temperature", Constant::Units::C, loop.InletNodeTemperature, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataPlnt->PlantLoop(LoopNum).Name); SetupOutputVariable(state, "Plant Supply Side Outlet Temperature", Constant::Units::C, loop.OutletNodeTemperature, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataPlnt->PlantLoop(LoopNum).Name); SetupOutputVariable(state, "Plant Supply Side Not Distributed Demand Rate", Constant::Units::W, loop.DemandNotDispatched, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataPlnt->PlantLoop(LoopNum).Name); SetupOutputVariable(state, "Plant Supply Side Unmet Demand Rate", Constant::Units::W, loop.UnmetDemand, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataPlnt->PlantLoop(LoopNum).Name); SetupOutputVariable(state, "Debug Plant Loop Bypass Fraction", Constant::Units::None, loop.BypassFrac, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataPlnt->PlantLoop(LoopNum).Name); SetupOutputVariable(state, "Debug Plant Last Simulated Loop Side", Constant::Units::None, loop.LastLoopSideSimulated, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataPlnt->PlantLoop(LoopNum).Name); } @@ -1990,57 +1990,57 @@ void SetupReports(EnergyPlusData &state) "Plant Demand Side Lumped Capacitance Temperature", Constant::Units::C, state.dataPlnt->PlantLoop(LoopNum).LoopSide(LoopSideLocation::Demand).LoopSideInlet_TankTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataPlnt->PlantLoop(LoopNum).Name); SetupOutputVariable(state, "Plant Supply Side Lumped Capacitance Temperature", Constant::Units::C, state.dataPlnt->PlantLoop(LoopNum).LoopSide(LoopSideLocation::Supply).LoopSideInlet_TankTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataPlnt->PlantLoop(LoopNum).Name); SetupOutputVariable(state, "Plant Demand Side Lumped Capacitance Heat Transport Rate", Constant::Units::W, state.dataPlnt->PlantLoop(LoopNum).LoopSide(LoopSideLocation::Demand).LoopSideInlet_MdotCpDeltaT, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataPlnt->PlantLoop(LoopNum).Name); SetupOutputVariable(state, "Plant Supply Side Lumped Capacitance Heat Transport Rate", Constant::Units::W, state.dataPlnt->PlantLoop(LoopNum).LoopSide(LoopSideLocation::Supply).LoopSideInlet_MdotCpDeltaT, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataPlnt->PlantLoop(LoopNum).Name); SetupOutputVariable(state, "Plant Demand Side Lumped Capacitance Heat Storage Rate", Constant::Units::W, state.dataPlnt->PlantLoop(LoopNum).LoopSide(LoopSideLocation::Demand).LoopSideInlet_McpDTdt, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataPlnt->PlantLoop(LoopNum).Name); SetupOutputVariable(state, "Plant Supply Side Lumped Capacitance Heat Storage Rate", Constant::Units::W, state.dataPlnt->PlantLoop(LoopNum).LoopSide(LoopSideLocation::Supply).LoopSideInlet_McpDTdt, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataPlnt->PlantLoop(LoopNum).Name); SetupOutputVariable(state, "Plant Demand Side Lumped Capacitance Excessive Storage Time", Constant::Units::hr, state.dataPlnt->PlantLoop(LoopNum).LoopSide(LoopSideLocation::Demand).LoopSideInlet_CapExcessStorageTimeReport, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataPlnt->PlantLoop(LoopNum).Name); SetupOutputVariable(state, "Plant Supply Side Lumped Capacitance Excessive Storage Time", Constant::Units::hr, state.dataPlnt->PlantLoop(LoopNum).LoopSide(LoopSideLocation::Supply).LoopSideInlet_CapExcessStorageTimeReport, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataPlnt->PlantLoop(LoopNum).Name); for (DataPlant::LoopSideLocation LoopSideNum : DataPlant::LoopSideKeys) { for (BranchNum = 1; BranchNum <= state.dataPlnt->PlantLoop(LoopNum).LoopSide(LoopSideNum).TotalBranches; ++BranchNum) { @@ -2052,8 +2052,8 @@ void SetupReports(EnergyPlusData &state) "Plant Component Distributed Demand Rate", Constant::Units::W, state.dataPlnt->PlantLoop(LoopNum).LoopSide(LoopSideNum).Branch(BranchNum).Comp(CompNum).MyLoad, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataPlnt->PlantLoop(LoopNum).LoopSide(LoopSideNum).Branch(BranchNum).Comp(CompNum).Name); } } diff --git a/src/EnergyPlus/PlantCentralGSHP.cc b/src/EnergyPlus/PlantCentralGSHP.cc index 881d9de1fd6..1c50c8f22d7 100644 --- a/src/EnergyPlus/PlantCentralGSHP.cc +++ b/src/EnergyPlus/PlantCentralGSHP.cc @@ -804,172 +804,167 @@ void WrapperSpecs::setupOutputVars(EnergyPlusData &state) "Chiller Heater System Cooling Electricity Energy", Constant::Units::J, this->Report.TotElecCooling, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Cooling); SetupOutputVariable(state, "Chiller Heater System Heating Electricity Energy", Constant::Units::J, this->Report.TotElecHeating, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Heating, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Heating); SetupOutputVariable(state, "Chiller Heater System Cooling Electricity Rate", Constant::Units::W, this->Report.TotElecCoolingPwr, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Heater System Heating Electricity Rate", Constant::Units::W, this->Report.TotElecHeatingPwr, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Heater System Cooling Energy", Constant::Units::J, this->Report.CoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::Chillers, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Chillers); SetupOutputVariable(state, "Chiller Heater System Heating Energy", Constant::Units::J, this->Report.HeatingEnergy, - 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, "Chiller Heater System Source Heat Transfer Energy", Constant::Units::J, this->Report.GLHEEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::HeatRejection, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::HeatRejection); SetupOutputVariable(state, "Chiller Heater System Cooling Rate", Constant::Units::W, this->Report.CoolingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Heater System Heating Rate", Constant::Units::W, this->Report.HeatingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Heater System Source Heat Transfer Rate", Constant::Units::W, this->Report.GLHERate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Heater System Cooling Mass Flow Rate", Constant::Units::kg_s, this->Report.CHWmdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Heater System Heating Mass Flow Rate", Constant::Units::kg_s, this->Report.HWmdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Heater System Source Mass Flow Rate", Constant::Units::kg_s, this->Report.GLHEmdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Heater System Cooling Inlet Temperature", Constant::Units::C, this->Report.CHWInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Heater System Heating Inlet Temperature", Constant::Units::C, this->Report.HWInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Heater System Source Inlet Temperature", Constant::Units::C, this->Report.GLHEInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Heater System Cooling Outlet Temperature", Constant::Units::C, this->Report.CHWOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Heater System Heating Outlet Temperature", Constant::Units::C, this->Report.HWOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Heater System Source Outlet Temperature", Constant::Units::C, this->Report.GLHEOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); if (this->ChillerHeaterNums > 0) { @@ -980,184 +975,184 @@ void WrapperSpecs::setupOutputVars(EnergyPlusData &state) format("Chiller Heater Operation Mode Unit {}", ChillerHeaterNum), Constant::Units::None, this->ChillerHeater(ChillerHeaterNum).Report.CurrentMode, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->ChillerHeater(ChillerHeaterNum).Name); SetupOutputVariable(state, format("Chiller Heater Part Load Ratio Unit {}", ChillerHeaterNum), Constant::Units::None, this->ChillerHeater(ChillerHeaterNum).Report.ChillerPartLoadRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->ChillerHeater(ChillerHeaterNum).Name); SetupOutputVariable(state, format("Chiller Heater Cycling Ratio Unit {}", ChillerHeaterNum), Constant::Units::None, this->ChillerHeater(ChillerHeaterNum).Report.ChillerCyclingRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->ChillerHeater(ChillerHeaterNum).Name); SetupOutputVariable(state, format("Chiller Heater Cooling Electricity Rate Unit {}", ChillerHeaterNum), Constant::Units::W, this->ChillerHeater(ChillerHeaterNum).Report.CoolingPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->ChillerHeater(ChillerHeaterNum).Name); SetupOutputVariable(state, format("Chiller Heater Heating Electricity Rate Unit {}", ChillerHeaterNum), Constant::Units::W, this->ChillerHeater(ChillerHeaterNum).Report.HeatingPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->ChillerHeater(ChillerHeaterNum).Name); SetupOutputVariable(state, format("Chiller Heater Cooling Electricity Energy Unit {}", ChillerHeaterNum), Constant::Units::J, this->ChillerHeater(ChillerHeaterNum).Report.CoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->ChillerHeater(ChillerHeaterNum).Name); SetupOutputVariable(state, format("Chiller Heater Heating Electricity Energy Unit {}", ChillerHeaterNum), Constant::Units::J, this->ChillerHeater(ChillerHeaterNum).Report.HeatingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->ChillerHeater(ChillerHeaterNum).Name); SetupOutputVariable(state, format("Chiller Heater Cooling Rate Unit {}", ChillerHeaterNum), Constant::Units::W, this->ChillerHeater(ChillerHeaterNum).Report.QEvap, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->ChillerHeater(ChillerHeaterNum).Name); SetupOutputVariable(state, format("Chiller Heater Cooling Energy Unit {}", ChillerHeaterNum), Constant::Units::J, this->ChillerHeater(ChillerHeaterNum).Report.EvapEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->ChillerHeater(ChillerHeaterNum).Name); SetupOutputVariable(state, format("Chiller Heater False Load Heat Transfer Rate Unit {}", ChillerHeaterNum), Constant::Units::W, this->ChillerHeater(ChillerHeaterNum).Report.ChillerFalseLoadRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->ChillerHeater(ChillerHeaterNum).Name); SetupOutputVariable(state, format("Chiller Heater False Load Heat Transfer Energy Unit {}", ChillerHeaterNum), Constant::Units::J, this->ChillerHeater(ChillerHeaterNum).Report.ChillerFalseLoad, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->ChillerHeater(ChillerHeaterNum).Name); SetupOutputVariable(state, format("Chiller Heater Evaporator Inlet Temperature Unit {}", ChillerHeaterNum), Constant::Units::C, this->ChillerHeater(ChillerHeaterNum).Report.EvapInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->ChillerHeater(ChillerHeaterNum).Name); SetupOutputVariable(state, format("Chiller Heater Evaporator Outlet Temperature Unit {}", ChillerHeaterNum), Constant::Units::C, this->ChillerHeater(ChillerHeaterNum).Report.EvapOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->ChillerHeater(ChillerHeaterNum).Name); SetupOutputVariable(state, format("Chiller Heater Evaporator Mass Flow Rate Unit {}", ChillerHeaterNum), Constant::Units::kg_s, this->ChillerHeater(ChillerHeaterNum).Report.Evapmdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->ChillerHeater(ChillerHeaterNum).Name); SetupOutputVariable(state, format("Chiller Heater Condenser Heat Transfer Rate Unit {}", ChillerHeaterNum), Constant::Units::W, this->ChillerHeater(ChillerHeaterNum).Report.QCond, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->ChillerHeater(ChillerHeaterNum).Name); SetupOutputVariable(state, format("Chiller Heater Condenser Heat Transfer Energy Unit {}", ChillerHeaterNum), Constant::Units::J, this->ChillerHeater(ChillerHeaterNum).Report.CondEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->ChillerHeater(ChillerHeaterNum).Name); SetupOutputVariable(state, format("Chiller Heater COP Unit {}", ChillerHeaterNum), Constant::Units::W_W, this->ChillerHeater(ChillerHeaterNum).Report.ActualCOP, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->ChillerHeater(ChillerHeaterNum).Name); SetupOutputVariable(state, format("Chiller Heater Capacity Temperature Modifier Multiplier Unit {}", ChillerHeaterNum), Constant::Units::None, this->ChillerHeater(ChillerHeaterNum).Report.ChillerCapFT, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->ChillerHeater(ChillerHeaterNum).Name); SetupOutputVariable(state, format("Chiller Heater EIR Temperature Modifier Multiplier Unit {}", ChillerHeaterNum), Constant::Units::None, this->ChillerHeater(ChillerHeaterNum).Report.ChillerEIRFT, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->ChillerHeater(ChillerHeaterNum).Name); SetupOutputVariable(state, format("Chiller Heater EIR Part Load Modifier Multiplier Unit {}", ChillerHeaterNum), Constant::Units::None, this->ChillerHeater(ChillerHeaterNum).Report.ChillerEIRFPLR, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->ChillerHeater(ChillerHeaterNum).Name); SetupOutputVariable(state, format("Chiller Heater Condenser Inlet Temperature Unit {}", ChillerHeaterNum), Constant::Units::C, this->ChillerHeater(ChillerHeaterNum).Report.CondInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->ChillerHeater(ChillerHeaterNum).Name); SetupOutputVariable(state, format("Chiller Heater Condenser Outlet Temperature Unit {}", ChillerHeaterNum), Constant::Units::C, this->ChillerHeater(ChillerHeaterNum).Report.CondOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->ChillerHeater(ChillerHeaterNum).Name); SetupOutputVariable(state, format("Chiller Heater Condenser Mass Flow Rate Unit {}", ChillerHeaterNum), Constant::Units::kg_s, this->ChillerHeater(ChillerHeaterNum).Report.Condmdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->ChillerHeater(ChillerHeaterNum).Name); } // End of individual chiller heater count for current wrapper diff --git a/src/EnergyPlus/PlantChillers.cc b/src/EnergyPlus/PlantChillers.cc index 8d7665cf67e..ef66b7db8ca 100644 --- a/src/EnergyPlus/PlantChillers.cc +++ b/src/EnergyPlus/PlantChillers.cc @@ -621,91 +621,89 @@ namespace PlantChillers { "Chiller Electricity Rate", Constant::Units::W, this->Power, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Electricity Energy", Constant::Units::J, this->Energy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cooling, - this->EndUseSubcategory, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Cooling, + this->EndUseSubcategory); SetupOutputVariable(state, "Chiller Evaporator Cooling Rate", Constant::Units::W, this->QEvaporator, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Evaporator Cooling Energy", Constant::Units::J, this->EvaporatorEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::Chillers, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Chillers); SetupOutputVariable(state, "Chiller Evaporator Inlet Temperature", Constant::Units::C, this->EvapInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Evaporator Outlet Temperature", Constant::Units::C, this->EvapOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Evaporator Mass Flow Rate", Constant::Units::kg_s, this->EvapMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Condenser Heat Transfer Rate", Constant::Units::W, this->QCondenser, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Condenser Heat Transfer Energy", Constant::Units::J, this->CondenserEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::HeatRejection, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::HeatRejection); SetupOutputVariable(state, "Chiller COP", Constant::Units::W_W, this->ActualCOP, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Condenser Inlet Temperature", Constant::Units::C, this->CondInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); // Condenser mass flow and outlet temp are valid for water cooled @@ -714,15 +712,15 @@ namespace PlantChillers { "Chiller Condenser Outlet Temperature", Constant::Units::C, this->CondOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Condenser Mass Flow Rate", Constant::Units::kg_s, this->CondMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); } else if (this->CondenserType == DataPlant::CondenserType::AirCooled) { } else if (this->CondenserType == DataPlant::CondenserType::EvapCooled) { @@ -731,20 +729,19 @@ namespace PlantChillers { "Chiller Basin Heater Electricity Rate", Constant::Units::W, this->BasinHeaterPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Basin Heater Electricity Energy", Constant::Units::J, this->BasinHeaterConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Chillers, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Chillers); } } @@ -754,47 +751,46 @@ namespace PlantChillers { "Chiller Total Recovered Heat Rate", Constant::Units::W, this->QHeatRecovery, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Total Recovered Heat Energy", Constant::Units::J, this->EnergyHeatRecovery, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::HeatRecovery, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::HeatRecovery); SetupOutputVariable(state, "Chiller Heat Recovery Inlet Temperature", Constant::Units::C, this->HeatRecInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Heat Recovery Outlet Temperature", Constant::Units::C, this->HeatRecOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Heat Recovery Mass Flow Rate", Constant::Units::kg_s, this->HeatRecMdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Effective Heat Rejection Temperature", Constant::Units::C, this->ChillerCondAvgTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); } if (state.dataGlobal->AnyEnergyManagementSystemInModel) { @@ -2649,80 +2645,78 @@ namespace PlantChillers { "Chiller Drive Shaft Power", Constant::Units::W, this->Power, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Drive Shaft Energy", Constant::Units::J, this->Energy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Chiller Evaporator Cooling Rate", Constant::Units::W, this->QEvaporator, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Evaporator Cooling Energy", Constant::Units::J, this->EvaporatorEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::Chillers, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Chillers); SetupOutputVariable(state, "Chiller Evaporator Inlet Temperature", Constant::Units::C, this->EvapInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Evaporator Outlet Temperature", Constant::Units::C, this->EvapOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Evaporator Mass Flow Rate", Constant::Units::kg_s, this->EvapMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Condenser Heat Transfer Rate", Constant::Units::W, this->QCondenser, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Condenser Heat Transfer Energy", Constant::Units::J, this->CondenserEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::HeatRejection, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::HeatRejection); SetupOutputVariable(state, "Chiller Condenser Inlet Temperature", Constant::Units::C, this->CondInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); // Condenser mass flow and outlet temp are valid for Water Cooled @@ -2731,15 +2725,15 @@ namespace PlantChillers { "Chiller Condenser Outlet Temperature", Constant::Units::C, this->CondOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Condenser Mass Flow Rate", Constant::Units::kg_s, this->CondMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); } else if (this->CondenserType == DataPlant::CondenserType::AirCooled) { } else if (this->CondenserType == DataPlant::CondenserType::EvapCooled) { @@ -2748,20 +2742,19 @@ namespace PlantChillers { "Chiller Basin Heater Electricity Rate", Constant::Units::W, this->BasinHeaterPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Basin Heater Electricity Energy", Constant::Units::J, this->BasinHeaterConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Chillers, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Chillers); } } @@ -2770,48 +2763,47 @@ namespace PlantChillers { format("Chiller {} Rate", sFuelType), Constant::Units::W, this->FuelEnergyUseRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, format("Chiller {} Energy", sFuelType), Constant::Units::J, this->FuelEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eFuel2eResource[(int)this->FuelType], - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Cooling); SetupOutputVariable(state, "Chiller COP", Constant::Units::W_W, this->FuelCOP, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, format("Chiller {} Mass Flow Rate", sFuelType), Constant::Units::kg_s, this->FuelMdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Exhaust Temperature", Constant::Units::C, this->ExhaustStackTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Heat Recovery Mass Flow Rate", Constant::Units::kg_s, this->HeatRecMdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); if (this->HeatRecActive) { @@ -2820,86 +2812,83 @@ namespace PlantChillers { "Chiller Jacket Recovered Heat Rate", Constant::Units::W, this->QJacketRecovered, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Jacket Recovered Heat Energy", Constant::Units::J, this->JacketEnergyRec, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::HeatRecovery, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::HeatRecovery); SetupOutputVariable(state, "Chiller Lube Recovered Heat Rate", Constant::Units::W, this->QLubeOilRecovered, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Lube Recovered Heat Energy", Constant::Units::J, this->LubeOilEnergyRec, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::HeatRecovery, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::HeatRecovery); SetupOutputVariable(state, "Chiller Exhaust Recovered Heat Rate", Constant::Units::W, this->QExhaustRecovered, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Exhaust Recovered Heat Energy", Constant::Units::J, this->ExhaustEnergyRec, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::HeatRecovery, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::HeatRecovery); SetupOutputVariable(state, "Chiller Total Recovered Heat Rate", Constant::Units::W, this->QTotalHeatRecovered, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Total Recovered Heat Energy", Constant::Units::J, this->TotalHeatEnergyRec, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Chiller Heat Recovery Inlet Temperature", Constant::Units::C, this->HeatRecInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Heat Recovery Outlet Temperature", Constant::Units::C, this->HeatRecOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); } if (state.dataGlobal->AnyEnergyManagementSystemInModel) { @@ -4688,80 +4677,78 @@ namespace PlantChillers { "Chiller Drive Shaft Power", Constant::Units::W, this->Power, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Drive Shaft Energy", Constant::Units::J, this->Energy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Chiller Evaporator Cooling Rate", Constant::Units::W, this->QEvaporator, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Evaporator Cooling Energy", Constant::Units::J, this->EvaporatorEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::Chillers, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Chillers); SetupOutputVariable(state, "Chiller Evaporator Inlet Temperature", Constant::Units::C, this->EvapInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Evaporator Outlet Temperature", Constant::Units::C, this->EvapOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Evaporator Mass Flow Rate", Constant::Units::kg_s, this->EvapMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Condenser Heat Transfer Rate", Constant::Units::W, this->QCondenser, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Condenser Heat Transfer Energy", Constant::Units::J, this->CondenserEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::HeatRejection, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::HeatRejection); SetupOutputVariable(state, "Chiller Condenser Inlet Temperature", Constant::Units::C, this->CondInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); // Condenser mass flow and outlet temp are valid for water cooled @@ -4770,15 +4757,15 @@ namespace PlantChillers { "Chiller Condenser Outlet Temperature", Constant::Units::C, this->CondOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Condenser Mass Flow Rate", Constant::Units::kg_s, this->CondMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); } else if (this->CondenserType == DataPlant::CondenserType::AirCooled) { } else if (this->CondenserType == DataPlant::CondenserType::EvapCooled) { @@ -4787,20 +4774,19 @@ namespace PlantChillers { "Chiller Basin Heater Electricity Rate", Constant::Units::W, this->BasinHeaterPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Basin Heater Electricity Energy", Constant::Units::J, this->BasinHeaterConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Chillers, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Chillers); } } @@ -4808,90 +4794,88 @@ namespace PlantChillers { "Chiller Lube Recovered Heat Rate", Constant::Units::W, this->HeatRecLubeRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Lube Recovered Heat Energy", Constant::Units::J, this->HeatRecLubeEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::HeatRecovery, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::HeatRecovery); std::string_view const sFuelType = Constant::eFuelNames[static_cast(this->FuelType)]; SetupOutputVariable(state, format("Chiller {} Rate", sFuelType), Constant::Units::W, this->FuelEnergyUsedRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, format("Chiller {} Energy", sFuelType), Constant::Units::J, this->FuelEnergyUsed, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eFuel2eResource[(int)this->FuelType], - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Cooling); SetupOutputVariable(state, format("Chiller {} Mass Flow Rate", sFuelType), Constant::Units::kg_s, this->FuelMassUsedRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, format("Chiller {} Mass", sFuelType), Constant::Units::kg, this->FuelMassUsed, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Chiller Exhaust Temperature", Constant::Units::C, this->ExhaustStackTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Heat Recovery Inlet Temperature", Constant::Units::C, this->HeatRecInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Heat Recovery Outlet Temperature", Constant::Units::C, this->HeatRecOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Heat Recovery Mass Flow Rate", Constant::Units::kg_s, this->HeatRecMdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller COP", Constant::Units::W_W, this->FuelCOP, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); if (state.dataGlobal->AnyEnergyManagementSystemInModel) { @@ -6548,91 +6532,88 @@ namespace PlantChillers { "Chiller Electricity Rate", Constant::Units::W, this->Power, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Electricity Energy", Constant::Units::J, this->Energy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Cooling); SetupOutputVariable(state, "Chiller Evaporator Cooling Rate", Constant::Units::W, this->QEvaporator, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Evaporator Cooling Energy", Constant::Units::J, this->EvaporatorEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::Chillers, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Chillers); SetupOutputVariable(state, "Chiller Evaporator Inlet Temperature", Constant::Units::C, this->EvapInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Evaporator Outlet Temperature", Constant::Units::C, this->EvapOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Evaporator Mass Flow Rate", Constant::Units::kg_s, this->EvapMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller COP", Constant::Units::W_W, this->ActualCOP, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Condenser Heat Transfer Rate", Constant::Units::W, this->QCondenser, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Condenser Heat Transfer Energy", Constant::Units::J, this->CondenserEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::HeatRejection, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::HeatRejection); SetupOutputVariable(state, "Chiller Condenser Inlet Temperature", Constant::Units::C, this->CondInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); // Condenser mass flow and outlet temp are valid for water cooled @@ -6641,15 +6622,15 @@ namespace PlantChillers { "Chiller Condenser Outlet Temperature", Constant::Units::C, this->CondOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Condenser Mass Flow Rate", Constant::Units::kg_s, this->CondMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); } else if (this->CondenserType == DataPlant::CondenserType::AirCooled) { } else if (this->CondenserType == DataPlant::CondenserType::EvapCooled) { @@ -6658,20 +6639,19 @@ namespace PlantChillers { "Chiller Basin Heater Electricity Rate", Constant::Units::W, this->BasinHeaterPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chiller Basin Heater Electricity Energy", Constant::Units::J, this->BasinHeaterConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Chillers, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Chillers); } } if (state.dataGlobal->AnyEnergyManagementSystemInModel) { diff --git a/src/EnergyPlus/PlantComponentTemperatureSources.cc b/src/EnergyPlus/PlantComponentTemperatureSources.cc index c6aec4daa8b..d26f2e27c70 100644 --- a/src/EnergyPlus/PlantComponentTemperatureSources.cc +++ b/src/EnergyPlus/PlantComponentTemperatureSources.cc @@ -210,43 +210,43 @@ namespace PlantComponentTemperatureSources { "Plant Temperature Source Component Mass Flow Rate", Constant::Units::kg_s, this->MassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Plant Temperature Source Component Inlet Temperature", Constant::Units::C, this->InletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Plant Temperature Source Component Outlet Temperature", Constant::Units::C, this->OutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Plant Temperature Source Component Source Temperature", Constant::Units::C, this->BoundaryTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Plant Temperature Source Component Heat Transfer Rate", Constant::Units::W, this->HeatRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Plant Temperature Source Component Heat Transfer Energy", Constant::Units::J, this->HeatEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); if (state.dataGlobal->AnyEnergyManagementSystemInModel) { SetupEMSActuator(state, diff --git a/src/EnergyPlus/PlantHeatExchangerFluidToFluid.cc b/src/EnergyPlus/PlantHeatExchangerFluidToFluid.cc index e92b4c2defa..cf56d51b526 100644 --- a/src/EnergyPlus/PlantHeatExchangerFluidToFluid.cc +++ b/src/EnergyPlus/PlantHeatExchangerFluidToFluid.cc @@ -449,15 +449,15 @@ void GetFluidHeatExchangerInput(EnergyPlusData &state) std::string endUseCat = Util::makeUPPER(cAlphaArgs(10)); if (endUseCat == "FREECOOLING") - state.dataPlantHXFluidToFluid->FluidHX(CompLoop).HeatTransferMeteringEndUse = OutputProcessor::SOVEndUseCat::FreeCooling; + state.dataPlantHXFluidToFluid->FluidHX(CompLoop).HeatTransferMeteringEndUse = OutputProcessor::EndUseCat::FreeCooling; else if (endUseCat == "HEATREJECTION") - state.dataPlantHXFluidToFluid->FluidHX(CompLoop).HeatTransferMeteringEndUse = OutputProcessor::SOVEndUseCat::HeatRejection; + state.dataPlantHXFluidToFluid->FluidHX(CompLoop).HeatTransferMeteringEndUse = OutputProcessor::EndUseCat::HeatRejection; else if (endUseCat == "HEATRECOVERYFORCOOLING") - state.dataPlantHXFluidToFluid->FluidHX(CompLoop).HeatTransferMeteringEndUse = OutputProcessor::SOVEndUseCat::HeatRecoveryForCooling; + state.dataPlantHXFluidToFluid->FluidHX(CompLoop).HeatTransferMeteringEndUse = OutputProcessor::EndUseCat::HeatRecoveryForCooling; else if (endUseCat == "HEATRECOVERYFORCOOLING") - state.dataPlantHXFluidToFluid->FluidHX(CompLoop).HeatTransferMeteringEndUse = OutputProcessor::SOVEndUseCat::HeatRecoveryForHeating; + state.dataPlantHXFluidToFluid->FluidHX(CompLoop).HeatTransferMeteringEndUse = OutputProcessor::EndUseCat::HeatRecoveryForHeating; else if (endUseCat == "LOOPTOLOOP") - state.dataPlantHXFluidToFluid->FluidHX(CompLoop).HeatTransferMeteringEndUse = OutputProcessor::SOVEndUseCat::LoopToLoop; + state.dataPlantHXFluidToFluid->FluidHX(CompLoop).HeatTransferMeteringEndUse = OutputProcessor::EndUseCat::LoopToLoop; else { ShowWarningError( state, @@ -550,84 +550,83 @@ void HeatExchangerStruct::setupOutputVars(EnergyPlusData &state) "Fluid Heat Exchanger Heat Transfer Rate", Constant::Units::W, this->HeatTransferRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Fluid Heat Exchanger Heat Transfer Energy", Constant::Units::J, this->HeatTransferEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::EnergyTransfer, - this->HeatTransferMeteringEndUse, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + this->HeatTransferMeteringEndUse); SetupOutputVariable(state, "Fluid Heat Exchanger Loop Supply Side Mass Flow Rate", Constant::Units::kg_s, this->SupplySideLoop.InletMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Fluid Heat Exchanger Loop Supply Side Inlet Temperature", Constant::Units::C, this->SupplySideLoop.InletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Fluid Heat Exchanger Loop Supply Side Outlet Temperature", Constant::Units::C, this->SupplySideLoop.OutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Fluid Heat Exchanger Loop Demand Side Mass Flow Rate", Constant::Units::kg_s, this->DemandSideLoop.InletMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Fluid Heat Exchanger Loop Demand Side Inlet Temperature", Constant::Units::C, this->DemandSideLoop.InletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Fluid Heat Exchanger Loop Demand Side Outlet Temperature", Constant::Units::C, this->DemandSideLoop.OutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Fluid Heat Exchanger Operation Status", Constant::Units::None, this->OperationStatus, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Fluid Heat Exchanger Effectiveness", Constant::Units::None, this->Effectiveness, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); } diff --git a/src/EnergyPlus/PlantHeatExchangerFluidToFluid.hh b/src/EnergyPlus/PlantHeatExchangerFluidToFluid.hh index 65e09c7c1d4..93d2235a21b 100644 --- a/src/EnergyPlus/PlantHeatExchangerFluidToFluid.hh +++ b/src/EnergyPlus/PlantHeatExchangerFluidToFluid.hh @@ -166,7 +166,7 @@ namespace PlantHeatExchangerFluidToFluid { Real64 MaxOperationTemp; PlantConnectionStruct DemandSideLoop; // plant connections and data for the side of HX connected to demand side PlantConnectionStruct SupplySideLoop; - OutputProcessor::SOVEndUseCat HeatTransferMeteringEndUse = OutputProcessor::SOVEndUseCat::Invalid; + OutputProcessor::EndUseCat HeatTransferMeteringEndUse = OutputProcessor::EndUseCat::Invalid; std::string ComponentUserName; // user name for control-associated component DataPlant::PlantEquipmentType ComponentType; PlantLocatorStruct OtherCompSupplySideLoop; diff --git a/src/EnergyPlus/PlantLoadProfile.cc b/src/EnergyPlus/PlantLoadProfile.cc index ec6ed91e518..fa976ca3efe 100644 --- a/src/EnergyPlus/PlantLoadProfile.cc +++ b/src/EnergyPlus/PlantLoadProfile.cc @@ -517,53 +517,50 @@ void GetPlantProfileInput(EnergyPlusData &state) "Plant Load Profile Mass Flow Rate", Constant::Units::kg_s, state.dataPlantLoadProfile->PlantProfile(ProfileNum).MassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataPlantLoadProfile->PlantProfile(ProfileNum).Name); SetupOutputVariable(state, "Plant Load Profile Heat Transfer Rate", Constant::Units::W, state.dataPlantLoadProfile->PlantProfile(ProfileNum).Power, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataPlantLoadProfile->PlantProfile(ProfileNum).Name); SetupOutputVariable(state, "Plant Load Profile Heat Transfer Energy", Constant::Units::J, state.dataPlantLoadProfile->PlantProfile(ProfileNum).Energy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataPlantLoadProfile->PlantProfile(ProfileNum).Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::Heating, - {}, - OutputProcessor::SOVGroup::Plant); // is EndUseKey right? + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Heating); // is EndUseKey right? SetupOutputVariable(state, "Plant Load Profile Heating Energy", Constant::Units::J, state.dataPlantLoadProfile->PlantProfile(ProfileNum).HeatingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataPlantLoadProfile->PlantProfile(ProfileNum).Name, Constant::eResource::PlantLoopHeatingDemand, - OutputProcessor::SOVEndUseCat::Heating, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Heating); SetupOutputVariable(state, "Plant Load Profile Cooling Energy", Constant::Units::J, state.dataPlantLoadProfile->PlantProfile(ProfileNum).CoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataPlantLoadProfile->PlantProfile(ProfileNum).Name, Constant::eResource::PlantLoopCoolingDemand, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Cooling); if (state.dataGlobal->AnyEnergyManagementSystemInModel) { SetupEMSActuator(state, @@ -587,8 +584,8 @@ void GetPlantProfileInput(EnergyPlusData &state) "Plant Load Profile Steam Outlet Temperature", Constant::Units::C, state.dataPlantLoadProfile->PlantProfile(ProfileNum).OutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataPlantLoadProfile->PlantProfile(ProfileNum).Name); } diff --git a/src/EnergyPlus/PlantLoopHeatPumpEIR.cc b/src/EnergyPlus/PlantLoopHeatPumpEIR.cc index 8b9e5d173f4..b2d40d1e4c9 100644 --- a/src/EnergyPlus/PlantLoopHeatPumpEIR.cc +++ b/src/EnergyPlus/PlantLoopHeatPumpEIR.cc @@ -1701,155 +1701,153 @@ void EIRPlantLoopHeatPump::oneTimeInit(EnergyPlusData &state) "Heat Pump Part Load Ratio", Constant::Units::None, this->partLoadRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); SetupOutputVariable(state, "Heat Pump Cycling Ratio", Constant::Units::None, this->cyclingRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); SetupOutputVariable(state, "Heat Pump Load Side Heat Transfer Rate", Constant::Units::W, this->loadSideHeatTransfer, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); SetupOutputVariable(state, "Heat Pump Load Side Heat Transfer Energy", Constant::Units::J, this->loadSideEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::Invalid, // a {} parameter turns into 0 which is SOVEndUseCat::Heating - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant); SetupOutputVariable(state, "Heat Pump Source Side Heat Transfer Rate", Constant::Units::W, this->sourceSideHeatTransfer, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); SetupOutputVariable(state, "Heat Pump Source Side Heat Transfer Energy", Constant::Units::J, this->sourceSideEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->name); SetupOutputVariable(state, "Heat Pump Load Side Inlet Temperature", Constant::Units::C, this->loadSideInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); SetupOutputVariable(state, "Heat Pump Load Side Outlet Temperature", Constant::Units::C, this->loadSideOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); SetupOutputVariable(state, "Heat Pump Source Side Inlet Temperature", Constant::Units::C, this->sourceSideInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); SetupOutputVariable(state, "Heat Pump Source Side Outlet Temperature", Constant::Units::C, this->sourceSideOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); SetupOutputVariable(state, "Heat Pump Electricity Rate", Constant::Units::W, this->powerUsage, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); if (this->EIRHPType == DataPlant::PlantEquipmentType::HeatPumpEIRCooling) { // energy from HeatPump:PlantLoop:EIR:Cooling object SetupOutputVariable(state, "Heat Pump Electricity Energy", Constant::Units::J, this->powerEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cooling, - "Heat Pump", - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Cooling, + "Heat Pump"); } else if (this->EIRHPType == DataPlant::PlantEquipmentType::HeatPumpEIRHeating) { // energy from HeatPump:PlantLoop:EIR:Heating object SetupOutputVariable(state, "Heat Pump Electricity Energy", Constant::Units::J, this->powerEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Heating, - "Heat Pump", - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Heating, + "Heat Pump"); if (this->defrostAvailable) { SetupOutputVariable(state, "Heat Pump Load Due To Defrost", Constant::Units::W, this->loadDueToDefrost, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); SetupOutputVariable(state, "Heat Pump Fractioal Defrost Time", Constant::Units::W, this->fractionalDefrostTime, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); SetupOutputVariable(state, "Heat Pump Defrost Electricity Rate", Constant::Units::W, this->defrostEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); SetupOutputVariable(state, "Heat Pump Defrost Electricity Energy", Constant::Units::J, this->defrostEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Heating, - "Heat Pump", - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Heating, + "Heat Pump"); } } SetupOutputVariable(state, "Heat Pump Load Side Mass Flow Rate", Constant::Units::kg_s, this->loadSideMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); SetupOutputVariable(state, "Heat Pump Source Side Mass Flow Rate", Constant::Units::kg_s, this->sourceSideMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); // report variable used for debugging, System Node Specific Heat can also report the node Cp // added spaces to SetupOutputVariable to avoid issue with variable parsing script @@ -1857,8 +1855,8 @@ void EIRPlantLoopHeatPump::oneTimeInit(EnergyPlusData &state) // "Heat Pump Source Side Specific Heat", // Constant::Units::J_kgK, // this->sourceSideCp, - // OutputProcessor::SOVTimeStepType::System, - // OutputProcessor::SOVStoreType::Average, + // OutputProcessor::TimeStepType::System, + // OutputProcessor::StoreType::Average, // this->name); // find this component on the plant @@ -2967,137 +2965,135 @@ void EIRFuelFiredHeatPump::oneTimeInit(EnergyPlusData &state) "Fuel-fired Absorption HeatPump Load Side Heat Transfer Rate", Constant::Units::W, this->loadSideHeatTransfer, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); SetupOutputVariable(state, "Fuel-fired Absorption HeatPump Load Side Heat Transfer Energy", Constant::Units::J, this->loadSideEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::Invalid, // a {} parameter turns into 0 which is SOVEndUseCat::Heating - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant); // Setup Output Variable(state, // "Fuel-fired Absorption Heat Pump Source Side Heat Transfer Rate", // Constant::Units::W, // this->sourceSideHeatTransfer, - // OutputProcessor::SOVTimeStepType::System, - // OutputProcessor::SOVStoreType::Average, + // OutputProcessor::TimeStepType::System, + // OutputProcessor::StoreType::Average, // this->name); // Setup Output Variable(state, // "Fuel-fired Absorption Heat Pump Source Side Heat Transfer Energy", // Constant::Units::J, // this->sourceSideEnergy, - // OutputProcessor::SOVTimeStepType::System, - // OutputProcessor::SOVStoreType::Summed, + // OutputProcessor::TimeStepType::System, + // OutputProcessor::StoreType::Sum, // this->name); SetupOutputVariable(state, "Fuel-fired Absorption HeatPump Inlet Temperature", // "Heat Pump Load Side Inlet Temperature", Constant::Units::C, this->loadSideInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); SetupOutputVariable(state, "Fuel-fired Absorption HeatPump Outlet Temperature", // "Heat Pump Load Side Outlet Temperature", Constant::Units::C, this->loadSideOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); // Setup Output Variable(state, // "Fuel-fired Absorption Heat Pump Source Side Inlet Temperature", // Constant::Units::C, // this->sourceSideInletTemp, - // OutputProcessor::SOVTimeStepType::System, - // OutputProcessor::SOVStoreType::Average, + // OutputProcessor::TimeStepType::System, + // OutputProcessor::StoreType::Average, // this->name); // Setup Output Variable(state, // "Heat Pump Source Side Outlet Temperature", // Constant::Units::C, // this->sourceSideOutletTemp, - // OutputProcessor::SOVTimeStepType::System, - // OutputProcessor::SOVStoreType::Average, + // OutputProcessor::TimeStepType::System, + // OutputProcessor::StoreType::Average, // this->name); SetupOutputVariable(state, "Fuel-fired Absorption HeatPump Fuel Rate", Constant::Units::W, this->fuelRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); SetupOutputVariable(state, "Fuel-fired Absorption HeatPump Electricity Rate", Constant::Units::W, this->powerUsage, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); if (this->EIRHPType == DataPlant::PlantEquipmentType::HeatPumpFuelFiredCooling) { // energy from HeatPump:AirToWater:FuelFired:Cooling object SetupOutputVariable(state, "Fuel-fired Absorption HeatPump Fuel Energy", Constant::Units::J, this->fuelEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->name, Constant::eFuel2eResource[(int)this->fuelType], - OutputProcessor::SOVEndUseCat::Cooling, - this->endUseSubcat, //"Heat Pump", - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Cooling, + this->endUseSubcat); //"Heat Pump", SetupOutputVariable(state, "Fuel-fired Absorption HeatPump Electricity Energy", Constant::Units::J, this->powerEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cooling, - this->endUseSubcat, // "Heat Pump", - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Cooling, + this->endUseSubcat); // "Heat Pump", } else if (this->EIRHPType == DataPlant::PlantEquipmentType::HeatPumpFuelFiredHeating) { // energy from HeatPump:AirToWater:FuelFired:Heating object SetupOutputVariable(state, "Fuel-fired Absorption HeatPump Fuel Energy", Constant::Units::J, this->fuelEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->name, Constant::eFuel2eResource[(int)this->fuelType], - OutputProcessor::SOVEndUseCat::Heating, - this->endUseSubcat, // "Heat Pump", - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Heating, + this->endUseSubcat); // "Heat Pump", SetupOutputVariable(state, "Fuel-fired Absorption HeatPump Electricity Energy", Constant::Units::J, this->powerEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Heating, - this->endUseSubcat, // "Heat Pump", - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Heating, + this->endUseSubcat); // "Heat Pump", } SetupOutputVariable(state, "Fuel-fired Absorption HeatPump Mass Flow Rate", Constant::Units::kg_s, this->loadSideMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); SetupOutputVariable(state, "Fuel-fired Absorption HeatPump Volumetric Flow Rate", Constant::Units::m3_s, this->loadSideVolumeFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->name); // find this component on the plant diff --git a/src/EnergyPlus/PlantPipingSystemsManager.cc b/src/EnergyPlus/PlantPipingSystemsManager.cc index 992490136e2..dc8deb1da92 100644 --- a/src/EnergyPlus/PlantPipingSystemsManager.cc +++ b/src/EnergyPlus/PlantPipingSystemsManager.cc @@ -1929,23 +1929,23 @@ namespace PlantPipingSystemsManager { "Pipe Segment Inlet Temperature", Constant::Units::C, thisSegment.InletTemperature, - OutputProcessor::SOVTimeStepType::Plant, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisSegment.Name); SetupOutputVariable(state, "Pipe Segment Outlet Temperature", Constant::Units::C, thisSegment.OutletTemperature, - OutputProcessor::SOVTimeStepType::Plant, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisSegment.Name); SetupOutputVariable(state, "Pipe Segment Fluid Heat Transfer Rate", Constant::Units::W, thisSegment.FluidHeatLoss, - OutputProcessor::SOVTimeStepType::Plant, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisSegment.Name); } } @@ -1958,31 +1958,31 @@ namespace PlantPipingSystemsManager { "Pipe Circuit Mass Flow Rate", Constant::Units::kg_s, thisCircuit.CurCircuitFlowRate, - OutputProcessor::SOVTimeStepType::Plant, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisCircuit.Name); SetupOutputVariable(state, "Pipe Circuit Inlet Temperature", Constant::Units::C, thisCircuit.InletTemperature, - OutputProcessor::SOVTimeStepType::Plant, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisCircuit.Name); SetupOutputVariable(state, "Pipe Circuit Outlet Temperature", Constant::Units::C, thisCircuit.OutletTemperature, - OutputProcessor::SOVTimeStepType::Plant, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisCircuit.Name); SetupOutputVariable(state, "Pipe Circuit Fluid Heat Transfer Rate", Constant::Units::W, thisCircuit.FluidHeatLoss, - OutputProcessor::SOVTimeStepType::Plant, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisCircuit.Name); } else { // it is a horizontal trench @@ -1991,31 +1991,31 @@ namespace PlantPipingSystemsManager { "Ground Heat Exchanger Mass Flow Rate", Constant::Units::kg_s, thisCircuit.CurCircuitFlowRate, - OutputProcessor::SOVTimeStepType::Plant, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisCircuit.Name); SetupOutputVariable(state, "Ground Heat Exchanger Inlet Temperature", Constant::Units::C, thisCircuit.InletTemperature, - OutputProcessor::SOVTimeStepType::Plant, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisCircuit.Name); SetupOutputVariable(state, "Ground Heat Exchanger Outlet Temperature", Constant::Units::C, thisCircuit.OutletTemperature, - OutputProcessor::SOVTimeStepType::Plant, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisCircuit.Name); SetupOutputVariable(state, "Ground Heat Exchanger Fluid Heat Transfer Rate", Constant::Units::W, thisCircuit.FluidHeatLoss, - OutputProcessor::SOVTimeStepType::Plant, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisCircuit.Name); } } @@ -2036,15 +2036,15 @@ namespace PlantPipingSystemsManager { "GroundDomain Slab Zone Coupled Surface Heat Flux", Constant::Units::W_m2, this->HeatFlux, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "GroundDomain Slab Zone Coupled Surface Temperature", Constant::Units::C, this->ZoneCoupledSurfaceTemp, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, this->Name); } else if (this->HasZoneCoupledBasement) { // Zone-coupled basement wall outputs @@ -2052,30 +2052,30 @@ namespace PlantPipingSystemsManager { "GroundDomain Basement Wall Interface Heat Flux", Constant::Units::W_m2, this->WallHeatFlux, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "GroundDomain Basement Wall Interface Temperature", Constant::Units::C, this->BasementWallTemp, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, this->Name); // Zone-coupled basement floor outputs SetupOutputVariable(state, "GroundDomain Basement Floor Interface Heat Flux", Constant::Units::W_m2, this->FloorHeatFlux, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "GroundDomain Basement Floor Interface Temperature", Constant::Units::C, this->BasementFloorTemp, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, this->Name); } } diff --git a/src/EnergyPlus/PlantPressureSystem.cc b/src/EnergyPlus/PlantPressureSystem.cc index eea24aa266a..dc15cff6b4c 100644 --- a/src/EnergyPlus/PlantPressureSystem.cc +++ b/src/EnergyPlus/PlantPressureSystem.cc @@ -198,8 +198,8 @@ void InitPressureDrop(EnergyPlusData &state, int const LoopNum, bool const First "Plant Branch Pressure Difference", Constant::Units::Pa, branch.PressureDrop, - OutputProcessor::SOVTimeStepType::Plant, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, branch.Name); } } @@ -212,8 +212,8 @@ void InitPressureDrop(EnergyPlusData &state, int const LoopNum, bool const First "Plant Demand Side Loop Pressure Difference", Constant::Units::Pa, loop_side.PressureDrop, - OutputProcessor::SOVTimeStepType::Plant, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, loop.Name); } else if (LoopSideNum == DataPlant::LoopSideLocation::Supply) { @@ -222,8 +222,8 @@ void InitPressureDrop(EnergyPlusData &state, int const LoopNum, bool const First "Plant Supply Side Loop Pressure Difference", Constant::Units::Pa, loop_side.PressureDrop, - OutputProcessor::SOVTimeStepType::Plant, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, loop.Name); } } @@ -239,8 +239,8 @@ void InitPressureDrop(EnergyPlusData &state, int const LoopNum, bool const First "Plant Loop Pressure Difference", Constant::Units::Pa, loop.PressureDrop, - OutputProcessor::SOVTimeStepType::Plant, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, loop.Name); // Check for illegal configurations on this plant loop diff --git a/src/EnergyPlus/PlantValves.cc b/src/EnergyPlus/PlantValves.cc index 010e4ae08f4..7c0e98d2dde 100644 --- a/src/EnergyPlus/PlantValves.cc +++ b/src/EnergyPlus/PlantValves.cc @@ -233,8 +233,8 @@ namespace PlantValves { "Tempering Valve Flow Fraction", Constant::Units::None, state.dataPlantValves->TemperValve(Item).FlowDivFract, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataPlantValves->TemperValve(Item).Name); } diff --git a/src/EnergyPlus/PluginManager.cc b/src/EnergyPlus/PluginManager.cc index c5921c5b042..51a09c452f3 100644 --- a/src/EnergyPlus/PluginManager.cc +++ b/src/EnergyPlus/PluginManager.cc @@ -207,16 +207,16 @@ void PluginManager::setupOutputVariables([[maybe_unused]] EnergyPlusData &state) EnergyPlus::ShowFatalError(state, "Python Plugin Output Variable problem causes program termination"); } bool isMetered = false; - OutputProcessor::SOVStoreType sAvgOrSum = OutputProcessor::SOVStoreType::Average; + OutputProcessor::StoreType sAvgOrSum = OutputProcessor::StoreType::Average; if (avgOrSum == "SUMMED") { - sAvgOrSum = OutputProcessor::SOVStoreType::Summed; + sAvgOrSum = OutputProcessor::StoreType::Sum; } else if (avgOrSum == "METERED") { - sAvgOrSum = OutputProcessor::SOVStoreType::Summed; + sAvgOrSum = OutputProcessor::StoreType::Sum; isMetered = true; } - OutputProcessor::SOVTimeStepType sUpdateFreq = OutputProcessor::SOVTimeStepType::Zone; + OutputProcessor::TimeStepType sUpdateFreq = OutputProcessor::TimeStepType::Zone; if (updateFreq == "SYSTEMTIMESTEP") { - sUpdateFreq = OutputProcessor::SOVTimeStepType::System; + sUpdateFreq = OutputProcessor::TimeStepType::System; } Constant::Units thisUnit = Constant::Units::None; if (!units.empty()) { @@ -244,12 +244,13 @@ void PluginManager::setupOutputVariables([[maybe_unused]] EnergyPlusData &state) sAvgOrSum, thisObjectName, Constant::eResource::Invalid, - OutputProcessor::SOVEndUseCat::Invalid, - {}, // EndUseSub - OutputProcessor::SOVGroup::Invalid, - {}, // Zone + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::Invalid, + "", // EndUseSub + "", // Zone 1, 1, + "", // SpaceType -999, units); } @@ -298,9 +299,8 @@ void PluginManager::setupOutputVariables([[maybe_unused]] EnergyPlusData &state) EnergyPlus::ShowFatalError(state, "Input error on PythonPlugin:OutputVariable causes program termination"); } std::string const groupType = EnergyPlus::Util::makeUPPER(fields.at("group_type").get()); - OutputProcessor::SOVGroup sovGroup = - static_cast(getEnumValue(OutputProcessor::sovGroupNamesUC, groupType)); - if (sovGroup == OutputProcessor::SOVGroup::Invalid) { + OutputProcessor::Group group = static_cast(getEnumValue(OutputProcessor::groupNamesUC, groupType)); + if (group == OutputProcessor::Group::Invalid) { ShowSevereError(state, format("Invalid input for PythonPlugin:OutputVariable, unexpected Group Type = {}", groupType)); ShowFatalError(state, "Python plugin output variable input problem causes program termination"); } @@ -314,21 +314,20 @@ void PluginManager::setupOutputVariables([[maybe_unused]] EnergyPlusData &state) EnergyPlus::ShowFatalError(state, "Input error on PythonPlugin:OutputVariable causes program termination"); } std::string const endUse = EnergyPlus::Util::makeUPPER(fields.at("end_use_category").get()); - OutputProcessor::SOVEndUseCat sovEndUseCat = - static_cast(getEnumValue(OutputProcessor::sovEndUseCatNamesUC, endUse)); + OutputProcessor::EndUseCat endUseCat = + static_cast(getEnumValue(OutputProcessor::endUseCatNamesUC, endUse)); - if (sovEndUseCat == OutputProcessor::SOVEndUseCat::Invalid) { + if (endUseCat == OutputProcessor::EndUseCat::Invalid) { ShowSevereError(state, format("Invalid input for PythonPlugin:OutputVariable, unexpected End-use Subcategory = {}", endUse)); ShowFatalError(state, "Python plugin output variable input problem causes program termination"); } // Additional End Use Types Only Used for EnergyTransfer if ((resource != Constant::eResource::EnergyTransfer) && - (sovEndUseCat == OutputProcessor::SOVEndUseCat::HeatingCoils || sovEndUseCat == OutputProcessor::SOVEndUseCat::CoolingCoils || - sovEndUseCat == OutputProcessor::SOVEndUseCat::Chillers || sovEndUseCat == OutputProcessor::SOVEndUseCat::Boilers || - sovEndUseCat == OutputProcessor::SOVEndUseCat::Baseboard || - sovEndUseCat == OutputProcessor::SOVEndUseCat::HeatRecoveryForCooling || - sovEndUseCat == OutputProcessor::SOVEndUseCat::HeatRecoveryForHeating)) { + (endUseCat == OutputProcessor::EndUseCat::HeatingCoils || endUseCat == OutputProcessor::EndUseCat::CoolingCoils || + endUseCat == OutputProcessor::EndUseCat::Chillers || endUseCat == OutputProcessor::EndUseCat::Boilers || + endUseCat == OutputProcessor::EndUseCat::Baseboard || endUseCat == OutputProcessor::EndUseCat::HeatRecoveryForCooling || + endUseCat == OutputProcessor::EndUseCat::HeatRecoveryForHeating)) { ShowWarningError(state, format("Inconsistent resource type input for PythonPlugin:OutputVariable = {}", thisObjectName)); ShowContinueError(state, format("For end use subcategory = {}, resource type must be EnergyTransfer", endUse)); ShowContinueError(state, "Resource type is being reset to EnergyTransfer and the simulation continues..."); @@ -349,9 +348,8 @@ void PluginManager::setupOutputVariables([[maybe_unused]] EnergyPlusData &state) sAvgOrSum, thisObjectName, resource, - sovEndUseCat, - {}, - sovGroup); + group, + endUseCat); } else { // has subcategory SetupOutputVariable(state, sOutputVariable, @@ -361,9 +359,9 @@ void PluginManager::setupOutputVariables([[maybe_unused]] EnergyPlusData &state) sAvgOrSum, thisObjectName, resource, - sovEndUseCat, - sEndUseSubcategory, - sovGroup); + group, + endUseCat, + sEndUseSubcategory); } } } // for (instance) diff --git a/src/EnergyPlus/PollutionModule.cc b/src/EnergyPlus/PollutionModule.cc index 0c534ac3bbf..a05573c2b94 100644 --- a/src/EnergyPlus/PollutionModule.cc +++ b/src/EnergyPlus/PollutionModule.cc @@ -444,22 +444,22 @@ void SetupPollutionMeterReporting(EnergyPlusData &state) Constant::eFuel fuel = pollFuel2fuel[(int)pollFuel]; - constexpr std::array fuel2sovEndUseCat = { - OutputProcessor::SOVEndUseCat::ElectricityEmissions, - OutputProcessor::SOVEndUseCat::NaturalGasEmissions, - OutputProcessor::SOVEndUseCat::GasolineEmissions, - OutputProcessor::SOVEndUseCat::DieselEmissions, - OutputProcessor::SOVEndUseCat::CoalEmissions, - OutputProcessor::SOVEndUseCat::PropaneEmissions, - OutputProcessor::SOVEndUseCat::FuelOilNo1Emissions, - OutputProcessor::SOVEndUseCat::FuelOilNo2Emissions, - OutputProcessor::SOVEndUseCat::OtherFuel1Emissions, - OutputProcessor::SOVEndUseCat::OtherFuel2Emissions, - OutputProcessor::SOVEndUseCat::Invalid, - OutputProcessor::SOVEndUseCat::Invalid, - OutputProcessor::SOVEndUseCat::Invalid, - OutputProcessor::SOVEndUseCat::Invalid, - OutputProcessor::SOVEndUseCat::Invalid // used for OtherEquipment object + constexpr std::array fuel2sovEndUseCat = { + OutputProcessor::EndUseCat::ElectricityEmissions, + OutputProcessor::EndUseCat::NaturalGasEmissions, + OutputProcessor::EndUseCat::GasolineEmissions, + OutputProcessor::EndUseCat::DieselEmissions, + OutputProcessor::EndUseCat::CoalEmissions, + OutputProcessor::EndUseCat::PropaneEmissions, + OutputProcessor::EndUseCat::FuelOilNo1Emissions, + OutputProcessor::EndUseCat::FuelOilNo2Emissions, + OutputProcessor::EndUseCat::OtherFuel1Emissions, + OutputProcessor::EndUseCat::OtherFuel2Emissions, + OutputProcessor::EndUseCat::Invalid, + OutputProcessor::EndUseCat::Invalid, + OutputProcessor::EndUseCat::Invalid, + OutputProcessor::EndUseCat::Invalid, + OutputProcessor::EndUseCat::Invalid // used for OtherEquipment object }; // Need to check whether this fuel is used? @@ -467,26 +467,24 @@ void SetupPollutionMeterReporting(EnergyPlusData &state) format("Environmental Impact {} Source Energy", Constant::eFuelNames[(int)fuel]), Constant::Units::J, pollComp.sourceVal, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, "Site", Constant::eResource::Source, - fuel2sovEndUseCat[(int)fuel], - {}, - OutputProcessor::SOVGroup::Invalid); + OutputProcessor::Group::Invalid, + fuel2sovEndUseCat[(int)fuel]); for (int iPollutant = 0; iPollutant < (int)Pollutant::Num; ++iPollutant) { SetupOutputVariable(state, format("Environmental Impact {} {}", Constant::eFuelNames[(int)fuel], poll2outVarStrs[iPollutant]), pollUnits[iPollutant], pollComp.pollutantVals[iPollutant], - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, "Site", poll2Resource[iPollutant], - fuel2sovEndUseCat[(int)fuel], - {}, - OutputProcessor::SOVGroup::Invalid); + OutputProcessor::Group::Invalid, + fuel2sovEndUseCat[(int)fuel]); } if (fuel == Constant::eFuel::Electricity) { @@ -496,24 +494,22 @@ void SetupPollutionMeterReporting(EnergyPlusData &state) "Environmental Impact Purchased Electricity Source Energy", Constant::Units::J, pm->pollComps[(int)PollFuelComponent::ElectricityPurchased].sourceVal, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, "Site", Constant::eResource::Source, - OutputProcessor::SOVEndUseCat::PurchasedElectricityEmissions, - {}, - OutputProcessor::SOVGroup::Invalid); + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::PurchasedElectricityEmissions); SetupOutputVariable(state, "Environmental Impact Surplus Sold Electricity Source", Constant::Units::J, pm->pollComps[(int)PollFuelComponent::ElectricitySurplusSold].sourceVal, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, "Site", Constant::eResource::Source, - OutputProcessor::SOVEndUseCat::SoldElectricityEmissions, - {}, - OutputProcessor::SOVGroup::Invalid); + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::SoldElectricityEmissions); } } // End of the NumEnergyTypes Do Loop @@ -523,35 +519,32 @@ void SetupPollutionMeterReporting(EnergyPlusData &state) "Environmental Impact Total N2O Emissions Carbon Equivalent Mass", Constant::Units::kg, pm->TotCarbonEquivFromN2O, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, "Site", Constant::eResource::CarbonEquivalent, - OutputProcessor::SOVEndUseCat::CarbonEquivalentEmissions, - {}, - OutputProcessor::SOVGroup::Invalid); + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::CarbonEquivalentEmissions); SetupOutputVariable(state, "Environmental Impact Total CH4 Emissions Carbon Equivalent Mass", Constant::Units::kg, pm->TotCarbonEquivFromCH4, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, "Site", Constant::eResource::CarbonEquivalent, - OutputProcessor::SOVEndUseCat::CarbonEquivalentEmissions, - {}, - OutputProcessor::SOVGroup::Invalid); + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::CarbonEquivalentEmissions); SetupOutputVariable(state, "Environmental Impact Total CO2 Emissions Carbon Equivalent Mass", Constant::Units::kg, pm->TotCarbonEquivFromCO2, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, "Site", Constant::eResource::CarbonEquivalent, - OutputProcessor::SOVEndUseCat::CarbonEquivalentEmissions, - {}, - OutputProcessor::SOVGroup::Invalid); + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::CarbonEquivalentEmissions); // Connect pollution meters to energy meters for (int iMeter = 0; iMeter < (int)PollFacilityMeter::Num; ++iMeter) { diff --git a/src/EnergyPlus/PondGroundHeatExchanger.cc b/src/EnergyPlus/PondGroundHeatExchanger.cc index 5659aac8f89..3cc385c8d92 100644 --- a/src/EnergyPlus/PondGroundHeatExchanger.cc +++ b/src/EnergyPlus/PondGroundHeatExchanger.cc @@ -351,43 +351,43 @@ void PondGroundHeatExchangerData::setupOutputVars(EnergyPlusData &state) "Pond Heat Exchanger Heat Transfer Rate", Constant::Units::W, this->HeatTransferRate, - OutputProcessor::SOVTimeStepType::Plant, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Pond Heat Exchanger Heat Transfer Energy", Constant::Units::J, this->Energy, - OutputProcessor::SOVTimeStepType::Plant, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Pond Heat Exchanger Mass Flow Rate", Constant::Units::kg_s, this->MassFlowRate, - OutputProcessor::SOVTimeStepType::Plant, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Pond Heat Exchanger Inlet Temperature", Constant::Units::C, this->InletTemp, - OutputProcessor::SOVTimeStepType::Plant, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Pond Heat Exchanger Outlet Temperature", Constant::Units::C, this->OutletTemp, - OutputProcessor::SOVTimeStepType::Plant, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Pond Heat Exchanger Bulk Temperature", Constant::Units::C, this->PondTemp, - OutputProcessor::SOVTimeStepType::Plant, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); } diff --git a/src/EnergyPlus/PoweredInductionUnits.cc b/src/EnergyPlus/PoweredInductionUnits.cc index 06d85ef9aae..d7f299360fd 100644 --- a/src/EnergyPlus/PoweredInductionUnits.cc +++ b/src/EnergyPlus/PoweredInductionUnits.cc @@ -743,43 +743,43 @@ void GetPIUs(EnergyPlusData &state) "Zone Air Terminal Primary Damper Position", Constant::Units::None, thisPIU.PriDamperPosition, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisPIU.Name); SetupOutputVariable(state, "Zone Air Terminal Heating Rate", Constant::Units::W, thisPIU.HeatingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisPIU.Name); SetupOutputVariable(state, "Zone Air Terminal Heating Energy", Constant::Units::J, thisPIU.HeatingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisPIU.Name); SetupOutputVariable(state, "Zone Air Terminal Sensible Cooling Rate", Constant::Units::W, thisPIU.SensCoolRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisPIU.Name); SetupOutputVariable(state, "Zone Air Terminal Sensible Cooling Energy", Constant::Units::J, thisPIU.SensCoolEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisPIU.Name); SetupOutputVariable(state, "Zone Air Terminal Outdoor Air Volume Flow Rate", Constant::Units::m3_s, thisPIU.OutdoorAirFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisPIU.Name); } } diff --git a/src/EnergyPlus/Pumps.cc b/src/EnergyPlus/Pumps.cc index b1b8e41eb70..33f13332f18 100644 --- a/src/EnergyPlus/Pumps.cc +++ b/src/EnergyPlus/Pumps.cc @@ -1122,54 +1122,54 @@ void GetPumpInput(EnergyPlusData &state) "Pump Electricity Energy", Constant::Units::J, thisPump.Energy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisPump.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Pumps, - thisPump.EndUseSubcategoryName, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Pumps, + thisPump.EndUseSubcategoryName); SetupOutputVariable(state, "Pump Electricity Rate", Constant::Units::W, thisPump.Power, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisPump.Name); SetupOutputVariable(state, "Pump Shaft Power", Constant::Units::W, thisPumpRep.ShaftPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisPump.Name); SetupOutputVariable(state, "Pump Fluid Heat Gain Rate", Constant::Units::W, thisPumpRep.PumpHeattoFluid, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisPump.Name); SetupOutputVariable(state, "Pump Fluid Heat Gain Energy", Constant::Units::J, thisPumpRep.PumpHeattoFluidEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisPump.Name); SetupOutputVariable(state, "Pump Outlet Temperature", Constant::Units::C, thisPumpRep.OutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisPump.Name); SetupOutputVariable(state, "Pump Mass Flow Rate", Constant::Units::kg_s, thisPumpRep.PumpMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisPump.Name); } break; @@ -1180,61 +1180,61 @@ void GetPumpInput(EnergyPlusData &state) "Pump Electricity Energy", Constant::Units::J, thisPump.Energy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisPump.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Pumps, - thisPump.EndUseSubcategoryName, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Pumps, + thisPump.EndUseSubcategoryName); SetupOutputVariable(state, "Pump Electricity Rate", Constant::Units::W, thisPump.Power, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisPump.Name); SetupOutputVariable(state, "Pump Shaft Power", Constant::Units::W, thisPumpRep.ShaftPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisPump.Name); SetupOutputVariable(state, "Pump Fluid Heat Gain Rate", Constant::Units::W, thisPumpRep.PumpHeattoFluid, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisPump.Name); SetupOutputVariable(state, "Pump Fluid Heat Gain Energy", Constant::Units::J, thisPumpRep.PumpHeattoFluidEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisPump.Name); SetupOutputVariable(state, "Pump Outlet Temperature", Constant::Units::C, thisPumpRep.OutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisPump.Name); SetupOutputVariable(state, "Pump Mass Flow Rate", Constant::Units::kg_s, thisPumpRep.PumpMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisPump.Name); SetupOutputVariable(state, "Pump Operating Pumps Count", Constant::Units::None, thisPumpRep.NumPumpsOperating, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisPump.Name); } break; default: { @@ -1256,29 +1256,29 @@ void GetPumpInput(EnergyPlusData &state) "Pump Zone Total Heating Rate", Constant::Units::W, thisPumpRep.ZoneTotalGainRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisPump.Name); SetupOutputVariable(state, "Pump Zone Total Heating Energy", Constant::Units::J, thisPumpRep.ZoneTotalGainEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisPump.Name); SetupOutputVariable(state, "Pump Zone Convective Heating Rate", Constant::Units::W, thisPumpRep.ZoneConvGainRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisPump.Name); SetupOutputVariable(state, "Pump Zone Radiative Heating Rate", Constant::Units::W, thisPumpRep.ZoneRadGainRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisPump.Name); // setup internal gains diff --git a/src/EnergyPlus/PurchasedAirManager.cc b/src/EnergyPlus/PurchasedAirManager.cc index 162961ae20f..988bbaa85ee 100644 --- a/src/EnergyPlus/PurchasedAirManager.cc +++ b/src/EnergyPlus/PurchasedAirManager.cc @@ -679,177 +679,175 @@ void GetPurchasedAir(EnergyPlusData &state) "Zone Ideal Loads Supply Air Sensible Heating Energy", Constant::Units::J, PurchAir(PurchAirNum).SenHeatEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, PurchAir(PurchAirNum).Name); SetupOutputVariable(state, "Zone Ideal Loads Supply Air Latent Heating Energy", Constant::Units::J, PurchAir(PurchAirNum).LatHeatEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, PurchAir(PurchAirNum).Name); SetupOutputVariable(state, "Zone Ideal Loads Supply Air Total Heating Energy", Constant::Units::J, PurchAir(PurchAirNum).TotHeatEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, PurchAir(PurchAirNum).Name, Constant::eResource::DistrictHeatingWater, - OutputProcessor::SOVEndUseCat::Heating, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Heating); SetupOutputVariable(state, "Zone Ideal Loads Supply Air Sensible Cooling Energy", Constant::Units::J, PurchAir(PurchAirNum).SenCoolEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, PurchAir(PurchAirNum).Name); SetupOutputVariable(state, "Zone Ideal Loads Supply Air Latent Cooling Energy", Constant::Units::J, PurchAir(PurchAirNum).LatCoolEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, PurchAir(PurchAirNum).Name); SetupOutputVariable(state, "Zone Ideal Loads Supply Air Total Cooling Energy", Constant::Units::J, PurchAir(PurchAirNum).TotCoolEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, PurchAir(PurchAirNum).Name, Constant::eResource::DistrictCooling, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); SetupOutputVariable(state, "Zone Ideal Loads Zone Sensible Heating Energy", Constant::Units::J, PurchAir(PurchAirNum).ZoneSenHeatEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, PurchAir(PurchAirNum).Name); SetupOutputVariable(state, "Zone Ideal Loads Zone Latent Heating Energy", Constant::Units::J, PurchAir(PurchAirNum).ZoneLatHeatEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, PurchAir(PurchAirNum).Name); SetupOutputVariable(state, "Zone Ideal Loads Zone Total Heating Energy", Constant::Units::J, PurchAir(PurchAirNum).ZoneTotHeatEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, PurchAir(PurchAirNum).Name); SetupOutputVariable(state, "Zone Ideal Loads Zone Sensible Cooling Energy", Constant::Units::J, PurchAir(PurchAirNum).ZoneSenCoolEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, PurchAir(PurchAirNum).Name); SetupOutputVariable(state, "Zone Ideal Loads Zone Latent Cooling Energy", Constant::Units::J, PurchAir(PurchAirNum).ZoneLatCoolEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, PurchAir(PurchAirNum).Name); SetupOutputVariable(state, "Zone Ideal Loads Zone Total Cooling Energy", Constant::Units::J, PurchAir(PurchAirNum).ZoneTotCoolEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, PurchAir(PurchAirNum).Name); SetupOutputVariable(state, "Zone Ideal Loads Outdoor Air Sensible Heating Energy", Constant::Units::J, PurchAir(PurchAirNum).OASenHeatEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, PurchAir(PurchAirNum).Name); SetupOutputVariable(state, "Zone Ideal Loads Outdoor Air Latent Heating Energy", Constant::Units::J, PurchAir(PurchAirNum).OALatHeatEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, PurchAir(PurchAirNum).Name); SetupOutputVariable(state, "Zone Ideal Loads Outdoor Air Total Heating Energy", Constant::Units::J, PurchAir(PurchAirNum).OATotHeatEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, PurchAir(PurchAirNum).Name); SetupOutputVariable(state, "Zone Ideal Loads Outdoor Air Sensible Cooling Energy", Constant::Units::J, PurchAir(PurchAirNum).OASenCoolEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, PurchAir(PurchAirNum).Name); SetupOutputVariable(state, "Zone Ideal Loads Outdoor Air Latent Cooling Energy", Constant::Units::J, PurchAir(PurchAirNum).OALatCoolEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, PurchAir(PurchAirNum).Name); SetupOutputVariable(state, "Zone Ideal Loads Outdoor Air Total Cooling Energy", Constant::Units::J, PurchAir(PurchAirNum).OATotCoolEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, PurchAir(PurchAirNum).Name); SetupOutputVariable(state, "Zone Ideal Loads Heat Recovery Sensible Heating Energy", Constant::Units::J, PurchAir(PurchAirNum).HtRecSenHeatEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, PurchAir(PurchAirNum).Name); SetupOutputVariable(state, "Zone Ideal Loads Heat Recovery Latent Heating Energy", Constant::Units::J, PurchAir(PurchAirNum).HtRecLatHeatEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, PurchAir(PurchAirNum).Name); SetupOutputVariable(state, "Zone Ideal Loads Heat Recovery Total Heating Energy", Constant::Units::J, PurchAir(PurchAirNum).HtRecTotHeatEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, PurchAir(PurchAirNum).Name); SetupOutputVariable(state, "Zone Ideal Loads Heat Recovery Sensible Cooling Energy", Constant::Units::J, PurchAir(PurchAirNum).HtRecSenCoolEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, PurchAir(PurchAirNum).Name); SetupOutputVariable(state, "Zone Ideal Loads Heat Recovery Latent Cooling Energy", Constant::Units::J, PurchAir(PurchAirNum).HtRecLatCoolEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, PurchAir(PurchAirNum).Name); SetupOutputVariable(state, "Zone Ideal Loads Heat Recovery Total Cooling Energy", Constant::Units::J, PurchAir(PurchAirNum).HtRecTotCoolEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, PurchAir(PurchAirNum).Name); // rate variables @@ -857,192 +855,192 @@ void GetPurchasedAir(EnergyPlusData &state) "Zone Ideal Loads Supply Air Sensible Heating Rate", Constant::Units::W, PurchAir(PurchAirNum).SenHeatRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, PurchAir(PurchAirNum).Name); SetupOutputVariable(state, "Zone Ideal Loads Supply Air Latent Heating Rate", Constant::Units::W, PurchAir(PurchAirNum).LatHeatRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, PurchAir(PurchAirNum).Name); SetupOutputVariable(state, "Zone Ideal Loads Supply Air Total Heating Rate", Constant::Units::W, PurchAir(PurchAirNum).TotHeatRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, PurchAir(PurchAirNum).Name); SetupOutputVariable(state, "Zone Ideal Loads Supply Air Sensible Cooling Rate", Constant::Units::W, PurchAir(PurchAirNum).SenCoolRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, PurchAir(PurchAirNum).Name); SetupOutputVariable(state, "Zone Ideal Loads Supply Air Latent Cooling Rate", Constant::Units::W, PurchAir(PurchAirNum).LatCoolRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, PurchAir(PurchAirNum).Name); SetupOutputVariable(state, "Zone Ideal Loads Supply Air Total Cooling Rate", Constant::Units::W, PurchAir(PurchAirNum).TotCoolRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, PurchAir(PurchAirNum).Name); SetupOutputVariable(state, "Zone Ideal Loads Zone Sensible Heating Rate", Constant::Units::W, PurchAir(PurchAirNum).ZoneSenHeatRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, PurchAir(PurchAirNum).Name); SetupOutputVariable(state, "Zone Ideal Loads Zone Latent Heating Rate", Constant::Units::W, PurchAir(PurchAirNum).ZoneLatHeatRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, PurchAir(PurchAirNum).Name); SetupOutputVariable(state, "Zone Ideal Loads Zone Total Heating Rate", Constant::Units::W, PurchAir(PurchAirNum).ZoneTotHeatRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, PurchAir(PurchAirNum).Name); SetupOutputVariable(state, "Zone Ideal Loads Zone Sensible Cooling Rate", Constant::Units::W, PurchAir(PurchAirNum).ZoneSenCoolRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, PurchAir(PurchAirNum).Name); SetupOutputVariable(state, "Zone Ideal Loads Zone Latent Cooling Rate", Constant::Units::W, PurchAir(PurchAirNum).ZoneLatCoolRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, PurchAir(PurchAirNum).Name); SetupOutputVariable(state, "Zone Ideal Loads Zone Total Cooling Rate", Constant::Units::W, PurchAir(PurchAirNum).ZoneTotCoolRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, PurchAir(PurchAirNum).Name); SetupOutputVariable(state, "Zone Ideal Loads Outdoor Air Sensible Heating Rate", Constant::Units::W, PurchAir(PurchAirNum).OASenHeatRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, PurchAir(PurchAirNum).Name); SetupOutputVariable(state, "Zone Ideal Loads Outdoor Air Latent Heating Rate", Constant::Units::W, PurchAir(PurchAirNum).OALatHeatRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, PurchAir(PurchAirNum).Name); SetupOutputVariable(state, "Zone Ideal Loads Outdoor Air Total Heating Rate", Constant::Units::W, PurchAir(PurchAirNum).OATotHeatRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, PurchAir(PurchAirNum).Name); SetupOutputVariable(state, "Zone Ideal Loads Outdoor Air Sensible Cooling Rate", Constant::Units::W, PurchAir(PurchAirNum).OASenCoolRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, PurchAir(PurchAirNum).Name); SetupOutputVariable(state, "Zone Ideal Loads Outdoor Air Latent Cooling Rate", Constant::Units::W, PurchAir(PurchAirNum).OALatCoolRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, PurchAir(PurchAirNum).Name); SetupOutputVariable(state, "Zone Ideal Loads Outdoor Air Total Cooling Rate", Constant::Units::W, PurchAir(PurchAirNum).OATotCoolRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, PurchAir(PurchAirNum).Name); SetupOutputVariable(state, "Zone Ideal Loads Heat Recovery Sensible Heating Rate", Constant::Units::W, PurchAir(PurchAirNum).HtRecSenHeatRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, PurchAir(PurchAirNum).Name); SetupOutputVariable(state, "Zone Ideal Loads Heat Recovery Latent Heating Rate", Constant::Units::W, PurchAir(PurchAirNum).HtRecLatHeatRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, PurchAir(PurchAirNum).Name); SetupOutputVariable(state, "Zone Ideal Loads Heat Recovery Total Heating Rate", Constant::Units::W, PurchAir(PurchAirNum).HtRecTotHeatRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, PurchAir(PurchAirNum).Name); SetupOutputVariable(state, "Zone Ideal Loads Heat Recovery Sensible Cooling Rate", Constant::Units::W, PurchAir(PurchAirNum).HtRecSenCoolRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, PurchAir(PurchAirNum).Name); SetupOutputVariable(state, "Zone Ideal Loads Heat Recovery Latent Cooling Rate", Constant::Units::W, PurchAir(PurchAirNum).HtRecLatCoolRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, PurchAir(PurchAirNum).Name); SetupOutputVariable(state, "Zone Ideal Loads Heat Recovery Total Cooling Rate", Constant::Units::W, PurchAir(PurchAirNum).HtRecTotCoolRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, PurchAir(PurchAirNum).Name); SetupOutputVariable(state, "Zone Ideal Loads Economizer Active Time", Constant::Units::hr, PurchAir(PurchAirNum).TimeEconoActive, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, PurchAir(PurchAirNum).Name); SetupOutputVariable(state, "Zone Ideal Loads Heat Recovery Active Time", Constant::Units::hr, PurchAir(PurchAirNum).TimeHtRecActive, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, PurchAir(PurchAirNum).Name); SetupOutputVariable(state, "Zone Ideal Loads Hybrid Ventilation Available Status", Constant::Units::None, PurchAir(PurchAirNum).AvailStatus, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, PurchAir(PurchAirNum).Name); // air flows @@ -1050,29 +1048,29 @@ void GetPurchasedAir(EnergyPlusData &state) "Zone Ideal Loads Outdoor Air Mass Flow Rate", Constant::Units::kg_s, PurchAir(PurchAirNum).OutdoorAirMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, PurchAir(PurchAirNum).Name); SetupOutputVariable(state, "Zone Ideal Loads Outdoor Air Standard Density Volume Flow Rate", Constant::Units::m3_s, PurchAir(PurchAirNum).OutdoorAirVolFlowRateStdRho, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, PurchAir(PurchAirNum).Name); SetupOutputVariable(state, "Zone Ideal Loads Supply Air Mass Flow Rate", Constant::Units::kg_s, PurchAir(PurchAirNum).SupplyAirMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, PurchAir(PurchAirNum).Name); SetupOutputVariable(state, "Zone Ideal Loads Supply Air Standard Density Volume Flow Rate", Constant::Units::m3_s, PurchAir(PurchAirNum).SupplyAirVolFlowRateStdRho, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, PurchAir(PurchAirNum).Name); // Supply Air temperature @@ -1080,16 +1078,16 @@ void GetPurchasedAir(EnergyPlusData &state) "Zone Ideal Loads Supply Air Temperature", Constant::Units::C, PurchAir(PurchAirNum).SupplyTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, PurchAir(PurchAirNum).Name); // Supply Air Humidity Ratio SetupOutputVariable(state, "Zone Ideal Loads Supply Air Humidity Ratio", Constant::Units::kgWater_kgDryAir, PurchAir(PurchAirNum).SupplyHumRat, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, PurchAir(PurchAirNum).Name); // Mixed Air temperature @@ -1097,16 +1095,16 @@ void GetPurchasedAir(EnergyPlusData &state) "Zone Ideal Loads Mixed Air Temperature", Constant::Units::C, PurchAir(PurchAirNum).MixedAirTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, PurchAir(PurchAirNum).Name); // Mixed Air Humidity Ratio SetupOutputVariable(state, "Zone Ideal Loads Mixed Air Humidity Ratio", Constant::Units::kgWater_kgDryAir, PurchAir(PurchAirNum).MixedAirHumRat, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, PurchAir(PurchAirNum).Name); if (state.dataGlobal->AnyEnergyManagementSystemInModel) { diff --git a/src/EnergyPlus/RefrigeratedCase.cc b/src/EnergyPlus/RefrigeratedCase.cc index 25ad29fb738..522c1806c34 100644 --- a/src/EnergyPlus/RefrigeratedCase.cc +++ b/src/EnergyPlus/RefrigeratedCase.cc @@ -7450,175 +7450,175 @@ void SetupReportInput(EnergyPlusData &state) "Refrigeration Case Evaporator Total Cooling Rate", Constant::Units::W, thisCase.TotalCoolingLoad, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, thisCase.Name); SetupOutputVariable(state, "Refrigeration Case Evaporator Total Cooling Energy", Constant::Units::J, thisCase.TotalCoolingEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, thisCase.Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::Refrigeration, - {}, - OutputProcessor::SOVGroup::Building, + OutputProcessor::Group::Building, + OutputProcessor::EndUseCat::Refrigeration, + "", // End-use sub category thisCase.ZoneName); SetupOutputVariable(state, "Refrigeration Case Evaporator Sensible Cooling Rate", Constant::Units::W, thisCase.SensCoolingEnergyRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, thisCase.Name); SetupOutputVariable(state, "Refrigeration Case Evaporator Sensible Cooling Energy", Constant::Units::J, thisCase.SensCoolingEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, thisCase.Name); SetupOutputVariable(state, "Refrigeration Case Evaporator Latent Cooling Rate", Constant::Units::W, thisCase.LatCoolingEnergyRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, thisCase.Name); SetupOutputVariable(state, "Refrigeration Case Evaporator Latent Cooling Energy", Constant::Units::J, thisCase.LatCoolingEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, thisCase.Name); SetupOutputVariable(state, "Refrigeration Case Zone Sensible Cooling Rate", Constant::Units::W, thisCase.SensZoneCreditCoolRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, thisCase.Name); SetupOutputVariable(state, "Refrigeration Case Zone Sensible Cooling Energy", Constant::Units::J, thisCase.SensZoneCreditCool, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, thisCase.Name); SetupOutputVariable(state, "Refrigeration Case Zone Sensible Heating Rate", Constant::Units::W, thisCase.SensZoneCreditHeatRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, thisCase.Name); SetupOutputVariable(state, "Refrigeration Case Zone Sensible Heating Energy", Constant::Units::J, thisCase.SensZoneCreditHeat, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, thisCase.Name); SetupOutputVariable(state, "Refrigeration Case Zone Latent Rate", Constant::Units::W, thisCase.LatZoneCreditRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, thisCase.Name); SetupOutputVariable(state, "Refrigeration Case Zone Latent Energy", Constant::Units::J, thisCase.LatZoneCredit, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, thisCase.Name); SetupOutputVariable(state, "Refrigeration Case Return Air Sensible Cooling Rate", Constant::Units::W, thisCase.SensHVACCreditCoolRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, thisCase.Name); SetupOutputVariable(state, "Refrigeration Case Return Air Sensible Cooling Energy", Constant::Units::J, thisCase.SensHVACCreditCool, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, thisCase.Name); SetupOutputVariable(state, "Refrigeration Case Return Air Sensible Heating Rate", Constant::Units::W, thisCase.SensHVACCreditHeatRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, thisCase.Name); SetupOutputVariable(state, "Refrigeration Case Return Air Sensible Heating Energy", Constant::Units::J, thisCase.SensHVACCreditHeat, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, thisCase.Name); SetupOutputVariable(state, "Refrigeration Case Return Air Latent Rate", Constant::Units::W, thisCase.LatHVACCreditRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, thisCase.Name); SetupOutputVariable(state, "Refrigeration Case Return Air Latent Energy", Constant::Units::J, thisCase.LatHVACCredit, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, thisCase.Name); SetupOutputVariable(state, "Refrigeration Case Evaporator Fan Electricity Rate", Constant::Units::W, thisCase.ElecFanPower, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, thisCase.Name); SetupOutputVariable(state, "Refrigeration Case Evaporator Fan Electricity Energy", Constant::Units::J, thisCase.ElecFanConsumption, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, thisCase.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Refrigeration, + OutputProcessor::Group::Building, + OutputProcessor::EndUseCat::Refrigeration, "General", - OutputProcessor::SOVGroup::Building, thisCase.ZoneName); SetupOutputVariable(state, "Refrigeration Case Lighting Electricity Rate", Constant::Units::W, thisCase.ElecLightingPower, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, thisCase.Name); SetupOutputVariable(state, "Refrigeration Case Lighting Electricity Energy", Constant::Units::J, thisCase.ElecLightingConsumption, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, thisCase.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Refrigeration, + OutputProcessor::Group::Building, + OutputProcessor::EndUseCat::Refrigeration, "General", - OutputProcessor::SOVGroup::Building, thisCase.ZoneName); // Report defrost energy curve value only for cases having electric or hot-gas defrost with temperature termination @@ -7627,8 +7627,8 @@ void SetupReportInput(EnergyPlusData &state) "Refrigeration Case Defrost Energy Correction Curve Value", Constant::Units::None, thisCase.DefEnergyCurveValue, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, thisCase.Name); } @@ -7636,8 +7636,8 @@ void SetupReportInput(EnergyPlusData &state) "Refrigeration Case Latent Credit Curve Value", Constant::Units::None, thisCase.LatEnergyCurveValue, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, thisCase.Name); // Report only for cases having anti-sweat heaters @@ -7646,20 +7646,20 @@ void SetupReportInput(EnergyPlusData &state) "Refrigeration Case Anti Sweat Electricity Rate", Constant::Units::W, thisCase.ElecAntiSweatPower, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, thisCase.Name); SetupOutputVariable(state, "Refrigeration Case Anti Sweat Electricity Energy", Constant::Units::J, thisCase.ElecAntiSweatConsumption, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, thisCase.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Refrigeration, + OutputProcessor::Group::Building, + OutputProcessor::EndUseCat::Refrigeration, "General", - OutputProcessor::SOVGroup::Building, thisCase.ZoneName); } @@ -7671,20 +7671,20 @@ void SetupReportInput(EnergyPlusData &state) "Refrigeration Case Defrost Electricity Rate", Constant::Units::W, thisCase.ElecDefrostPower, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, thisCase.Name); SetupOutputVariable(state, "Refrigeration Case Defrost Electricity Energy", Constant::Units::J, thisCase.ElecDefrostConsumption, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, thisCase.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Refrigeration, + OutputProcessor::Group::Building, + OutputProcessor::EndUseCat::Refrigeration, "General", - OutputProcessor::SOVGroup::Building, thisCase.ZoneName); } @@ -7717,112 +7717,112 @@ void SetupReportInput(EnergyPlusData &state) "Refrigeration Walk In Evaporator Total Cooling Rate", Constant::Units::W, walkin.TotalCoolingLoad, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, walkin.Name); SetupOutputVariable(state, "Refrigeration Walk In Evaporator Total Cooling Energy", Constant::Units::J, walkin.TotalCoolingEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, walkin.Name); SetupOutputVariable(state, "Refrigeration Walk In Evaporator Sensible Cooling Rate", Constant::Units::W, walkin.TotSensCoolingEnergyRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, walkin.Name); SetupOutputVariable(state, "Refrigeration Walk In Evaporator Sensible Cooling Energy", Constant::Units::J, walkin.TotSensCoolingEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, walkin.Name); SetupOutputVariable(state, "Refrigeration Walk In Evaporator Latent Cooling Rate", Constant::Units::W, walkin.TotLatCoolingEnergyRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, walkin.Name); SetupOutputVariable(state, "Refrigeration Walk In Evaporator Latent Cooling Energy", Constant::Units::J, walkin.TotLatCoolingEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, walkin.Name); SetupOutputVariable(state, "Refrigeration Walk In Ancillary Electricity Rate", Constant::Units::W, walkin.TotalElecPower, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, walkin.Name); SetupOutputVariable(state, "Refrigeration Walk In Ancillary Electricity Energy", Constant::Units::J, walkin.TotalElecConsumption, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, walkin.Name); SetupOutputVariable(state, "Refrigeration Walk In Fan Electricity Rate", Constant::Units::W, walkin.ElecFanPower, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, walkin.Name); SetupOutputVariable(state, "Refrigeration Walk In Fan Electricity Energy", Constant::Units::J, walkin.ElecFanConsumption, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, walkin.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Refrigeration, - "General", - OutputProcessor::SOVGroup::Building); + OutputProcessor::Group::Building, + OutputProcessor::EndUseCat::Refrigeration, + "General"); SetupOutputVariable(state, "Refrigeration Walk In Lighting Electricity Rate", Constant::Units::W, walkin.ElecLightingPower, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, walkin.Name); SetupOutputVariable(state, "Refrigeration Walk In Lighting Electricity Energy", Constant::Units::J, walkin.ElecLightingConsumption, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, walkin.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Refrigeration, - "General", - OutputProcessor::SOVGroup::Building); + OutputProcessor::Group::Building, + OutputProcessor::EndUseCat::Refrigeration, + "General"); SetupOutputVariable(state, "Refrigeration Walk In Heater Electricity Rate", Constant::Units::W, walkin.ElecHeaterPower, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, walkin.Name); SetupOutputVariable(state, "Refrigeration Walk In Heater Electricity Energy", Constant::Units::J, walkin.ElecHeaterConsumption, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, walkin.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Refrigeration, - "General", - OutputProcessor::SOVGroup::Building); + OutputProcessor::Group::Building, + OutputProcessor::EndUseCat::Refrigeration, + "General"); // Report only for WalkIns using electric defrost if (walkin.defrostType == WalkinClrDefrostType::Elec) { @@ -7830,20 +7830,20 @@ void SetupReportInput(EnergyPlusData &state) "Refrigeration Walk In Defrost Electricity Rate", Constant::Units::W, walkin.ElecDefrostPower, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, walkin.Name); SetupOutputVariable(state, "Refrigeration Walk In Defrost Electricity Energy", Constant::Units::J, walkin.ElecDefrostConsumption, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, walkin.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Refrigeration, - "General", - OutputProcessor::SOVGroup::Building); + OutputProcessor::Group::Building, + OutputProcessor::EndUseCat::Refrigeration, + "General"); } // Report walkin variables that are specified for each zone exposed to the walkin @@ -7858,43 +7858,43 @@ void SetupReportInput(EnergyPlusData &state) "Refrigeration Walk In Zone Sensible Cooling Rate", Constant::Units::W, walkin.SensZoneCreditCoolRate(zoneId), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, Walkin_and_zone_name); SetupOutputVariable(state, "Refrigeration Walk In Zone Sensible Cooling Energy", Constant::Units::J, walkin.SensZoneCreditCool(zoneId), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, Walkin_and_zone_name); SetupOutputVariable(state, "Refrigeration Walk In Zone Sensible Heating Rate", Constant::Units::W, walkin.SensZoneCreditHeatRate(zoneId), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, Walkin_and_zone_name); SetupOutputVariable(state, "Refrigeration Walk In Zone Sensible Heating Energy", Constant::Units::J, walkin.SensZoneCreditHeat(zoneId), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, Walkin_and_zone_name); SetupOutputVariable(state, "Refrigeration Walk In Zone Latent Rate", Constant::Units::W, walkin.LatZoneCreditRate(zoneId), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, Walkin_and_zone_name); SetupOutputVariable(state, "Refrigeration Walk In Zone Latent Energy", Constant::Units::J, walkin.LatZoneCredit(zoneId), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, Walkin_and_zone_name); if (walkin.ZoneNum(zoneId) > 0) @@ -7922,156 +7922,156 @@ void SetupReportInput(EnergyPlusData &state) "Refrigeration Zone Air Chiller Total Cooling Rate", Constant::Units::W, coil.TotalCoolingLoad, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, coil.Name); SetupOutputVariable(state, "Refrigeration Zone Air Chiller Total Cooling Energy", Constant::Units::J, coil.TotalCoolingEnergy, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, coil.Name); SetupOutputVariable(state, "Refrigeration Zone Air Chiller Sensible Cooling Rate", Constant::Units::W, coil.SensCoolingEnergyRate, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, coil.Name); SetupOutputVariable(state, "Refrigeration Zone Air Chiller Sensible Cooling Energy", Constant::Units::J, coil.SensCoolingEnergy, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, coil.Name); SetupOutputVariable(state, "Refrigeration Zone Air Chiller Latent Cooling Rate", Constant::Units::W, coil.LatCreditRate, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, coil.Name); SetupOutputVariable(state, "Refrigeration Zone Air Chiller Latent Cooling Energy", Constant::Units::J, coil.LatCreditEnergy, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, coil.Name); SetupOutputVariable(state, "Refrigeration Zone Air Chiller Water Removed Mass Flow Rate", Constant::Units::kg_s, coil.LatKgPerS_ToZone, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, coil.Name); SetupOutputVariable(state, "Refrigeration Zone Air Chiller Total Electricity Rate", Constant::Units::W, coil.TotalElecPower, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, coil.Name); SetupOutputVariable(state, "Refrigeration Zone Air Chiller Total Electricity Energy", Constant::Units::J, coil.TotalElecConsumption, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, coil.Name); // components are metered seperately SetupOutputVariable(state, "Refrigeration Zone Air Chiller Fan Electricity Rate", Constant::Units::W, coil.ElecFanPower, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, coil.Name); SetupOutputVariable(state, "Refrigeration Zone Air Chiller Fan Electric Energy", Constant::Units::J, coil.ElecFanConsumption, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, coil.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Refrigeration, - "General", - OutputProcessor::SOVGroup::Building); + OutputProcessor::Group::Building, + OutputProcessor::EndUseCat::Refrigeration, + "General"); SetupOutputVariable(state, "Refrigeration Zone Air Chiller Heater Electricity Rate", Constant::Units::W, coil.ElecHeaterPower, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, coil.Name); SetupOutputVariable(state, "Refrigeration Zone Air Chiller Heater Electricity Energy", Constant::Units::J, coil.ElecHeaterConsumption, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, coil.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Refrigeration, - "General", - OutputProcessor::SOVGroup::Building); + OutputProcessor::Group::Building, + OutputProcessor::EndUseCat::Refrigeration, + "General"); SetupOutputVariable(state, "Refrigeration Zone Air Chiller Sensible Heat Ratio", Constant::Units::None, coil.SensHeatRatio, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, coil.Name); SetupOutputVariable(state, "Refrigeration Zone Air Chiller Frost Accumulation Mass", Constant::Units::kg, coil.KgFrost, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, coil.Name); SetupOutputVariable(state, "Refrigeration Zone Air Chiller Zone Total Cooling Rate", Constant::Units::W, coil.ReportTotalCoolCreditRate, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, coil.Name); SetupOutputVariable(state, "Refrigeration Zone Air Chiller Zone Total Cooling Energy", Constant::Units::J, coil.ReportTotalCoolCreditEnergy, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, coil.Name); SetupOutputVariable(state, "Refrigeration Zone Air Chiller Zone Sensible Cooling Rate", Constant::Units::W, coil.ReportSensCoolCreditRate, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, coil.Name); SetupOutputVariable(state, "Refrigeration Zone Air Chiller Zone Sensible Cooling Energy", Constant::Units::J, coil.ReportSensCoolCreditEnergy, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, coil.Name); SetupOutputVariable(state, "Refrigeration Zone Air Chiller Zone Heating Rate", Constant::Units::W, coil.ReportHeatingCreditRate, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, coil.Name); SetupOutputVariable(state, "Refrigeration Zone Air Chiller Zone Heating Energy", Constant::Units::J, coil.ReportHeatingCreditEnergy, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, coil.Name); // Report only for Warehouse coils using electric defrost @@ -8080,20 +8080,20 @@ void SetupReportInput(EnergyPlusData &state) "Refrigeration Zone Air Chiller Defrost Electricity Rate", Constant::Units::W, coil.ElecDefrostPower, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, coil.Name); SetupOutputVariable(state, "Refrigeration Zone Air Chiller Defrost Electricity Energy", Constant::Units::J, coil.ElecDefrostConsumption, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, coil.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Refrigeration, - "General", - OutputProcessor::SOVGroup::Building); + OutputProcessor::Group::Building, + OutputProcessor::EndUseCat::Refrigeration, + "General"); } // electric defrost coil } //(.NOT. coil%unusedWarehouseCoil) } // NumSimulationWarehouseCoils @@ -8112,85 +8112,85 @@ void SetupReportInput(EnergyPlusData &state) "Refrigeration Zone Case and Walk In Total Sensible Cooling Rate", Constant::Units::W, state.dataHeatBal->RefrigCaseCredit(zoneID).SenCaseCreditToZone, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneID).Name); SetupOutputVariable(state, "Refrigeration Zone Case and Walk In Total Sensible Cooling Energy", Constant::Units::J, CaseWIZoneReport(zoneID).SenCaseCreditToZoneEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneID).Name); SetupOutputVariable(state, "Refrigeration Zone Case and Walk In Heating Rate", Constant::Units::W, CaseWIZoneReport(zoneID).HeatingToZoneRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneID).Name); SetupOutputVariable(state, "Refrigeration Zone Case and Walk In Heating Energy", Constant::Units::J, CaseWIZoneReport(zoneID).HeatingToZoneEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneID).Name); SetupOutputVariable(state, "Refrigeration Zone Case and Walk In Sensible Cooling Rate", Constant::Units::W, CaseWIZoneReport(zoneID).SenCoolingToZoneRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneID).Name); SetupOutputVariable(state, "Refrigeration Zone Case and Walk In Sensible Cooling Energy", Constant::Units::J, CaseWIZoneReport(zoneID).SenCoolingToZoneEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneID).Name); SetupOutputVariable(state, "Refrigeration Zone Case and Walk In Total Latent Cooling Rate", Constant::Units::W, CaseWIZoneReport(zoneID).LatCoolingToZoneRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneID).Name); SetupOutputVariable(state, "Refrigeration Zone Case and Walk In Total Latent Cooling Energy", Constant::Units::J, CaseWIZoneReport(zoneID).LatCoolingToZoneEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneID).Name); SetupOutputVariable(state, "Refrigeration Zone Case and Walk In Total Cooling Rate", Constant::Units::W, CaseWIZoneReport(zoneID).TotCoolingToZoneRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneID).Name); SetupOutputVariable(state, "Refrigeration Zone Case and Walk In Total Cooling Energy", Constant::Units::J, CaseWIZoneReport(zoneID).TotCoolingToZoneEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneID).Name); SetupOutputVariable(state, "Refrigeration Zone Case and Walk In Total Heat Transfer Rate", Constant::Units::W, CaseWIZoneReport(zoneID).TotHtXferToZoneRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneID).Name); SetupOutputVariable(state, "Refrigeration Zone Case and Walk In Total Heat Transfer Energy", Constant::Units::J, CaseWIZoneReport(zoneID).TotHtXferToZoneEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneID).Name); } // HaveCasesOrWalkIns @@ -8199,78 +8199,78 @@ void SetupReportInput(EnergyPlusData &state) "Refrigeration Zone Air Chiller Sensible Heat Transfer Rate", Constant::Units::W, CoilSysCredit(zoneID).SenCreditToZoneRate, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneID).Name); SetupOutputVariable(state, "Refrigeration Zone Air Chiller Sensible Heat Transfer Energy", Constant::Units::J, CoilSysCredit(zoneID).SenCreditToZoneEnergy, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneID).Name); SetupOutputVariable(state, "Refrigeration Zone Air Chiller Sensible Cooling Rate", Constant::Units::W, CoilSysCredit(zoneID).ReportSenCoolingToZoneRate, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneID).Name); SetupOutputVariable(state, "Refrigeration Zone Air Chiller Sensible Cooling Energy", Constant::Units::J, CoilSysCredit(zoneID).ReportSenCoolingToZoneEnergy, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneID).Name); SetupOutputVariable(state, "Refrigeration Zone Air Chiller Latent Cooling Rate", Constant::Units::W, CoilSysCredit(zoneID).ReportLatCreditToZoneRate, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneID).Name); SetupOutputVariable(state, "Refrigeration Zone Air Chiller Latent Cooling Energy", Constant::Units::J, CoilSysCredit(zoneID).ReportLatCreditToZoneEnergy, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneID).Name); SetupOutputVariable(state, "Refrigeration Zone Air Chiller Water Removed Mass Flow Rate", Constant::Units::kg_s, CoilSysCredit(zoneID).ReportH2ORemovedKgPerS_FromZoneRate, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneID).Name); SetupOutputVariable(state, "Refrigeration Zone Air Chiller Total Cooling Rate", Constant::Units::W, CoilSysCredit(zoneID).ReportTotCoolingToZoneRate, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneID).Name); SetupOutputVariable(state, "Refrigeration Zone Air Chiller Total Cooling Energy", Constant::Units::J, CoilSysCredit(zoneID).ReportTotCoolingToZoneEnergy, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneID).Name); SetupOutputVariable(state, "Refrigeration Zone Air Chiller Heating Rate", Constant::Units::W, CoilSysCredit(zoneID).ReportHeatingToZoneRate, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(zoneID).Name); SetupOutputVariable(state, "Refrigeration Zone Air Chiller Heating Energy", Constant::Units::J, CoilSysCredit(zoneID).ReportHeatingToZoneEnergy, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(zoneID).Name); } // HaveChillers } // RefrigPresentInZone(ZoneID) @@ -8286,178 +8286,178 @@ void SetupReportInput(EnergyPlusData &state) "Refrigeration Air Chiller Secondary Loop Pump Electricity Rate", Constant::Units::W, secondary.PumpPowerTotal, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, secondary.Name); SetupOutputVariable(state, "Refrigeration Air Chiller Secondary Loop Pump Electricity Energy", Constant::Units::J, secondary.PumpElecEnergyTotal, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, secondary.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Refrigeration, - secondary.EndUseSubcategory, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Refrigeration, + secondary.EndUseSubcategory); SetupOutputVariable(state, "Refrigeration Air Chiller Secondary Loop Load Heat Transfer Rate", Constant::Units::W, secondary.TotalRefrigLoad, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, secondary.Name); SetupOutputVariable(state, "Refrigeration Air Chiller Secondary Loop Load Heat Transfer Energy", Constant::Units::J, secondary.TotalRefrigEnergy, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, secondary.Name); SetupOutputVariable(state, "Refrigeration Air Chiller Secondary Loop Total Heat Transfer Rate", Constant::Units::W, secondary.TotalCoolingLoad, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, secondary.Name); SetupOutputVariable(state, "Refrigeration Air Chiller Secondary Loop Total Heat Transfer Energy", Constant::Units::J, secondary.TotalCoolingEnergy, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, secondary.Name); SetupOutputVariable(state, "Refrigeration Air Chiller Secondary Loop Estimated Refrigerant Inventory Mass", Constant::Units::kg, secondary.RefInventory, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, secondary.Name); SetupOutputVariable(state, "Refrigeration Air Chiller Secondary Loop Volume Flow Rate", Constant::Units::m3_s, secondary.FlowVolActual, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, secondary.Name); SetupOutputVariable(state, "Refrigeration Air Chiller Secondary Loop Pipe Heat Gain Rate", Constant::Units::W, secondary.DistPipeHeatGain, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, secondary.Name); SetupOutputVariable(state, "Refrigeration Air Chiller Secondary Loop Pipe Heat Gain Energy", Constant::Units::J, secondary.DistPipeHeatGainEnergy, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, secondary.Name); SetupOutputVariable(state, "Refrigeration Air Chiller Secondary Loop Receiver Heat Gain Rate", Constant::Units::W, secondary.ReceiverHeatGain, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, secondary.Name); SetupOutputVariable(state, "Refrigeration Air Chiller Secondary Loop Receiver Heat Gain Energy", Constant::Units::J, secondary.ReceiverHeatGainEnergy, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, secondary.Name); } else { // Secondary loop serves cases and walk-ins on zone(load) time step SetupOutputVariable(state, "Refrigeration Secondary Loop Pump Electricity Rate", Constant::Units::W, secondary.PumpPowerTotal, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, secondary.Name); SetupOutputVariable(state, "Refrigeration Secondary Loop Pump Electricity Energy", Constant::Units::J, secondary.PumpElecEnergyTotal, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, secondary.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Refrigeration, - secondary.EndUseSubcategory, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Refrigeration, + secondary.EndUseSubcategory); SetupOutputVariable(state, "Refrigeration Secondary Loop Load Heat Transfer Rate", Constant::Units::W, secondary.TotalRefrigLoad, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, secondary.Name); SetupOutputVariable(state, "Refrigeration Secondary Loop Load Heat Transfer Energy", Constant::Units::J, secondary.TotalRefrigEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, secondary.Name); SetupOutputVariable(state, "Refrigeration Secondary Loop Total Heat Transfer Rate", Constant::Units::W, secondary.TotalCoolingLoad, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, secondary.Name); SetupOutputVariable(state, "Refrigeration Secondary Loop Total Heat Transfer Energy", Constant::Units::J, secondary.TotalCoolingEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, secondary.Name); SetupOutputVariable(state, "Refrigeration Secondary Loop Estimated Refrigerant Inventory Mass", Constant::Units::kg, secondary.RefInventory, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, secondary.Name); SetupOutputVariable(state, "Refrigeration Secondary Loop Volume Flow Rate", Constant::Units::m3_s, secondary.FlowVolActual, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, secondary.Name); SetupOutputVariable(state, "Refrigeration Secondary Loop Pipe Heat Gain Rate", Constant::Units::W, secondary.DistPipeHeatGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, secondary.Name); SetupOutputVariable(state, "Refrigeration Secondary Loop Pipe Heat Gain Energy", Constant::Units::J, secondary.DistPipeHeatGainEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, secondary.Name); SetupOutputVariable(state, "Refrigeration Secondary Loop Receiver Heat Gain Rate", Constant::Units::W, secondary.ReceiverHeatGain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, secondary.Name); SetupOutputVariable(state, "Refrigeration Secondary Loop Receiver Heat Gain Energy", Constant::Units::J, secondary.ReceiverHeatGainEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, secondary.Name); } // NOT coilflag so on Zone timestep if (secondary.ReceiverZoneNum > 0) { @@ -8488,62 +8488,62 @@ void SetupReportInput(EnergyPlusData &state) "Refrigeration Air Chiller Compressor Rack Electricity Rate", Constant::Units::W, rack.RackCompressorPower, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, rack.Name); SetupOutputVariable(state, "Refrigeration Air Chiller Compressor Rack Electricity Energy", Constant::Units::J, rack.RackElecConsumption, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, rack.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Refrigeration, - rack.EndUseSubcategory, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Refrigeration, + rack.EndUseSubcategory); SetupOutputVariable(state, "Refrigeration Air Chiller Compressor Rack Condenser Fan Electricity Rate", Constant::Units::W, rack.ActualCondenserFanPower, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, rack.Name); SetupOutputVariable(state, "Refrigeration Air Chiller Compressor Rack Condenser Fan Electricity Energy", Constant::Units::J, rack.CondenserFanConsumption, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, rack.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Refrigeration, - rack.EndUseSubcategory, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Refrigeration, + rack.EndUseSubcategory); SetupOutputVariable(state, "Refrigeration Air Chiller Compressor Rack Total Heat Transfer Rate", Constant::Units::W, rack.RackCapacity, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, rack.Name); SetupOutputVariable(state, "Refrigeration Air Chiller Compressor Rack Total Heat Transfer Energy", Constant::Units::J, rack.RackCoolingEnergy, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, rack.Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::Refrigeration, - rack.EndUseSubcategory, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Refrigeration, + rack.EndUseSubcategory); SetupOutputVariable(state, "Refrigeration Air Chiller Compressor Rack COP", Constant::Units::W_W, rack.RackCompressorCOP, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, rack.Name); if (rack.CondenserType == DataHeatBalance::RefrigCondenserType::Evap) { @@ -8551,56 +8551,56 @@ void SetupReportInput(EnergyPlusData &state) "Refrigeration Air Chiller Compressor Rack Evaporative Condenser Pump Electricity Rate", Constant::Units::W, rack.ActualEvapPumpPower, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, rack.Name); SetupOutputVariable(state, "Refrigeration Air Chiller Compressor Rack Evaporative Condenser Pump Electricity Energy", Constant::Units::J, rack.EvapPumpConsumption, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, rack.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Refrigeration, - rack.EndUseSubcategory, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Refrigeration, + rack.EndUseSubcategory); SetupOutputVariable(state, "Refrigeration Air Chiller Compressor Rack Evaporative Condenser Basin Heater Electricity Rate", Constant::Units::W, rack.BasinHeaterPower, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, rack.Name); SetupOutputVariable(state, "Refrigeration Air Chiller Compressor Rack Evaporative Condenser Basin Heater Electricity Energy", Constant::Units::J, rack.BasinHeaterConsumption, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, rack.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Refrigeration, - rack.EndUseSubcategory, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Refrigeration, + rack.EndUseSubcategory); SetupOutputVariable(state, "Refrigeration Air Chiller Compressor Rack Evaporative Condenser Water Volume Flow Rate", Constant::Units::m3_s, rack.EvapWaterConsumpRate, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, rack.Name); SetupOutputVariable(state, "Refrigeration Air Chiller Compressor Rack Evaporative Condenser Water Volume", Constant::Units::m3, rack.EvapWaterConsumption, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, rack.Name, Constant::eResource::Water, - OutputProcessor::SOVEndUseCat::Refrigeration, - rack.EndUseSubcategory, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Refrigeration, + rack.EndUseSubcategory); } // Evap condenser if (rack.HeatRejectionLocation == HeatRejLocation::Zone) { @@ -8608,30 +8608,30 @@ void SetupReportInput(EnergyPlusData &state) "Refrigeration Air Chiller Compressor Rack Zone Sensible Heating Rate", Constant::Units::W, rack.SensZoneCreditHeatRate, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, rack.Name); SetupOutputVariable(state, "Refrigeration Air Chiller Compressor Rack Zone Sensible Heating Energy", Constant::Units::J, rack.SensZoneCreditHeat, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, rack.Name); SetupOutputVariable(state, "Refrigeration Air Chiller Compressor Rack Return Air Sensible Heating Rate", Constant::Units::W, rack.SensHVACCreditHeatRate, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, rack.Name); SetupOutputVariable(state, "Refrigeration Air Chiller Compressor Rack Return Air Sensible Heating Energy", Constant::Units::J, rack.SensHVACCreditHeat, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, rack.Name); SetupZoneInternalGain(state, @@ -8649,62 +8649,62 @@ void SetupReportInput(EnergyPlusData &state) "Refrigeration Compressor Rack Electricity Rate", Constant::Units::W, rack.RackCompressorPower, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, rack.Name); SetupOutputVariable(state, "Refrigeration Compressor Rack Electricity Energy", Constant::Units::J, rack.RackElecConsumption, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, rack.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Refrigeration, - rack.EndUseSubcategory, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Refrigeration, + rack.EndUseSubcategory); SetupOutputVariable(state, "Refrigeration Compressor Rack Condenser Fan Electricity Rate", Constant::Units::W, rack.ActualCondenserFanPower, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, rack.Name); SetupOutputVariable(state, "Refrigeration Compressor Rack Condenser Fan Electricity Energy", Constant::Units::J, rack.CondenserFanConsumption, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, rack.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Refrigeration, - rack.EndUseSubcategory, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Refrigeration, + rack.EndUseSubcategory); SetupOutputVariable(state, "Refrigeration Compressor Rack Total Heat Transfer Rate", Constant::Units::W, rack.RackCapacity, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, rack.Name); SetupOutputVariable(state, "Refrigeration Compressor Rack Total Heat Transfer Energy", Constant::Units::J, rack.RackCoolingEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, rack.Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::Refrigeration, - rack.EndUseSubcategory, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Refrigeration, + rack.EndUseSubcategory); SetupOutputVariable(state, "Refrigeration Compressor Rack COP", Constant::Units::W_W, rack.RackCompressorCOP, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, rack.Name); if (rack.CondenserType == DataHeatBalance::RefrigCondenserType::Evap) { @@ -8712,56 +8712,56 @@ void SetupReportInput(EnergyPlusData &state) "Refrigeration Compressor Rack Evaporative Condenser Pump Electricity Rate", Constant::Units::W, rack.ActualEvapPumpPower, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, rack.Name); SetupOutputVariable(state, "Refrigeration Compressor Rack Evaporative Condenser Pump Electricity Energy", Constant::Units::J, rack.EvapPumpConsumption, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, rack.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Refrigeration, - rack.EndUseSubcategory, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Refrigeration, + rack.EndUseSubcategory); SetupOutputVariable(state, "Refrigeration Compressor Rack Evaporative Condenser Basin Heater Electricity Rate", Constant::Units::W, rack.BasinHeaterPower, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, rack.Name); SetupOutputVariable(state, "Refrigeration Compressor Rack Evaporative Condenser Basin Heater Electricity Energy", Constant::Units::J, rack.BasinHeaterConsumption, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, rack.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Refrigeration, - rack.EndUseSubcategory, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Refrigeration, + rack.EndUseSubcategory); SetupOutputVariable(state, "Refrigeration Compressor Rack Evaporative Condenser Water Volume Flow Rate", Constant::Units::m3_s, rack.EvapWaterConsumpRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, rack.Name); SetupOutputVariable(state, "Refrigeration Compressor Rack Evaporative Condenser Water Volume", Constant::Units::m3, rack.EvapWaterConsumption, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, rack.Name, Constant::eResource::Water, - OutputProcessor::SOVEndUseCat::Refrigeration, - rack.EndUseSubcategory, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Refrigeration, + rack.EndUseSubcategory); } // condenser evap if (rack.HeatRejectionLocation == HeatRejLocation::Zone) { @@ -8769,30 +8769,30 @@ void SetupReportInput(EnergyPlusData &state) "Refrigeration Compressor Rack Zone Sensible Heating Rate", Constant::Units::W, rack.SensZoneCreditHeatRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, rack.Name); SetupOutputVariable(state, "Refrigeration Compressor Rack Zone Sensible Heating Energy", Constant::Units::J, rack.SensZoneCreditHeat, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, rack.Name); SetupOutputVariable(state, "Refrigeration Compressor Rack Return Air Sensible Heating Rate", Constant::Units::W, rack.SensHVACCreditHeatRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, rack.Name); SetupOutputVariable(state, "Refrigeration Compressor Rack Return Air Sensible Heating Energy", Constant::Units::J, rack.SensHVACCreditHeat, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, rack.Name); SetupZoneInternalGain(state, RefrigCase(rack.CaseNum(1)).ActualZoneNum, @@ -8809,29 +8809,28 @@ void SetupReportInput(EnergyPlusData &state) "Refrigeration Compressor Rack Condenser Mass Flow Rate", Constant::Units::kg_s, rack.MassFlowRate, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, rack.Name); SetupOutputVariable(state, "Refrigeration Compressor Rack Condenser Heat Transfer Rate", Constant::Units::W, rack.CondLoad, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, rack.Name); SetupOutputVariable(state, "Refrigeration Compressor Rack Condenser Heat Transfer Energy", Constant::Units::J, rack.CondEnergy, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, rack.Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::Heating, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Heating); } // Condenser cooling water } // Refrigerated Racks @@ -8847,190 +8846,190 @@ void SetupReportInput(EnergyPlusData &state) "Refrigeration Air Chiller System Total Compressor Electricity Rate", Constant::Units::W, sys.TotCompPower, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, sys.Name); SetupOutputVariable(state, "Refrigeration Air Chiller System Total Compressor Electricity Energy", Constant::Units::J, sys.TotCompElecConsump, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, sys.Name); } else if (sys.NumStages == 2) { SetupOutputVariable(state, "Refrigeration Air Chiller System Total Low Stage Compressor Electricity Rate", Constant::Units::W, sys.TotCompPower, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, sys.Name); SetupOutputVariable(state, "Refrigeration Air Chiller System Total Low Stage Compressor Electricity Energy", Constant::Units::J, sys.TotCompElecConsump, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, sys.Name); SetupOutputVariable(state, "Refrigeration Air Chiller System Total High Stage Compressor Electricity Rate", Constant::Units::W, sys.TotHiStageCompPower, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, sys.Name); SetupOutputVariable(state, "Refrigeration Air Chiller System Total High Stage Compressor Electricity Energy", Constant::Units::J, sys.TotHiStageCompElecConsump, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, sys.Name); SetupOutputVariable(state, "Refrigeration Air Chiller System Total Low and High Stage Compressor Electricity Energy", Constant::Units::J, sys.TotCompElecConsumpTwoStage, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, sys.Name); } // NumStages SetupOutputVariable(state, "Refrigeration Air Chiller System Average Compressor COP", Constant::Units::W_W, sys.AverageCompressorCOP, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, sys.Name); SetupOutputVariable(state, "Refrigeration Air Chiller System Total Air Chiller Heat Transfer Rate", Constant::Units::W, sys.TotalCoolingLoad, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, sys.Name); SetupOutputVariable(state, "Refrigeration Air Chiller System Total Case and Walk In Heat Transfer Energy", Constant::Units::J, sys.TotalCoolingEnergy, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, sys.Name); SetupOutputVariable(state, "Refrigeration Air Chiller System Total Transferred Load Heat Transfer Rate", Constant::Units::W, sys.TotTransferLoad, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, sys.Name); SetupOutputVariable(state, "Refrigeration Air Chiller System Total Transferred Load Heat Transfer Energy", Constant::Units::J, sys.TotTransferEnergy, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, sys.Name); SetupOutputVariable(state, "Refrigeration Air Chiller System Total Suction Pipe Heat Gain Rate", Constant::Units::W, sys.PipeHeatLoad, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, sys.Name); SetupOutputVariable(state, "Refrigeration Air Chiller System Total Suction Pipe Heat Gain Energy", Constant::Units::J, sys.PipeHeatEnergy, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, sys.Name); if (sys.NumStages == 1) { SetupOutputVariable(state, "Refrigeration Air Chiller System Total Compressor Heat Transfer Rate", Constant::Units::W, sys.TotCompCapacity, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, sys.Name); SetupOutputVariable(state, "Refrigeration Air Chiller System Total Compressor Heat Transfer Energy", Constant::Units::J, sys.TotCompCoolingEnergy, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, sys.Name); // indiv compressors go to meter, not system sum } else if (sys.NumStages == 2) { SetupOutputVariable(state, "Refrigeration Air Chiller System Total Low Stage Compressor Heat Transfer Rate", Constant::Units::W, sys.TotCompCapacity, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, sys.Name); SetupOutputVariable(state, "Refrigeration Air Chiller System Total Low Stage Compressor Heat Transfer Energy", Constant::Units::J, sys.TotCompCoolingEnergy, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, sys.Name); // indiv compressors go to meter, not system sum SetupOutputVariable(state, "Refrigeration Air Chiller System Total High Stage Compressor Heat Transfer Rate", Constant::Units::W, sys.TotHiStageCompCapacity, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, sys.Name); SetupOutputVariable(state, "Refrigeration Air Chiller System Total High Stage Compressor Heat Transfer Energy", Constant::Units::J, sys.TotHiStageCompCoolingEnergy, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, sys.Name); // indiv compressors go to meter, not system sum } // NumStages SetupOutputVariable(state, "Refrigeration Air Chiller System Net Rejected Heat Transfer Rate", Constant::Units::W, sys.NetHeatRejectLoad, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, sys.Name); SetupOutputVariable(state, "Refrigeration Air Chiller System Net Rejected Heat Transfer Energy", Constant::Units::J, sys.NetHeatRejectEnergy, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, sys.Name); SetupOutputVariable(state, "Refrigeration Air Chiller System Estimated Refrigerant Inventory Mass", Constant::Units::kg, sys.RefInventory, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, sys.Name); if (sys.NumStages == 1) { SetupOutputVariable(state, "Refrigeration Air Chiller System Estimated Refrigerant Mass Flow Rate", Constant::Units::kg_s, sys.RefMassFlowComps, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, sys.Name); } else if (sys.NumStages == 2) { SetupOutputVariable(state, "Refrigeration Air Chiller System Estimated Low Stage Refrigerant Mass Flow Rate", Constant::Units::kg_s, sys.RefMassFlowComps, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, sys.Name); SetupOutputVariable(state, "Refrigeration Air Chiller System Estimated High Stage Refrigerant Mass Flow Rate", Constant::Units::kg_s, sys.RefMassFlowHiStageComps, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, sys.Name); } // NumStages if (sys.NumStages == 2) { @@ -9038,58 +9037,58 @@ void SetupReportInput(EnergyPlusData &state) "Refrigeration Air Chiller System Intercooler Temperature", Constant::Units::C, sys.TIntercooler, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, sys.Name); SetupOutputVariable(state, "Refrigeration Air Chiller System Intercooler Pressure", Constant::Units::Pa, sys.PIntercooler, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, sys.Name); } SetupOutputVariable(state, "Refrigeration Air Chiller System Condensing Temperature", Constant::Units::C, sys.TCondense, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, sys.Name); SetupOutputVariable(state, "Refrigeration Air Chiller System Evaporating Temperature", Constant::Units::C, sys.TEvapNeeded, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, sys.Name); SetupOutputVariable(state, "Refrigeration Air Chiller System Suction Temperature", Constant::Units::C, sys.TCompIn, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, sys.Name); SetupOutputVariable(state, "Refrigeration Air Chiller System TXV Liquid Temperature", Constant::Units::C, sys.TLiqInActual, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, sys.Name); SetupOutputVariable(state, "Refrigeration Air Chiller System Liquid Suction Subcooler Heat Transfer Rate", Constant::Units::W, sys.LSHXTrans, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, sys.Name); SetupOutputVariable(state, "Refrigeration Air Chiller System Liquid Suction Subcooler Heat Transfer Energy", Constant::Units::J, sys.LSHXTransEnergy, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, sys.Name); } else { // NOT System(SysNum)%CoilFlag, so serving loads on zone timestep if (sys.NumStages == 1) { @@ -9097,190 +9096,190 @@ void SetupReportInput(EnergyPlusData &state) "Refrigeration System Total Compressor Electricity Rate", Constant::Units::W, sys.TotCompPower, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, sys.Name); SetupOutputVariable(state, "Refrigeration System Total Compressor Electricity Energy", Constant::Units::J, sys.TotCompElecConsump, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, sys.Name); } else if (sys.NumStages == 2) { SetupOutputVariable(state, "Refrigeration System Total Low Stage Compressor Electricity Rate", Constant::Units::W, sys.TotCompPower, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, sys.Name); SetupOutputVariable(state, "Refrigeration System Total Low Stage Compressor Electricity Energy", Constant::Units::J, sys.TotCompElecConsump, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, sys.Name); SetupOutputVariable(state, "Refrigeration System Total High Stage Compressor Electricity Rate", Constant::Units::W, sys.TotHiStageCompPower, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, sys.Name); SetupOutputVariable(state, "Refrigeration System Total High Stage Compressor Electricity Energy", Constant::Units::J, sys.TotHiStageCompElecConsump, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, sys.Name); SetupOutputVariable(state, "Refrigeration System Total Low and High Stage Compressor Electricity Energy", Constant::Units::J, sys.TotCompElecConsumpTwoStage, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, sys.Name); } // NumStages SetupOutputVariable(state, "Refrigeration System Average Compressor COP", Constant::Units::W_W, sys.AverageCompressorCOP, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, sys.Name); SetupOutputVariable(state, "Refrigeration System Total Cases and Walk Ins Heat Transfer Rate", Constant::Units::W, sys.TotalCoolingLoad, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, sys.Name); SetupOutputVariable(state, "Refrigeration System Total Cases and Walk Ins Heat Transfer Energy", Constant::Units::J, sys.TotalCoolingEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, sys.Name); SetupOutputVariable(state, "Refrigeration System Total Transferred Load Heat Transfer Rate", Constant::Units::W, sys.TotTransferLoad, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, sys.Name); SetupOutputVariable(state, "Refrigeration System Total Transferred Load Heat Transfer Energy", Constant::Units::J, sys.TotTransferEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, sys.Name); SetupOutputVariable(state, "Refrigeration System Total Suction Pipe Heat Gain Rate", Constant::Units::W, sys.PipeHeatLoad, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, sys.Name); SetupOutputVariable(state, "Refrigeration System Total Suction Pipe Heat Gain Energy", Constant::Units::J, sys.PipeHeatEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, sys.Name); if (sys.NumStages == 1) { SetupOutputVariable(state, "Refrigeration System Total Compressor Heat Transfer Rate", Constant::Units::W, sys.TotCompCapacity, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, sys.Name); SetupOutputVariable(state, "Refrigeration System Total Compressor Heat Transfer Energy", Constant::Units::J, sys.TotCompCoolingEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, sys.Name); // indiv compressors go to meter, not system sum } else if (sys.NumStages == 2) { SetupOutputVariable(state, "Refrigeration System Total Low Stage Compressor Heat Transfer Rate", Constant::Units::W, sys.TotCompCapacity, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, sys.Name); SetupOutputVariable(state, "Refrigeration System Total Low Stage Compressor Heat Transfer Energy", Constant::Units::J, sys.TotCompCoolingEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, sys.Name); // indiv compressors go to meter, not system sum SetupOutputVariable(state, "Refrigeration System Total High Stage Compressor Heat Transfer Rate", Constant::Units::W, sys.TotHiStageCompCapacity, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, sys.Name); SetupOutputVariable(state, "Refrigeration System Total High Stage Compressor Heat Transfer Energy", Constant::Units::J, sys.TotHiStageCompCoolingEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, sys.Name); // indiv compressors go to meter, not system sum } // NumStages SetupOutputVariable(state, "Refrigeration System Net Rejected Heat Transfer Rate", Constant::Units::W, sys.NetHeatRejectLoad, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, sys.Name); SetupOutputVariable(state, "Refrigeration System Net Rejected Heat Transfer Energy", Constant::Units::J, sys.NetHeatRejectEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, sys.Name); SetupOutputVariable(state, "Refrigeration System Estimated Refrigerant Inventory Mass", Constant::Units::kg, sys.RefInventory, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, sys.Name); if (sys.NumStages == 1) { SetupOutputVariable(state, "Refrigeration System Estimated Refrigerant Mass Flow Rate", Constant::Units::kg_s, sys.RefMassFlowComps, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, sys.Name); } else if (sys.NumStages == 2) { SetupOutputVariable(state, "Refrigeration System Estimated Low Stage Refrigerant Mass Flow Rate", Constant::Units::kg_s, sys.RefMassFlowComps, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, sys.Name); SetupOutputVariable(state, "Refrigeration System Estimated High Stage Refrigerant Mass Flow Rate", Constant::Units::kg_s, sys.RefMassFlowHiStageComps, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, sys.Name); } // NumStages if (sys.NumStages == 2) { @@ -9288,58 +9287,58 @@ void SetupReportInput(EnergyPlusData &state) "Refrigeration System Intercooler Temperature", Constant::Units::C, sys.TIntercooler, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, sys.Name); SetupOutputVariable(state, "Refrigeration System Intercooler Pressure", Constant::Units::Pa, sys.PIntercooler, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, sys.Name); } SetupOutputVariable(state, "Refrigeration System Condensing Temperature", Constant::Units::C, sys.TCondense, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, sys.Name); SetupOutputVariable(state, "Refrigeration System Evaporating Temperature", Constant::Units::C, sys.TEvapNeeded, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, sys.Name); SetupOutputVariable(state, "Refrigeration System Suction Pipe Suction Temperature", Constant::Units::C, sys.TCompIn, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, sys.Name); SetupOutputVariable(state, "Refrigeration System Thermostatic Expansion Valve Liquid Temperature", Constant::Units::C, sys.TLiqInActual, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, sys.Name); SetupOutputVariable(state, "Refrigeration System Liquid Suction Subcooler Heat Transfer Rate", Constant::Units::W, sys.LSHXTrans, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, sys.Name); SetupOutputVariable(state, "Refrigeration System Liquid Suction Subcooler Heat Transfer Energy", Constant::Units::J, sys.LSHXTransEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, sys.Name); } // System(coilflag) @@ -9370,80 +9369,80 @@ void SetupReportInput(EnergyPlusData &state) "Refrigeration Air Chiller System Compressor Electricity Rate", Constant::Units::W, comp.Power, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, comp.Name); SetupOutputVariable(state, "Refrigeration Air Chiller System Compressor Electricity Energy", Constant::Units::J, comp.ElecConsumption, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, comp.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Refrigeration, - comp.EndUseSubcategory, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Refrigeration, + comp.EndUseSubcategory); SetupOutputVariable(state, "Refrigeration Air Chiller System Compressor Heat Transfer Rate", Constant::Units::W, comp.Capacity, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, comp.Name); SetupOutputVariable(state, "Refrigeration Air Chiller System Compressor Heat Transfer Energy", Constant::Units::J, comp.CoolingEnergy, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, comp.Name); SetupOutputVariable(state, "Refrigeration Air Chiller System Compressor Runtime Fraction", Constant::Units::None, comp.LoadFactor, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, comp.Name); } else { // serve cases/walkins on zone time step SetupOutputVariable(state, "Refrigeration Compressor Electricity Rate", Constant::Units::W, comp.Power, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, comp.Name); SetupOutputVariable(state, "Refrigeration Compressor Electricity Energy", Constant::Units::J, comp.ElecConsumption, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, comp.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Refrigeration, - comp.EndUseSubcategory, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Refrigeration, + comp.EndUseSubcategory); SetupOutputVariable(state, "Refrigeration Compressor Heat Transfer Rate", Constant::Units::W, comp.Capacity, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, comp.Name); SetupOutputVariable(state, "Refrigeration Compressor Heat Transfer Energy", Constant::Units::J, comp.CoolingEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, comp.Name); SetupOutputVariable(state, "Refrigeration Compressor Runtime Fraction", Constant::Units::None, comp.LoadFactor, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, comp.Name); } // Serve coils on HVAC time step or cases/walkins on Zone time step } // NumSysAttach @@ -9458,15 +9457,15 @@ void SetupReportInput(EnergyPlusData &state) "Refrigeration Air Chiller System Condenser Heat Transfer Rate", Constant::Units::W, cond.CondLoad, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, cond.Name); SetupOutputVariable(state, "Refrigeration Air Chiller System Condenser Heat Transfer Energy", Constant::Units::J, cond.CondEnergy, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, cond.Name); if (cond.CondenserType != DataHeatBalance::RefrigCondenserType::Cascade) { @@ -9474,43 +9473,43 @@ void SetupReportInput(EnergyPlusData &state) "Refrigeration Air Chiller System Condenser Total Recovered Heat Transfer Rate", Constant::Units::W, cond.TotalHeatRecoveredLoad, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, cond.Name); SetupOutputVariable(state, "Refrigeration Air Chiller System Condenser Total Recovered Heat Transfer Energy", Constant::Units::J, cond.TotalHeatRecoveredEnergy, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, cond.Name); SetupOutputVariable(state, "Refrigeration Air Chiller System Condenser Non Refrigeration Recovered Heat Transfer Rate", Constant::Units::W, cond.ExternalHeatRecoveredLoad, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, cond.Name); SetupOutputVariable(state, "Refrigeration Air Chiller System Condenser Non Refrigeration Recovered Heat Transfer Energy", Constant::Units::J, cond.ExternalEnergyRecovered, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, cond.Name); SetupOutputVariable(state, "Refrigeration Air Chiller System Condenser Defrost Recovered Heat Transfer Rate", Constant::Units::W, cond.InternalHeatRecoveredLoad, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, cond.Name); SetupOutputVariable(state, "Refrigeration Air Chiller System Condenser Defrost Recovered Heat Transfer Energy", Constant::Units::J, cond.InternalEnergyRecovered, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, cond.Name); } // not cascade because recovered energy on cascade systems passed up to higher temperature system @@ -9519,20 +9518,20 @@ void SetupReportInput(EnergyPlusData &state) "Refrigeration Air Chiller System Condenser Fan Electricity Rate", Constant::Units::W, cond.ActualFanPower, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, cond.Name); SetupOutputVariable(state, "Refrigeration Air Chiller System Condenser Fan Electricity Energy", Constant::Units::J, cond.FanElecEnergy, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, cond.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Refrigeration, - cond.EndUseSubcategory, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Refrigeration, + cond.EndUseSubcategory); } // Air cooled if (cond.CondenserType == DataHeatBalance::RefrigCondenserType::Evap) { @@ -9540,74 +9539,74 @@ void SetupReportInput(EnergyPlusData &state) "Refrigeration Air Chiller System Condenser Fan Electricity Rate", Constant::Units::W, cond.ActualFanPower, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, cond.Name); SetupOutputVariable(state, "Refrigeration Air Chiller System Condenser Fan Electricity Energy", Constant::Units::J, cond.FanElecEnergy, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, cond.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Refrigeration, - cond.EndUseSubcategory, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Refrigeration, + cond.EndUseSubcategory); SetupOutputVariable(state, "Refrigeration Air Chiller System Condenser Pump Electricity Rate", Constant::Units::W, cond.ActualEvapPumpPower, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, cond.Name); SetupOutputVariable(state, "Refrigeration Air Chiller System Condenser Pump Electricity Energy", Constant::Units::J, cond.EvapPumpConsumption, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, cond.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Refrigeration, - cond.EndUseSubcategory, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Refrigeration, + cond.EndUseSubcategory); SetupOutputVariable(state, "Refrigeration Air Chiller System Condenser Basin Heater Electricity Rate", Constant::Units::W, cond.BasinHeaterPower, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, cond.Name); SetupOutputVariable(state, "Refrigeration Air Chiller System Condenser Basin Heater Electricity Energy", Constant::Units::J, cond.BasinHeaterConsumption, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, cond.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Refrigeration, - cond.EndUseSubcategory, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Refrigeration, + cond.EndUseSubcategory); SetupOutputVariable(state, "Refrigeration Air Chiller System Condenser Evaporated Water Volume Flow Rate", Constant::Units::m3_s, cond.EvapWaterConsumpRate, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, cond.Name); SetupOutputVariable(state, "Refrigeration Air Chiller System Condenser Evaporated Water Volume", Constant::Units::m3, cond.EvapWaterConsumption, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, cond.Name, Constant::eResource::Water, - OutputProcessor::SOVEndUseCat::Refrigeration, - cond.EndUseSubcategory, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Refrigeration, + cond.EndUseSubcategory); } // Evaporative Condenser Variables if (cond.CondenserType == DataHeatBalance::RefrigCondenserType::Water) { @@ -9615,8 +9614,8 @@ void SetupReportInput(EnergyPlusData &state) "Refrigeration Air Chiller System Condenser Fluid Mass Flow Rate", Constant::Units::kg_s, cond.MassFlowRate, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, cond.Name); } // Water-cooled Condenser variables @@ -9627,15 +9626,15 @@ void SetupReportInput(EnergyPlusData &state) "Refrigeration System Condenser Heat Transfer Rate", Constant::Units::W, cond.CondLoad, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, cond.Name); SetupOutputVariable(state, "Refrigeration System Condenser Heat Transfer Energy", Constant::Units::J, cond.CondEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, cond.Name); if (cond.CondenserType != DataHeatBalance::RefrigCondenserType::Cascade) { @@ -9643,43 +9642,43 @@ void SetupReportInput(EnergyPlusData &state) "Refrigeration System Condenser Total Recovered Heat Transfer Rate", Constant::Units::W, cond.TotalHeatRecoveredLoad, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, cond.Name); SetupOutputVariable(state, "Refrigeration System Condenser Total Recovered Heat Transfer Energy", Constant::Units::J, cond.TotalHeatRecoveredEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, cond.Name); SetupOutputVariable(state, "Refrigeration System Condenser Non Refrigeration Recovered Heat Transfer Rate", Constant::Units::W, cond.ExternalHeatRecoveredLoad, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, cond.Name); SetupOutputVariable(state, "Refrigeration System Condenser Non Refrigeration Recovered Heat Transfer Energy", Constant::Units::J, cond.ExternalEnergyRecovered, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, cond.Name); SetupOutputVariable(state, "Refrigeration System Condenser Defrost Recovered Heat Transfer Rate", Constant::Units::W, cond.InternalHeatRecoveredLoad, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, cond.Name); SetupOutputVariable(state, "Refrigeration System Condenser Defrost Recovered Heat Transfer Energy", Constant::Units::J, cond.InternalEnergyRecovered, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, cond.Name); } // not cascade because recovered energy on cascade systems passed up to higher temperature system @@ -9688,20 +9687,20 @@ void SetupReportInput(EnergyPlusData &state) "Refrigeration System Condenser Fan Electricity Rate", Constant::Units::W, cond.ActualFanPower, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, cond.Name); SetupOutputVariable(state, "Refrigeration System Condenser Fan Electricity Energy", Constant::Units::J, cond.FanElecEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, cond.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Refrigeration, - cond.EndUseSubcategory, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Refrigeration, + cond.EndUseSubcategory); } // Air cooled if (cond.CondenserType == DataHeatBalance::RefrigCondenserType::Evap) { @@ -9709,74 +9708,74 @@ void SetupReportInput(EnergyPlusData &state) "Refrigeration System Condenser Fan Electricity Rate", Constant::Units::W, cond.ActualFanPower, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, cond.Name); SetupOutputVariable(state, "Refrigeration System Condenser Fan Electricity Energy", Constant::Units::J, cond.FanElecEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, cond.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Refrigeration, - cond.EndUseSubcategory, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Refrigeration, + cond.EndUseSubcategory); SetupOutputVariable(state, "Refrigeration System Condenser Pump Electricity Rate", Constant::Units::W, cond.ActualEvapPumpPower, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, cond.Name); SetupOutputVariable(state, "Refrigeration System Condenser Pump Electricity Energy", Constant::Units::J, cond.EvapPumpConsumption, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, cond.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Refrigeration, - cond.EndUseSubcategory, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Refrigeration, + cond.EndUseSubcategory); SetupOutputVariable(state, "Refrigeration System Condenser Basin Heater Electricity Rate", Constant::Units::W, cond.BasinHeaterPower, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, cond.Name); SetupOutputVariable(state, "Refrigeration System Condenser Basin Heater Electricity Energy", Constant::Units::J, cond.BasinHeaterConsumption, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, cond.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Refrigeration, - cond.EndUseSubcategory, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Refrigeration, + cond.EndUseSubcategory); SetupOutputVariable(state, "Refrigeration System Condenser Evaporated Water Volume Flow Rate", Constant::Units::m3_s, cond.EvapWaterConsumpRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, cond.Name); SetupOutputVariable(state, "Refrigeration System Condenser Evaporated Water Volume", Constant::Units::m3, cond.EvapWaterConsumption, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, cond.Name, Constant::eResource::Water, - OutputProcessor::SOVEndUseCat::Refrigeration, - cond.EndUseSubcategory, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Refrigeration, + cond.EndUseSubcategory); } // Evaporative Condenser Variables if (cond.CondenserType == DataHeatBalance::RefrigCondenserType::Water) { @@ -9784,8 +9783,8 @@ void SetupReportInput(EnergyPlusData &state) "Refrigeration System Condenser Water Mass Flow Rate", Constant::Units::kg_s, cond.MassFlowRate, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, cond.Name); } // Water-cooled Condenser variables @@ -9802,15 +9801,15 @@ void SetupReportInput(EnergyPlusData &state) "Refrigeration Air Chiller System Mechanical Subcooler Heat Transfer Rate", Constant::Units::W, cooler.MechSCTransLoad, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, cooler.Name); SetupOutputVariable(state, "Refrigeration Air Chiller System Mechanical Subcooler Heat Transfer Energy", Constant::Units::J, cooler.MechSCTransEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, cooler.Name); } } else { // Subcooler on system serving cases and/or walkins @@ -9819,15 +9818,15 @@ void SetupReportInput(EnergyPlusData &state) "Refrigeration System Mechanical Subcooler Heat Transfer Rate", Constant::Units::W, cooler.MechSCTransLoad, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, cooler.Name); SetupOutputVariable(state, "Refrigeration System Mechanical Subcooler Heat Transfer Energy", Constant::Units::J, cooler.MechSCTransEnergy, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, cooler.Name); } } // Subcoolers on system serving chillers @@ -9845,191 +9844,191 @@ void SetupReportInput(EnergyPlusData &state) "Refrigeration Transcritical System Total High Pressure Compressor Electricity Rate", Constant::Units::W, sys.TotCompPowerHP, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, sys.Name); SetupOutputVariable(state, "Refrigeration Transcritical System Total High Pressure Compressor Electricity Energy", Constant::Units::J, sys.TotCompElecConsumpHP, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, sys.Name); SetupOutputVariable(state, "Refrigeration Transcritical System Total Compressor Electricity Energy", Constant::Units::J, sys.TotCompElecConsump, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, sys.Name); SetupOutputVariable(state, "Refrigeration Transcritical System Average COP", Constant::Units::W_W, sys.AverageCompressorCOP, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, sys.Name); SetupOutputVariable(state, "Refrigeration Transcritical System Medium Temperature Cases and Walk Ins Heat Transfer Rate", Constant::Units::W, sys.TotalCoolingLoadMT, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, sys.Name); SetupOutputVariable(state, "Refrigeration Transcritical System Medium Temperature Cases and Walk Ins Heat Transfer Energy", Constant::Units::J, sys.TotalCoolingEnergyMT, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, sys.Name); SetupOutputVariable(state, "Refrigeration Transcritical System Total Cases and Walk Ins Heat Transfer Energy", Constant::Units::J, sys.TotalCoolingEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, sys.Name); SetupOutputVariable(state, "Refrigeration Transcritical System Medium Temperature Suction Pipe Heat Transfer Rate", Constant::Units::W, sys.PipeHeatLoadMT, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, sys.Name); SetupOutputVariable(state, "Refrigeration Transcritical System Medium Temperature Suction Pipe Heat Transfer Energy", Constant::Units::J, sys.PipeHeatEnergyMT, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, sys.Name); SetupOutputVariable(state, "Refrigeration Transcritical System High Pressure Compressor Heat Transfer Rate", Constant::Units::W, sys.TotCompCapacityHP, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, sys.Name); SetupOutputVariable(state, "Refrigeration Transcritical System High Pressure Compressor Heat Transfer Energy", Constant::Units::J, sys.TotCompCoolingEnergyHP, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, sys.Name); // indiv compressors go to meter, not system sum SetupOutputVariable(state, "Refrigeration Transcritical System Net Rejected Heat Transfer Rate", Constant::Units::W, sys.NetHeatRejectLoad, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, sys.Name); SetupOutputVariable(state, "Refrigeration Transcritical System Net Rejected Heat Transfer Energy", Constant::Units::J, sys.NetHeatRejectEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, sys.Name); SetupOutputVariable(state, "Refrigeration Transcritical System Estimated Refrigerant Inventory Mass", Constant::Units::kg, sys.RefInventory, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, sys.Name); SetupOutputVariable(state, "Refrigeration Transcritical System Refrigerant Mass Flow Rate", Constant::Units::kg_s, sys.RefMassFlowComps, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, sys.Name); SetupOutputVariable(state, "Refrigeration Transcritical System Medium Temperature Evaporating Temperature", Constant::Units::C, sys.TEvapNeededMT, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, sys.Name); SetupOutputVariable(state, "Refrigeration Transcritical System Medium Temperature Suction Temperature", Constant::Units::C, sys.TCompInHP, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, sys.Name); if (sys.TransSysType == 2) { // for TwoStage system only (low temperature loads present) SetupOutputVariable(state, "Refrigeration Transcritical System Low Pressure Compressor Electricity Rate", Constant::Units::W, sys.TotCompPowerLP, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, sys.Name); SetupOutputVariable(state, "Refrigeration Transcritical System Low Pressure Compressor Electricity Energy", Constant::Units::J, sys.TotCompElecConsumpLP, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, sys.Name); SetupOutputVariable(state, "Refrigeration Transcritical System Low Temperature Cases and Walk Ins Heat Transfer Rate", Constant::Units::W, sys.TotalCoolingLoadLT, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, sys.Name); SetupOutputVariable(state, "Refrigeration Transcritical System Low Temperature Cases and Walk Ins Heat Transfer Energy", Constant::Units::J, sys.TotalCoolingEnergyLT, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, sys.Name); SetupOutputVariable(state, "Refrigeration Transcritical System Low Temperature Suction Pipe Heat Transfer Rate", Constant::Units::W, sys.PipeHeatLoadLT, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, sys.Name); SetupOutputVariable(state, "Refrigeration Transcritical System Low Temperature Suction Pipe Heat Transfer Energy", Constant::Units::J, sys.PipeHeatEnergyLT, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, sys.Name); SetupOutputVariable(state, "Refrigeration Transcritical System Low Pressure Compressor Heat Transfer Rate", Constant::Units::W, sys.TotCompCapacityLP, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, sys.Name); SetupOutputVariable(state, "Refrigeration Transcritical System Low Pressure Compressor Heat Transfer Energy", Constant::Units::J, sys.TotCompCoolingEnergyLP, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, sys.Name); // indiv compressors go to meter, not system sum SetupOutputVariable(state, "Refrigeration Transcritical System Low Temperature Evaporating Temperature", Constant::Units::C, sys.TEvapNeededLT, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, sys.Name); SetupOutputVariable(state, "Refrigeration Transcritical System Low Temperature Suction Temperature", Constant::Units::C, sys.TCompInLP, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, sys.Name); } // (sys%TransSysType == 2) @@ -10066,40 +10065,40 @@ void SetupReportInput(EnergyPlusData &state) "Refrigeration Compressor Electricity Rate", Constant::Units::W, Compressor(compNum).Power, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, Compressor(compNum).Name); SetupOutputVariable(state, "Refrigeration Compressor Electricity Energy", Constant::Units::J, Compressor(compNum).ElecConsumption, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, Compressor(compNum).Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Refrigeration, - Compressor(compNum).EndUseSubcategory, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Refrigeration, + Compressor(compNum).EndUseSubcategory); SetupOutputVariable(state, "Refrigeration Compressor Heat Transfer Rate", Constant::Units::W, Compressor(compNum).Capacity, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, Compressor(compNum).Name); SetupOutputVariable(state, "Refrigeration Compressor Heat Transfer Energy", Constant::Units::J, Compressor(compNum).CoolingEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, Compressor(compNum).Name); SetupOutputVariable(state, "Refrigeration Compressor Runtime Fraction", Constant::Units::None, Compressor(compNum).LoadFactor, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, Compressor(compNum).Name); } // NumSysAttach } // sys%NumCompressorsLP @@ -10113,40 +10112,40 @@ void SetupReportInput(EnergyPlusData &state) "Refrigeration Compressor Electricity Rate", Constant::Units::W, Compressor(compNum).Power, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, Compressor(compNum).Name); SetupOutputVariable(state, "Refrigeration Compressor Electricity Energy", Constant::Units::J, Compressor(compNum).ElecConsumption, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, Compressor(compNum).Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Refrigeration, - Compressor(compNum).EndUseSubcategory, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Refrigeration, + Compressor(compNum).EndUseSubcategory); SetupOutputVariable(state, "Refrigeration Compressor Heat Transfer Rate", Constant::Units::W, Compressor(compNum).Capacity, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, Compressor(compNum).Name); SetupOutputVariable(state, "Refrigeration Compressor Heat Transfer Energy", Constant::Units::J, Compressor(compNum).CoolingEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, Compressor(compNum).Name); SetupOutputVariable(state, "Refrigeration Compressor Runtime Fraction", Constant::Units::None, Compressor(compNum).LoadFactor, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, Compressor(compNum).Name); } // NumSysAttach } // sys%NumCompressorsHP @@ -10162,61 +10161,61 @@ void SetupReportInput(EnergyPlusData &state) "Refrigeration Transcritical System Gas Cooler Heat Transfer Rate", Constant::Units::W, cooler.GasCoolerLoad, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, cooler.Name); SetupOutputVariable(state, "Refrigeration Transcritical System Gas Cooler Heat Transfer Energy", Constant::Units::J, cooler.GasCoolerEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, cooler.Name); SetupOutputVariable(state, "Refrigeration Transcritical System Gas Cooler Fan Electricity Rate", Constant::Units::W, cooler.ActualFanPower, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, cooler.Name); SetupOutputVariable(state, "Refrigeration Transcritical System Gas Cooler Fan Electricity Energy", Constant::Units::J, cooler.FanElecEnergy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, cooler.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Refrigeration, - cooler.EndUseSubcategory, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::Refrigeration, + cooler.EndUseSubcategory); SetupOutputVariable(state, "Refrigeration Transcritical System Gas Cooler Outlet Temperature", Constant::Units::C, cooler.TGasCoolerOut, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, cooler.Name); SetupOutputVariable(state, "Refrigeration Transcritical System Gas Cooler Outlet Pressure", Constant::Units::Pa, cooler.PGasCoolerOut, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, cooler.Name); SetupOutputVariable(state, "Refrigeration Transcritical System Gas Cooler Defrost Recovered Heat Transfer Rate", Constant::Units::W, cooler.InternalHeatRecoveredLoad, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, cooler.Name); SetupOutputVariable(state, "Refrigeration Transcritical System Gas Cooler Defrost Recovered Heat Transfer Energy", Constant::Units::J, cooler.InternalEnergyRecovered, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, cooler.Name); } // GCNum on NumSimulationGasCooler } // (NumSimulationGasCooler >0) diff --git a/src/EnergyPlus/ResultsFramework.hh b/src/EnergyPlus/ResultsFramework.hh index af9acf9b5e2..2d62ef5f08f 100644 --- a/src/EnergyPlus/ResultsFramework.hh +++ b/src/EnergyPlus/ResultsFramework.hh @@ -374,7 +374,9 @@ namespace ResultsFramework { void initializeMeters(const std::vector &EnergyMeters, const ReportFreq reportFrequency); - std::array detailedTSData = {DataFrame("Dummy"), DataFrame("Detailed-Zone"), DataFrame("Detailed-HVAC")}; + std::array detailedTSData = {// DataFrame("Dummy"), + DataFrame("Detailed-Zone"), + DataFrame("Detailed-HVAC")}; std::array freqTSData = {DataFrame("Each Call"), DataFrame("TimeStep"), diff --git a/src/EnergyPlus/RoomAirModelAirflowNetwork.cc b/src/EnergyPlus/RoomAirModelAirflowNetwork.cc index eff37e6b939..01fbcadae2a 100644 --- a/src/EnergyPlus/RoomAirModelAirflowNetwork.cc +++ b/src/EnergyPlus/RoomAirModelAirflowNetwork.cc @@ -198,29 +198,29 @@ namespace RoomAir { "RoomAirflowNetwork Node NonAirSystemResponse", Constant::Units::W, afnNode.NonAirSystemResponse, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, afnNode.Name); SetupOutputVariable(state, "RoomAirflowNetwork Node SysDepZoneLoadsLagged", Constant::Units::W, afnNode.SysDepZoneLoadsLagged, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, afnNode.Name); SetupOutputVariable(state, "RoomAirflowNetwork Node SumIntSensibleGain", Constant::Units::W, afnNode.SumIntSensibleGain, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, afnNode.Name); SetupOutputVariable(state, "RoomAirflowNetwork Node SumIntLatentGain", Constant::Units::W, afnNode.SumIntLatentGain, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, afnNode.Name); } } @@ -341,15 +341,15 @@ namespace RoomAir { "RoomAirflowNetwork Node HVAC Supply Fraction", Constant::Units::None, afnHVAC.SupplyFraction, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, afnHVAC.Name); SetupOutputVariable(state, "RoomAirflowNetwork Node HVAC Return Fraction", Constant::Units::None, afnHVAC.ReturnFraction, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, afnHVAC.Name); } } diff --git a/src/EnergyPlus/RoomAirModelManager.cc b/src/EnergyPlus/RoomAirModelManager.cc index d7aa8ac9986..7b58ec2075d 100644 --- a/src/EnergyPlus/RoomAirModelManager.cc +++ b/src/EnergyPlus/RoomAirModelManager.cc @@ -1722,22 +1722,22 @@ namespace RoomAir { "RoomAirflowNetwork Node Temperature", Constant::Units::C, roomAFNZoneNode.AirTemp, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, roomAFNZoneNode.Name); SetupOutputVariable(state, "RoomAirflowNetwork Node Humidity Ratio", Constant::Units::kgWater_kgDryAir, roomAFNZoneNode.HumRat, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, roomAFNZoneNode.Name); SetupOutputVariable(state, "RoomAirflowNetwork Node Relative Humidity", Constant::Units::Perc, roomAFNZoneNode.RelHumidity, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, roomAFNZoneNode.Name); } // for (iAirNodE) } // for (iZone) @@ -2139,71 +2139,71 @@ namespace RoomAir { "Room Air Zone Mixed Subzone Temperature", Constant::Units::C, state.dataRoomAir->ZTMX(iZone), - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(iZone).Name); SetupOutputVariable(state, "Room Air Zone Occupied Subzone Temperature", Constant::Units::C, state.dataRoomAir->ZTOC(iZone), - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(iZone).Name); SetupOutputVariable(state, "Room Air Zone Floor Subzone Temperature", Constant::Units::C, state.dataRoomAir->ZTFloor(iZone), - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(iZone).Name); SetupOutputVariable(state, "Room Air Zone Transition Height", Constant::Units::m, state.dataRoomAir->HeightTransition(iZone), - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(iZone).Name); SetupOutputVariable(state, "Room Air Zone Recommended Minimum Flow Fraction", Constant::Units::None, state.dataRoomAir->FracMinFlow(iZone), - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(iZone).Name); SetupOutputVariable(state, "Room Air Zone Is Mixed Status", Constant::Units::None, state.dataRoomAir->ZoneDispVent3NodeMixedFlagRep(iZone), - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(iZone).Name); SetupOutputVariable(state, "Room Air Zone Average Temperature Gradient", Constant::Units::K_m, state.dataRoomAir->AvgTempGrad(iZone), - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(iZone).Name); SetupOutputVariable(state, "Room Air Zone Maximum Temperature Gradient", Constant::Units::K_m, state.dataRoomAir->MaxTempGrad(iZone), - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(iZone).Name); SetupOutputVariable(state, "Room Air Zone Thermal Comfort Effective Air Temperature", Constant::Units::C, state.dataRoomAir->TCMF(iZone), - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(iZone).Name); SetupOutputVariable(state, "Room Air Zone Thermostat Temperature", Constant::Units::C, state.dataHeatBalFanSys->TempTstatAir(iZone), - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(iZone).Name); } // for (iZone) } // if (any(IsZoneDV)) @@ -2232,71 +2232,71 @@ namespace RoomAir { "Room Air Zone Mixed Subzone Temperature", Constant::Units::C, state.dataRoomAir->ZTMX(iZone), - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, zone.Name); SetupOutputVariable(state, "Room Air Zone Occupied Subzone Temperature", Constant::Units::C, state.dataRoomAir->ZTOC(iZone), - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, zone.Name); SetupOutputVariable(state, "Room Air Zone Transition Height", Constant::Units::m, state.dataRoomAir->HeightTransition(iZone), - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, zone.Name); SetupOutputVariable(state, "Room Air Zone Is Mixed Status", Constant::Units::None, state.dataRoomAir->ZoneUFADMixedFlagRep(iZone), - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, zone.Name); SetupOutputVariable(state, "Room Air Zone Average Temperature Gradient", Constant::Units::K_m, state.dataRoomAir->AvgTempGrad(iZone), - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, zone.Name); SetupOutputVariable(state, "Room Air Zone Effective Comfort Air Temperature", Constant::Units::C, state.dataRoomAir->TCMF(iZone), - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, zone.Name); SetupOutputVariable(state, "Room Air Zone Thermostat Temperature", Constant::Units::C, state.dataHeatBalFanSys->TempTstatAir(iZone), - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, zone.Name); SetupOutputVariable(state, "Room Air Zone Transition Height Gamma Value", Constant::Units::None, state.dataRoomAir->ZoneUFADGamma(iZone), - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, zone.Name); SetupOutputVariable(state, "Room Air Zone Plume Heat Transfer Rate", Constant::Units::W, state.dataRoomAir->ZoneUFADPowInPlumes(iZone), - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, zone.Name); SetupOutputVariable(state, "Room Air Zone Temperature Stratification Fraction", Constant::Units::None, state.dataRoomAir->Phi(iZone), - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, zone.Name); // set zone equip pointer in the UCSDUI data structure @@ -2311,78 +2311,78 @@ namespace RoomAir { "Room Air Zone Mixed Subzone Temperature", Constant::Units::C, state.dataRoomAir->ZTMX(iZone), - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, zone.Name); SetupOutputVariable(state, "Room Air Zone Occupied Subzone Temperature", Constant::Units::C, state.dataRoomAir->ZTOC(iZone), - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, zone.Name); SetupOutputVariable(state, "Room Air Zone Transition Height", Constant::Units::m, state.dataRoomAir->HeightTransition(iZone), - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, zone.Name); SetupOutputVariable(state, "Room Air Zone Is Mixed Status", Constant::Units::None, state.dataRoomAir->ZoneUFADMixedFlagRep(iZone), - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, zone.Name); SetupOutputVariable(state, "Room Air Zone Average Temperature Gradient", Constant::Units::K_m, state.dataRoomAir->AvgTempGrad(iZone), - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, zone.Name); SetupOutputVariable(state, "Room Air Zone Effective Comfort Air Temperature", Constant::Units::C, state.dataRoomAir->TCMF(iZone), - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, zone.Name); SetupOutputVariable(state, "Room Air Zone Thermostat Temperature", Constant::Units::C, state.dataHeatBalFanSys->TempTstatAir(iZone), - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, zone.Name); SetupOutputVariable(state, "Room Air Zone Transition Height Gamma Value", Constant::Units::None, state.dataRoomAir->ZoneUFADGamma(iZone), - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, zone.Name); SetupOutputVariable(state, "Room Air Zone Plume Heat Transfer Rate", Constant::Units::W, state.dataRoomAir->ZoneUFADPowInPlumes(iZone), - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, zone.Name); SetupOutputVariable(state, "Room Air Zone Window Plume Heat Transfer Rate", Constant::Units::W, state.dataRoomAir->ZoneUFADPowInPlumesfromWindows(iZone), - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, zone.Name); SetupOutputVariable(state, "Room Air Zone Temperature Stratification Fraction", Constant::Units::None, state.dataRoomAir->Phi(iZone), - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, zone.Name); // set zone equip pointer in the UCSDUE data structure state.dataRoomAir->ZoneUFAD(state.dataRoomAir->ZoneUFADPtr(iZone)).ZoneEquipPtr = iZone; @@ -2454,64 +2454,64 @@ namespace RoomAir { "Room Air Zone Jet Region Temperature", Constant::Units::C, state.dataRoomAir->ZTJET(iZone), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, zone.Name); SetupOutputVariable(state, "Room Air Zone Recirculation Region Temperature", Constant::Units::C, state.dataRoomAir->ZTREC(iZone), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, zone.Name); SetupOutputVariable(state, "Room Air Zone Jet Region Average Air Velocity", Constant::Units::m_s, state.dataRoomAir->Ujet(iZone), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, zone.Name); SetupOutputVariable(state, "Room Air Zone Recirculation Region Average Air Velocity", Constant::Units::m_s, state.dataRoomAir->Urec(iZone), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, zone.Name); SetupOutputVariable(state, "Room Air Zone Recirculation and Inflow Rate Ratio", Constant::Units::None, state.dataRoomAir->RecInflowRatio(iZone), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, zone.Name); SetupOutputVariable(state, "Room Air Zone Inflow Opening Area", Constant::Units::m2, state.dataRoomAir->Ain(iZone), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, zone.Name); SetupOutputVariable(state, "Room Air Zone Room Length", Constant::Units::m, state.dataRoomAir->Dstar(iZone), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, zone.Name); SetupOutputVariable(state, "Room Air Zone Is Mixing Status", Constant::Units::None, state.dataRoomAir->ZoneCrossVentIsMixing(iZone), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, zone.Name); SetupOutputVariable(state, "Room Air Zone Is Recirculating Status", Constant::Units::None, state.dataRoomAir->ZoneCrossVentHasREC(iZone), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, zone.Name); for (int i = 1; i <= state.dataRoomAir->AFNSurfaceCrossVent(0, ZoneNum); ++i) { int N = state.afn->AirflowNetworkLinkageData(i).CompNum; @@ -2520,8 +2520,8 @@ namespace RoomAir { "Room Air Window Jet Region Average Air Velocity", Constant::Units::m_s, state.dataRoomAir->CrossVentJetRecFlows(i, iZone).Ujet, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.afn->MultizoneSurfaceData(i).SurfName); } } diff --git a/src/EnergyPlus/RoomAirModelUserTempPattern.cc b/src/EnergyPlus/RoomAirModelUserTempPattern.cc index ce7f9c2f717..aa088220fb7 100644 --- a/src/EnergyPlus/RoomAirModelUserTempPattern.cc +++ b/src/EnergyPlus/RoomAirModelUserTempPattern.cc @@ -369,8 +369,8 @@ void FigureTwoGradInterpPattern(EnergyPlusData &state, int const PattrnID, int c "Room Air Zone Vertical Temperature Gradient", Constant::Units::K_m, patternZoneInfo.Gradient, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, patternZoneInfo.ZoneName); state.dataRoomAirModelTempPattern->SetupOutputFlag(ZoneNum) = false; diff --git a/src/EnergyPlus/RuntimeLanguageProcessor.cc b/src/EnergyPlus/RuntimeLanguageProcessor.cc index 53d0c467601..2f63668ff35 100644 --- a/src/EnergyPlus/RuntimeLanguageProcessor.cc +++ b/src/EnergyPlus/RuntimeLanguageProcessor.cc @@ -2708,8 +2708,8 @@ void GetRuntimeLanguageUserInput(EnergyPlusData &state) int VariableNum(0); // temporary int RuntimeReportVarNum; bool Found; - OutputProcessor::SOVTimeStepType sovTimeStepType; // temporary - OutputProcessor::SOVStoreType sovStoreType; // temporary + OutputProcessor::TimeStepType sovTimeStepType; // temporary + OutputProcessor::StoreType sovStoreType; // temporary std::string EndUseSubCatString; int TrendNum; @@ -3350,9 +3350,9 @@ void GetRuntimeLanguageUserInput(EnergyPlusData &state) } if (cAlphaArgs(3) == "AVERAGED") { - sovStoreType = OutputProcessor::SOVStoreType::Average; + sovStoreType = OutputProcessor::StoreType::Average; } else if (cAlphaArgs(3) == "SUMMED") { - sovStoreType = OutputProcessor::SOVStoreType::Summed; + sovStoreType = OutputProcessor::StoreType::Sum; } else { ShowSevereError(state, format("{}{}=\"{} invalid field.", RoutineName, cCurrentModuleObject, cAlphaArgs(1))); ShowContinueError(state, format("Invalid {}={}", cAlphaFieldNames(3), cAlphaArgs(3))); @@ -3361,9 +3361,9 @@ void GetRuntimeLanguageUserInput(EnergyPlusData &state) } if (cAlphaArgs(4) == "ZONETIMESTEP") { - sovTimeStepType = OutputProcessor::SOVTimeStepType::Zone; + sovTimeStepType = OutputProcessor::TimeStepType::Zone; } else if (cAlphaArgs(4) == "SYSTEMTIMESTEP") { - sovTimeStepType = OutputProcessor::SOVTimeStepType::System; + sovTimeStepType = OutputProcessor::TimeStepType::System; } else { ShowSevereError(state, format("{}{}=\"{} invalid field.", RoutineName, cCurrentModuleObject, cAlphaArgs(1))); ShowContinueError(state, format("Invalid {}={}", cAlphaFieldNames(4), cAlphaArgs(4))); @@ -3388,13 +3388,14 @@ void GetRuntimeLanguageUserInput(EnergyPlusData &state) sovStoreType, "EMS", Constant::eResource::Invalid, - OutputProcessor::SOVEndUseCat::Invalid, - {}, // EndUseSub - OutputProcessor::SOVGroup::Invalid, - {}, // Zone - 1, - 1, - -999, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::Invalid, + "", // EndUseSubCat + "", // ZoneName + 1, // ZoneMult + 1, // ZoneListMult + "", // SpaceType + -999, // indexGroupKey UnitsB); } // Last field is index key, no indexing here so mimic weather output data @@ -3520,12 +3521,12 @@ void GetRuntimeLanguageUserInput(EnergyPlusData &state) state.dataRuntimeLangProcessor->RuntimeReportVar(RuntimeReportVarNum).VariableNum = VariableNum; } - sovStoreType = OutputProcessor::SOVStoreType::Summed; // all metered vars are sum type + sovStoreType = OutputProcessor::StoreType::Sum; // all metered vars are sum type if (cAlphaArgs(3) == "ZONETIMESTEP") { - sovTimeStepType = OutputProcessor::SOVTimeStepType::Zone; + sovTimeStepType = OutputProcessor::TimeStepType::Zone; } else if (cAlphaArgs(3) == "SYSTEMTIMESTEP") { - sovTimeStepType = OutputProcessor::SOVTimeStepType::System; + sovTimeStepType = OutputProcessor::TimeStepType::System; } else { ShowSevereError(state, format("{}{}=\"{} invalid field.", RoutineName, cCurrentModuleObject, cAlphaArgs(1))); ShowContinueError(state, format("Invalid {}={}", cAlphaFieldNames(4), cAlphaArgs(4))); @@ -3544,16 +3545,16 @@ void GetRuntimeLanguageUserInput(EnergyPlusData &state) } // Group Type - OutputProcessor::SOVGroup sovGroup; + OutputProcessor::Group sovGroup; if (cAlphaArgs(6) == "BUILDING") { - sovGroup = OutputProcessor::SOVGroup::Building; + sovGroup = OutputProcessor::Group::Building; } else if (cAlphaArgs(6) == "HVAC") { - sovGroup = OutputProcessor::SOVGroup::HVAC; + sovGroup = OutputProcessor::Group::HVAC; } else if (cAlphaArgs(6) == "PLANT") { - sovGroup = OutputProcessor::SOVGroup::Plant; + sovGroup = OutputProcessor::Group::Plant; } else if (cAlphaArgs(6) == "SYSTEM") { - sovGroup = OutputProcessor::SOVGroup::HVAC; + sovGroup = OutputProcessor::Group::HVAC; } else { ShowSevereError(state, format("{}{}=\"{} invalid field.", RoutineName, cCurrentModuleObject, cAlphaArgs(1))); ShowContinueError(state, format("Invalid {}={}", cAlphaFieldNames(6), cAlphaArgs(6))); @@ -3561,50 +3562,50 @@ void GetRuntimeLanguageUserInput(EnergyPlusData &state) } // End Use Type - OutputProcessor::SOVEndUseCat sovEndUseCat; + OutputProcessor::EndUseCat sovEndUseCat; if (cAlphaArgs(7) == "HEATING") { - sovEndUseCat = OutputProcessor::SOVEndUseCat::Heating; + sovEndUseCat = OutputProcessor::EndUseCat::Heating; } else if (cAlphaArgs(7) == "COOLING") { - sovEndUseCat = OutputProcessor::SOVEndUseCat::Cooling; + sovEndUseCat = OutputProcessor::EndUseCat::Cooling; } else if (cAlphaArgs(7) == "INTERIORLIGHTS") { - sovEndUseCat = OutputProcessor::SOVEndUseCat::InteriorLights; + sovEndUseCat = OutputProcessor::EndUseCat::InteriorLights; } else if (cAlphaArgs(7) == "EXTERIORLIGHTS") { - sovEndUseCat = OutputProcessor::SOVEndUseCat::ExteriorLights; + sovEndUseCat = OutputProcessor::EndUseCat::ExteriorLights; } else if (cAlphaArgs(7) == "INTERIOREQUIPMENT") { - sovEndUseCat = OutputProcessor::SOVEndUseCat::InteriorEquipment; + sovEndUseCat = OutputProcessor::EndUseCat::InteriorEquipment; } else if (cAlphaArgs(7) == "EXTERIOREQUIPMENT") { - sovEndUseCat = OutputProcessor::SOVEndUseCat::ExteriorEquipment; + sovEndUseCat = OutputProcessor::EndUseCat::ExteriorEquipment; } else if (cAlphaArgs(7) == "FANS") { - sovEndUseCat = OutputProcessor::SOVEndUseCat::Fans; + sovEndUseCat = OutputProcessor::EndUseCat::Fans; } else if (cAlphaArgs(7) == "PUMPS") { - sovEndUseCat = OutputProcessor::SOVEndUseCat::Pumps; + sovEndUseCat = OutputProcessor::EndUseCat::Pumps; } else if (cAlphaArgs(7) == "HEATREJECTION") { - sovEndUseCat = OutputProcessor::SOVEndUseCat::HeatRejection; + sovEndUseCat = OutputProcessor::EndUseCat::HeatRejection; } else if (cAlphaArgs(7) == "HUMIDIFIER") { - sovEndUseCat = OutputProcessor::SOVEndUseCat::Humidification; + sovEndUseCat = OutputProcessor::EndUseCat::Humidification; } else if (cAlphaArgs(7) == "HEATRECOVERY") { - sovEndUseCat = OutputProcessor::SOVEndUseCat::HeatRecovery; + sovEndUseCat = OutputProcessor::EndUseCat::HeatRecovery; } else if (cAlphaArgs(7) == "WATERSYSTEMS") { - sovEndUseCat = OutputProcessor::SOVEndUseCat::WaterSystem; + sovEndUseCat = OutputProcessor::EndUseCat::WaterSystem; } else if (cAlphaArgs(7) == "REFRIGERATION") { - sovEndUseCat = OutputProcessor::SOVEndUseCat::Refrigeration; + sovEndUseCat = OutputProcessor::EndUseCat::Refrigeration; } else if (cAlphaArgs(7) == "ONSITEGENERATION") { - sovEndUseCat = OutputProcessor::SOVEndUseCat::Cogeneration; + sovEndUseCat = OutputProcessor::EndUseCat::Cogeneration; } else if (cAlphaArgs(7) == "HEATINGCOILS") { - sovEndUseCat = OutputProcessor::SOVEndUseCat::HeatingCoils; + sovEndUseCat = OutputProcessor::EndUseCat::HeatingCoils; } else if (cAlphaArgs(7) == "COOLINGCOILS") { - sovEndUseCat = OutputProcessor::SOVEndUseCat::CoolingCoils; + sovEndUseCat = OutputProcessor::EndUseCat::CoolingCoils; } else if (cAlphaArgs(7) == "CHILLERS") { - sovEndUseCat = OutputProcessor::SOVEndUseCat::Chillers; + sovEndUseCat = OutputProcessor::EndUseCat::Chillers; } else if (cAlphaArgs(7) == "BOILERS") { - sovEndUseCat = OutputProcessor::SOVEndUseCat::Boilers; + sovEndUseCat = OutputProcessor::EndUseCat::Boilers; } else if (cAlphaArgs(7) == "BASEBOARD") { - sovEndUseCat = OutputProcessor::SOVEndUseCat::Baseboard; + sovEndUseCat = OutputProcessor::EndUseCat::Baseboard; } else if (cAlphaArgs(7) == "HEATRECOVERYFORCOOLING") { - sovEndUseCat = OutputProcessor::SOVEndUseCat::HeatRecoveryForCooling; + sovEndUseCat = OutputProcessor::EndUseCat::HeatRecoveryForCooling; } else if (cAlphaArgs(7) == "HEATRECOVERYFORHEATING") { - sovEndUseCat = OutputProcessor::SOVEndUseCat::HeatRecoveryForHeating; + sovEndUseCat = OutputProcessor::EndUseCat::HeatRecoveryForHeating; } else { ShowSevereError(state, format("{}{}=\"{} invalid field.", RoutineName, cCurrentModuleObject, cAlphaArgs(1))); ShowContinueError(state, format("Invalid {}={}", cAlphaFieldNames(7), cAlphaArgs(7))); @@ -3613,11 +3614,10 @@ void GetRuntimeLanguageUserInput(EnergyPlusData &state) // Additional End Use Types Only Used for EnergyTransfer if ((resource != Constant::eResource::EnergyTransfer) && - (sovEndUseCat == OutputProcessor::SOVEndUseCat::HeatingCoils || sovEndUseCat == OutputProcessor::SOVEndUseCat::CoolingCoils || - sovEndUseCat == OutputProcessor::SOVEndUseCat::Chillers || sovEndUseCat == OutputProcessor::SOVEndUseCat::Boilers || - sovEndUseCat == OutputProcessor::SOVEndUseCat::Baseboard || - sovEndUseCat == OutputProcessor::SOVEndUseCat::HeatRecoveryForCooling || - sovEndUseCat == OutputProcessor::SOVEndUseCat::HeatRecoveryForHeating)) { + (sovEndUseCat == OutputProcessor::EndUseCat::HeatingCoils || sovEndUseCat == OutputProcessor::EndUseCat::CoolingCoils || + sovEndUseCat == OutputProcessor::EndUseCat::Chillers || sovEndUseCat == OutputProcessor::EndUseCat::Boilers || + sovEndUseCat == OutputProcessor::EndUseCat::Baseboard || sovEndUseCat == OutputProcessor::EndUseCat::HeatRecoveryForCooling || + sovEndUseCat == OutputProcessor::EndUseCat::HeatRecoveryForHeating)) { ShowWarningError(state, format("{}{}=\"{} invalid field.", RoutineName, cCurrentModuleObject, cAlphaArgs(1))); ShowContinueError(state, format("Invalid {}={} for {}={}", cAlphaFieldNames(5), cAlphaArgs(5), cAlphaFieldNames(7), cAlphaArgs(7))); @@ -3636,9 +3636,9 @@ void GetRuntimeLanguageUserInput(EnergyPlusData &state) sovStoreType, "EMS", resource, + sovGroup, sovEndUseCat, - EndUseSubCatString, - sovGroup); + EndUseSubCatString); } else { // no subcat SetupOutputVariable(state, cAlphaArgs(1), @@ -3648,9 +3648,8 @@ void GetRuntimeLanguageUserInput(EnergyPlusData &state) sovStoreType, "EMS", resource, - sovEndUseCat, - {}, - sovGroup); + sovGroup, + sovEndUseCat); } } } // NumEMSMeteredOutputVariables > 0 diff --git a/src/EnergyPlus/SQLiteProcedures.cc b/src/EnergyPlus/SQLiteProcedures.cc index 057e8952429..798722e3a56 100644 --- a/src/EnergyPlus/SQLiteProcedures.cc +++ b/src/EnergyPlus/SQLiteProcedures.cc @@ -1398,9 +1398,13 @@ void SQLite::createSQLiteReportDictionaryRecord(int const reportVariableReportID static constexpr std::array reportFreqStrings = { "HVAC System Timestep", "Zone Timestep", "Hourly", "Daily", "Monthly", "Run Period", "Annual"}; - static constexpr std::array storeTypeStrings = {"Dummy", "Avg", "Sum"}; + static constexpr std::array storeTypeStrings = {// "Dummy", + "Avg", + "Sum"}; - static constexpr std::array timeStepTypeStrings = {"Dummy", "Zone", "HVAC System"}; + static constexpr std::array timeStepTypeStrings = {// "Dummy", + "Zone", + "HVAC System"}; if (m_writeOutputToSQLite) { sqliteBindInteger(m_reportDictionaryInsertStmt, 1, reportVariableReportID); diff --git a/src/EnergyPlus/ScheduleManager.cc b/src/EnergyPlus/ScheduleManager.cc index 7cf3efe6b93..2c41f51df09 100644 --- a/src/EnergyPlus/ScheduleManager.cc +++ b/src/EnergyPlus/ScheduleManager.cc @@ -4571,8 +4571,8 @@ namespace ScheduleManager { "Schedule Value", Constant::Units::None, state.dataScheduleMgr->Schedule(ScheduleIndex).CurrentValue, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataScheduleMgr->Schedule(ScheduleIndex).Name); } state.dataScheduleMgr->DoScheduleReportingSetup = false; diff --git a/src/EnergyPlus/SetPointManager.cc b/src/EnergyPlus/SetPointManager.cc index cfddfacb881..30c0c30e9f7 100644 --- a/src/EnergyPlus/SetPointManager.cc +++ b/src/EnergyPlus/SetPointManager.cc @@ -3156,15 +3156,15 @@ void GetSetPointManagerInputData(EnergyPlusData &state, bool &ErrorsFound) "Setpoint Manager Warmest Temperature Critical Zone Number", Constant::Units::None, state.dataSetPointManager->WarmestSetPtMgrTempFlow(SetPtMgrNum).CritZoneNum, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataSetPointManager->WarmestSetPtMgrTempFlow(SetPtMgrNum).Name); SetupOutputVariable(state, "Setpoint Manager Warmest Temperature Turndown Flow Fraction", Constant::Units::None, state.dataSetPointManager->WarmestSetPtMgrTempFlow(SetPtMgrNum).Turndown, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataSetPointManager->WarmestSetPtMgrTempFlow(SetPtMgrNum).Name); } diff --git a/src/EnergyPlus/SimAirServingZones.cc b/src/EnergyPlus/SimAirServingZones.cc index 1891f11545a..baac78583ff 100644 --- a/src/EnergyPlus/SimAirServingZones.cc +++ b/src/EnergyPlus/SimAirServingZones.cc @@ -1375,8 +1375,8 @@ void GetAirPathData(EnergyPlusData &state) "Air System Simulation Cycle On Off Status", Constant::Units::None, state.dataAirLoop->PriAirSysAvailMgr(AirSysNum).AvailStatus, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataAirSystemsData->PrimaryAirSystems(AirSysNum).Name); } @@ -2441,22 +2441,22 @@ void SimAirLoops(EnergyPlusData &state, bool const FirstHVACIteration, bool &Sim "Air System Simulation Maximum Iteration Count", Constant::Units::None, state.dataSimAirServingZones->salIterMax, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, "SimAir"); SetupOutputVariable(state, "Air System Simulation Iteration Count", Constant::Units::None, state.dataSimAirServingZones->salIterTot, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, "SimAir"); SetupOutputVariable(state, "Air System Component Model Simulation Calls", Constant::Units::None, state.dataSimAirServingZones->NumCallsTot, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, "SimAir"); state.dataSimAirServingZones->OutputSetupFlag = true; } diff --git a/src/EnergyPlus/SimulationManager.cc b/src/EnergyPlus/SimulationManager.cc index f77b3794892..281a12ee279 100644 --- a/src/EnergyPlus/SimulationManager.cc +++ b/src/EnergyPlus/SimulationManager.cc @@ -218,8 +218,8 @@ namespace SimulationManager { SetPreConstructionInputParameters(state); // establish array bounds for constructions early OutputProcessor::SetupTimePointers( - state, OutputProcessor::SOVTimeStepType::Zone, state.dataGlobal->TimeStepZone); // Set up Time pointer for HB/Zone Simulation - OutputProcessor::SetupTimePointers(state, OutputProcessor::SOVTimeStepType::HVAC, state.dataHVACGlobal->TimeStepSys); + state, OutputProcessor::TimeStepType::Zone, state.dataGlobal->TimeStepZone); // Set up Time pointer for HB/Zone Simulation + OutputProcessor::SetupTimePointers(state, OutputProcessor::TimeStepType::System, state.dataHVACGlobal->TimeStepSys); createFacilityElectricPowerServiceObject(state); createCoilSelectionReportObj(state); diff --git a/src/EnergyPlus/SingleDuct.cc b/src/EnergyPlus/SingleDuct.cc index 0252d2153c0..ce5145c5769 100644 --- a/src/EnergyPlus/SingleDuct.cc +++ b/src/EnergyPlus/SingleDuct.cc @@ -757,15 +757,15 @@ void GetSysInput(EnergyPlusData &state) "Zone Air Terminal VAV Damper Position", Constant::Units::None, state.dataSingleDuct->sd_airterminal(state.dataSingleDuct->SysNumGSI).DamperPosition, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataSingleDuct->sd_airterminal(state.dataSingleDuct->SysNumGSI).SysName); SetupOutputVariable(state, "Zone Air Terminal Minimum Air Flow Fraction", Constant::Units::None, state.dataSingleDuct->sd_airterminal(state.dataSingleDuct->SysNumGSI).ZoneMinAirFracReport, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataSingleDuct->sd_airterminal(state.dataSingleDuct->SysNumGSI).SysName); } // end Number of Sys Loop @@ -1066,8 +1066,8 @@ void GetSysInput(EnergyPlusData &state) "Zone Air Terminal VAV Damper Position", Constant::Units::None, state.dataSingleDuct->sd_airterminal(state.dataSingleDuct->SysNumGSI).DamperPosition, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataSingleDuct->sd_airterminal(state.dataSingleDuct->SysNumGSI).SysName); } // end Number of VAVHeatandCool Sys Loop @@ -1779,15 +1779,15 @@ void GetSysInput(EnergyPlusData &state) "Zone Air Terminal VAV Damper Position", Constant::Units::None, state.dataSingleDuct->sd_airterminal(state.dataSingleDuct->SysNumGSI).DamperPosition, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataSingleDuct->sd_airterminal(state.dataSingleDuct->SysNumGSI).SysName); SetupOutputVariable(state, "Zone Air Terminal Minimum Air Flow Fraction", Constant::Units::None, state.dataSingleDuct->sd_airterminal(state.dataSingleDuct->SysNumGSI).ZoneMinAirFracReport, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataSingleDuct->sd_airterminal(state.dataSingleDuct->SysNumGSI).SysName); } // end Number of Sys Loop @@ -1977,8 +1977,8 @@ void GetSysInput(EnergyPlusData &state) "Zone Air Terminal VAV Damper Position", Constant::Units::None, state.dataSingleDuct->sd_airterminal(state.dataSingleDuct->SysNumGSI).DamperPosition, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataSingleDuct->sd_airterminal(state.dataSingleDuct->SysNumGSI).SysName); } // end Number of VAVHeatandCool:NoReheat Sys Loop @@ -2414,8 +2414,8 @@ void GetSysInput(EnergyPlusData &state) "Zone Air Terminal VAV Damper Position", Constant::Units::None, state.dataSingleDuct->sd_airterminal(state.dataSingleDuct->SysNumGSI).DamperPosition, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataSingleDuct->sd_airterminal(state.dataSingleDuct->SysNumGSI).SysName); } @@ -2425,8 +2425,8 @@ void GetSysInput(EnergyPlusData &state) "Zone Air Terminal Outdoor Air Volume Flow Rate", Constant::Units::m3_s, state.dataSingleDuct->sd_airterminal(sdIndex).OutdoorAirFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataSingleDuct->sd_airterminal(sdIndex).SysName); } diff --git a/src/EnergyPlus/SolarCollectors.cc b/src/EnergyPlus/SolarCollectors.cc index 41619ff3e22..0fa3219531a 100644 --- a/src/EnergyPlus/SolarCollectors.cc +++ b/src/EnergyPlus/SolarCollectors.cc @@ -738,154 +738,150 @@ namespace SolarCollectors { "Solar Collector Incident Angle Modifier", Constant::Units::None, this->IncidentAngleModifier, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Solar Collector Efficiency", Constant::Units::None, this->Efficiency, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Solar Collector Heat Transfer Rate", Constant::Units::W, this->Power, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Solar Collector Heat Gain Rate", Constant::Units::W, this->HeatGain, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Solar Collector Heat Loss Rate", Constant::Units::W, this->HeatLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Solar Collector Heat Transfer Energy", Constant::Units::J, this->Energy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::SolarWater, - OutputProcessor::SOVEndUseCat::HeatProduced, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::HeatProduced); } else if (this->Type == DataPlant::PlantEquipmentType::SolarCollectorICS) { SetupOutputVariable(state, "Solar Collector Transmittance Absorptance Product", Constant::Units::None, this->TauAlpha, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Solar Collector Overall Top Heat Loss Coefficient", Constant::Units::W_m2C, this->UTopLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Solar Collector Absorber Plate Temperature", Constant::Units::C, this->TempOfAbsPlate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Solar Collector Storage Water Temperature", Constant::Units::C, this->TempOfWater, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Solar Collector Thermal Efficiency", Constant::Units::None, this->Efficiency, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Solar Collector Storage Heat Transfer Rate", Constant::Units::W, this->StoredHeatRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Solar Collector Storage Heat Transfer Energy", Constant::Units::J, this->StoredHeatEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::SolarWater, - OutputProcessor::SOVEndUseCat::HeatProduced, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::HeatProduced); SetupOutputVariable(state, "Solar Collector Skin Heat Transfer Rate", Constant::Units::W, this->SkinHeatLossRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Solar Collector Skin Heat Transfer Energy", Constant::Units::J, this->CollHeatLossEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::SolarWater, - OutputProcessor::SOVEndUseCat::HeatProduced, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::HeatProduced); SetupOutputVariable(state, "Solar Collector Heat Transfer Rate", Constant::Units::W, this->HeatRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Solar Collector Heat Transfer Energy", Constant::Units::J, this->HeatEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::SolarWater, - OutputProcessor::SOVEndUseCat::HeatProduced, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::HeatProduced); } } diff --git a/src/EnergyPlus/SolarShading.cc b/src/EnergyPlus/SolarShading.cc index 5e8d7860718..ad514abd6ea 100644 --- a/src/EnergyPlus/SolarShading.cc +++ b/src/EnergyPlus/SolarShading.cc @@ -1057,72 +1057,72 @@ void AllocateModuleArrays(EnergyPlusData &state) "Zone Windows Total Transmitted Solar Radiation Rate", Constant::Units::W, state.dataHeatBal->ZoneTransSolar(enclosureNum), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, thisEnclosureName); SetupOutputVariable(state, "Zone Exterior Windows Total Transmitted Beam Solar Radiation Rate", Constant::Units::W, state.dataHeatBal->ZoneBmSolFrExtWinsRep(enclosureNum), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, thisEnclosureName); SetupOutputVariable(state, "Zone Interior Windows Total Transmitted Beam Solar Radiation Rate", Constant::Units::W, state.dataHeatBal->ZoneBmSolFrIntWinsRep(enclosureNum), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, thisEnclosureName); SetupOutputVariable(state, "Zone Exterior Windows Total Transmitted Diffuse Solar Radiation Rate", Constant::Units::W, state.dataHeatBal->ZoneDifSolFrExtWinsRep(enclosureNum), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, thisEnclosureName); SetupOutputVariable(state, "Zone Interior Windows Total Transmitted Diffuse Solar Radiation Rate", Constant::Units::W, state.dataHeatBal->ZoneDifSolFrIntWinsRep(enclosureNum), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, thisEnclosureName); // Energy variables SetupOutputVariable(state, "Zone Windows Total Transmitted Solar Radiation Energy", Constant::Units::J, state.dataHeatBal->ZoneTransSolarEnergy(enclosureNum), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, thisEnclosureName); SetupOutputVariable(state, "Zone Exterior Windows Total Transmitted Beam Solar Radiation Energy", Constant::Units::J, state.dataHeatBal->ZoneBmSolFrExtWinsRepEnergy(enclosureNum), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, thisEnclosureName); SetupOutputVariable(state, "Zone Interior Windows Total Transmitted Beam Solar Radiation Energy", Constant::Units::J, state.dataHeatBal->ZoneBmSolFrIntWinsRepEnergy(enclosureNum), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, thisEnclosureName); SetupOutputVariable(state, "Zone Exterior Windows Total Transmitted Diffuse Solar Radiation Energy", Constant::Units::J, state.dataHeatBal->ZoneDifSolFrExtWinsRepEnergy(enclosureNum), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, thisEnclosureName); SetupOutputVariable(state, "Zone Interior Windows Total Transmitted Diffuse Solar Radiation Energy", Constant::Units::J, state.dataHeatBal->ZoneDifSolFrIntWinsRepEnergy(enclosureNum), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, thisEnclosureName); } for (int ZoneLoop = 1; ZoneLoop <= state.dataGlobal->NumOfZones; ++ZoneLoop) { @@ -1130,29 +1130,29 @@ void AllocateModuleArrays(EnergyPlusData &state) "Zone Windows Total Heat Gain Rate", Constant::Units::W, state.dataHeatBal->ZoneWinHeatGainRep(ZoneLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(ZoneLoop).Name); SetupOutputVariable(state, "Zone Windows Total Heat Loss Rate", Constant::Units::W, state.dataHeatBal->ZoneWinHeatLossRep(ZoneLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(ZoneLoop).Name); SetupOutputVariable(state, "Zone Windows Total Heat Gain Energy", Constant::Units::J, state.dataHeatBal->ZoneWinHeatGainRepEnergy(ZoneLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(ZoneLoop).Name); SetupOutputVariable(state, "Zone Windows Total Heat Loss Energy", Constant::Units::J, state.dataHeatBal->ZoneWinHeatLossRepEnergy(ZoneLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(ZoneLoop).Name); if (state.dataGlobal->DisplayAdvancedReportVariables) { // CurrentModuleObject='Zone(Advanced)' @@ -1160,30 +1160,30 @@ void AllocateModuleArrays(EnergyPlusData &state) "Zone Opaque Surface Inside Faces Total Conduction Heat Gain Rate", Constant::Units::W, state.dataHeatBal->ZoneOpaqSurfInsFaceCondGainRep(ZoneLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(ZoneLoop).Name); SetupOutputVariable(state, "Zone Opaque Surface Inside Faces Total Conduction Heat Loss Rate", Constant::Units::W, state.dataHeatBal->ZoneOpaqSurfInsFaceCondLossRep(ZoneLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(ZoneLoop).Name); // Energy variables SetupOutputVariable(state, "Zone Opaque Surface Inside Faces Total Conduction Heat Gain Energy", Constant::Units::J, state.dataHeatBal->ZnOpqSurfInsFaceCondGnRepEnrg(ZoneLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(ZoneLoop).Name); SetupOutputVariable(state, "Zone Opaque Surface Inside Faces Total Conduction Heat Loss Energy", Constant::Units::J, state.dataHeatBal->ZnOpqSurfInsFaceCondLsRepEnrg(ZoneLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(ZoneLoop).Name); } } @@ -1196,121 +1196,121 @@ void AllocateModuleArrays(EnergyPlusData &state) "Surface Outside Normal Azimuth Angle", Constant::Units::deg, surf.Azimuth, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); if (surf.ExtSolar) { SetupOutputVariable(state, "Surface Outside Face Sunlit Area", Constant::Units::m2, state.dataSurface->SurfSunlitArea(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Outside Face Sunlit Fraction", Constant::Units::None, state.dataSurface->SurfSunlitFrac(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Outside Face Incident Solar Radiation Rate per Area", Constant::Units::W_m2, state.dataHeatBal->SurfQRadSWOutIncident(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Outside Face Incident Beam Solar Radiation Rate per Area", Constant::Units::W_m2, state.dataHeatBal->SurfQRadSWOutIncidentBeam(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Outside Face Incident Sky Diffuse Solar Radiation Rate per Area", Constant::Units::W_m2, state.dataHeatBal->SurfQRadSWOutIncidentSkyDiffuse(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Outside Face Incident Ground Diffuse Solar Radiation Rate per Area", Constant::Units::W_m2, state.dataHeatBal->SurfQRadSWOutIncidentGndDiffuse(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Outside Face Beam Solar Incident Angle Cosine Value", Constant::Units::None, state.dataHeatBal->SurfCosIncidenceAngle(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Outside Face Incident Sky Diffuse Ground Reflected Solar Radiation Rate per Area", Constant::Units::W_m2, state.dataHeatBal->SurfQRadSWOutIncSkyDiffReflGnd(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Outside Face Incident Sky Diffuse Surface Reflected Solar Radiation Rate per Area", Constant::Units::W_m2, state.dataHeatBal->SurfQRadSWOutIncSkyDiffReflObs(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Outside Face Incident Beam To Beam Surface Reflected Solar Radiation Rate per Area", Constant::Units::W_m2, state.dataHeatBal->SurfQRadSWOutIncBmToBmReflObs(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Outside Face Incident Beam To Diffuse Surface Reflected Solar Radiation Rate per Area", Constant::Units::W_m2, state.dataHeatBal->SurfQRadSWOutIncBmToDiffReflObs(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Outside Face Incident Beam To Diffuse Ground Reflected Solar Radiation Rate per Area", Constant::Units::W_m2, state.dataHeatBal->SurfQRadSWOutIncBmToDiffReflGnd(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Anisotropic Sky Multiplier", Constant::Units::None, state.dataSolarShading->SurfAnisoSkyMult(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window BSDF Beam Direction Number", Constant::Units::None, state.dataHeatBal->SurfWinBSDFBeamDirectionRep(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window BSDF Beam Theta Angle", Constant::Units::rad, state.dataHeatBal->SurfWinBSDFBeamThetaRep(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window BSDF Beam Phi Angle", Constant::Units::rad, state.dataHeatBal->SurfWinBSDFBeamPhiRep(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); } if (!surf.HeatTransSurf) continue; @@ -1322,15 +1322,15 @@ void AllocateModuleArrays(EnergyPlusData &state) "Surface Window Total Glazing Layers Absorbed Solar Radiation Rate", Constant::Units::W, state.dataHeatBal->SurfWinQRadSWwinAbsTot(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Total Glazing Layers Absorbed Shortwave Radiation Rate", Constant::Units::W, state.dataHeatBal->SurfWinSWwinAbsTotalReport(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); if (state.dataConstruction->Construct(surf.Construction).WindowTypeBSDF) { @@ -1344,8 +1344,8 @@ void AllocateModuleArrays(EnergyPlusData &state) format("Surface Window Total Absorbed Shortwave Radiation Rate Layer {}", I), Constant::Units::W, state.dataHeatBal->SurfWinQRadSWwinAbsLayer(SurfLoop, I), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); } if (state.dataConstruction->Construct(surf.Construction).WindowTypeBSDF || (I == 1)) { @@ -1353,8 +1353,8 @@ void AllocateModuleArrays(EnergyPlusData &state) format("Surface Window Front Face Temperature Layer {}", I), Constant::Units::C, state.dataHeatBal->SurfWinFenLaySurfTempFront(SurfLoop, I), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); } if (state.dataConstruction->Construct(surf.Construction).WindowTypeBSDF || (I == NumOfLayers)) { @@ -1362,8 +1362,8 @@ void AllocateModuleArrays(EnergyPlusData &state) format("Surface Window Back Face Temperature Layer {}", I), Constant::Units::C, state.dataHeatBal->SurfWinFenLaySurfTempBack(SurfLoop, I), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); } } @@ -1372,15 +1372,15 @@ void AllocateModuleArrays(EnergyPlusData &state) "Surface Window Transmitted Solar Radiation Rate", Constant::Units::W, state.dataSurface->SurfWinTransSolar(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Transmitted Beam Solar Radiation Rate", Constant::Units::W, state.dataSurface->SurfWinBmSolar(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); // added TH 12/9/2009 @@ -1388,58 +1388,58 @@ void AllocateModuleArrays(EnergyPlusData &state) "Surface Window Transmitted Beam To Beam Solar Radiation Rate", Constant::Units::W, state.dataSurface->SurfWinBmBmSolar(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Transmitted Beam To Diffuse Solar Radiation Rate", Constant::Units::W, state.dataSurface->SurfWinBmDifSolar(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Transmitted Diffuse Solar Radiation Rate", Constant::Units::W, state.dataSurface->SurfWinDifSolar(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Heat Gain Rate", Constant::Units::W, state.dataSurface->SurfWinHeatGainRep(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Heat Loss Rate", Constant::Units::W, state.dataSurface->SurfWinHeatLossRep(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Gap Convective Heat Transfer Rate", Constant::Units::W, state.dataSurface->SurfWinGapConvHtFlowRep(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Shading Device Absorbed Solar Radiation Rate", Constant::Units::W, state.dataSurface->SurfWinShadingAbsorbedSolar(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Net Heat Transfer Rate", Constant::Units::W, state.dataSurface->SurfWinHeatGain(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); if (state.dataGlobal->DisplayAdvancedReportVariables) { @@ -1448,58 +1448,58 @@ void AllocateModuleArrays(EnergyPlusData &state) "Surface Window Inside Face Glazing Zone Convection Heat Gain Rate", Constant::Units::W, state.dataSurface->SurfWinGainConvGlazToZoneRep(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Inside Face Glazing Net Infrared Heat Transfer Rate", Constant::Units::W, state.dataSurface->SurfWinGainIRGlazToZoneRep(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Shortwave from Zone Back Out Window Heat Transfer Rate", Constant::Units::W, state.dataSurface->SurfWinLossSWZoneToOutWinRep(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Inside Face Frame and Divider Zone Heat Gain Rate", Constant::Units::W, state.dataSurface->SurfWinGainFrameDividerToZoneRep(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Inside Face Gap between Shade and Glazing Zone Convection Heat Gain Rate", Constant::Units::W, state.dataSurface->SurfWinConvHeatFlowNatural(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Inside Face Shade Zone Convection Heat Gain Rate", Constant::Units::W, state.dataSurface->SurfWinGainConvShadeToZoneRep(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Inside Face Shade Net Infrared Heat Transfer Rate", Constant::Units::W, state.dataSurface->SurfWinGainIRShadeToZoneRep(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); if (state.dataConstruction->Construct(surf.Construction).WindowTypeEQL) { SetupOutputVariable(state, "Surface Window Inside Face Other Convection Heat Gain Rate", Constant::Units::W, state.dataSurface->SurfWinOtherConvHeatGain(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); } } @@ -1511,15 +1511,15 @@ void AllocateModuleArrays(EnergyPlusData &state) "Surface Window Thermochromic Layer Temperature", Constant::Units::C, state.dataSurface->SurfWinTCLayerTemp(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Thermochromic Layer Property Specification Temperature", Constant::Units::C, state.dataSurface->SurfWinSpecTemp(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); } @@ -1533,15 +1533,15 @@ void AllocateModuleArrays(EnergyPlusData &state) "Surface Window Switchable Glazing Switching Factor", Constant::Units::None, state.dataSurface->SurfWinSwitchingFactor(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Switchable Glazing Visible Transmittance", Constant::Units::None, state.dataSurface->SurfWinVisTransSelected(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); } } @@ -1552,29 +1552,29 @@ void AllocateModuleArrays(EnergyPlusData &state) "Surface Window Frame Heat Gain Rate", Constant::Units::W, state.dataSurface->SurfWinFrameHeatGain(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Frame Heat Loss Rate", Constant::Units::W, state.dataSurface->SurfWinFrameHeatLoss(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Frame Inside Temperature", Constant::Units::C, state.dataSurface->SurfWinFrameTempIn(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Frame Outside Temperature", Constant::Units::C, state.dataSurface->SurfWinFrameTempSurfOut(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); } if (state.dataSurface->SurfWinDividerArea(SurfLoop) > 0.0) { @@ -1583,29 +1583,29 @@ void AllocateModuleArrays(EnergyPlusData &state) "Surface Window Divider Heat Gain Rate", Constant::Units::W, state.dataSurface->SurfWinDividerHeatGain(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Divider Heat Loss Rate", Constant::Units::W, state.dataSurface->SurfWinDividerHeatLoss(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Divider Inside Temperature", Constant::Units::C, state.dataSurface->SurfWinDividerTempIn(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Divider Outside Temperature", Constant::Units::C, state.dataSurface->SurfWinDividerTempSurfOut(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); } @@ -1615,22 +1615,22 @@ void AllocateModuleArrays(EnergyPlusData &state) "Surface Window Total Glazing Layers Absorbed Solar Radiation Energy", Constant::Units::J, state.dataHeatBal->SurfWinQRadSWwinAbsTotEnergy(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, surf.Name); SetupOutputVariable(state, "Surface Window Transmitted Solar Radiation Energy", Constant::Units::J, state.dataSurface->SurfWinTransSolarEnergy(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, surf.Name); SetupOutputVariable(state, "Surface Window Transmitted Beam Solar Radiation Energy", Constant::Units::J, state.dataSurface->SurfWinBmSolarEnergy(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, surf.Name); // added TH 12/9/2009 @@ -1638,101 +1638,101 @@ void AllocateModuleArrays(EnergyPlusData &state) "Surface Window Transmitted Beam To Beam Solar Radiation Energy", Constant::Units::J, state.dataSurface->SurfWinBmBmSolarEnergy(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, surf.Name); SetupOutputVariable(state, "Surface Window Transmitted Beam To Diffuse Solar Radiation Energy", Constant::Units::J, state.dataSurface->SurfWinBmDifSolarEnergy(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, surf.Name); SetupOutputVariable(state, "Surface Window Transmitted Diffuse Solar Radiation Energy", Constant::Units::J, state.dataSurface->SurfWinDifSolarEnergy(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, surf.Name); SetupOutputVariable(state, "Surface Window Heat Gain Energy", Constant::Units::J, state.dataSurface->SurfWinHeatGainRepEnergy(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, surf.Name); SetupOutputVariable(state, "Surface Window Heat Loss Energy", Constant::Units::J, state.dataSurface->SurfWinHeatLossRepEnergy(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, surf.Name); SetupOutputVariable(state, "Surface Window Gap Convective Heat Transfer Energy", Constant::Units::J, state.dataSurface->SurfWinGapConvHtFlowRepEnergy(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, surf.Name); SetupOutputVariable(state, "Surface Window Shading Device Absorbed Solar Radiation Energy", Constant::Units::J, state.dataSurface->SurfWinShadingAbsorbedSolarEnergy(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, surf.Name); SetupOutputVariable(state, "Surface Window Net Heat Transfer Energy", Constant::Units::J, state.dataSurface->SurfWinHeatTransferRepEnergy(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, surf.Name); SetupOutputVariable(state, "Surface Window System Solar Transmittance", Constant::Units::None, state.dataSurface->SurfWinSysSolTransmittance(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window System Solar Reflectance", Constant::Units::None, state.dataSurface->SurfWinSysSolReflectance(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window System Solar Absorptance", Constant::Units::None, state.dataSurface->SurfWinSysSolAbsorptance(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Inside Face Glazing Condensation Status", Constant::Units::None, state.dataSurface->SurfWinInsideGlassCondensationFlag(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Inside Face Frame Condensation Status", Constant::Units::None, state.dataSurface->SurfWinInsideFrameCondensationFlag(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Inside Face Divider Condensation Status", Constant::Units::None, state.dataSurface->SurfWinInsideDividerCondensationFlag(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); // Outside reveal report variables @@ -1741,16 +1741,16 @@ void AllocateModuleArrays(EnergyPlusData &state) "Surface Window Outside Reveal Reflected Beam Solar Radiation Rate", Constant::Units::W, state.dataSurface->SurfWinBmSolRefldOutsRevealReport(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); // Energy SetupOutputVariable(state, "Surface Window Outside Reveal Reflected Beam Solar Radiation Energy", Constant::Units::J, state.dataSurface->SurfWinBmSolRefldOutsRevealRepEnergy(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, surf.Name); // ENDIF @@ -1760,16 +1760,16 @@ void AllocateModuleArrays(EnergyPlusData &state) "Surface Window Inside Reveal Reflected Beam Solar Radiation Rate", Constant::Units::W, state.dataSurface->SurfWinBmSolRefldInsRevealReport(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); // Energy SetupOutputVariable(state, "Surface Window Inside Reveal Reflected Beam Solar Radiation Energy", Constant::Units::J, state.dataSurface->SurfWinBmSolRefldInsRevealRepEnergy(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, surf.Name); // Added report variables for inside reveal to debug CR 7596. TH 5/26/2009 @@ -1778,29 +1778,29 @@ void AllocateModuleArrays(EnergyPlusData &state) "Surface Window Inside Reveal Absorbed Beam Solar Radiation Rate", Constant::Units::W, state.dataSurface->SurfWinBmSolAbsdInsRevealReport(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Inside Reveal Reflected Diffuse Zone Solar Radiation Rate", Constant::Units::W, state.dataSurface->SurfWinInsRevealDiffIntoZoneReport(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Inside Reveal Reflected Diffuse Frame Solar Radiation Rate", Constant::Units::W, state.dataSurface->SurfWinInsRevealDiffOntoFrameReport(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Inside Reveal Reflected Diffuse Glazing Solar Radiation Rate", Constant::Units::W, state.dataSurface->SurfWinInsRevealDiffOntoGlazingReport(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); } @@ -1811,36 +1811,36 @@ void AllocateModuleArrays(EnergyPlusData &state) "Surface Window Blind Beam to Beam Solar Transmittance", Constant::Units::None, state.dataSurface->SurfWinBlTsolBmBm(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Blind Beam to Diffuse Solar Transmittance", Constant::Units::None, state.dataSurface->SurfWinBlTsolBmDif(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Blind Diffuse to Diffuse Solar Transmittance", Constant::Units::None, state.dataSurface->SurfWinBlTsolDifDif(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Blind and Glazing System Beam Solar Transmittance", Constant::Units::None, state.dataSurface->SurfWinBlGlSysTsolBmBm(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Blind and Glazing System Diffuse Solar Transmittance", Constant::Units::None, state.dataSurface->SurfWinBlGlSysTsolDifDif(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); } @@ -1851,36 +1851,36 @@ void AllocateModuleArrays(EnergyPlusData &state) "Surface Window Screen Beam to Beam Solar Transmittance", Constant::Units::None, state.dataSurface->SurfWinScTsolBmBm(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Screen Beam to Diffuse Solar Transmittance", Constant::Units::None, state.dataSurface->SurfWinScTsolBmDif(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Screen Diffuse to Diffuse Solar Transmittance", Constant::Units::None, state.dataSurface->SurfWinScTsolDifDif(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Screen and Glazing System Beam Solar Transmittance", Constant::Units::None, state.dataSurface->SurfWinScGlSysTsolBmBm(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Screen and Glazing System Diffuse Solar Transmittance", Constant::Units::None, state.dataSurface->SurfWinScGlSysTsolDifDif(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); } @@ -1889,43 +1889,43 @@ void AllocateModuleArrays(EnergyPlusData &state) "Surface Window Solar Horizontal Profile Angle", Constant::Units::deg, state.dataSurface->SurfWinProfileAngHor(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Solar Vertical Profile Angle", Constant::Units::deg, state.dataSurface->SurfWinProfileAngVert(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Glazing Beam to Beam Solar Transmittance", Constant::Units::None, state.dataSurface->SurfWinGlTsolBmBm(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Glazing Beam to Diffuse Solar Transmittance", Constant::Units::None, state.dataSurface->SurfWinGlTsolBmDif(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Glazing Diffuse to Diffuse Solar Transmittance", Constant::Units::None, state.dataSurface->SurfWinGlTsolDifDif(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Model Solver Iteration Count", Constant::Units::None, state.dataSurface->SurfWinWindowCalcIterationsRep(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); } else { // Not ExtSolar if (state.dataGlobal->DisplayAdvancedReportVariables) { @@ -1935,16 +1935,16 @@ void AllocateModuleArrays(EnergyPlusData &state) "Surface Window Total Glazing Layers Absorbed Solar Radiation Rate", Constant::Units::W, state.dataHeatBal->SurfWinQRadSWwinAbsTot(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); } SetupOutputVariable(state, "Surface Window Total Glazing Layers Absorbed Shortwave Radiation Rate", Constant::Units::W, state.dataHeatBal->SurfWinSWwinAbsTotalReport(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); if (surf.OriginalClass != SurfaceClass::TDD_Diffuser) { @@ -1952,16 +1952,16 @@ void AllocateModuleArrays(EnergyPlusData &state) "Surface Window Transmitted Solar Radiation Rate", Constant::Units::W, state.dataSurface->SurfWinTransSolar(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); } SetupOutputVariable(state, "Surface Window Transmitted Beam Solar Radiation Rate", Constant::Units::W, state.dataSurface->SurfWinBmSolar(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); // added TH 12/9/2009 @@ -1969,80 +1969,80 @@ void AllocateModuleArrays(EnergyPlusData &state) "Surface Window Transmitted Beam To Beam Solar Radiation Rate", Constant::Units::W, state.dataSurface->SurfWinBmBmSolar(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Transmitted Beam To Diffuse Solar Radiation Rate", Constant::Units::W, state.dataSurface->SurfWinBmDifSolar(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Transmitted Diffuse Solar Radiation Rate", Constant::Units::W, state.dataSurface->SurfWinDifSolar(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Heat Gain Rate", Constant::Units::W, state.dataSurface->SurfWinHeatGainRep(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Heat Loss Rate", Constant::Units::W, state.dataSurface->SurfWinHeatLossRep(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Gap Convective Heat Transfer Rate", Constant::Units::W, state.dataSurface->SurfWinGapConvHtFlowRep(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Shading Device Absorbed Solar Radiation Rate", Constant::Units::W, state.dataSurface->SurfWinShadingAbsorbedSolar(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); if (state.dataSurface->SurfWinFrameArea(SurfLoop) > 0.0) { SetupOutputVariable(state, "Surface Window Frame Heat Gain Rate", Constant::Units::W, state.dataSurface->SurfWinFrameHeatGain(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Frame Heat Loss Rate", Constant::Units::W, state.dataSurface->SurfWinFrameHeatLoss(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Frame Inside Temperature", Constant::Units::C, state.dataSurface->SurfWinFrameTempIn(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Frame Outside Temperature", Constant::Units::C, state.dataSurface->SurfWinFrameTempSurfOut(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); } if (state.dataSurface->SurfWinDividerArea(SurfLoop) > 0.0) { @@ -2050,29 +2050,29 @@ void AllocateModuleArrays(EnergyPlusData &state) "Surface Window Divider Heat Gain Rate", Constant::Units::W, state.dataSurface->SurfWinDividerHeatGain(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Divider Heat Loss Rate", Constant::Units::W, state.dataSurface->SurfWinDividerHeatLoss(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Divider Inside Temperature", Constant::Units::C, state.dataSurface->SurfWinDividerTempIn(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Divider Outside Temperature", Constant::Units::C, state.dataSurface->SurfWinDividerTempSurfOut(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); } // Energy @@ -2082,8 +2082,8 @@ void AllocateModuleArrays(EnergyPlusData &state) "Surface Window Total Glazing Layers Absorbed Solar Radiation Energy", Constant::Units::J, state.dataHeatBal->SurfWinQRadSWwinAbsTotEnergy(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, surf.Name); } @@ -2092,139 +2092,139 @@ void AllocateModuleArrays(EnergyPlusData &state) "Surface Window Transmitted Solar Radiation Energy", Constant::Units::J, state.dataSurface->SurfWinTransSolarEnergy(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, surf.Name); } SetupOutputVariable(state, "Surface Window Transmitted Beam Solar Radiation Energy", Constant::Units::J, state.dataSurface->SurfWinBmSolarEnergy(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, surf.Name); SetupOutputVariable(state, "Surface Window Transmitted Beam To Beam Solar Radiation Energy", Constant::Units::J, state.dataSurface->SurfWinBmBmSolarEnergy(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, surf.Name); SetupOutputVariable(state, "Surface Window Transmitted Beam To Diffuse Solar Radiation Energy", Constant::Units::J, state.dataSurface->SurfWinBmDifSolarEnergy(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, surf.Name); SetupOutputVariable(state, "Surface Window Transmitted Diffuse Solar Radiation Energy", Constant::Units::J, state.dataSurface->SurfWinDifSolarEnergy(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, surf.Name); SetupOutputVariable(state, "Surface Window Heat Gain Energy", Constant::Units::J, state.dataSurface->SurfWinHeatGainRepEnergy(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, surf.Name); SetupOutputVariable(state, "Surface Window Heat Loss Energy", Constant::Units::J, state.dataSurface->SurfWinHeatLossRepEnergy(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, surf.Name); SetupOutputVariable(state, "Surface Window Gap Convective Heat Transfer Energy", Constant::Units::J, state.dataSurface->SurfWinGapConvHtFlowRepEnergy(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, surf.Name); SetupOutputVariable(state, "Surface Window Shading Device Absorbed Solar Radiation Energy", Constant::Units::J, state.dataSurface->SurfWinShadingAbsorbedSolarEnergy(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, surf.Name); SetupOutputVariable(state, "Surface Window System Solar Transmittance", Constant::Units::None, state.dataSurface->SurfWinSysSolTransmittance(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window System Solar Reflectance", Constant::Units::None, state.dataSurface->SurfWinSysSolReflectance(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window System Solar Absorptance", Constant::Units::None, state.dataSurface->SurfWinSysSolAbsorptance(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Inside Face Glazing Condensation Status", Constant::Units::None, state.dataSurface->SurfWinInsideGlassCondensationFlag(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Inside Face Frame Condensation Status", Constant::Units::None, state.dataSurface->SurfWinInsideFrameCondensationFlag(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Inside Face Divider Condensation Status", Constant::Units::None, state.dataSurface->SurfWinInsideDividerCondensationFlag(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Outside Reveal Reflected Beam Solar Radiation Rate", Constant::Units::W, state.dataSurface->SurfWinBmSolRefldOutsRevealReport(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Inside Reveal Reflected Beam Solar Radiation Rate", Constant::Units::W, state.dataSurface->SurfWinBmSolRefldInsRevealReport(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); // Energy SetupOutputVariable(state, "Surface Window Outside Reveal Reflected Beam Solar Radiation Energy", Constant::Units::J, state.dataSurface->SurfWinBmSolRefldOutsRevealRepEnergy(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, surf.Name); SetupOutputVariable(state, "Surface Window Inside Reveal Reflected Beam Solar Radiation Energy", Constant::Units::J, state.dataSurface->SurfWinBmSolRefldInsRevealRepEnergy(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, surf.Name); // Output blind report variables only when blinds are used @@ -2233,36 +2233,36 @@ void AllocateModuleArrays(EnergyPlusData &state) "Surface Window Blind Beam to Beam Solar Transmittance", Constant::Units::None, state.dataSurface->SurfWinBlTsolBmBm(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Blind Beam to Diffuse Solar Transmittance", Constant::Units::None, state.dataSurface->SurfWinBlTsolBmDif(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Blind Diffuse to Diffuse Solar Transmittance", Constant::Units::None, state.dataSurface->SurfWinBlTsolDifDif(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Blind and Glazing System Beam Solar Transmittance", Constant::Units::None, state.dataSurface->SurfWinBlGlSysTsolBmBm(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Blind and Glazing System Diffuse Solar Transmittance", Constant::Units::None, state.dataSurface->SurfWinBlGlSysTsolDifDif(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); } @@ -2272,36 +2272,36 @@ void AllocateModuleArrays(EnergyPlusData &state) "Surface Window Screen Beam to Beam Solar Transmittance", Constant::Units::None, state.dataSurface->SurfWinScTsolBmBm(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Screen Beam to Diffuse Solar Transmittance", Constant::Units::None, state.dataSurface->SurfWinScTsolBmDif(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Screen Diffuse to Diffuse Solar Transmittance", Constant::Units::None, state.dataSurface->SurfWinScTsolDifDif(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Screen and Glazing System Beam Solar Transmittance", Constant::Units::None, state.dataSurface->SurfWinScGlSysTsolBmBm(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Screen and Glazing System Diffuse Solar Transmittance", Constant::Units::None, state.dataSurface->SurfWinScGlSysTsolDifDif(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); } @@ -2309,43 +2309,43 @@ void AllocateModuleArrays(EnergyPlusData &state) "Surface Window Solar Horizontal Profile Angle", Constant::Units::deg, state.dataSurface->SurfWinProfileAngHor(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Solar Vertical Profile Angle", Constant::Units::deg, state.dataSurface->SurfWinProfileAngVert(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Glazing Beam to Beam Solar Transmittance", Constant::Units::None, state.dataSurface->SurfWinGlTsolBmBm(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Glazing Beam to Diffuse Solar Transmittance", Constant::Units::None, state.dataSurface->SurfWinGlTsolBmDif(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Glazing Diffuse to Diffuse Solar Transmittance", Constant::Units::None, state.dataSurface->SurfWinGlTsolDifDif(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Model Solver Iteration Count", Constant::Units::None, state.dataSurface->SurfWinWindowCalcIterationsRep(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); } } // end non extsolar reporting as advanced variables @@ -2356,16 +2356,16 @@ void AllocateModuleArrays(EnergyPlusData &state) "Surface Window Transmitted Beam Solar Radiation Rate", Constant::Units::W, state.dataSurface->SurfWinBmSolTransThruIntWinRep(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); // energy SetupOutputVariable(state, "Surface Window Transmitted Beam Solar Radiation Energy", Constant::Units::J, state.dataSurface->SurfWinBmSolTransThruIntWinRepEnergy(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, surf.Name); } if (surf.Class == SurfaceClass::TDD_Dome && surf.ExtSolar) { @@ -2374,30 +2374,30 @@ void AllocateModuleArrays(EnergyPlusData &state) "Surface Window Total Glazing Layers Absorbed Solar Radiation Rate", Constant::Units::W, state.dataHeatBal->SurfWinQRadSWwinAbsTot(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Transmitted Solar Radiation Rate", Constant::Units::W, state.dataSurface->SurfWinTransSolar(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); // energy SetupOutputVariable(state, "Surface Window Total Glazing Layers Absorbed Solar Radiation Energy", Constant::Units::J, state.dataHeatBal->SurfWinQRadSWwinAbsTotEnergy(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, surf.Name); SetupOutputVariable(state, "Surface Window Transmitted Solar Radiation Energy", Constant::Units::J, state.dataSurface->SurfWinTransSolarEnergy(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, surf.Name); } if (surf.OriginalClass == SurfaceClass::TDD_Diffuser) { @@ -2406,37 +2406,37 @@ void AllocateModuleArrays(EnergyPlusData &state) "Surface Outside Face Incident Solar Radiation Rate per Area", Constant::Units::W_m2, state.dataHeatBal->SurfQRadSWOutIncident(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Total Glazing Layers Absorbed Solar Radiation Rate", Constant::Units::W, state.dataHeatBal->SurfWinQRadSWwinAbsTot(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Window Transmitted Solar Radiation Rate", Constant::Units::W, state.dataSurface->SurfWinTransSolar(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); // energy SetupOutputVariable(state, "Surface Window Total Glazing Layers Absorbed Solar Radiation Energy", Constant::Units::J, state.dataHeatBal->SurfWinQRadSWwinAbsTotEnergy(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, surf.Name); SetupOutputVariable(state, "Surface Window Transmitted Solar Radiation Energy", Constant::Units::J, state.dataSurface->SurfWinTransSolarEnergy(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, surf.Name); } } @@ -2449,65 +2449,65 @@ void AllocateModuleArrays(EnergyPlusData &state) "Surface Inside Face Exterior Windows Incident Beam Solar Radiation Rate per Area", Constant::Units::W_m2, state.dataHeatBal->SurfBmIncInsSurfIntensRep(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Inside Face Exterior Windows Incident Beam Solar Radiation Rate", Constant::Units::W, state.dataHeatBal->SurfBmIncInsSurfAmountRep(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Inside Face Interior Windows Incident Beam Solar Radiation Rate per Area", Constant::Units::W_m2, state.dataHeatBal->SurfIntBmIncInsSurfIntensRep(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Inside Face Interior Windows Incident Beam Solar Radiation Rate", Constant::Units::W, state.dataHeatBal->SurfIntBmIncInsSurfAmountRep(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Inside Face Initial Transmitted Diffuse Absorbed Solar Radiation Rate", Constant::Units::W, state.dataHeatBal->SurfInitialDifSolInAbsReport(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Inside Face Initial Transmitted Diffuse Transmitted Out Window Solar Radiation Rate", Constant::Units::W, state.dataHeatBal->SurfWinInitialDifSolInTransReport(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Surface Inside Face Absorbed Shortwave Radiation Rate", Constant::Units::W, state.dataHeatBal->SurfSWInAbsTotalReport(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); // energy SetupOutputVariable(state, "Surface Inside Face Exterior Windows Incident Beam Solar Radiation Energy", Constant::Units::J, state.dataHeatBal->SurfBmIncInsSurfAmountRepEnergy(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, surf.Name); SetupOutputVariable(state, "Surface Inside Face Interior Windows Incident Beam Solar Radiation Energy", Constant::Units::J, state.dataHeatBal->SurfIntBmIncInsSurfAmountRepEnergy(SurfLoop), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, surf.Name); } } @@ -10387,38 +10387,38 @@ void SkyDifSolarShading(EnergyPlusData &state) "Debug Surface Solar Shading Model DifShdgRatioIsoSky", Constant::Units::None, state.dataSolarShading->SurfCurDifShdgRatioIsoSky(SurfNum), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); } else { SetupOutputVariable(state, "Debug Surface Solar Shading Model DifShdgRatioIsoSky", Constant::Units::None, state.dataSolarShading->SurfDifShdgRatioIsoSky(SurfNum), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); } SetupOutputVariable(state, "Debug Surface Solar Shading Model DifShdgRatioHoriz", Constant::Units::None, state.dataSolarShading->SurfDifShdgRatioHoriz(SurfNum), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Debug Surface Solar Shading Model WithShdgIsoSky", Constant::Units::None, state.dataSolarShading->SurfWithShdgIsoSky(SurfNum), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); SetupOutputVariable(state, "Debug Surface Solar Shading Model WoShdgIsoSky", Constant::Units::None, state.dataSolarShading->SurfWoShdgIsoSky(SurfNum), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, surf.Name); } diff --git a/src/EnergyPlus/SteamBaseboardRadiator.cc b/src/EnergyPlus/SteamBaseboardRadiator.cc index d4477c79bb5..114f7657543 100644 --- a/src/EnergyPlus/SteamBaseboardRadiator.cc +++ b/src/EnergyPlus/SteamBaseboardRadiator.cc @@ -804,87 +804,85 @@ namespace SteamBaseboardRadiator { "Baseboard Total Heating Rate", Constant::Units::W, state.dataSteamBaseboardRadiator->SteamBaseboard(BaseboardNum).TotPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataSteamBaseboardRadiator->SteamBaseboard(BaseboardNum).EquipID); SetupOutputVariable(state, "Baseboard Convective Heating Rate", Constant::Units::W, state.dataSteamBaseboardRadiator->SteamBaseboard(BaseboardNum).ConvPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataSteamBaseboardRadiator->SteamBaseboard(BaseboardNum).EquipID); SetupOutputVariable(state, "Baseboard Radiant Heating Rate", Constant::Units::W, state.dataSteamBaseboardRadiator->SteamBaseboard(BaseboardNum).RadPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataSteamBaseboardRadiator->SteamBaseboard(BaseboardNum).EquipID); SetupOutputVariable(state, "Baseboard Total Heating Energy", Constant::Units::J, state.dataSteamBaseboardRadiator->SteamBaseboard(BaseboardNum).TotEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataSteamBaseboardRadiator->SteamBaseboard(BaseboardNum).EquipID, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::Baseboard, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Baseboard); SetupOutputVariable(state, "Baseboard Convective Heating Energy", Constant::Units::J, state.dataSteamBaseboardRadiator->SteamBaseboard(BaseboardNum).ConvEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataSteamBaseboardRadiator->SteamBaseboard(BaseboardNum).EquipID); SetupOutputVariable(state, "Baseboard Radiant Heating Energy", Constant::Units::J, state.dataSteamBaseboardRadiator->SteamBaseboard(BaseboardNum).RadEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataSteamBaseboardRadiator->SteamBaseboard(BaseboardNum).EquipID); SetupOutputVariable(state, "Baseboard Steam Energy", Constant::Units::J, state.dataSteamBaseboardRadiator->SteamBaseboard(BaseboardNum).Energy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataSteamBaseboardRadiator->SteamBaseboard(BaseboardNum).EquipID, Constant::eResource::PlantLoopHeatingDemand, - OutputProcessor::SOVEndUseCat::Baseboard, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Baseboard); SetupOutputVariable(state, "Baseboard Steam Rate", Constant::Units::W, state.dataSteamBaseboardRadiator->SteamBaseboard(BaseboardNum).Power, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataSteamBaseboardRadiator->SteamBaseboard(BaseboardNum).EquipID); SetupOutputVariable(state, "Baseboard Steam Mass Flow Rate", Constant::Units::kg_s, state.dataSteamBaseboardRadiator->SteamBaseboard(BaseboardNum).SteamMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataSteamBaseboardRadiator->SteamBaseboard(BaseboardNum).EquipID); SetupOutputVariable(state, "Baseboard Steam Inlet Temperature", Constant::Units::C, state.dataSteamBaseboardRadiator->SteamBaseboard(BaseboardNum).SteamInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataSteamBaseboardRadiator->SteamBaseboard(BaseboardNum).EquipID); SetupOutputVariable(state, "Baseboard Steam Outlet Temperature", Constant::Units::C, state.dataSteamBaseboardRadiator->SteamBaseboard(BaseboardNum).SteamOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataSteamBaseboardRadiator->SteamBaseboard(BaseboardNum).EquipID); } } diff --git a/src/EnergyPlus/SteamCoils.cc b/src/EnergyPlus/SteamCoils.cc index 862ecda6b74..c3638f17395 100644 --- a/src/EnergyPlus/SteamCoils.cc +++ b/src/EnergyPlus/SteamCoils.cc @@ -393,47 +393,46 @@ namespace SteamCoils { "Heating Coil Heating Energy", Constant::Units::J, state.dataSteamCoils->SteamCoil(CoilNum).TotSteamHeatingCoilEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataSteamCoils->SteamCoil(CoilNum).Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::HeatingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::HeatingCoils); SetupOutputVariable(state, "Heating Coil Heating Rate", Constant::Units::W, state.dataSteamCoils->SteamCoil(CoilNum).TotSteamHeatingCoilRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataSteamCoils->SteamCoil(CoilNum).Name); SetupOutputVariable(state, "Heating Coil Steam Mass Flow Rate", Constant::Units::kg_s, state.dataSteamCoils->SteamCoil(CoilNum).OutletSteamMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataSteamCoils->SteamCoil(CoilNum).Name); SetupOutputVariable(state, "Heating Coil Steam Inlet Temperature", Constant::Units::C, state.dataSteamCoils->SteamCoil(CoilNum).InletSteamTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataSteamCoils->SteamCoil(CoilNum).Name); SetupOutputVariable(state, "Heating Coil Steam Outlet Temperature", Constant::Units::C, state.dataSteamCoils->SteamCoil(CoilNum).OutletSteamTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataSteamCoils->SteamCoil(CoilNum).Name); SetupOutputVariable(state, "Heating Coil Steam Trap Loss Rate", Constant::Units::W, state.dataSteamCoils->SteamCoil(CoilNum).LoopLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataSteamCoils->SteamCoil(CoilNum).Name); } diff --git a/src/EnergyPlus/SurfaceGeometry.cc b/src/EnergyPlus/SurfaceGeometry.cc index eac19084351..bb29e0bfca7 100644 --- a/src/EnergyPlus/SurfaceGeometry.cc +++ b/src/EnergyPlus/SurfaceGeometry.cc @@ -7882,43 +7882,43 @@ namespace SurfaceGeometry { "Surface Exterior Cavity Baffle Surface Temperature", Constant::Units::C, state.dataHeatBal->ExtVentedCavity(Item).Tbaffle, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->ExtVentedCavity(Item).Name); SetupOutputVariable(state, "Surface Exterior Cavity Air Drybulb Temperature", Constant::Units::C, state.dataHeatBal->ExtVentedCavity(Item).TAirCav, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->ExtVentedCavity(Item).Name); SetupOutputVariable(state, "Surface Exterior Cavity Total Natural Ventilation Air Change Rate", Constant::Units::ach, state.dataHeatBal->ExtVentedCavity(Item).PassiveACH, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->ExtVentedCavity(Item).Name); SetupOutputVariable(state, "Surface Exterior Cavity Total Natural Ventilation Mass Flow Rate", Constant::Units::kg_s, state.dataHeatBal->ExtVentedCavity(Item).PassiveMdotVent, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->ExtVentedCavity(Item).Name); SetupOutputVariable(state, "Surface Exterior Cavity Natural Ventilation from Wind Mass Flow Rate", Constant::Units::kg_s, state.dataHeatBal->ExtVentedCavity(Item).PassiveMdotWind, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->ExtVentedCavity(Item).Name); SetupOutputVariable(state, "Surface Exterior Cavity Natural Ventilation from Buoyancy Mass Flow Rate", Constant::Units::kg_s, state.dataHeatBal->ExtVentedCavity(Item).PassiveMdotTherm, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->ExtVentedCavity(Item).Name); } } @@ -8507,8 +8507,8 @@ namespace SurfaceGeometry { "Surfaces Property Ground Surfaces Average Temperature", Constant::Units::C, thisGndSurfsObj.SurfsTempAvg, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, thisGndSurfsObj.Name); SetTempSchReportVar = false; } @@ -8517,8 +8517,8 @@ namespace SurfaceGeometry { "Surfaces Property Ground Surfaces Average Reflectance", Constant::Units::None, thisGndSurfsObj.SurfsReflAvg, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, thisGndSurfsObj.Name); SetReflSchReportVar = false; } @@ -11906,8 +11906,8 @@ namespace SurfaceGeometry { "Surface Other Side Coefficients Exterior Air Drybulb Temperature", Constant::Units::C, state.dataSurface->OSC(Loop).OSCTempCalc, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataSurface->OSC(Loop).Name); } else { state.dataIPShortCut->cAlphaArgs(1) = "N/A"; @@ -12021,29 +12021,29 @@ namespace SurfaceGeometry { "Surface Other Side Conditions Modeled Convection Air Temperature", Constant::Units::C, state.dataSurface->OSCM(OSCMNum).TConv, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataSurface->OSCM(OSCMNum).Name); SetupOutputVariable(state, "Surface Other Side Conditions Modeled Convection Heat Transfer Coefficient", Constant::Units::W_m2K, state.dataSurface->OSCM(OSCMNum).HConv, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataSurface->OSCM(OSCMNum).Name); SetupOutputVariable(state, "Surface Other Side Conditions Modeled Radiation Temperature", Constant::Units::C, state.dataSurface->OSCM(OSCMNum).TRad, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataSurface->OSCM(OSCMNum).Name); SetupOutputVariable(state, "Surface Other Side Conditions Modeled Radiation Heat Transfer Coefficient", Constant::Units::W_m2K, state.dataSurface->OSCM(OSCMNum).HRad, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataSurface->OSCM(OSCMNum).Name); if (state.dataGlobal->AnyEnergyManagementSystemInModel) { @@ -15556,8 +15556,8 @@ namespace SurfaceGeometry { "Enclosure Mean Radiant Temperature", Constant::Units::C, thisEnclosure.MRT, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, thisEnclosure.Name); } diff --git a/src/EnergyPlus/SurfaceGroundHeatExchanger.cc b/src/EnergyPlus/SurfaceGroundHeatExchanger.cc index b7583eca88e..3f7a64e5c02 100644 --- a/src/EnergyPlus/SurfaceGroundHeatExchanger.cc +++ b/src/EnergyPlus/SurfaceGroundHeatExchanger.cc @@ -353,85 +353,85 @@ namespace SurfaceGroundHeatExchanger { "Ground Heat Exchanger Heat Transfer Rate", Constant::Units::W, state.dataSurfaceGroundHeatExchangers->SurfaceGHE(Item).HeatTransferRate, - OutputProcessor::SOVTimeStepType::Plant, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataSurfaceGroundHeatExchangers->SurfaceGHE(Item).Name); SetupOutputVariable(state, "Ground Heat Exchanger Surface Heat Transfer Rate", Constant::Units::W, state.dataSurfaceGroundHeatExchangers->SurfaceGHE(Item).SurfHeatTransferRate, - OutputProcessor::SOVTimeStepType::Plant, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataSurfaceGroundHeatExchangers->SurfaceGHE(Item).Name); SetupOutputVariable(state, "Ground Heat Exchanger Heat Transfer Energy", Constant::Units::J, state.dataSurfaceGroundHeatExchangers->SurfaceGHE(Item).Energy, - OutputProcessor::SOVTimeStepType::Plant, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataSurfaceGroundHeatExchangers->SurfaceGHE(Item).Name); SetupOutputVariable(state, "Ground Heat Exchanger Mass Flow Rate", Constant::Units::kg_s, state.dataSurfaceGroundHeatExchangers->SurfaceGHE(Item).MassFlowRate, - OutputProcessor::SOVTimeStepType::Plant, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataSurfaceGroundHeatExchangers->SurfaceGHE(Item).Name); SetupOutputVariable(state, "Ground Heat Exchanger Inlet Temperature", Constant::Units::C, state.dataSurfaceGroundHeatExchangers->SurfaceGHE(Item).InletTemp, - OutputProcessor::SOVTimeStepType::Plant, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataSurfaceGroundHeatExchangers->SurfaceGHE(Item).Name); SetupOutputVariable(state, "Ground Heat Exchanger Outlet Temperature", Constant::Units::C, state.dataSurfaceGroundHeatExchangers->SurfaceGHE(Item).OutletTemp, - OutputProcessor::SOVTimeStepType::Plant, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataSurfaceGroundHeatExchangers->SurfaceGHE(Item).Name); SetupOutputVariable(state, "Ground Heat Exchanger Top Surface Temperature", Constant::Units::C, state.dataSurfaceGroundHeatExchangers->SurfaceGHE(Item).TopSurfaceTemp, - OutputProcessor::SOVTimeStepType::Plant, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataSurfaceGroundHeatExchangers->SurfaceGHE(Item).Name); SetupOutputVariable(state, "Ground Heat Exchanger Bottom Surface Temperature", Constant::Units::C, state.dataSurfaceGroundHeatExchangers->SurfaceGHE(Item).BtmSurfaceTemp, - OutputProcessor::SOVTimeStepType::Plant, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataSurfaceGroundHeatExchangers->SurfaceGHE(Item).Name); SetupOutputVariable(state, "Ground Heat Exchanger Top Surface Heat Transfer Energy per Area", Constant::Units::J_m2, state.dataSurfaceGroundHeatExchangers->SurfaceGHE(Item).TopSurfaceFlux, - OutputProcessor::SOVTimeStepType::Plant, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataSurfaceGroundHeatExchangers->SurfaceGHE(Item).Name); SetupOutputVariable(state, "Ground Heat Exchanger Bottom Surface Heat Transfer Energy per Area", Constant::Units::J_m2, state.dataSurfaceGroundHeatExchangers->SurfaceGHE(Item).BtmSurfaceFlux, - OutputProcessor::SOVTimeStepType::Plant, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataSurfaceGroundHeatExchangers->SurfaceGHE(Item).Name); SetupOutputVariable(state, "Ground Heat Exchanger Surface Heat Transfer Energy", Constant::Units::J, state.dataSurfaceGroundHeatExchangers->SurfaceGHE(Item).SurfEnergy, - OutputProcessor::SOVTimeStepType::Plant, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataSurfaceGroundHeatExchangers->SurfaceGHE(Item).Name); SetupOutputVariable(state, "Ground Heat Exchanger Source Temperature", Constant::Units::C, state.dataSurfaceGroundHeatExchangers->SurfaceGHE(Item).SourceTemp, - OutputProcessor::SOVTimeStepType::Plant, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataSurfaceGroundHeatExchangers->SurfaceGHE(Item).Name); } diff --git a/src/EnergyPlus/SwimmingPool.cc b/src/EnergyPlus/SwimmingPool.cc index cf3c0c418a4..1b9baf82b57 100644 --- a/src/EnergyPlus/SwimmingPool.cc +++ b/src/EnergyPlus/SwimmingPool.cc @@ -645,163 +645,161 @@ void SwimmingPoolData::setupOutputVars(EnergyPlusData &state) "Indoor Pool Makeup Water Rate", Constant::Units::m3_s, this->MakeUpWaterVolFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Indoor Pool Makeup Water Volume", Constant::Units::m3, this->MakeUpWaterVol, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::MainsWater, - OutputProcessor::SOVEndUseCat::Heating, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Heating); SetupOutputVariable(state, "Indoor Pool Makeup Water Temperature", Constant::Units::C, this->CurMakeupWaterTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Indoor Pool Water Temperature", Constant::Units::C, this->PoolWaterTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Indoor Pool Inlet Water Temperature", Constant::Units::C, this->WaterInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Indoor Pool Inlet Water Mass Flow Rate", Constant::Units::kg_s, this->WaterMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Indoor Pool Miscellaneous Equipment Power", Constant::Units::W, this->MiscEquipPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Indoor Pool Miscellaneous Equipment Energy", Constant::Units::J, this->MiscEquipEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Indoor Pool Water Heating Rate", Constant::Units::W, this->HeatPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Indoor Pool Water Heating Energy", Constant::Units::J, this->HeatEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::HeatingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::HeatingCoils); SetupOutputVariable(state, "Indoor Pool Radiant to Convection by Cover", Constant::Units::W, this->RadConvertToConvect, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Indoor Pool People Heat Gain", Constant::Units::W, this->PeopleHeatGain, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Indoor Pool Current Activity Factor", Constant::Units::None, this->CurActivityFactor, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Indoor Pool Current Cover Factor", Constant::Units::None, this->CurCoverSchedVal, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Indoor Pool Evaporative Heat Loss Rate", Constant::Units::W, this->EvapHeatLossRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Indoor Pool Evaporative Heat Loss Energy", Constant::Units::J, this->EvapEnergyLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Indoor Pool Saturation Pressure at Pool Temperature", Constant::Units::Pa, this->SatPressPoolWaterTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Indoor Pool Partial Pressure of Water Vapor in Air", Constant::Units::Pa, this->PartPressZoneAirTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Indoor Pool Current Cover Evaporation Factor", Constant::Units::None, this->CurCoverEvapFac, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Indoor Pool Current Cover Convective Factor", Constant::Units::None, this->CurCoverConvFac, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Indoor Pool Current Cover SW Radiation Factor", Constant::Units::None, this->CurCoverSWRadFac, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Indoor Pool Current Cover LW Radiation Factor", Constant::Units::None, this->CurCoverLWRadFac, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); } diff --git a/src/EnergyPlus/SystemAvailabilityManager.cc b/src/EnergyPlus/SystemAvailabilityManager.cc index 74559ed2b25..74530b2300f 100644 --- a/src/EnergyPlus/SystemAvailabilityManager.cc +++ b/src/EnergyPlus/SystemAvailabilityManager.cc @@ -463,8 +463,8 @@ namespace SystemAvailabilityManager { "Availability Manager Scheduled Control Status", Constant::Units::None, schedMgr.AvailStatus, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, schedMgr.Name); } // SysAvailNum @@ -508,8 +508,8 @@ namespace SystemAvailabilityManager { "Availability Manager Scheduled On Control Status", Constant::Units::None, schedOnMgr.AvailStatus, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, schedOnMgr.Name); } // SysAvailNum @@ -553,8 +553,8 @@ namespace SystemAvailabilityManager { "Availability Manager Scheduled Off Control Status", Constant::Units::None, schedOffMgr.AvailStatus, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, schedOffMgr.Name); } // SysAvailNum @@ -753,8 +753,8 @@ namespace SystemAvailabilityManager { "Availability Manager Night Cycle Control Status", Constant::Units::None, nightCycleMgr.AvailStatus, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, nightCycleMgr.Name); } // SysAvailNum @@ -870,8 +870,8 @@ namespace SystemAvailabilityManager { "Availability Manager Optimum Start Control Status", Constant::Units::None, optimumStartMgr.AvailStatus, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, optimumStartMgr.Name); // add @@ -879,19 +879,19 @@ namespace SystemAvailabilityManager { "Availability Manager Optimum Start Time Before Occupancy", Constant::Units::hr, optimumStartMgr.NumHoursBeforeOccupancy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, optimumStartMgr.Name, Constant::eResource::Invalid, - OutputProcessor::SOVEndUseCat::Invalid, - {}, - OutputProcessor::SOVGroup::Invalid, - {}, // Zone - 1, - 1, - -999, - {}, // custom units - {}, // space type + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::Invalid, + "", // End-use SubCat + "", // Zone + 1, // ZoneMult + 1, // ZoneListMult + "", // space type + -999, // indexGroupKey + "", // custom units OutputProcessor::ReportFreq::Day); } } @@ -970,8 +970,8 @@ namespace SystemAvailabilityManager { "Availability Manager Differential Thermostat Control Status", Constant::Units::None, diffThermoMgr.AvailStatus, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, diffThermoMgr.Name); } // SysAvailNum @@ -1024,8 +1024,8 @@ namespace SystemAvailabilityManager { "Availability Manager High Temperature Turn Off Control Status", Constant::Units::None, hiTurnOffMgr.AvailStatus, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hiTurnOffMgr.Name); } // SysAvailNum @@ -1079,8 +1079,8 @@ namespace SystemAvailabilityManager { "Availability Manager High Temperature Turn On Control Status", Constant::Units::None, hiTurnOnMgr.AvailStatus, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, hiTurnOnMgr.Name); } // SysAvailNum @@ -1145,8 +1145,8 @@ namespace SystemAvailabilityManager { "Availability Manager Low Temperature Turn Off Control Status", Constant::Units::None, loTurnOffMgr.AvailStatus, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, loTurnOffMgr.Name); } // SysAvailNum @@ -1200,8 +1200,8 @@ namespace SystemAvailabilityManager { "Availability Manager Low Temperature Turn On Control Status", Constant::Units::None, loTurnOnMgr.AvailStatus, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, loTurnOnMgr.Name); } // SysAvailNum @@ -1269,8 +1269,8 @@ namespace SystemAvailabilityManager { "Availability Manager Night Ventilation Control Status", Constant::Units::None, nightVentMgr.AvailStatus, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, nightVentMgr.Name); } // SysAvailNum @@ -4299,30 +4299,30 @@ namespace SystemAvailabilityManager { "Availability Manager Hybrid Ventilation Control Status", Constant::Units::None, state.dataSystemAvailabilityManager->HybridVentData(SysAvailNum).VentilationCtrl, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataSystemAvailabilityManager->HybridVentData(SysAvailNum).AirLoopName); SetupOutputVariable(state, "Availability Manager Hybrid Ventilation Control Mode", Constant::Units::None, state.dataSystemAvailabilityManager->HybridVentData(SysAvailNum).ControlMode, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataSystemAvailabilityManager->HybridVentData(SysAvailNum).AirLoopName); } else { SetupOutputVariable(state, "Availability Manager Hybrid Ventilation Control Status", Constant::Units::None, state.dataSystemAvailabilityManager->HybridVentData(SysAvailNum).VentilationCtrl, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataSystemAvailabilityManager->HybridVentData(SysAvailNum).ControlZoneName); SetupOutputVariable(state, "Availability Manager Hybrid Ventilation Control Mode", Constant::Units::None, state.dataSystemAvailabilityManager->HybridVentData(SysAvailNum).ControlMode, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataSystemAvailabilityManager->HybridVentData(SysAvailNum).ControlZoneName); } @@ -4331,8 +4331,8 @@ namespace SystemAvailabilityManager { "Hybrid Ventilation Control HVAC System Operation Elapsed Time", Constant::Units::min, state.dataSystemAvailabilityManager->HybridVentData(SysAvailNum).TimeOperDuration, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataSystemAvailabilityManager->HybridVentData(SysAvailNum).Name); } @@ -4341,8 +4341,8 @@ namespace SystemAvailabilityManager { "Hybrid Ventilation Control Natural Ventilation Elapsed Time", Constant::Units::min, state.dataSystemAvailabilityManager->HybridVentData(SysAvailNum).TimeVentDuration, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataSystemAvailabilityManager->HybridVentData(SysAvailNum).Name); } @@ -4354,22 +4354,22 @@ namespace SystemAvailabilityManager { "Hybrid Ventilation Operative Temperature", Constant::Units::C, state.dataSystemAvailabilityManager->HybridVentData(SysAvailNum).OperativeTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataSystemAvailabilityManager->HybridVentData(SysAvailNum).Name); SetupOutputVariable(state, "Hybrid Ventilation Lower Limit Operative Temperature", Constant::Units::C, state.dataSystemAvailabilityManager->HybridVentData(SysAvailNum).minAdaTem, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataSystemAvailabilityManager->HybridVentData(SysAvailNum).Name); SetupOutputVariable(state, "Hybrid Ventilation Upper Limit Operative Temperature", Constant::Units::C, state.dataSystemAvailabilityManager->HybridVentData(SysAvailNum).maxAdaTem, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataSystemAvailabilityManager->HybridVentData(SysAvailNum).Name); } @@ -4378,8 +4378,8 @@ namespace SystemAvailabilityManager { "Hybrid Ventilation CO2 Concentration", Constant::Units::ppm, state.dataSystemAvailabilityManager->HybridVentData(SysAvailNum).CO2, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataSystemAvailabilityManager->HybridVentData(SysAvailNum).Name); } } diff --git a/src/EnergyPlus/SystemReports.cc b/src/EnergyPlus/SystemReports.cc index 6b0224d10b7..5c07f6257f5 100644 --- a/src/EnergyPlus/SystemReports.cc +++ b/src/EnergyPlus/SystemReports.cc @@ -1615,16 +1615,16 @@ void AllocateAndSetUpVentReports(EnergyPlusData &state) "Air System Total Heating Energy", Constant::Units::J, thisSysLoadRepVars.TotHTNG, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, primaryAirSysName); SetupOutputVariable(state, "Air System Total Cooling Energy", Constant::Units::J, thisSysLoadRepVars.TotCLNG, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, primaryAirSysName); // SYSTEM ENERGY USE REPORT @@ -1632,56 +1632,56 @@ void AllocateAndSetUpVentReports(EnergyPlusData &state) "Air System Hot Water Energy", Constant::Units::J, thisSysLoadRepVars.TotH2OHOT, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, primaryAirSysName); SetupOutputVariable(state, "Air System Steam Energy", Constant::Units::J, thisSysLoadRepVars.TotSteam, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, primaryAirSysName); SetupOutputVariable(state, "Air System Chilled Water Energy", Constant::Units::J, thisSysLoadRepVars.TotH2OCOLD, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, primaryAirSysName); SetupOutputVariable(state, "Air System Electricity Energy", Constant::Units::J, thisSysLoadRepVars.TotElec, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, primaryAirSysName); SetupOutputVariable(state, "Air System NaturalGas Energy", Constant::Units::J, thisSysLoadRepVars.TotNaturalGas, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, primaryAirSysName); SetupOutputVariable(state, "Air System Propane Energy", Constant::Units::J, thisSysLoadRepVars.TotPropane, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, primaryAirSysName); SetupOutputVariable(state, "Air System Water Volume", Constant::Units::m3, thisSysLoadRepVars.DomesticH2O, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, primaryAirSysName); // SYSTEM COMPONENT LOAD REPORT @@ -1689,96 +1689,96 @@ void AllocateAndSetUpVentReports(EnergyPlusData &state) "Air System Fan Air Heating Energy", Constant::Units::J, thisSysLoadRepVars.FANCompHTNG, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, primaryAirSysName); SetupOutputVariable(state, "Air System Cooling Coil Total Cooling Energy", Constant::Units::J, thisSysLoadRepVars.CCCompCLNG, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, primaryAirSysName); SetupOutputVariable(state, "Air System Heating Coil Total Heating Energy", Constant::Units::J, thisSysLoadRepVars.HCCompHTNG, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, primaryAirSysName); SetupOutputVariable(state, "Air System Heat Exchanger Total Heating Energy", Constant::Units::J, thisSysLoadRepVars.HeatExHTNG, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, primaryAirSysName); SetupOutputVariable(state, "Air System Heat Exchanger Total Cooling Energy", Constant::Units::J, thisSysLoadRepVars.HeatExCLNG, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, primaryAirSysName); SetupOutputVariable(state, "Air System Solar Collector Total Heating Energy", Constant::Units::J, thisSysLoadRepVars.SolarCollectHeating, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, primaryAirSysName); SetupOutputVariable(state, "Air System Solar Collector Total Cooling Energy", Constant::Units::J, thisSysLoadRepVars.SolarCollectCooling, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, primaryAirSysName); SetupOutputVariable(state, "Air System User Defined Air Terminal Total Heating Energy", Constant::Units::J, thisSysLoadRepVars.UserDefinedTerminalHeating, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, primaryAirSysName); SetupOutputVariable(state, "Air System User Defined Air Terminal Total Cooling Energy", Constant::Units::J, thisSysLoadRepVars.UserDefinedTerminalCooling, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, primaryAirSysName); SetupOutputVariable(state, "Air System Humidifier Total Heating Energy", Constant::Units::J, thisSysLoadRepVars.HumidHTNG, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, primaryAirSysName); SetupOutputVariable(state, "Air System Evaporative Cooler Total Cooling Energy", Constant::Units::J, thisSysLoadRepVars.EvapCLNG, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, primaryAirSysName); SetupOutputVariable(state, "Air System Desiccant Dehumidifier Total Cooling Energy", Constant::Units::J, thisSysLoadRepVars.DesDehumidCLNG, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, primaryAirSysName); // SYSTEM COMPONENT ENERGY REPORT @@ -1786,168 +1786,168 @@ void AllocateAndSetUpVentReports(EnergyPlusData &state) "Air System Fan Electricity Energy", Constant::Units::J, thisSysLoadRepVars.FANCompElec, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, primaryAirSysName); SetupOutputVariable(state, "Air System Heating Coil Hot Water Energy", Constant::Units::J, thisSysLoadRepVars.HCCompH2OHOT, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, primaryAirSysName); SetupOutputVariable(state, "Air System Cooling Coil Chilled Water Energy", Constant::Units::J, thisSysLoadRepVars.CCCompH2OCOLD, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, primaryAirSysName); SetupOutputVariable(state, "Air System DX Heating Coil Electricity Energy", Constant::Units::J, thisSysLoadRepVars.HCCompElec, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, primaryAirSysName); SetupOutputVariable(state, "Air System DX Cooling Coil Electricity Energy", Constant::Units::J, thisSysLoadRepVars.CCCompElec, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, primaryAirSysName); SetupOutputVariable(state, "Air System Heating Coil Electricity Energy", Constant::Units::J, thisSysLoadRepVars.HCCompElecRes, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, primaryAirSysName); SetupOutputVariable(state, "Air System Heating Coil NaturalGas Energy", Constant::Units::J, thisSysLoadRepVars.HCCompNaturalGas, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, primaryAirSysName); SetupOutputVariable(state, "Air System Heating Coil Propane Energy", Constant::Units::J, thisSysLoadRepVars.HCCompPropane, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, primaryAirSysName); SetupOutputVariable(state, "Air System Heating Coil Steam Energy", Constant::Units::J, thisSysLoadRepVars.HCCompSteam, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, primaryAirSysName); SetupOutputVariable(state, "Air System Humidifier Electricity Energy", Constant::Units::J, thisSysLoadRepVars.HumidElec, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, primaryAirSysName); SetupOutputVariable(state, "Air System Humidifier NaturalGas Energy", Constant::Units::J, thisSysLoadRepVars.HumidNaturalGas, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, primaryAirSysName); SetupOutputVariable(state, "Air System Humidifier Propane Energy", Constant::Units::J, thisSysLoadRepVars.HumidPropane, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, primaryAirSysName); SetupOutputVariable(state, "Air System Evaporative Cooler Electricity Energy", Constant::Units::J, thisSysLoadRepVars.EvapElec, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, primaryAirSysName); SetupOutputVariable(state, "Air System Desiccant Dehumidifier Electricity Energy", Constant::Units::J, thisSysLoadRepVars.DesDehumidElec, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, primaryAirSysName); SetupOutputVariable(state, "Air System Mechanical Ventilation Flow Rate", Constant::Units::m3_s, thisSysVentRepVars.MechVentFlow, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, primaryAirSysName); SetupOutputVariable(state, "Air System Natural Ventilation Flow Rate", Constant::Units::m3_s, thisSysVentRepVars.NatVentFlow, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, primaryAirSysName); SetupOutputVariable(state, "Air System Target Voz Ventilation Flow Rate", Constant::Units::m3_s, thisSysVentRepVars.TargetVentilationFlowVoz, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, primaryAirSysName); SetupOutputVariable(state, "Air System Ventilation Below Target Voz Time", Constant::Units::hr, thisSysVentRepVars.TimeBelowVozDyn, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, primaryAirSysName); SetupOutputVariable(state, "Air System Ventilation At Target Voz Time", Constant::Units::hr, thisSysVentRepVars.TimeAtVozDyn, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, primaryAirSysName); SetupOutputVariable(state, "Air System Ventilation Above Target Voz Time", Constant::Units::hr, thisSysVentRepVars.TimeAboveVozDyn, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, primaryAirSysName); SetupOutputVariable(state, "Air System Ventilation When Unoccupied Time", Constant::Units::hr, thisSysVentRepVars.TimeVentUnocc, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, primaryAirSysName); } } @@ -1962,64 +1962,64 @@ void AllocateAndSetUpVentReports(EnergyPlusData &state) "Zone Mechanical Ventilation No Load Heat Removal Energy", Constant::Units::J, thisZoneVentRepVars.NoLoadCoolingByVent, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisZoneName); SetupOutputVariable(state, "Zone Mechanical Ventilation Cooling Load Increase Energy", Constant::Units::J, thisZoneVentRepVars.CoolingLoadAddedByVent, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisZoneName); SetupOutputVariable(state, "Zone Mechanical Ventilation Cooling Load Increase Due to Overheating Energy", Constant::Units::J, thisZoneVentRepVars.OverheatingByVent, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisZoneName); SetupOutputVariable(state, "Zone Mechanical Ventilation Cooling Load Decrease Energy", Constant::Units::J, thisZoneVentRepVars.CoolingLoadMetByVent, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisZoneName); // Heating Loads SetupOutputVariable(state, "Zone Mechanical Ventilation No Load Heat Addition Energy", Constant::Units::J, thisZoneVentRepVars.NoLoadHeatingByVent, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisZoneName); SetupOutputVariable(state, "Zone Mechanical Ventilation Heating Load Increase Energy", Constant::Units::J, thisZoneVentRepVars.HeatingLoadAddedByVent, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisZoneName); SetupOutputVariable(state, "Zone Mechanical Ventilation Heating Load Increase Due to Overcooling Energy", Constant::Units::J, thisZoneVentRepVars.OvercoolingByVent, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisZoneName); SetupOutputVariable(state, "Zone Mechanical Ventilation Heating Load Decrease Energy", Constant::Units::J, thisZoneVentRepVars.HeatingLoadMetByVent, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisZoneName); } @@ -2027,96 +2027,96 @@ void AllocateAndSetUpVentReports(EnergyPlusData &state) "Zone Mechanical Ventilation Mass Flow Rate", Constant::Units::kg_s, thisZoneVentRepVars.OAMassFlow, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisZoneName); SetupOutputVariable(state, "Zone Mechanical Ventilation Mass", Constant::Units::kg, thisZoneVentRepVars.OAMass, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisZoneName); SetupOutputVariable(state, "Zone Mechanical Ventilation Standard Density Volume Flow Rate", Constant::Units::m3_s, thisZoneVentRepVars.OAVolFlowStdRho, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisZoneName); SetupOutputVariable(state, "Zone Mechanical Ventilation Standard Density Volume", Constant::Units::m3, thisZoneVentRepVars.OAVolStdRho, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisZoneName); SetupOutputVariable(state, "Zone Mechanical Ventilation Current Density Volume Flow Rate", Constant::Units::m3_s, thisZoneVentRepVars.OAVolFlowCrntRho, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisZoneName); SetupOutputVariable(state, "Zone Mechanical Ventilation Current Density Volume", Constant::Units::m3, thisZoneVentRepVars.OAVolCrntRho, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisZoneName); SetupOutputVariable(state, "Zone Mechanical Ventilation Air Changes per Hour", Constant::Units::ach, thisZoneVentRepVars.MechACH, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisZoneName); SetupOutputVariable(state, "Zone Target Voz Ventilation Flow Rate", Constant::Units::m3_s, thisZoneVentRepVars.TargetVentilationFlowVoz, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisZoneName); SetupOutputVariable(state, "Zone Ventilation Below Target Voz Time", Constant::Units::hr, thisZoneVentRepVars.TimeBelowVozDyn, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisZoneName); SetupOutputVariable(state, "Zone Ventilation At Target Voz Time", Constant::Units::hr, thisZoneVentRepVars.TimeAtVozDyn, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisZoneName); SetupOutputVariable(state, "Zone Ventilation Above Target Voz Time", Constant::Units::hr, thisZoneVentRepVars.TimeAboveVozDyn, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisZoneName); SetupOutputVariable(state, "Zone Ventilation When Unoccupied Time", Constant::Units::hr, thisZoneVentRepVars.TimeVentUnocc, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, thisZoneName); } @@ -2125,32 +2125,32 @@ void AllocateAndSetUpVentReports(EnergyPlusData &state) "Facility Any Zone Ventilation Below Target Voz Time", Constant::Units::hr, state.dataSysRpts->AnyZoneTimeBelowVozDyn, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, "Facility"); SetupOutputVariable(state, "Facility All Zones Ventilation At Target Voz Time", Constant::Units::hr, state.dataSysRpts->AllZonesTimeAtVozDyn, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, "Facility"); SetupOutputVariable(state, "Facility Any Zone Ventilation Above Target Voz Time", Constant::Units::hr, state.dataSysRpts->AnyZoneTimeAboveVozDyn, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, "Facility"); SetupOutputVariable(state, "Facility Any Zone Ventilation When Unoccupied Time", Constant::Units::hr, state.dataSysRpts->AnyZoneTimeVentUnocc, - OutputProcessor::SOVTimeStepType::HVAC, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, "Facility"); } @@ -2358,12 +2358,12 @@ void CreateEnergyReportStructure(EnergyPlusData &state) { thisComp.MeteredVar(VarNum) = meteredVars(VarNum); // Copy auto &thisVar = thisComp.MeteredVar(VarNum); - if (thisVar.sovEndUseCat == OutputProcessor::SOVEndUseCat::HeatingCoils && ModeFlagOn) { + if (thisVar.endUseCat == OutputProcessor::EndUseCat::HeatingCoils && ModeFlagOn) { for (VarNum1 = 1; VarNum1 <= NumVariables; ++VarNum1) { thisComp.MeteredVar(VarNum1).heatOrCool = Constant::HeatOrCool::HeatingOnly; } ModeFlagOn = false; - } else if (thisVar.sovEndUseCat == OutputProcessor::SOVEndUseCat::CoolingCoils && ModeFlagOn) { + } else if (thisVar.endUseCat == OutputProcessor::EndUseCat::CoolingCoils && ModeFlagOn) { for (VarNum1 = 1; VarNum1 <= NumVariables; ++VarNum1) { thisComp.MeteredVar(VarNum1).heatOrCool = Constant::HeatOrCool::CoolingOnly; } @@ -2391,12 +2391,12 @@ void CreateEnergyReportStructure(EnergyPlusData &state) { thisComp.SubComp(SubCompNum).MeteredVar(VarNum) = meteredVars(VarNum); auto &thisVar = thisComp.SubComp(SubCompNum).MeteredVar(VarNum); - if (thisVar.sovEndUseCat == OutputProcessor::SOVEndUseCat::HeatingCoils && ModeFlagOn) { + if (thisVar.endUseCat == OutputProcessor::EndUseCat::HeatingCoils && ModeFlagOn) { for (VarNum1 = 1; VarNum1 <= NumVariables; ++VarNum1) { thisComp.SubComp(SubCompNum).MeteredVar(VarNum1).heatOrCool = Constant::HeatOrCool::HeatingOnly; } ModeFlagOn = false; - } else if (thisVar.sovEndUseCat == OutputProcessor::SOVEndUseCat::CoolingCoils && ModeFlagOn) { + } else if (thisVar.endUseCat == OutputProcessor::EndUseCat::CoolingCoils && ModeFlagOn) { for (VarNum1 = 1; VarNum1 <= NumVariables; ++VarNum1) { thisComp.SubComp(SubCompNum).MeteredVar(VarNum1).heatOrCool = Constant::HeatOrCool::CoolingOnly; } @@ -2427,13 +2427,13 @@ void CreateEnergyReportStructure(EnergyPlusData &state) { thisComp.SubComp(SubCompNum).SubSubComp(SubSubCompNum).MeteredVar(VarNum) = meteredVars(VarNum); auto &thisVar = thisComp.SubComp(SubCompNum).SubSubComp(SubSubCompNum).MeteredVar(VarNum); - if (thisVar.sovEndUseCat == OutputProcessor::SOVEndUseCat::HeatingCoils && ModeFlagOn) { + if (thisVar.endUseCat == OutputProcessor::EndUseCat::HeatingCoils && ModeFlagOn) { for (VarNum1 = 1; VarNum1 <= NumVariables; ++VarNum1) { thisComp.SubComp(SubCompNum).SubSubComp(SubSubCompNum).MeteredVar(VarNum1).heatOrCool = Constant::HeatOrCool::HeatingOnly; } ModeFlagOn = false; - } else if (thisVar.sovEndUseCat == OutputProcessor::SOVEndUseCat::CoolingCoils && ModeFlagOn) { + } else if (thisVar.endUseCat == OutputProcessor::EndUseCat::CoolingCoils && ModeFlagOn) { for (VarNum1 = 1; VarNum1 <= NumVariables; ++VarNum1) { thisComp.SubComp(SubCompNum).SubSubComp(SubSubCompNum).MeteredVar(VarNum1).heatOrCool = Constant::HeatOrCool::CoolingOnly; @@ -2507,12 +2507,12 @@ void CreateEnergyReportStructure(EnergyPlusData &state) { thisEquipData.MeteredVar(VarNum) = meteredVars(VarNum); auto &thisVar = thisEquipData.MeteredVar(VarNum); - if (thisVar.sovEndUseCat == OutputProcessor::SOVEndUseCat::HeatingCoils && ModeFlagOn) { + if (thisVar.endUseCat == OutputProcessor::EndUseCat::HeatingCoils && ModeFlagOn) { for (VarNum1 = 1; VarNum1 <= NumVariables; ++VarNum1) { thisEquipData.MeteredVar(VarNum1).heatOrCool = Constant::HeatOrCool::HeatingOnly; } ModeFlagOn = false; - } else if (thisVar.sovEndUseCat == OutputProcessor::SOVEndUseCat::CoolingCoils && ModeFlagOn) { + } else if (thisVar.endUseCat == OutputProcessor::EndUseCat::CoolingCoils && ModeFlagOn) { for (VarNum1 = 1; VarNum1 <= NumVariables; ++VarNum1) { thisEquipData.MeteredVar(VarNum1).heatOrCool = Constant::HeatOrCool::CoolingOnly; } @@ -2637,12 +2637,12 @@ void CreateEnergyReportStructure(EnergyPlusData &state) for (VarNum = 1; VarNum <= NumVariables; ++VarNum) { thisSubEquipData.MeteredVar(VarNum) = meteredVars(VarNum); auto &thisVar = thisSubEquipData.MeteredVar(VarNum); - if (thisVar.sovEndUseCat == OutputProcessor::SOVEndUseCat::HeatingCoils && ModeFlagOn) { + if (thisVar.endUseCat == OutputProcessor::EndUseCat::HeatingCoils && ModeFlagOn) { for (VarNum1 = 1; VarNum1 <= NumVariables; ++VarNum1) { thisSubEquipData.MeteredVar(VarNum1).heatOrCool = Constant::HeatOrCool::HeatingOnly; } ModeFlagOn = false; - } else if (thisVar.sovEndUseCat == OutputProcessor::SOVEndUseCat::CoolingCoils && ModeFlagOn) { + } else if (thisVar.endUseCat == OutputProcessor::EndUseCat::CoolingCoils && ModeFlagOn) { for (VarNum1 = 1; VarNum1 <= NumVariables; ++VarNum1) { thisSubEquipData.MeteredVar(VarNum1).heatOrCool = Constant::HeatOrCool::CoolingOnly; } @@ -2670,13 +2670,13 @@ void CreateEnergyReportStructure(EnergyPlusData &state) for (VarNum = 1; VarNum <= NumVariables; ++VarNum) { thisSubEquipData.SubSubEquipData(SubSubCompNum).MeteredVar(VarNum) = meteredVars(VarNum); auto &thisVar = thisSubEquipData.SubSubEquipData(SubSubCompNum).MeteredVar(VarNum); - if (thisVar.sovEndUseCat == OutputProcessor::SOVEndUseCat::HeatingCoils && ModeFlagOn) { + if (thisVar.endUseCat == OutputProcessor::EndUseCat::HeatingCoils && ModeFlagOn) { for (VarNum1 = 1; VarNum1 <= NumVariables; ++VarNum1) { thisSubEquipData.SubSubEquipData(SubSubCompNum).MeteredVar(VarNum1).heatOrCool = Constant::HeatOrCool::HeatingOnly; } ModeFlagOn = false; - } else if (thisVar.sovEndUseCat == OutputProcessor::SOVEndUseCat::CoolingCoils && ModeFlagOn) { + } else if (thisVar.endUseCat == OutputProcessor::EndUseCat::CoolingCoils && ModeFlagOn) { for (VarNum1 = 1; VarNum1 <= NumVariables; ++VarNum1) { thisSubEquipData.SubSubEquipData(SubSubCompNum).MeteredVar(VarNum1).heatOrCool = Constant::HeatOrCool::CoolingOnly; @@ -2871,12 +2871,12 @@ void CreateEnergyReportStructure(EnergyPlusData &state) for (VarNum = 1; VarNum <= NumVariables; ++VarNum) { thisComp.MeteredVar(VarNum) = meteredVars(VarNum); auto &thisVar = thisComp.MeteredVar(VarNum); - if (thisVar.sovEndUseCat == OutputProcessor::SOVEndUseCat::HeatingCoils && ModeFlagOn) { + if (thisVar.endUseCat == OutputProcessor::EndUseCat::HeatingCoils && ModeFlagOn) { for (VarNum1 = 1; VarNum1 <= NumVariables; ++VarNum1) { thisComp.MeteredVar(VarNum1).heatOrCool = Constant::HeatOrCool::HeatingOnly; } ModeFlagOn = false; - } else if (thisVar.sovEndUseCat == OutputProcessor::SOVEndUseCat::CoolingCoils && ModeFlagOn) { + } else if (thisVar.endUseCat == OutputProcessor::EndUseCat::CoolingCoils && ModeFlagOn) { for (VarNum1 = 1; VarNum1 <= NumVariables; ++VarNum1) { thisComp.MeteredVar(VarNum1).heatOrCool = Constant::HeatOrCool::CoolingOnly; } @@ -2904,12 +2904,12 @@ void CreateEnergyReportStructure(EnergyPlusData &state) for (VarNum = 1; VarNum <= NumVariables; ++VarNum) { thisComp.SubComp(SubCompNum).MeteredVar(VarNum) = meteredVars(VarNum); auto &thisVar = thisComp.SubComp(SubCompNum).MeteredVar(VarNum); - if (thisVar.sovEndUseCat == OutputProcessor::SOVEndUseCat::HeatingCoils && ModeFlagOn) { + if (thisVar.endUseCat == OutputProcessor::EndUseCat::HeatingCoils && ModeFlagOn) { for (VarNum1 = 1; VarNum1 <= NumVariables; ++VarNum1) { thisComp.SubComp(SubCompNum).MeteredVar(VarNum1).heatOrCool = Constant::HeatOrCool::HeatingOnly; } ModeFlagOn = false; - } else if (thisVar.sovEndUseCat == OutputProcessor::SOVEndUseCat::CoolingCoils && ModeFlagOn) { + } else if (thisVar.endUseCat == OutputProcessor::EndUseCat::CoolingCoils && ModeFlagOn) { for (VarNum1 = 1; VarNum1 <= NumVariables; ++VarNum1) { thisComp.SubComp(SubCompNum).MeteredVar(VarNum1).heatOrCool = Constant::HeatOrCool::CoolingOnly; } diff --git a/src/EnergyPlus/ThermalChimney.cc b/src/EnergyPlus/ThermalChimney.cc index 5549a765984..ba0329917ed 100644 --- a/src/EnergyPlus/ThermalChimney.cc +++ b/src/EnergyPlus/ThermalChimney.cc @@ -373,29 +373,29 @@ namespace ThermalChimney { "Zone Thermal Chimney Current Density Air Volume Flow Rate", Constant::Units::m3_s, state.dataThermalChimneys->ThermalChimneyReport(Loop).OverallTCVolumeFlow, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataThermalChimneys->ThermalChimneySys(Loop).Name); SetupOutputVariable(state, "Zone Thermal Chimney Standard Density Air Volume Flow Rate", Constant::Units::m3_s, state.dataThermalChimneys->ThermalChimneyReport(Loop).OverallTCVolumeFlowStd, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataThermalChimneys->ThermalChimneySys(Loop).Name); SetupOutputVariable(state, "Zone Thermal Chimney Mass Flow Rate", Constant::Units::kg_s, state.dataThermalChimneys->ThermalChimneyReport(Loop).OverallTCMassFlow, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataThermalChimneys->ThermalChimneySys(Loop).Name); SetupOutputVariable(state, "Zone Thermal Chimney Outlet Temperature", Constant::Units::C, state.dataThermalChimneys->ThermalChimneyReport(Loop).OutletAirTempThermalChim, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataThermalChimneys->ThermalChimneySys(Loop).Name); if (state.dataGlobal->AnyEnergyManagementSystemInModel) { @@ -414,32 +414,32 @@ namespace ThermalChimney { Constant::Units::J, state.dataThermalChimneys->ZnRptThermChim(state.dataThermalChimneys->ThermalChimneySys(Loop).ZonePtr(TCZoneNum)) .ThermalChimneyHeatLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(state.dataThermalChimneys->ThermalChimneySys(Loop).ZonePtr(TCZoneNum)).Name); SetupOutputVariable(state, "Zone Thermal Chimney Heat Gain Energy", Constant::Units::J, state.dataThermalChimneys->ZnRptThermChim(state.dataThermalChimneys->ThermalChimneySys(Loop).ZonePtr(TCZoneNum)) .ThermalChimneyHeatGain, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(state.dataThermalChimneys->ThermalChimneySys(Loop).ZonePtr(TCZoneNum)).Name); SetupOutputVariable(state, "Zone Thermal Chimney Volume", Constant::Units::m3, state.dataThermalChimneys->ZnRptThermChim(state.dataThermalChimneys->ThermalChimneySys(Loop).ZonePtr(TCZoneNum)) .ThermalChimneyVolume, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(state.dataThermalChimneys->ThermalChimneySys(Loop).ZonePtr(TCZoneNum)).Name); SetupOutputVariable(state, "Zone Thermal Chimney Mass", Constant::Units::kg, state.dataThermalChimneys->ZnRptThermChim(state.dataThermalChimneys->ThermalChimneySys(Loop).ZonePtr(TCZoneNum)) .ThermalChimneyMass, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(state.dataThermalChimneys->ThermalChimneySys(Loop).ZonePtr(TCZoneNum)).Name); if (RepVarSet(state.dataThermalChimneys->ThermalChimneySys(Loop).ZonePtr(TCZoneNum))) { SetupOutputVariable( @@ -447,102 +447,102 @@ namespace ThermalChimney { "Zone Infiltration Sensible Heat Loss Energy", Constant::Units::J, state.dataHeatBal->ZnAirRpt(state.dataThermalChimneys->ThermalChimneySys(Loop).ZonePtr(TCZoneNum)).InfilHeatLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(state.dataThermalChimneys->ThermalChimneySys(Loop).ZonePtr(TCZoneNum)).Name); SetupOutputVariable( state, "Zone Infiltration Sensible Heat Gain Energy", Constant::Units::J, state.dataHeatBal->ZnAirRpt(state.dataThermalChimneys->ThermalChimneySys(Loop).ZonePtr(TCZoneNum)).InfilHeatGain, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(state.dataThermalChimneys->ThermalChimneySys(Loop).ZonePtr(TCZoneNum)).Name); SetupOutputVariable( state, "Zone Infiltration Latent Heat Loss Energy", Constant::Units::J, state.dataHeatBal->ZnAirRpt(state.dataThermalChimneys->ThermalChimneySys(Loop).ZonePtr(TCZoneNum)).InfilLatentLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(state.dataThermalChimneys->ThermalChimneySys(Loop).ZonePtr(TCZoneNum)).Name); SetupOutputVariable( state, "Zone Infiltration Latent Heat Gain Energy", Constant::Units::J, state.dataHeatBal->ZnAirRpt(state.dataThermalChimneys->ThermalChimneySys(Loop).ZonePtr(TCZoneNum)).InfilLatentGain, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(state.dataThermalChimneys->ThermalChimneySys(Loop).ZonePtr(TCZoneNum)).Name); SetupOutputVariable( state, "Zone Infiltration Total Heat Loss Energy", Constant::Units::J, state.dataHeatBal->ZnAirRpt(state.dataThermalChimneys->ThermalChimneySys(Loop).ZonePtr(TCZoneNum)).InfilTotalLoss, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(state.dataThermalChimneys->ThermalChimneySys(Loop).ZonePtr(TCZoneNum)).Name); SetupOutputVariable( state, "Zone Infiltration Total Heat Gain Energy", Constant::Units::J, state.dataHeatBal->ZnAirRpt(state.dataThermalChimneys->ThermalChimneySys(Loop).ZonePtr(TCZoneNum)).InfilTotalGain, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(state.dataThermalChimneys->ThermalChimneySys(Loop).ZonePtr(TCZoneNum)).Name); SetupOutputVariable( state, "Zone Infiltration Current Density Volume Flow Rate", Constant::Units::m3_s, state.dataHeatBal->ZnAirRpt(state.dataThermalChimneys->ThermalChimneySys(Loop).ZonePtr(TCZoneNum)).InfilVdotCurDensity, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(state.dataThermalChimneys->ThermalChimneySys(Loop).ZonePtr(TCZoneNum)).Name); SetupOutputVariable( state, "Zone Infiltration Standard Density Volume Flow Rate", Constant::Units::m3_s, state.dataHeatBal->ZnAirRpt(state.dataThermalChimneys->ThermalChimneySys(Loop).ZonePtr(TCZoneNum)).InfilVdotStdDensity, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(state.dataThermalChimneys->ThermalChimneySys(Loop).ZonePtr(TCZoneNum)).Name); SetupOutputVariable( state, "Zone Infiltration Current Density Volume", Constant::Units::m3, state.dataHeatBal->ZnAirRpt(state.dataThermalChimneys->ThermalChimneySys(Loop).ZonePtr(TCZoneNum)).InfilVolumeCurDensity, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(state.dataThermalChimneys->ThermalChimneySys(Loop).ZonePtr(TCZoneNum)).Name); SetupOutputVariable( state, "Zone Infiltration Standard Density Volume", Constant::Units::m3, state.dataHeatBal->ZnAirRpt(state.dataThermalChimneys->ThermalChimneySys(Loop).ZonePtr(TCZoneNum)).InfilVolumeStdDensity, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(state.dataThermalChimneys->ThermalChimneySys(Loop).ZonePtr(TCZoneNum)).Name); SetupOutputVariable(state, "Zone Infiltration Mass", Constant::Units::kg, state.dataHeatBal->ZnAirRpt(state.dataThermalChimneys->ThermalChimneySys(Loop).ZonePtr(TCZoneNum)).InfilMass, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(state.dataThermalChimneys->ThermalChimneySys(Loop).ZonePtr(TCZoneNum)).Name); SetupOutputVariable(state, "Zone Infiltration Mass Flow Rate", Constant::Units::kg_s, state.dataHeatBal->ZnAirRpt(state.dataThermalChimneys->ThermalChimneySys(Loop).ZonePtr(TCZoneNum)).InfilMdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(state.dataThermalChimneys->ThermalChimneySys(Loop).ZonePtr(TCZoneNum)).Name); SetupOutputVariable( state, "Zone Infiltration Air Change Rate", Constant::Units::ach, state.dataHeatBal->ZnAirRpt(state.dataThermalChimneys->ThermalChimneySys(Loop).ZonePtr(TCZoneNum)).InfilAirChangeRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(state.dataThermalChimneys->ThermalChimneySys(Loop).ZonePtr(TCZoneNum)).Name); RepVarSet(state.dataThermalChimneys->ThermalChimneySys(Loop).ZonePtr(TCZoneNum)) = false; } diff --git a/src/EnergyPlus/ThermalComfort.cc b/src/EnergyPlus/ThermalComfort.cc index 40b0ea8af7f..4d0b30c11f4 100644 --- a/src/EnergyPlus/ThermalComfort.cc +++ b/src/EnergyPlus/ThermalComfort.cc @@ -176,22 +176,22 @@ namespace ThermalComfort { "Zone Thermal Comfort Fanger Model PMV", Constant::Units::None, state.dataThermalComforts->ThermalComfortData(Loop).FangerPMV, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->People(Loop).Name); SetupOutputVariable(state, "Zone Thermal Comfort Fanger Model PPD", Constant::Units::Perc, state.dataThermalComforts->ThermalComfortData(Loop).FangerPPD, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->People(Loop).Name); SetupOutputVariable(state, "Zone Thermal Comfort Clothing Surface Temperature", Constant::Units::C, state.dataThermalComforts->ThermalComfortData(Loop).CloSurfTemp, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->People(Loop).Name); } @@ -200,36 +200,36 @@ namespace ThermalComfort { "Zone Thermal Comfort Pierce Model Effective Temperature PMV", Constant::Units::None, state.dataThermalComforts->ThermalComfortData(Loop).PiercePMVET, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->People(Loop).Name); SetupOutputVariable(state, "Zone Thermal Comfort Pierce Model Standard Effective Temperature PMV", Constant::Units::None, state.dataThermalComforts->ThermalComfortData(Loop).PiercePMVSET, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->People(Loop).Name); SetupOutputVariable(state, "Zone Thermal Comfort Pierce Model Discomfort Index", Constant::Units::None, state.dataThermalComforts->ThermalComfortData(Loop).PierceDISC, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->People(Loop).Name); SetupOutputVariable(state, "Zone Thermal Comfort Pierce Model Thermal Sensation Index", Constant::Units::None, state.dataThermalComforts->ThermalComfortData(Loop).PierceTSENS, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->People(Loop).Name); SetupOutputVariable(state, "Zone Thermal Comfort Pierce Model Standard Effective Temperature", Constant::Units::C, state.dataThermalComforts->ThermalComfortData(Loop).PierceSET, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->People(Loop).Name); } @@ -238,8 +238,8 @@ namespace ThermalComfort { "Zone Thermal Comfort KSU Model Thermal Sensation Vote", Constant::Units::None, state.dataThermalComforts->ThermalComfortData(Loop).KsuTSV, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->People(Loop).Name); } @@ -248,22 +248,22 @@ namespace ThermalComfort { "Zone Thermal Comfort Mean Radiant Temperature", Constant::Units::C, state.dataThermalComforts->ThermalComfortData(Loop).ThermalComfortMRT, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->People(Loop).Name); SetupOutputVariable(state, "Zone Thermal Comfort Operative Temperature", Constant::Units::C, state.dataThermalComforts->ThermalComfortData(Loop).ThermalComfortOpTemp, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->People(Loop).Name); SetupOutputVariable(state, "Zone Thermal Comfort Clothing Value", Constant::Units::clo, state.dataThermalComforts->ThermalComfortData(Loop).ClothingValue, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->People(Loop).Name); } @@ -272,29 +272,29 @@ namespace ThermalComfort { "Zone Thermal Comfort ASHRAE 55 Adaptive Model 90% Acceptability Status", Constant::Units::None, state.dataThermalComforts->ThermalComfortData(Loop).ThermalComfortAdaptiveASH5590, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->People(Loop).Name); SetupOutputVariable(state, "Zone Thermal Comfort ASHRAE 55 Adaptive Model 80% Acceptability Status", Constant::Units::None, state.dataThermalComforts->ThermalComfortData(Loop).ThermalComfortAdaptiveASH5580, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->People(Loop).Name); SetupOutputVariable(state, "Zone Thermal Comfort ASHRAE 55 Adaptive Model Running Average Outdoor Air Temperature", Constant::Units::C, state.dataThermalComforts->ThermalComfortData(Loop).ASHRAE55RunningMeanOutdoorTemp, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->People(Loop).Name); SetupOutputVariable(state, "Zone Thermal Comfort ASHRAE 55 Adaptive Model Temperature", Constant::Units::C, state.dataThermalComforts->ThermalComfortData(Loop).TComfASH55, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->People(Loop).Name); } @@ -303,36 +303,36 @@ namespace ThermalComfort { "Zone Thermal Comfort CEN 15251 Adaptive Model Category I Status", Constant::Units::None, state.dataThermalComforts->ThermalComfortData(Loop).ThermalComfortAdaptiveCEN15251CatI, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->People(Loop).Name); SetupOutputVariable(state, "Zone Thermal Comfort CEN 15251 Adaptive Model Category II Status", Constant::Units::None, state.dataThermalComforts->ThermalComfortData(Loop).ThermalComfortAdaptiveCEN15251CatII, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->People(Loop).Name); SetupOutputVariable(state, "Zone Thermal Comfort CEN 15251 Adaptive Model Category III Status", Constant::Units::None, state.dataThermalComforts->ThermalComfortData(Loop).ThermalComfortAdaptiveCEN15251CatIII, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->People(Loop).Name); SetupOutputVariable(state, "Zone Thermal Comfort CEN 15251 Adaptive Model Running Average Outdoor Air Temperature", Constant::Units::C, state.dataThermalComforts->ThermalComfortData(Loop).CEN15251RunningMeanOutdoorTemp, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->People(Loop).Name); SetupOutputVariable(state, "Zone Thermal Comfort CEN 15251 Adaptive Model Temperature", Constant::Units::C, state.dataThermalComforts->ThermalComfortData(Loop).TComfCEN15251, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->People(Loop).Name); } if (state.dataHeatBal->People(Loop).CoolingEffectASH55) { @@ -340,22 +340,22 @@ namespace ThermalComfort { "Zone Thermal Comfort ASHRAE 55 Elevated Air Speed Cooling Effect", Constant::Units::C, state.dataThermalComforts->ThermalComfortData(Loop).CoolingEffectASH55, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->People(Loop).Name); SetupOutputVariable(state, "Zone Thermal Comfort ASHRAE 55 Elevated Air Speed Cooling Effect Adjusted PMV", Constant::Units::None, state.dataThermalComforts->ThermalComfortData(Loop).CoolingEffectAdjustedPMVASH55, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->People(Loop).Name); SetupOutputVariable(state, "Zone Thermal Comfort ASHRAE 55 Elevated Air Speed Cooling Effect Adjusted PPD", Constant::Units::None, state.dataThermalComforts->ThermalComfortData(Loop).CoolingEffectAdjustedPPDASH55, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->People(Loop).Name); } if (state.dataHeatBal->People(Loop).AnkleDraftASH55) { @@ -363,8 +363,8 @@ namespace ThermalComfort { "Zone Thermal Comfort ASHRAE 55 Ankle Draft PPD", Constant::Units::None, state.dataThermalComforts->ThermalComfortData(Loop).AnkleDraftPPDASH55, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->People(Loop).Name); } } @@ -383,44 +383,44 @@ namespace ThermalComfort { "Zone Thermal Comfort ASHRAE 55 Simple Model Summer Clothes Not Comfortable Time", Constant::Units::hr, state.dataThermalComforts->ThermalComfortInASH55(Loop).timeNotSummer, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(Loop).Name); SetupOutputVariable(state, "Zone Thermal Comfort ASHRAE 55 Simple Model Winter Clothes Not Comfortable Time", Constant::Units::hr, state.dataThermalComforts->ThermalComfortInASH55(Loop).timeNotWinter, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(Loop).Name); SetupOutputVariable(state, "Zone Thermal Comfort ASHRAE 55 Simple Model Summer or Winter Clothes Not Comfortable Time", Constant::Units::hr, state.dataThermalComforts->ThermalComfortInASH55(Loop).timeNotEither, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(Loop).Name); } SetupOutputVariable(state, "Facility Thermal Comfort ASHRAE 55 Simple Model Summer Clothes Not Comfortable Time", Constant::Units::hr, state.dataThermalComforts->AnyZoneTimeNotSimpleASH55Summer, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Facility"); SetupOutputVariable(state, "Facility Thermal Comfort ASHRAE 55 Simple Model Winter Clothes Not Comfortable Time", Constant::Units::hr, state.dataThermalComforts->AnyZoneTimeNotSimpleASH55Winter, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Facility"); SetupOutputVariable(state, "Facility Thermal Comfort ASHRAE 55 Simple Model Summer or Winter Clothes Not Comfortable Time", Constant::Units::hr, state.dataThermalComforts->AnyZoneTimeNotSimpleASH55Either, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Facility"); state.dataThermalComforts->ThermalComfortSetPoint.allocate(state.dataGlobal->NumOfZones); @@ -429,29 +429,29 @@ namespace ThermalComfort { "Zone Heating Setpoint Not Met Time", Constant::Units::hr, state.dataThermalComforts->ThermalComfortSetPoint(Loop).notMetHeating, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(Loop).Name); SetupOutputVariable(state, "Zone Heating Setpoint Not Met While Occupied Time", Constant::Units::hr, state.dataThermalComforts->ThermalComfortSetPoint(Loop).notMetHeatingOccupied, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(Loop).Name); SetupOutputVariable(state, "Zone Cooling Setpoint Not Met Time", Constant::Units::hr, state.dataThermalComforts->ThermalComfortSetPoint(Loop).notMetCooling, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(Loop).Name); SetupOutputVariable(state, "Zone Cooling Setpoint Not Met While Occupied Time", Constant::Units::hr, state.dataThermalComforts->ThermalComfortSetPoint(Loop).notMetCoolingOccupied, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, state.dataHeatBal->Zone(Loop).Name); } @@ -459,29 +459,29 @@ namespace ThermalComfort { "Facility Heating Setpoint Not Met Time", Constant::Units::hr, state.dataThermalComforts->AnyZoneNotMetHeating, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Facility"); SetupOutputVariable(state, "Facility Cooling Setpoint Not Met Time", Constant::Units::hr, state.dataThermalComforts->AnyZoneNotMetCooling, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Facility"); SetupOutputVariable(state, "Facility Heating Setpoint Not Met While Occupied Time", Constant::Units::hr, state.dataThermalComforts->AnyZoneNotMetHeatingOccupied, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Facility"); SetupOutputVariable(state, "Facility Cooling Setpoint Not Met While Occupied Time", Constant::Units::hr, state.dataThermalComforts->AnyZoneNotMetCoolingOccupied, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Facility"); GetAngleFactorList(state); diff --git a/src/EnergyPlus/TranspiredCollector.cc b/src/EnergyPlus/TranspiredCollector.cc index 8b1d42d85b9..94d11b37487 100644 --- a/src/EnergyPlus/TranspiredCollector.cc +++ b/src/EnergyPlus/TranspiredCollector.cc @@ -748,104 +748,103 @@ namespace TranspiredCollector { "Solar Collector Heat Exchanger Effectiveness", Constant::Units::None, state.dataTranspiredCollector->UTSC(Item).HXeff, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataTranspiredCollector->UTSC(Item).Name); SetupOutputVariable(state, "Solar Collector Leaving Air Temperature", Constant::Units::C, state.dataTranspiredCollector->UTSC(Item).TairHX, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataTranspiredCollector->UTSC(Item).Name); SetupOutputVariable(state, "Solar Collector Outside Face Suction Velocity", Constant::Units::m_s, state.dataTranspiredCollector->UTSC(Item).Vsuction, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataTranspiredCollector->UTSC(Item).Name); SetupOutputVariable(state, "Solar Collector Surface Temperature", Constant::Units::C, state.dataTranspiredCollector->UTSC(Item).Tcoll, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataTranspiredCollector->UTSC(Item).Name); SetupOutputVariable(state, "Solar Collector Plenum Air Temperature", Constant::Units::C, state.dataTranspiredCollector->UTSC(Item).Tplen, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataTranspiredCollector->UTSC(Item).Name); SetupOutputVariable(state, "Solar Collector Sensible Heating Rate", Constant::Units::W, state.dataTranspiredCollector->UTSC(Item).SensHeatingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataTranspiredCollector->UTSC(Item).Name); SetupOutputVariable(state, "Solar Collector Sensible Heating Energy", Constant::Units::J, state.dataTranspiredCollector->UTSC(Item).SensHeatingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataTranspiredCollector->UTSC(Item).Name, Constant::eResource::SolarAir, - OutputProcessor::SOVEndUseCat::HeatProduced, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::HeatProduced); SetupOutputVariable(state, "Solar Collector Natural Ventilation Air Change Rate", Constant::Units::ach, state.dataTranspiredCollector->UTSC(Item).PassiveACH, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataTranspiredCollector->UTSC(Item).Name); SetupOutputVariable(state, "Solar Collector Natural Ventilation Mass Flow Rate", Constant::Units::kg_s, state.dataTranspiredCollector->UTSC(Item).PassiveMdotVent, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataTranspiredCollector->UTSC(Item).Name); SetupOutputVariable(state, "Solar Collector Wind Natural Ventilation Mass Flow Rate", Constant::Units::kg_s, state.dataTranspiredCollector->UTSC(Item).PassiveMdotWind, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataTranspiredCollector->UTSC(Item).Name); SetupOutputVariable(state, "Solar Collector Buoyancy Natural Ventilation Mass Flow Rate", Constant::Units::kg_s, state.dataTranspiredCollector->UTSC(Item).PassiveMdotTherm, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataTranspiredCollector->UTSC(Item).Name); SetupOutputVariable(state, "Solar Collector Incident Solar Radiation", Constant::Units::W_m2, state.dataTranspiredCollector->UTSC(Item).Isc, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataTranspiredCollector->UTSC(Item).Name); SetupOutputVariable(state, "Solar Collector System Efficiency", Constant::Units::None, state.dataTranspiredCollector->UTSC(Item).UTSCEfficiency, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataTranspiredCollector->UTSC(Item).Name); SetupOutputVariable(state, "Solar Collector Surface Efficiency", Constant::Units::None, state.dataTranspiredCollector->UTSC(Item).UTSCCollEff, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataTranspiredCollector->UTSC(Item).Name); } diff --git a/src/EnergyPlus/UnitHeater.cc b/src/EnergyPlus/UnitHeater.cc index 89859c180b3..5b79390e072 100644 --- a/src/EnergyPlus/UnitHeater.cc +++ b/src/EnergyPlus/UnitHeater.cc @@ -676,45 +676,45 @@ namespace UnitHeater { "Zone Unit Heater Heating Rate", Constant::Units::W, state.dataUnitHeaters->UnitHeat(UnitHeatNum).HeatPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitHeaters->UnitHeat(UnitHeatNum).Name); SetupOutputVariable(state, "Zone Unit Heater Heating Energy", Constant::Units::J, state.dataUnitHeaters->UnitHeat(UnitHeatNum).HeatEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataUnitHeaters->UnitHeat(UnitHeatNum).Name); SetupOutputVariable(state, "Zone Unit Heater Fan Electricity Rate", Constant::Units::W, state.dataUnitHeaters->UnitHeat(UnitHeatNum).ElecPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitHeaters->UnitHeat(UnitHeatNum).Name); // Note that the unit heater fan electric is NOT metered because this value is already metered through the fan component SetupOutputVariable(state, "Zone Unit Heater Fan Electricity Energy", Constant::Units::J, state.dataUnitHeaters->UnitHeat(UnitHeatNum).ElecEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataUnitHeaters->UnitHeat(UnitHeatNum).Name); SetupOutputVariable(state, "Zone Unit Heater Fan Availability Status", Constant::Units::None, state.dataUnitHeaters->UnitHeat(UnitHeatNum).AvailStatus, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitHeaters->UnitHeat(UnitHeatNum).Name); if (state.dataUnitHeaters->UnitHeat(UnitHeatNum).FanType_Num == FanType_SimpleOnOff) { SetupOutputVariable(state, "Zone Unit Heater Fan Part Load Ratio", Constant::Units::None, state.dataUnitHeaters->UnitHeat(UnitHeatNum).FanPartLoadRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitHeaters->UnitHeat(UnitHeatNum).Name); } } diff --git a/src/EnergyPlus/UnitVentilator.cc b/src/EnergyPlus/UnitVentilator.cc index dff841a922f..d148546602e 100644 --- a/src/EnergyPlus/UnitVentilator.cc +++ b/src/EnergyPlus/UnitVentilator.cc @@ -949,73 +949,73 @@ namespace UnitVentilator { "Zone Unit Ventilator Heating Rate", Constant::Units::W, unitVent.HeatPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, unitVent.Name); SetupOutputVariable(state, "Zone Unit Ventilator Heating Energy", Constant::Units::J, unitVent.HeatEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, unitVent.Name); SetupOutputVariable(state, "Zone Unit Ventilator Total Cooling Rate", Constant::Units::W, unitVent.TotCoolPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, unitVent.Name); SetupOutputVariable(state, "Zone Unit Ventilator Total Cooling Energy", Constant::Units::J, unitVent.TotCoolEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, unitVent.Name); SetupOutputVariable(state, "Zone Unit Ventilator Sensible Cooling Rate", Constant::Units::W, unitVent.SensCoolPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, unitVent.Name); SetupOutputVariable(state, "Zone Unit Ventilator Sensible Cooling Energy", Constant::Units::J, unitVent.SensCoolEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, unitVent.Name); SetupOutputVariable(state, "Zone Unit Ventilator Fan Electricity Rate", Constant::Units::W, unitVent.ElecPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, unitVent.Name); // Note that the unit vent fan electric is NOT metered because this value is already metered through the fan component SetupOutputVariable(state, "Zone Unit Ventilator Fan Electricity Energy", Constant::Units::J, unitVent.ElecEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, unitVent.Name); SetupOutputVariable(state, "Zone Unit Ventilator Fan Availability Status", Constant::Units::None, unitVent.AvailStatus, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, unitVent.Name); if (unitVent.FanType_Num == DataHVACGlobals::FanType_SimpleOnOff) { SetupOutputVariable(state, "Zone Unit Ventilator Fan Part Load Ratio", Constant::Units::None, unitVent.FanPartLoadRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, unitVent.Name); } } diff --git a/src/EnergyPlus/UnitarySystem.cc b/src/EnergyPlus/UnitarySystem.cc index de0b23e9ec3..bf4ec15f586 100644 --- a/src/EnergyPlus/UnitarySystem.cc +++ b/src/EnergyPlus/UnitarySystem.cc @@ -17046,70 +17046,69 @@ namespace UnitarySystems { "Unitary System Part Load Ratio", Constant::Units::None, state.dataUnitarySystems->unitarySys[sysNum].m_PartLoadFrac, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Unitary System Total Cooling Rate", Constant::Units::W, state.dataUnitarySystems->unitarySys[sysNum].m_TotCoolEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Unitary System Sensible Cooling Rate", Constant::Units::W, state.dataUnitarySystems->unitarySys[sysNum].m_SensCoolEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Unitary System Latent Cooling Rate", Constant::Units::W, state.dataUnitarySystems->unitarySys[sysNum].m_LatCoolEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Unitary System Total Heating Rate", Constant::Units::W, state.dataUnitarySystems->unitarySys[sysNum].m_TotHeatEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Unitary System Sensible Heating Rate", Constant::Units::W, state.dataUnitarySystems->unitarySys[sysNum].m_SensHeatEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Unitary System Latent Heating Rate", Constant::Units::W, state.dataUnitarySystems->unitarySys[sysNum].m_LatHeatEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Unitary System Ancillary Electricity Rate", Constant::Units::W, state.dataUnitarySystems->unitarySys[sysNum].m_TotalAuxElecPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); if (state.dataUnitarySystems->unitarySys[sysNum].m_CoolCoilExists) { SetupOutputVariable(state, "Unitary System Cooling Ancillary Electricity Energy", Constant::Units::J, state.dataUnitarySystems->unitarySys[sysNum].m_CoolingAuxElecConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataUnitarySystems->unitarySys[sysNum].Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); } if (state.dataUnitarySystems->unitarySys[sysNum].m_HeatCoilExists || state.dataUnitarySystems->unitarySys[sysNum].m_SuppCoilExists) { @@ -17117,28 +17116,27 @@ namespace UnitarySystems { "Unitary System Heating Ancillary Electricity Energy", Constant::Units::J, state.dataUnitarySystems->unitarySys[sysNum].m_HeatingAuxElecConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataUnitarySystems->unitarySys[sysNum].Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Heating, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Heating); } SetupOutputVariable(state, "Unitary System Electricity Rate", Constant::Units::W, state.dataUnitarySystems->unitarySys[sysNum].m_ElecPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Unitary System Electricity Energy", Constant::Units::J, state.dataUnitarySystems->unitarySys[sysNum].m_ElecPowerConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataUnitarySystems->unitarySys[sysNum].Name); // report predicted load as determined by Unitary System for load control only @@ -17147,15 +17145,15 @@ namespace UnitarySystems { "Unitary System Predicted Sensible Load to Setpoint Heat Transfer Rate", Constant::Units::W, state.dataUnitarySystems->unitarySys[sysNum].m_SensibleLoadPredicted, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Unitary System Predicted Moisture Load to Setpoint Heat Transfer Rate", Constant::Units::W, state.dataUnitarySystems->unitarySys[sysNum].m_MoistureLoadPredicted, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); } @@ -17164,8 +17162,8 @@ namespace UnitarySystems { "Unitary System Dehumidification Induced Heating Demand Rate", Constant::Units::W, state.dataUnitarySystems->unitarySys[sysNum].m_DehumidInducedHeatingDemandRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); // END IF @@ -17174,8 +17172,8 @@ namespace UnitarySystems { "Unitary System Fan Part Load Ratio", Constant::Units::None, state.dataUnitarySystems->unitarySys[sysNum].FanPartLoadRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); } @@ -17183,16 +17181,16 @@ namespace UnitarySystems { "Unitary System Compressor Part Load Ratio", Constant::Units::None, state.dataUnitarySystems->unitarySys[sysNum].m_CompPartLoadRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Unitary System Frost Control Status", Constant::Units::None, state.dataUnitarySystems->unitarySys[sysNum].m_FrostControlStatus, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); switch (state.dataUnitarySystems->unitarySys[sysNum].m_CoolingCoilType_Num) { @@ -17203,36 +17201,36 @@ namespace UnitarySystems { "Unitary System Heat Recovery Rate", Constant::Units::W, state.dataUnitarySystems->unitarySys[sysNum].m_HeatRecoveryRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Unitary System Heat Recovery Inlet Temperature", Constant::Units::C, state.dataUnitarySystems->unitarySys[sysNum].m_HeatRecoveryInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Unitary System Heat Recovery Outlet Temperature", Constant::Units::C, state.dataUnitarySystems->unitarySys[sysNum].m_HeatRecoveryOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Unitary System Heat Recovery Fluid Mass Flow Rate", Constant::Units::kg_s, state.dataUnitarySystems->unitarySys[sysNum].m_HeatRecoveryMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Unitary System Heat Recovery Energy", Constant::Units::J, state.dataUnitarySystems->unitarySys[sysNum].m_HeatRecoveryEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataUnitarySystems->unitarySys[sysNum].Name); } } break; @@ -17244,15 +17242,15 @@ namespace UnitarySystems { "Unitary System Requested Sensible Cooling Rate", Constant::Units::W, state.dataUnitarySystems->unitarySys[sysNum].m_CoolingCoilSensDemand, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Unitary System Requested Latent Cooling Rate", Constant::Units::W, state.dataUnitarySystems->unitarySys[sysNum].m_CoolingCoilLatentDemand, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); } break; default: @@ -17267,15 +17265,15 @@ namespace UnitarySystems { "Unitary System Zone Load Sensible Heat Ratio", Constant::Units::None, state.dataUnitarySystems->unitarySys[sysNum].LoadSHR, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Unitary System Cooling Coil Load Sensible Heat Ratio", Constant::Units::None, state.dataUnitarySystems->unitarySys[sysNum].CoilSHR, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); } } @@ -17289,8 +17287,8 @@ namespace UnitarySystems { "Unitary System Requested Heating Rate", Constant::Units::W, state.dataUnitarySystems->unitarySys[sysNum].m_HeatingCoilSensDemand, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); } break; default: @@ -17307,22 +17305,22 @@ namespace UnitarySystems { "Unitary System DX Coil Cycling Ratio", Constant::Units::None, state.dataUnitarySystems->unitarySys[sysNum].m_CycRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Unitary System DX Coil Speed Ratio", Constant::Units::None, state.dataUnitarySystems->unitarySys[sysNum].m_SpeedRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Unitary System DX Coil Speed Level", Constant::Units::None, state.dataUnitarySystems->unitarySys[sysNum].m_SpeedNum, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); } @@ -17335,22 +17333,22 @@ namespace UnitarySystems { "Unitary System Water Coil Cycling Ratio", Constant::Units::None, state.dataUnitarySystems->unitarySys[sysNum].m_CycRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Unitary System Water Coil Speed Ratio", Constant::Units::None, state.dataUnitarySystems->unitarySys[sysNum].m_SpeedRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Unitary System Water Coil Speed Level", Constant::Units::None, state.dataUnitarySystems->unitarySys[sysNum].m_SpeedNum, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); } @@ -17441,15 +17439,15 @@ namespace UnitarySystems { "Coil System Cycling Ratio", Constant::Units::None, state.dataUnitarySystems->unitarySys[sysNum].m_CoolingCycRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Coil System Compressor Speed Ratio", Constant::Units::None, state.dataUnitarySystems->unitarySys[sysNum].m_CoolingSpeedRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); } else if (state.dataUnitarySystems->unitarySys[sysNum].m_CoolingCoilType_Num == DataHVACGlobals::Coil_CoolingAirToAirVariableSpeed) { @@ -17457,38 +17455,38 @@ namespace UnitarySystems { "Coil System Cycling Ratio", Constant::Units::None, state.dataUnitarySystems->unitarySys[sysNum].m_CoolingCycRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Coil System Compressor Speed Ratio", Constant::Units::None, state.dataUnitarySystems->unitarySys[sysNum].m_CoolingSpeedRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Coil System Compressor Speed Number", Constant::Units::None, state.dataUnitarySystems->unitarySys[sysNum].m_CoolingSpeedNum, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); } else { SetupOutputVariable(state, "Coil System Part Load Ratio", Constant::Units::None, state.dataUnitarySystems->unitarySys[sysNum].m_CoolingPartLoadFrac, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); } SetupOutputVariable(state, "Coil System Frost Control Status", Constant::Units::None, state.dataUnitarySystems->unitarySys[sysNum].m_FrostControlStatus, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); break; case UnitarySys::SysType::CoilCoolingWater: @@ -17497,29 +17495,29 @@ namespace UnitarySystems { "Coil System Water Part Load Ratio", Constant::Units::None, state.dataUnitarySystems->unitarySys[sysNum].m_PartLoadFrac, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Coil System Water Total Cooling Rate", Constant::Units::W, state.dataUnitarySystems->unitarySys[sysNum].m_TotCoolEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Coil System Water Sensible Cooling Rate", Constant::Units::W, state.dataUnitarySystems->unitarySys[sysNum].m_SensCoolEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Coil System Water Latent Cooling Rate", Constant::Units::W, state.dataUnitarySystems->unitarySys[sysNum].m_LatCoolEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); if (state.dataUnitarySystems->unitarySys[sysNum].m_TemperatureOffsetControlActive) { @@ -17527,8 +17525,8 @@ namespace UnitarySystems { "Coil System Water Control Status", Constant::Units::None, state.dataUnitarySystems->unitarySys[sysNum].temperatureOffsetControlStatus, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); } break; @@ -17538,120 +17536,120 @@ namespace UnitarySystems { "Zone Packaged Terminal Air Conditioner Total Heating Rate", Constant::Units::W, state.dataUnitarySystems->unitarySys[sysNum].m_TotHeatEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Zone Packaged Terminal Air Conditioner Total Heating Energy", Constant::Units::J, state.dataUnitarySystems->unitarySys[sysNum].m_TotHeatEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Zone Packaged Terminal Air Conditioner Total Cooling Rate", Constant::Units::W, state.dataUnitarySystems->unitarySys[sysNum].m_TotCoolEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Zone Packaged Terminal Air Conditioner Total Cooling Energy", Constant::Units::J, state.dataUnitarySystems->unitarySys[sysNum].m_TotCoolEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Zone Packaged Terminal Air Conditioner Sensible Heating Rate", Constant::Units::W, state.dataUnitarySystems->unitarySys[sysNum].m_SensHeatEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Zone Packaged Terminal Air Conditioner Sensible Heating Energy", Constant::Units::J, state.dataUnitarySystems->unitarySys[sysNum].m_SensHeatEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Zone Packaged Terminal Air Conditioner Sensible Cooling Rate", Constant::Units::W, state.dataUnitarySystems->unitarySys[sysNum].m_SensCoolEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Zone Packaged Terminal Air Conditioner Sensible Cooling Energy", Constant::Units::J, state.dataUnitarySystems->unitarySys[sysNum].m_SensCoolEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Zone Packaged Terminal Air Conditioner Latent Heating Rate", Constant::Units::W, state.dataUnitarySystems->unitarySys[sysNum].m_LatHeatEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Zone Packaged Terminal Air Conditioner Latent Heating Energy", Constant::Units::J, state.dataUnitarySystems->unitarySys[sysNum].m_LatHeatEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Zone Packaged Terminal Air Conditioner Latent Cooling Rate", Constant::Units::W, state.dataUnitarySystems->unitarySys[sysNum].m_LatCoolEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Zone Packaged Terminal Air Conditioner Latent Cooling Energy", Constant::Units::J, state.dataUnitarySystems->unitarySys[sysNum].m_LatCoolEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Zone Packaged Terminal Air Conditioner Electricity Rate", Constant::Units::W, state.dataUnitarySystems->unitarySys[sysNum].m_ElecPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Zone Packaged Terminal Air Conditioner Electricity Energy", Constant::Units::J, state.dataUnitarySystems->unitarySys[sysNum].m_ElecPowerConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Zone Packaged Terminal Air Conditioner Fan Part Load Ratio", Constant::Units::None, state.dataUnitarySystems->unitarySys[sysNum].FanPartLoadRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Zone Packaged Terminal Air Conditioner Compressor Part Load Ratio", Constant::Units::None, state.dataUnitarySystems->unitarySys[sysNum].m_CompPartLoadRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Zone Packaged Terminal Air Conditioner Fan Availability Status", Constant::Units::None, state.dataUnitarySystems->unitarySys[sysNum].m_AvailStatus, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); break; case UnitarySys::SysType::PackagedHP: @@ -17660,120 +17658,120 @@ namespace UnitarySystems { "Zone Packaged Terminal Heat Pump Total Heating Rate", Constant::Units::W, state.dataUnitarySystems->unitarySys[sysNum].m_TotHeatEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Zone Packaged Terminal Heat Pump Total Heating Energy", Constant::Units::J, state.dataUnitarySystems->unitarySys[sysNum].m_TotHeatEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Zone Packaged Terminal Heat Pump Total Cooling Rate", Constant::Units::W, state.dataUnitarySystems->unitarySys[sysNum].m_TotCoolEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Zone Packaged Terminal Heat Pump Total Cooling Energy", Constant::Units::J, state.dataUnitarySystems->unitarySys[sysNum].m_TotCoolEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Zone Packaged Terminal Heat Pump Sensible Heating Rate", Constant::Units::W, state.dataUnitarySystems->unitarySys[sysNum].m_SensHeatEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Zone Packaged Terminal Heat Pump Sensible Heating Energy", Constant::Units::J, state.dataUnitarySystems->unitarySys[sysNum].m_SensHeatEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Zone Packaged Terminal Heat Pump Sensible Cooling Rate", Constant::Units::W, state.dataUnitarySystems->unitarySys[sysNum].m_SensCoolEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Zone Packaged Terminal Heat Pump Sensible Cooling Energy", Constant::Units::J, state.dataUnitarySystems->unitarySys[sysNum].m_SensCoolEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Zone Packaged Terminal Heat Pump Latent Heating Rate", Constant::Units::W, state.dataUnitarySystems->unitarySys[sysNum].m_LatHeatEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Zone Packaged Terminal Heat Pump Latent Heating Energy", Constant::Units::J, state.dataUnitarySystems->unitarySys[sysNum].m_LatHeatEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Zone Packaged Terminal Heat Pump Latent Cooling Rate", Constant::Units::W, state.dataUnitarySystems->unitarySys[sysNum].m_LatCoolEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Zone Packaged Terminal Heat Pump Latent Cooling Energy", Constant::Units::J, state.dataUnitarySystems->unitarySys[sysNum].m_LatCoolEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Zone Packaged Terminal Heat Pump Electricity Rate", Constant::Units::W, state.dataUnitarySystems->unitarySys[sysNum].m_ElecPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Zone Packaged Terminal Heat Pump Electricity Energy", Constant::Units::J, state.dataUnitarySystems->unitarySys[sysNum].m_ElecPowerConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Zone Packaged Terminal Heat Pump Fan Part Load Ratio", Constant::Units::None, state.dataUnitarySystems->unitarySys[sysNum].FanPartLoadRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Zone Packaged Terminal Heat Pump Compressor Part Load Ratio", Constant::Units::None, state.dataUnitarySystems->unitarySys[sysNum].m_CompPartLoadRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Zone Packaged Terminal Heat Pump Fan Availability Status", Constant::Units::None, state.dataUnitarySystems->unitarySys[sysNum].m_AvailStatus, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); break; case UnitarySys::SysType::PackagedWSHP: @@ -17782,120 +17780,120 @@ namespace UnitarySystems { "Zone Water to Air Heat Pump Total Heating Rate", Constant::Units::W, state.dataUnitarySystems->unitarySys[sysNum].m_TotHeatEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Zone Water to Air Heat Pump Total Heating Energy", Constant::Units::J, state.dataUnitarySystems->unitarySys[sysNum].m_TotHeatEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Zone Water to Air Heat Pump Total Cooling Rate", Constant::Units::W, state.dataUnitarySystems->unitarySys[sysNum].m_TotCoolEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Zone Water to Air Heat Pump Total Cooling Energy", Constant::Units::J, state.dataUnitarySystems->unitarySys[sysNum].m_TotCoolEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Zone Water to Air Heat Pump Sensible Heating Rate", Constant::Units::W, state.dataUnitarySystems->unitarySys[sysNum].m_SensHeatEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Zone Water to Air Heat Pump Sensible Heating Energy", Constant::Units::J, state.dataUnitarySystems->unitarySys[sysNum].m_SensHeatEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Zone Water to Air Heat Pump Sensible Cooling Rate", Constant::Units::W, state.dataUnitarySystems->unitarySys[sysNum].m_SensCoolEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Zone Water to Air Heat Pump Sensible Cooling Energy", Constant::Units::J, state.dataUnitarySystems->unitarySys[sysNum].m_SensCoolEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Zone Water to Air Heat Pump Latent Heating Rate", Constant::Units::W, state.dataUnitarySystems->unitarySys[sysNum].m_LatHeatEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Zone Water to Air Heat Pump Latent Heating Energy", Constant::Units::J, state.dataUnitarySystems->unitarySys[sysNum].m_LatHeatEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Zone Water to Air Heat Pump Latent Cooling Rate", Constant::Units::W, state.dataUnitarySystems->unitarySys[sysNum].m_LatCoolEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Zone Water to Air Heat Pump Latent Cooling Energy", Constant::Units::J, state.dataUnitarySystems->unitarySys[sysNum].m_LatCoolEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Zone Water to Air Heat Pump Electricity Rate", Constant::Units::W, state.dataUnitarySystems->unitarySys[sysNum].m_ElecPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Zone Water to Air Heat Pump Electricity Energy", Constant::Units::J, state.dataUnitarySystems->unitarySys[sysNum].m_ElecPowerConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Zone Water to Air Heat Pump Fan Part Load Ratio", Constant::Units::None, state.dataUnitarySystems->unitarySys[sysNum].FanPartLoadRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Zone Water to Air Heat Pump Compressor Part Load Ratio", Constant::Units::None, state.dataUnitarySystems->unitarySys[sysNum].m_CompPartLoadRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Zone Water to Air Heat Pump Fan Availability Status", Constant::Units::None, state.dataUnitarySystems->unitarySys[sysNum].m_AvailStatus, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); if (((state.dataUnitarySystems->unitarySys[sysNum].m_CoolingCoilType_Num == DataHVACGlobals::Coil_CoolingWaterToAirHPSimple || state.dataUnitarySystems->unitarySys[sysNum].m_CoolingCoilType_Num == @@ -17909,22 +17907,22 @@ namespace UnitarySystems { "Unitary System Water Coil Multispeed Fan Cycling Ratio", Constant::Units::None, state.dataUnitarySystems->unitarySys[sysNum].m_CycRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Unitary System Water Coil Multispeed Fan Speed Ratio", Constant::Units::None, state.dataUnitarySystems->unitarySys[sysNum].m_SpeedRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); SetupOutputVariable(state, "Unitary System Water Coil Multispeed Fan Speed Level", Constant::Units::None, state.dataUnitarySystems->unitarySys[sysNum].m_SpeedNum, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataUnitarySystems->unitarySys[sysNum].Name); } break; diff --git a/src/EnergyPlus/VariableSpeedCoils.cc b/src/EnergyPlus/VariableSpeedCoils.cc index 20c7a2e502a..4a3687107ef 100644 --- a/src/EnergyPlus/VariableSpeedCoils.cc +++ b/src/EnergyPlus/VariableSpeedCoils.cc @@ -807,49 +807,46 @@ namespace VariableSpeedCoils { "Cooling Coil Electricity Energy", Constant::Units::J, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Energy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); SetupOutputVariable(state, "Cooling Coil Total Cooling Energy", Constant::Units::J, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).EnergyLoadTotal, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::CoolingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::CoolingCoils); SetupOutputVariable(state, "Cooling Coil Sensible Cooling Energy", Constant::Units::J, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).EnergySensible, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Latent Cooling Energy", Constant::Units::J, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).EnergyLatent, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Source Side Heat Transfer Energy", Constant::Units::J, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).EnergySource, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name, Constant::eResource::PlantLoopCoolingDemand, - OutputProcessor::SOVEndUseCat::CoolingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::CoolingCoils); // for table output, being consistent with outher water-to-air coils // IF (VarSpeedCoil(DXCoilNum)%RatedCapCoolTotal /= AutoSize) THEN @@ -1364,44 +1361,42 @@ namespace VariableSpeedCoils { "Cooling Coil Electricity Energy", Constant::Units::J, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Energy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); SetupOutputVariable(state, "Cooling Coil Total Cooling Energy", Constant::Units::J, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).EnergyLoadTotal, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::CoolingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::CoolingCoils); SetupOutputVariable(state, "Cooling Coil Sensible Cooling Energy", Constant::Units::J, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).EnergySensible, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Latent Cooling Energy", Constant::Units::J, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).EnergyLatent, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Source Side Heat Transfer Energy", Constant::Units::J, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).EnergySource, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).RatedCapCoolSens = @@ -1911,35 +1906,32 @@ namespace VariableSpeedCoils { "Heating Coil Electricity Energy", Constant::Units::J, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Energy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Heating, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Heating); SetupOutputVariable(state, "Heating Coil Heating Energy", Constant::Units::J, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).EnergyLoadTotal, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::HeatingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::HeatingCoils); SetupOutputVariable(state, "Heating Coil Source Side Heat Transfer Energy", Constant::Units::J, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).EnergySource, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name, Constant::eResource::PlantLoopHeatingDemand, - OutputProcessor::SOVEndUseCat::HeatingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::HeatingCoils); // create predefined report entries PreDefTableEntry( @@ -2397,30 +2389,28 @@ namespace VariableSpeedCoils { "Heating Coil Electricity Energy", Constant::Units::J, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Energy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Heating, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Heating); SetupOutputVariable(state, "Heating Coil Heating Energy", Constant::Units::J, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).EnergyLoadTotal, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::HeatingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::HeatingCoils); SetupOutputVariable(state, "Heating Coil Source Side Heat Transfer Energy", Constant::Units::J, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).EnergySource, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); // create predefined report entries @@ -3029,58 +3019,55 @@ namespace VariableSpeedCoils { "Cooling Coil Electricity Energy", Constant::Units::J, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Energy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Heating, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Heating); SetupOutputVariable(state, "Cooling Coil Sensible Cooling Energy", Constant::Units::J, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).EnergySensible, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Latent Cooling Energy", Constant::Units::J, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).EnergyLatent, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Water Side Heat Transfer Energy", Constant::Units::J, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).EnergySource, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name, Constant::eResource::PlantLoopHeatingDemand, - OutputProcessor::SOVEndUseCat::HeatingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::HeatingCoils); if (state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).IsDXCoilInZone) { SetupOutputVariable(state, "Cooling Coil Cooling Energy", Constant::Units::J, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).EnergyLoadTotal, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::CoolingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::CoolingCoils); } else { SetupOutputVariable(state, "Cooling Coil Cooling Energy", Constant::Units::J, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).EnergyLoadTotal, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); } @@ -3112,99 +3099,99 @@ namespace VariableSpeedCoils { "Cooling Coil Air Mass Flow Rate", Constant::Units::kg_s, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).AirMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Air Inlet Temperature", Constant::Units::C, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).InletAirDBTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Air Inlet Humidity Ratio", Constant::Units::kgWater_kgDryAir, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).InletAirHumRat, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Latent Cooling Rate", Constant::Units::W, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).QLatent, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Air Outlet Temperature", Constant::Units::C, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).OutletAirDBTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Air Outlet Humidity Ratio", Constant::Units::kgWater_kgDryAir, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).OutletAirHumRat, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Sensible Cooling Rate", Constant::Units::W, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).QSensible, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Total Cooling Rate", Constant::Units::W, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).QLoadTotal, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Part Load Ratio", Constant::Units::None, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).PartLoadRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Electricity Rate", Constant::Units::W, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Power, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Runtime Fraction", Constant::Units::None, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).RunFrac, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Source Side Heat Transfer Rate", Constant::Units::W, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).QSource, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Upper Speed Level", Constant::Units::None, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).SpeedNumReport, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Neighboring Speed Levels Ratio", Constant::Units::None, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).SpeedRatioReport, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); if (state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).CondensateCollectMode == CondensateToTank) { @@ -3212,20 +3199,19 @@ namespace VariableSpeedCoils { "Cooling Coil Condensate Volume Flow Rate", Constant::Units::m3_s, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).CondensateVdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Condensate Volume", Constant::Units::m3, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).CondensateVol, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name, Constant::eResource::OnSiteWater, - OutputProcessor::SOVEndUseCat::Condensate, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Condensate); } if (state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).ReportEvapCondVars) { @@ -3233,68 +3219,64 @@ namespace VariableSpeedCoils { "Cooling Coil Condenser Inlet Temperature", Constant::Units::C, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).CondInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Evaporative Condenser Water Volume", Constant::Units::m3, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).EvapWaterConsump, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name, Constant::eResource::Water, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); SetupOutputVariable(state, "Cooling Coil Evaporative Condenser Mains Water Volume", Constant::Units::m3, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).EvapWaterConsump, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name, Constant::eResource::MainsWater, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); SetupOutputVariable(state, "Cooling Coil Evaporative Condenser Pump Electricity Rate", Constant::Units::W, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).EvapCondPumpElecPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Evaporative Condenser Pump Electricity Energy", Constant::Units::J, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).EvapCondPumpElecConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); if (state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).BasinHeaterPowerFTempDiff > 0.0) { SetupOutputVariable(state, "Cooling Coil Basin Heater Electricity Rate", Constant::Units::W, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).BasinHeaterPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Basin Heater Electricity Energy", Constant::Units::J, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).BasinHeaterConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); } } @@ -3302,151 +3284,148 @@ namespace VariableSpeedCoils { "Cooling Coil Crankcase Heater Electricity Rate", Constant::Units::W, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).CrankcaseHeaterPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Crankcase Heater Electricity Energy", Constant::Units::J, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).CrankcaseHeaterConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); } else { // air source heating coils SetupOutputVariable(state, "Heating Coil Air Mass Flow Rate", Constant::Units::kg_s, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).AirMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Heating Coil Air Inlet Temperature", Constant::Units::C, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).InletAirDBTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Heating Coil Air Inlet Humidity Ratio", Constant::Units::kgWater_kgDryAir, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).InletAirHumRat, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Heating Coil Air Outlet Temperature", Constant::Units::C, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).OutletAirDBTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Heating Coil Air Outlet Humidity Ratio", Constant::Units::kgWater_kgDryAir, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).OutletAirHumRat, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Heating Coil Sensible Heating Rate", Constant::Units::W, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).QSensible, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Heating Coil Heating Rate", Constant::Units::W, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).QLoadTotal, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Heating Coil Part Load Ratio", Constant::Units::None, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).PartLoadRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Heating Coil Electricity Rate", Constant::Units::W, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Power, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Heating Coil Runtime Fraction", Constant::Units::None, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).RunFrac, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Heating Coil Source Side Heat Transfer Rate", Constant::Units::W, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).QSource, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Heating Coil Upper Speed Level", Constant::Units::None, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).SpeedNumReport, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Heating Coil Neighboring Speed Levels Ratio", Constant::Units::None, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).SpeedRatioReport, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Heating Coil Defrost Electricity Rate", Constant::Units::W, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).DefrostPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Heating Coil Defrost Electricity Energy", Constant::Units::J, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).DefrostConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Heating, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Heating); SetupOutputVariable(state, "Heating Coil Crankcase Heater Electricity Rate", Constant::Units::W, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).CrankcaseHeaterPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Heating Coil Crankcase Heater Electricity Energy", Constant::Units::J, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).CrankcaseHeaterConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Heating, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Heating); } } else { @@ -3457,129 +3436,129 @@ namespace VariableSpeedCoils { "Cooling Coil Electricity Rate", Constant::Units::W, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Power, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Total Cooling Rate", Constant::Units::W, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).QLoadTotal, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Sensible Cooling Rate", Constant::Units::W, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).QSensible, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Latent Cooling Rate", Constant::Units::W, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).QLatent, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Source Side Heat Transfer Rate", Constant::Units::W, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).QSource, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Part Load Ratio", Constant::Units::None, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).PartLoadRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Runtime Fraction", Constant::Units::None, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).RunFrac, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Air Mass Flow Rate", Constant::Units::kg_s, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).AirMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Air Inlet Temperature", Constant::Units::C, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).InletAirDBTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Air Inlet Humidity Ratio", Constant::Units::kgWater_kgDryAir, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).InletAirHumRat, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Air Outlet Temperature", Constant::Units::C, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).OutletAirDBTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Air Outlet Humidity Ratio", Constant::Units::kgWater_kgDryAir, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).OutletAirHumRat, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Source Side Mass Flow Rate", Constant::Units::kg_s, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).WaterMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Source Side Inlet Temperature", Constant::Units::C, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).InletWaterTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Source Side Outlet Temperature", Constant::Units::C, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).OutletWaterTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Upper Speed Level", Constant::Units::None, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).SpeedNumReport, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Neighboring Speed Levels Ratio", Constant::Units::None, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).SpeedRatioReport, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Recoverable Heat Transfer Rate", Constant::Units::W, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).QWasteHeat, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); } else if (state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).VSCoilType == Coil_HeatingWaterToAirHPVSEquationFit) { // fix coil type @@ -3589,123 +3568,123 @@ namespace VariableSpeedCoils { "Heating Coil Electricity Rate", Constant::Units::W, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Power, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Heating Coil Heating Rate", Constant::Units::W, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).QLoadTotal, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Heating Coil Sensible Heating Rate", Constant::Units::W, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).QSensible, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Heating Coil Source Side Heat Transfer Rate", Constant::Units::W, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).QSource, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Heating Coil Part Load Ratio", Constant::Units::None, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).PartLoadRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Heating Coil Runtime Fraction", Constant::Units::None, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).RunFrac, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Heating Coil Air Mass Flow Rate", Constant::Units::kg_s, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).AirMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Heating Coil Air Inlet Temperature", Constant::Units::C, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).InletAirDBTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Heating Coil Air Inlet Humidity Ratio", Constant::Units::kgWater_kgDryAir, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).InletAirHumRat, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Heating Coil Air Outlet Temperature", Constant::Units::C, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).OutletAirDBTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Heating Coil Air Outlet Humidity Ratio", Constant::Units::kgWater_kgDryAir, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).OutletAirHumRat, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Heating Coil Source Side Mass Flow Rate", Constant::Units::kg_s, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).WaterMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Heating Coil Source Side Inlet Temperature", Constant::Units::C, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).InletWaterTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Heating Coil Source Side Outlet Temperature", Constant::Units::C, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).OutletWaterTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Heating Coil Upper Speed Level", Constant::Units::None, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).SpeedNumReport, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Heating Coil Neighboring Speed Levels Ratio", Constant::Units::None, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).SpeedRatioReport, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Heating Coil Recoverable Heat Transfer Rate", Constant::Units::W, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).QWasteHeat, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); } else if (state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).VSCoilType == CoilDX_HeatPumpWaterHeaterVariableSpeed) { // air source water heating coil @@ -3713,161 +3692,159 @@ namespace VariableSpeedCoils { "Cooling Coil Water Heating Electricity Rate", Constant::Units::W, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Power, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Total Cooling Rate", Constant::Units::W, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).QLoadTotal, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Sensible Cooling Rate", Constant::Units::W, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).QSensible, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Latent Cooling Rate", Constant::Units::W, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).QLatent, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Total Water Heating Rate", Constant::Units::W, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).TotalHeatingEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Part Load Ratio", Constant::Units::None, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).PartLoadRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Runtime Fraction", Constant::Units::None, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).RunFrac, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Air Mass Flow Rate", Constant::Units::kg_s, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).AirMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Air Inlet Temperature", Constant::Units::C, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).InletAirDBTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Air Inlet Humidity Ratio", Constant::Units::kgWater_kgDryAir, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).InletAirHumRat, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Air Outlet Temperature", Constant::Units::C, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).OutletAirDBTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Air Outlet Humidity Ratio", Constant::Units::kgWater_kgDryAir, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).OutletAirHumRat, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Water Mass Flow Rate", Constant::Units::kg_s, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).WaterMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Water Inlet Temperature", Constant::Units::C, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).InletWaterTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Water Outlet Temperature", Constant::Units::C, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).OutletWaterTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Crankcase Heater Electricity Rate", Constant::Units::W, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).CrankcaseHeaterPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Crankcase Heater Electricity Energy", Constant::Units::J, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).CrankcaseHeaterConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Heating, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Heating); SetupOutputVariable(state, "Cooling Coil Upper Speed Level", Constant::Units::None, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).SpeedNumReport, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Neighboring Speed Levels Ratio", Constant::Units::None, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).SpeedRatioReport, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Water Heating Pump Electricity Rate", Constant::Units::W, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).HPWHCondPumpElecNomPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name); SetupOutputVariable(state, "Cooling Coil Water Heating Pump Electricity Energy", Constant::Units::J, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).EvapCondPumpElecConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataVariableSpeedCoils->VarSpeedCoil(DXCoilNum).Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Heating, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Heating); } } } diff --git a/src/EnergyPlus/VentilatedSlab.cc b/src/EnergyPlus/VentilatedSlab.cc index 6e50944431f..30d93277835 100644 --- a/src/EnergyPlus/VentilatedSlab.cc +++ b/src/EnergyPlus/VentilatedSlab.cc @@ -1318,149 +1318,149 @@ namespace VentilatedSlab { "Zone Ventilated Slab Radiant Heating Rate", Constant::Units::W, ventSlab.RadHeatingPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ventSlab.Name); SetupOutputVariable(state, "Zone Ventilated Slab Radiant Heating Energy", Constant::Units::J, ventSlab.RadHeatingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, ventSlab.Name); SetupOutputVariable(state, "Zone Ventilated Slab Radiant Cooling Rate", Constant::Units::W, ventSlab.RadCoolingPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ventSlab.Name); SetupOutputVariable(state, "Zone Ventilated Slab Radiant Cooling Energy", Constant::Units::J, ventSlab.RadCoolingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, ventSlab.Name); SetupOutputVariable(state, "Zone Ventilated Slab Coil Heating Rate", Constant::Units::W, ventSlab.HeatCoilPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ventSlab.Name); SetupOutputVariable(state, "Zone Ventilated Slab Coil Heating Energy", Constant::Units::J, ventSlab.HeatCoilEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, ventSlab.Name); SetupOutputVariable(state, "Zone Ventilated Slab Coil Total Cooling Rate", Constant::Units::W, ventSlab.TotCoolCoilPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ventSlab.Name); SetupOutputVariable(state, "Zone Ventilated Slab Coil Total Cooling Energy", Constant::Units::J, ventSlab.TotCoolCoilEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, ventSlab.Name); SetupOutputVariable(state, "Zone Ventilated Slab Coil Sensible Cooling Rate", Constant::Units::W, ventSlab.SensCoolCoilPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ventSlab.Name); SetupOutputVariable(state, "Zone Ventilated Slab Coil Sensible Cooling Energy", Constant::Units::J, ventSlab.SensCoolCoilEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, ventSlab.Name); SetupOutputVariable(state, "Zone Ventilated Slab Coil Latent Cooling Rate", Constant::Units::W, ventSlab.LateCoolCoilPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ventSlab.Name); SetupOutputVariable(state, "Zone Ventilated Slab Coil Latent Cooling Energy", Constant::Units::J, ventSlab.LateCoolCoilEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, ventSlab.Name); SetupOutputVariable(state, "Zone Ventilated Slab Air Mass Flow Rate", Constant::Units::kg_s, ventSlab.AirMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ventSlab.Name); SetupOutputVariable(state, "Zone Ventilated Slab Fan Electricity Rate", Constant::Units::W, ventSlab.ElecFanPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ventSlab.Name); //! Note that the ventilated slab fan electric is NOT metered because this value is already metered through the fan component SetupOutputVariable(state, "Zone Ventilated Slab Fan Electricity Energy", Constant::Units::J, ventSlab.ElecFanEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, ventSlab.Name); SetupOutputVariable(state, "Zone Ventilated Slab Inlet Air Temperature", Constant::Units::C, ventSlab.SlabInTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ventSlab.Name); SetupOutputVariable(state, "Zone Ventilated Slab Outlet Air Temperature", Constant::Units::C, ventSlab.SlabOutTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ventSlab.Name); SetupOutputVariable(state, "Zone Ventilated Slab Zone Inlet Air Temperature", Constant::Units::C, ventSlab.ZoneInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ventSlab.Name); SetupOutputVariable(state, "Zone Ventilated Slab Return Air Temperature", Constant::Units::C, ventSlab.ReturnAirTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ventSlab.Name); SetupOutputVariable(state, "Zone Ventilated Slab Fan Outlet Air Temperature", Constant::Units::C, ventSlab.FanOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ventSlab.Name); SetupOutputVariable(state, "Zone Ventilated Slab Fan Availability Status", Constant::Units::None, ventSlab.AvailStatus, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ventSlab.Name); } } diff --git a/src/EnergyPlus/WaterCoils.cc b/src/EnergyPlus/WaterCoils.cc index ea90bb15595..188874237fb 100644 --- a/src/EnergyPlus/WaterCoils.cc +++ b/src/EnergyPlus/WaterCoils.cc @@ -443,37 +443,35 @@ void GetWaterCoilInput(EnergyPlusData &state) "Heating Coil Heating Energy", Constant::Units::J, waterCoil.TotWaterHeatingCoilEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, waterCoil.Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::HeatingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::HeatingCoils); SetupOutputVariable(state, "Heating Coil Source Side Heat Transfer Energy", Constant::Units::J, waterCoil.TotWaterHeatingCoilEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, waterCoil.Name, Constant::eResource::PlantLoopHeatingDemand, - OutputProcessor::SOVEndUseCat::HeatingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::HeatingCoils); SetupOutputVariable(state, "Heating Coil Heating Rate", Constant::Units::W, waterCoil.TotWaterHeatingCoilRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, waterCoil.Name); SetupOutputVariable(state, "Heating Coil U Factor Times Area Value", Constant::Units::W_K, waterCoil.UACoilVariable, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, waterCoil.Name); } @@ -630,44 +628,42 @@ void GetWaterCoilInput(EnergyPlusData &state) "Cooling Coil Total Cooling Energy", Constant::Units::J, waterCoil.TotWaterCoolingCoilEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, waterCoil.Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::CoolingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::CoolingCoils); SetupOutputVariable(state, "Cooling Coil Source Side Heat Transfer Energy", Constant::Units::J, waterCoil.TotWaterCoolingCoilEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, waterCoil.Name, Constant::eResource::PlantLoopCoolingDemand, - OutputProcessor::SOVEndUseCat::CoolingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::CoolingCoils); SetupOutputVariable(state, "Cooling Coil Sensible Cooling Energy", Constant::Units::J, waterCoil.SenWaterCoolingCoilEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, waterCoil.Name); SetupOutputVariable(state, "Cooling Coil Total Cooling Rate", Constant::Units::W, waterCoil.TotWaterCoolingCoilRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, waterCoil.Name); SetupOutputVariable(state, "Cooling Coil Sensible Cooling Rate", Constant::Units::W, waterCoil.SenWaterCoolingCoilRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, waterCoil.Name); if (waterCoil.CondensateCollectMode == state.dataWaterCoils->CondensateToTank) { @@ -676,20 +672,19 @@ void GetWaterCoilInput(EnergyPlusData &state) "Cooling Coil Condensate Volume Flow Rate", Constant::Units::m3_s, waterCoil.CondensateVdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, waterCoil.Name); SetupOutputVariable(state, "Cooling Coil Condensate Volume", Constant::Units::m3, waterCoil.CondensateVol, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, waterCoil.Name, Constant::eResource::OnSiteWater, - OutputProcessor::SOVEndUseCat::Condensate, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Condensate); } } @@ -838,51 +833,49 @@ void GetWaterCoilInput(EnergyPlusData &state) "Cooling Coil Total Cooling Energy", Constant::Units::J, waterCoil.TotWaterCoolingCoilEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, waterCoil.Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::CoolingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::CoolingCoils); SetupOutputVariable(state, "Cooling Coil Source Side Heat Transfer Energy", Constant::Units::J, waterCoil.TotWaterCoolingCoilEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, waterCoil.Name, Constant::eResource::PlantLoopCoolingDemand, - OutputProcessor::SOVEndUseCat::CoolingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::CoolingCoils); SetupOutputVariable(state, "Cooling Coil Sensible Cooling Energy", Constant::Units::J, waterCoil.SenWaterCoolingCoilEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, waterCoil.Name); SetupOutputVariable(state, "Cooling Coil Total Cooling Rate", Constant::Units::W, waterCoil.TotWaterCoolingCoilRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, waterCoil.Name); SetupOutputVariable(state, "Cooling Coil Sensible Cooling Rate", Constant::Units::W, waterCoil.SenWaterCoolingCoilRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, waterCoil.Name); SetupOutputVariable(state, "Cooling Coil Wetted Area Fraction", Constant::Units::None, waterCoil.SurfAreaWetFraction, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, waterCoil.Name); if (waterCoil.CondensateCollectMode == state.dataWaterCoils->CondensateToTank) { @@ -891,20 +884,19 @@ void GetWaterCoilInput(EnergyPlusData &state) "Cooling Coil Condensate Volume Flow Rate", Constant::Units::m3_s, waterCoil.CondensateVdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, waterCoil.Name); SetupOutputVariable(state, "Cooling Coil Condensate Volume", Constant::Units::m3, waterCoil.CondensateVol, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, waterCoil.Name, Constant::eResource::OnSiteWater, - OutputProcessor::SOVEndUseCat::Condensate, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Condensate); } } diff --git a/src/EnergyPlus/WaterManager.cc b/src/EnergyPlus/WaterManager.cc index ec8f8839e66..ce5248387fe 100644 --- a/src/EnergyPlus/WaterManager.cc +++ b/src/EnergyPlus/WaterManager.cc @@ -757,85 +757,85 @@ namespace WaterManager { "Water System Storage Tank Volume", Constant::Units::m3, state.dataWaterData->WaterStorage(Item).ThisTimeStepVolume, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataWaterData->WaterStorage(Item).Name); SetupOutputVariable(state, "Water System Storage Tank Net Volume Flow Rate", Constant::Units::m3_s, state.dataWaterData->WaterStorage(Item).NetVdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataWaterData->WaterStorage(Item).Name); SetupOutputVariable(state, "Water System Storage Tank Inlet Volume Flow Rate", Constant::Units::m3_s, state.dataWaterData->WaterStorage(Item).VdotToTank, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataWaterData->WaterStorage(Item).Name); SetupOutputVariable(state, "Water System Storage Tank Outlet Volume Flow Rate", Constant::Units::m3_s, state.dataWaterData->WaterStorage(Item).VdotFromTank, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataWaterData->WaterStorage(Item).Name); SetupOutputVariable(state, "Water System Storage Tank Mains Water Volume", Constant::Units::m3, state.dataWaterData->WaterStorage(Item).MainsDrawVol, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataWaterData->WaterStorage(Item).Name, Constant::eResource::MainsWater, - OutputProcessor::SOVEndUseCat::WaterSystem, - state.dataWaterData->WaterStorage(Item).QualitySubCategoryName, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::WaterSystem, + state.dataWaterData->WaterStorage(Item).QualitySubCategoryName); SetupOutputVariable(state, "Water System Storage Tank Mains Water Volume Flow Rate", Constant::Units::m3_s, state.dataWaterData->WaterStorage(Item).MainsDrawVdot, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataWaterData->WaterStorage(Item).Name); SetupOutputVariable(state, "Water System Storage Tank Water Temperature", Constant::Units::C, state.dataWaterData->WaterStorage(Item).Twater, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataWaterData->WaterStorage(Item).Name); SetupOutputVariable(state, "Water System Storage Tank Overflow Volume Flow Rate", Constant::Units::m3_s, state.dataWaterData->WaterStorage(Item).VdotOverflow, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataWaterData->WaterStorage(Item).Name); if (state.dataWaterData->WaterStorage(Item).OverflowMode == DataWater::Overflow::Discarded) { SetupOutputVariable(state, "Water System Storage Tank Overflow Water Volume", Constant::Units::m3, state.dataWaterData->WaterStorage(Item).VolOverflow, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataWaterData->WaterStorage(Item).Name); } else { SetupOutputVariable(state, "Water System Storage Tank Overflow Water Volume", Constant::Units::m3, state.dataWaterData->WaterStorage(Item).VolOverflow, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataWaterData->WaterStorage(Item).Name); } SetupOutputVariable(state, "Water System Storage Tank Overflow Temperature", Constant::Units::C, state.dataWaterData->WaterStorage(Item).TwaterOverflow, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataWaterData->WaterStorage(Item).Name); } @@ -844,15 +844,15 @@ namespace WaterManager { "Water System Roof Irrigation Scheduled Depth", Constant::Units::m, state.dataWaterData->Irrigation.ScheduledAmount, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, "RoofIrrigation"); SetupOutputVariable(state, "Water System Roof Irrigation Actual Depth", Constant::Units::m, state.dataWaterData->Irrigation.ActualAmount, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, "RoofIrrigation"); } @@ -861,20 +861,19 @@ namespace WaterManager { "Water System Rainwater Collector Volume Flow Rate", Constant::Units::m3_s, state.dataWaterData->RainCollector(Item).VdotAvail, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataWaterData->RainCollector(Item).Name); SetupOutputVariable(state, "Water System Rainwater Collector Volume", Constant::Units::m3, state.dataWaterData->RainCollector(Item).VolCollected, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataWaterData->RainCollector(Item).Name, Constant::eResource::OnSiteWater, - OutputProcessor::SOVEndUseCat::RainWater, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::RainWater); } for (Item = 1; Item <= state.dataWaterData->NumGroundWaterWells; ++Item) { // CurrentModuleObject='WaterUse:Well' @@ -882,45 +881,43 @@ namespace WaterManager { "Water System Groundwater Well Requested Volume Flow Rate", Constant::Units::m3_s, state.dataWaterData->GroundwaterWell(Item).VdotRequest, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataWaterData->GroundwaterWell(Item).Name); SetupOutputVariable(state, "Water System Groundwater Well Volume Flow Rate", Constant::Units::m3_s, state.dataWaterData->GroundwaterWell(Item).VdotDelivered, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataWaterData->GroundwaterWell(Item).Name); SetupOutputVariable(state, "Water System Groundwater Well Volume", Constant::Units::m3, state.dataWaterData->GroundwaterWell(Item).VolDelivered, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataWaterData->GroundwaterWell(Item).Name, Constant::eResource::OnSiteWater, - OutputProcessor::SOVEndUseCat::WellWater, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::WellWater); SetupOutputVariable(state, "Water System Groundwater Well Pump Electricity Rate", Constant::Units::W, state.dataWaterData->GroundwaterWell(Item).PumpPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataWaterData->GroundwaterWell(Item).Name); SetupOutputVariable(state, "Water System Groundwater Well Pump Electricity Energy", Constant::Units::J, state.dataWaterData->GroundwaterWell(Item).PumpEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataWaterData->GroundwaterWell(Item).Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::WaterSystem, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::WaterSystem); } } // my one time flag block diff --git a/src/EnergyPlus/WaterThermalTanks.cc b/src/EnergyPlus/WaterThermalTanks.cc index fd0a2527d4e..835e2e16c85 100644 --- a/src/EnergyPlus/WaterThermalTanks.cc +++ b/src/EnergyPlus/WaterThermalTanks.cc @@ -5019,109 +5019,109 @@ void WaterThermalTankData::setupChilledWaterTankOutputVars(EnergyPlusData &state "Chilled Water Thermal Storage Tank Temperature", Constant::Units::C, this->TankTempAvg, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chilled Water Thermal Storage Final Tank Temperature", Constant::Units::C, this->TankTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chilled Water Thermal Storage Tank Heat Gain Rate", Constant::Units::W, this->LossRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chilled Water Thermal Storage Tank Heat Gain Energy", Constant::Units::J, this->LossEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Chilled Water Thermal Storage Use Side Mass Flow Rate", Constant::Units::kg_s, this->UseMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chilled Water Thermal Storage Use Side Inlet Temperature", Constant::Units::C, this->UseInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chilled Water Thermal Storage Use Side Outlet Temperature", Constant::Units::C, this->UseOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chilled Water Thermal Storage Use Side Heat Transfer Rate", Constant::Units::W, this->UseRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chilled Water Thermal Storage Use Side Heat Transfer Energy", Constant::Units::J, this->UseEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Chilled Water Thermal Storage Source Side Mass Flow Rate", Constant::Units::kg_s, this->SourceMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chilled Water Thermal Storage Source Side Inlet Temperature", Constant::Units::C, this->SourceInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chilled Water Thermal Storage Source Side Outlet Temperature", Constant::Units::C, this->SourceOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chilled Water Thermal Storage Source Side Heat Transfer Rate", Constant::Units::W, this->SourceRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Chilled Water Thermal Storage Source Side Heat Transfer Energy", Constant::Units::J, this->SourceEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); if (this->WaterThermalTankType == DataPlant::PlantEquipmentType::ChilledWaterTankStratified) { @@ -5131,8 +5131,8 @@ void WaterThermalTankData::setupChilledWaterTankOutputVars(EnergyPlusData &state format("Chilled Water Thermal Storage Temperature Node {}", NodeNum), Constant::Units::C, this->Node(NodeNum).TempAvg, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); } @@ -5141,8 +5141,8 @@ void WaterThermalTankData::setupChilledWaterTankOutputVars(EnergyPlusData &state format("Chilled Water Thermal Storage Final Temperature Node {}", NodeNum), Constant::Units::C, this->Node(NodeNum).Temp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); } } @@ -5203,328 +5203,328 @@ void WaterThermalTankData::setupWaterHeaterOutputVars(EnergyPlusData &state) "Water Heater Tank Temperature", Constant::Units::C, this->TankTempAvg, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Heater Final Tank Temperature", Constant::Units::C, this->TankTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Heater Heat Loss Rate", Constant::Units::W, this->LossRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Heater Heat Loss Energy", Constant::Units::J, this->LossEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Water Heater Use Side Mass Flow Rate", Constant::Units::kg_s, this->UseMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Heater Use Side Inlet Temperature", Constant::Units::C, this->UseInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Heater Use Side Outlet Temperature", Constant::Units::C, this->UseOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Heater Use Side Heat Transfer Rate", Constant::Units::W, this->UseRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Heater Use Side Heat Transfer Energy", Constant::Units::J, this->UseEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Water Heater Source Side Mass Flow Rate", Constant::Units::kg_s, this->SourceMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Heater Source Side Inlet Temperature", Constant::Units::C, this->SourceInletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Heater Source Side Outlet Temperature", Constant::Units::C, this->SourceOutletTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Heater Source Side Heat Transfer Rate", Constant::Units::W, this->SourceRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Heater Source Side Heat Transfer Energy", Constant::Units::J, this->SourceEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::PlantLoopHeatingDemand, - OutputProcessor::SOVEndUseCat::WaterSystem, // "DHW", - this->EndUseSubcategoryName, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::WaterSystem, // DHW + this->EndUseSubcategoryName); SetupOutputVariable(state, "Water Heater Off Cycle Parasitic Tank Heat Transfer Rate", Constant::Units::W, this->OffCycParaRateToTank, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Heater Off Cycle Parasitic Tank Heat Transfer Energy", Constant::Units::J, this->OffCycParaEnergyToTank, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Water Heater On Cycle Parasitic Tank Heat Transfer Rate", Constant::Units::W, this->OnCycParaRateToTank, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Heater On Cycle Parasitic Tank Heat Transfer Energy", Constant::Units::J, this->OnCycParaEnergyToTank, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Water Heater Total Demand Heat Transfer Rate", Constant::Units::W, this->TotalDemandRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Heater Total Demand Heat Transfer Energy", Constant::Units::J, this->TotalDemandEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Water Heater Heating Rate", Constant::Units::W, this->HeaterRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Heater Heating Energy", Constant::Units::J, this->HeaterEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Water Heater Unmet Demand Heat Transfer Rate", Constant::Units::W, this->UnmetRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Heater Unmet Demand Heat Transfer Energy", Constant::Units::J, this->UnmetEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Water Heater Venting Heat Transfer Rate", Constant::Units::W, this->VentRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Heater Venting Heat Transfer Energy", Constant::Units::J, this->VentEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Water Heater Net Heat Transfer Rate", Constant::Units::W, this->NetHeatTransferRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Heater Net Heat Transfer Energy", Constant::Units::J, this->NetHeatTransferEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Water Heater Cycle On Count", Constant::Units::None, this->CycleOnCount, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Water Heater Runtime Fraction", Constant::Units::None, this->RuntimeFraction, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Heater Part Load Ratio", Constant::Units::None, this->PartLoadRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, format("Water Heater {} Rate", Constant::eFuelNames[static_cast(this->FuelType)]), Constant::Units::W, this->FuelRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, format("Water Heater {} Energy", Constant::eFuelNames[static_cast(this->FuelType)]), Constant::Units::J, this->FuelEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eFuel2eResource[(int)this->FuelType], - OutputProcessor::SOVEndUseCat::WaterSystem, // "DHW", - this->EndUseSubcategoryName, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::WaterSystem, // DHW + this->EndUseSubcategoryName); SetupOutputVariable(state, format("Water Heater Off Cycle Parasitic {} Rate", Constant::eFuelNames[static_cast(this->OffCycParaFuelType)]), Constant::Units::W, this->OffCycParaFuelRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, format("Water Heater Off Cycle Parasitic {} Energy", Constant::eFuelNames[static_cast(this->OffCycParaFuelType)]), Constant::Units::J, this->OffCycParaFuelEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eFuel2eResource[(int)this->OffCycParaFuelType], - OutputProcessor::SOVEndUseCat::WaterSystem, // "DHW", - this->EndUseSubcategoryName, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::WaterSystem, // DHW + this->EndUseSubcategoryName); SetupOutputVariable(state, format("Water Heater On Cycle Parasitic {} Rate", Constant::eFuelNames[static_cast(this->OnCycParaFuelType)]), Constant::Units::W, this->OnCycParaFuelRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, format("Water Heater On Cycle Parasitic {} Energy", Constant::eFuelNames[static_cast(this->OnCycParaFuelType)]), Constant::Units::J, this->OnCycParaFuelEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eFuel2eResource[(int)this->OnCycParaFuelType], - OutputProcessor::SOVEndUseCat::WaterSystem, // "DHW", - this->EndUseSubcategoryName, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::WaterSystem, // DHW + this->EndUseSubcategoryName); SetupOutputVariable(state, "Water Heater Water Volume Flow Rate", Constant::Units::m3_s, this->VolFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Heater Water Volume", Constant::Units::m3, this->VolumeConsumed, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::Water, - OutputProcessor::SOVEndUseCat::WaterSystem, // "DHW", - this->EndUseSubcategoryName, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::WaterSystem, // DHW + this->EndUseSubcategoryName); SetupOutputVariable(state, "Water Heater Mains Water Volume", Constant::Units::m3, this->VolumeConsumed, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::MainsWater, - OutputProcessor::SOVEndUseCat::WaterSystem, // "DHW", - this->EndUseSubcategoryName, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::WaterSystem, // DHW + this->EndUseSubcategoryName); if (this->HeatPumpNum > 0) { // CurrentModuleObject='WaterHeater:HeatPump:PumpedCondenser' @@ -5533,58 +5533,58 @@ void WaterThermalTankData::setupWaterHeaterOutputVars(EnergyPlusData &state) "Water Heater Compressor Part Load Ratio", Constant::Units::None, HPWH.HeatingPLR, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, HPWH.Name); SetupOutputVariable(state, "Water Heater Off Cycle Ancillary Electricity Rate", Constant::Units::W, HPWH.OffCycParaFuelRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, HPWH.Name); SetupOutputVariable(state, "Water Heater Off Cycle Ancillary Electricity Energy", Constant::Units::J, HPWH.OffCycParaFuelEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, HPWH.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::WaterSystem, // "DHW", - "Water Heater Parasitic", - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::WaterSystem, // DHW + "Water Heater Parasitic"); SetupOutputVariable(state, "Water Heater On Cycle Ancillary Electricity Rate", Constant::Units::W, HPWH.OnCycParaFuelRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, HPWH.Name); SetupOutputVariable(state, "Water Heater On Cycle Ancillary Electricity Energy", Constant::Units::J, HPWH.OnCycParaFuelEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, HPWH.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::WaterSystem, // "DHW", - "Water Heater Parasitic", - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::WaterSystem, // DHW + "Water Heater Parasitic"); SetupOutputVariable(state, "Water Heater Heat Pump Control Tank Temperature", Constant::Units::C, HPWH.ControlTempAvg, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, HPWH.Name); SetupOutputVariable(state, "Water Heater Heat Pump Control Tank Final Temperature", Constant::Units::C, HPWH.ControlTempFinal, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, HPWH.Name); } @@ -5594,88 +5594,88 @@ void WaterThermalTankData::setupWaterHeaterOutputVars(EnergyPlusData &state) "Water Heater Part Load Ratio", Constant::Units::None, state.dataWaterThermalTanks->WaterHeaterDesuperheater(this->DesuperheaterNum).DesuperheaterPLR, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataWaterThermalTanks->WaterHeaterDesuperheater(this->DesuperheaterNum).Name); SetupOutputVariable(state, "Water Heater On Cycle Parasitic Electricity Rate", Constant::Units::W, state.dataWaterThermalTanks->WaterHeaterDesuperheater(this->DesuperheaterNum).OnCycParaFuelRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataWaterThermalTanks->WaterHeaterDesuperheater(this->DesuperheaterNum).Name); SetupOutputVariable(state, "Water Heater On Cycle Parasitic Electricity Energy", Constant::Units::J, state.dataWaterThermalTanks->WaterHeaterDesuperheater(this->DesuperheaterNum).OnCycParaFuelEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataWaterThermalTanks->WaterHeaterDesuperheater(this->DesuperheaterNum).Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::WaterSystem, // "DHW", - "Water Heater Parasitic", - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::WaterSystem, // DHW + "Water Heater Parasitic"); SetupOutputVariable(state, "Water Heater Off Cycle Parasitic Electricity Rate", Constant::Units::W, state.dataWaterThermalTanks->WaterHeaterDesuperheater(this->DesuperheaterNum).OffCycParaFuelRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataWaterThermalTanks->WaterHeaterDesuperheater(this->DesuperheaterNum).Name); SetupOutputVariable(state, "Water Heater Off Cycle Parasitic Electricity Energy", Constant::Units::J, state.dataWaterThermalTanks->WaterHeaterDesuperheater(this->DesuperheaterNum).OffCycParaFuelEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataWaterThermalTanks->WaterHeaterDesuperheater(this->DesuperheaterNum).Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::WaterSystem, // "DHW", - "Water Heater Parasitic", - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::WaterSystem, // DHW + "Water Heater Parasitic"); SetupOutputVariable(state, "Water Heater Heat Reclaim Efficiency Modifier Multiplier", Constant::Units::None, state.dataWaterThermalTanks->WaterHeaterDesuperheater(this->DesuperheaterNum).HEffFTempOutput, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataWaterThermalTanks->WaterHeaterDesuperheater(this->DesuperheaterNum).Name); SetupOutputVariable(state, "Water Heater Pump Electricity Rate", Constant::Units::W, state.dataWaterThermalTanks->WaterHeaterDesuperheater(this->DesuperheaterNum).PumpPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataWaterThermalTanks->WaterHeaterDesuperheater(this->DesuperheaterNum).Name); SetupOutputVariable(state, "Water Heater Pump Electricity Energy", Constant::Units::J, state.dataWaterThermalTanks->WaterHeaterDesuperheater(this->DesuperheaterNum).PumpEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataWaterThermalTanks->WaterHeaterDesuperheater(this->DesuperheaterNum).Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::WaterSystem, // "DHW", - "Desuperheater Pump", - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::WaterSystem, // DHW + "Desuperheater Pump"); SetupOutputVariable(state, "Water Heater Heating Rate", Constant::Units::W, state.dataWaterThermalTanks->WaterHeaterDesuperheater(this->DesuperheaterNum).HeaterRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataWaterThermalTanks->WaterHeaterDesuperheater(this->DesuperheaterNum).Name); SetupOutputVariable(state, "Water Heater Heating Energy", Constant::Units::J, state.dataWaterThermalTanks->WaterHeaterDesuperheater(this->DesuperheaterNum).HeaterEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataWaterThermalTanks->WaterHeaterDesuperheater(this->DesuperheaterNum).Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::WaterSystem, // "DHW", - "Water Heater", - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::WaterSystem, // DHW + "Water Heater"); } // Setup report variables for WaterHeater:Stratified @@ -5686,60 +5686,60 @@ void WaterThermalTankData::setupWaterHeaterOutputVars(EnergyPlusData &state) "Water Heater Heater 1 Heating Rate", Constant::Units::W, this->HeaterRate1, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Heater Heater 2 Heating Rate", Constant::Units::W, this->HeaterRate2, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Heater Heater 1 Heating Energy", Constant::Units::J, this->HeaterEnergy1, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Water Heater Heater 2 Heating Energy", Constant::Units::J, this->HeaterEnergy2, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Water Heater Heater 1 Cycle On Count", Constant::Units::None, this->CycleOnCount1, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Water Heater Heater 2 Cycle On Count", Constant::Units::None, this->CycleOnCount2, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Water Heater Heater 1 Runtime Fraction", Constant::Units::None, this->RuntimeFraction1, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Heater Heater 2 Runtime Fraction", Constant::Units::None, this->RuntimeFraction2, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); for (int NodeNum = 1; NodeNum <= this->Nodes; ++NodeNum) { @@ -5747,8 +5747,8 @@ void WaterThermalTankData::setupWaterHeaterOutputVars(EnergyPlusData &state) format("Water Heater Temperature Node {}", NodeNum), Constant::Units::C, this->Node(NodeNum).TempAvg, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); } @@ -5757,8 +5757,8 @@ void WaterThermalTankData::setupWaterHeaterOutputVars(EnergyPlusData &state) format("Water Heater Final Temperature Node {}", NodeNum), Constant::Units::C, this->Node(NodeNum).Temp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); } } diff --git a/src/EnergyPlus/WaterToAirHeatPump.cc b/src/EnergyPlus/WaterToAirHeatPump.cc index 958c7a2572d..0625dd6a6df 100644 --- a/src/EnergyPlus/WaterToAirHeatPump.cc +++ b/src/EnergyPlus/WaterToAirHeatPump.cc @@ -461,49 +461,46 @@ namespace WaterToAirHeatPump { "Cooling Coil Electricity Energy", Constant::Units::J, heatPump.Energy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, heatPump.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); SetupOutputVariable(state, "Cooling Coil Total Cooling Energy", Constant::Units::J, heatPump.EnergyLoadTotal, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, heatPump.Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::CoolingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::CoolingCoils); SetupOutputVariable(state, "Cooling Coil Sensible Cooling Energy", Constant::Units::J, heatPump.EnergySensible, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, heatPump.Name); SetupOutputVariable(state, "Cooling Coil Latent Cooling Energy", Constant::Units::J, heatPump.EnergyLatent, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, heatPump.Name); SetupOutputVariable(state, "Cooling Coil Source Side Heat Transfer Energy", Constant::Units::J, heatPump.EnergySource, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, heatPump.Name, Constant::eResource::PlantLoopCoolingDemand, - OutputProcessor::SOVEndUseCat::CoolingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::CoolingCoils); // save the design source side flow rate for use by plant loop sizing algorithms RegisterPlantCompDesignFlow(state, heatPump.WaterInletNodeNum, 0.5 * heatPump.DesignWaterVolFlowRate); @@ -701,35 +698,32 @@ namespace WaterToAirHeatPump { "Heating Coil Electricity Energy", Constant::Units::J, heatPump.Energy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, heatPump.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Heating, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Heating); SetupOutputVariable(state, "Heating Coil Heating Energy", Constant::Units::J, heatPump.EnergyLoadTotal, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, heatPump.Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::HeatingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::HeatingCoils); SetupOutputVariable(state, "Heating Coil Source Side Heat Transfer Energy", Constant::Units::J, heatPump.EnergySource, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, heatPump.Name, Constant::eResource::PlantLoopHeatingDemand, - OutputProcessor::SOVEndUseCat::HeatingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::HeatingCoils); // save the design source side flow rate for use by plant loop sizing algorithms RegisterPlantCompDesignFlow(state, heatPump.WaterInletNodeNum, 0.5 * heatPump.DesignWaterVolFlowRate); @@ -760,113 +754,113 @@ namespace WaterToAirHeatPump { "Cooling Coil Electricity Rate", Constant::Units::W, heatPump.Power, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, heatPump.Name); SetupOutputVariable(state, "Cooling Coil Total Cooling Rate", Constant::Units::W, heatPump.QLoadTotal, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, heatPump.Name); SetupOutputVariable(state, "Cooling Coil Sensible Cooling Rate", Constant::Units::W, heatPump.QSensible, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, heatPump.Name); SetupOutputVariable(state, "Cooling Coil Latent Cooling Rate", Constant::Units::W, heatPump.QLatent, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, heatPump.Name); SetupOutputVariable(state, "Cooling Coil Source Side Heat Transfer Rate", Constant::Units::W, heatPump.QSource, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, heatPump.Name); SetupOutputVariable(state, "Cooling Coil Part Load Ratio", Constant::Units::None, heatPump.PartLoadRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, heatPump.Name); SetupOutputVariable(state, "Cooling Coil Runtime Fraction", Constant::Units::None, heatPump.RunFrac, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, heatPump.Name); SetupOutputVariable(state, "Cooling Coil Air Mass Flow Rate", Constant::Units::kg_s, heatPump.OutletAirMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, heatPump.Name); SetupOutputVariable(state, "Cooling Coil Air Inlet Temperature", Constant::Units::C, heatPump.InletAirDBTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, heatPump.Name); SetupOutputVariable(state, "Cooling Coil Air Inlet Humidity Ratio", Constant::Units::kgWater_kgDryAir, heatPump.InletAirHumRat, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, heatPump.Name); SetupOutputVariable(state, "Cooling Coil Air Outlet Temperature", Constant::Units::C, heatPump.OutletAirDBTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, heatPump.Name); SetupOutputVariable(state, "Cooling Coil Air Outlet Humidity Ratio", Constant::Units::kgWater_kgDryAir, heatPump.OutletAirHumRat, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, heatPump.Name); SetupOutputVariable(state, "Cooling Coil Source Side Mass Flow Rate", Constant::Units::kg_s, heatPump.OutletWaterMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, heatPump.Name); SetupOutputVariable(state, "Cooling Coil Source Side Inlet Temperature", Constant::Units::C, heatPump.InletWaterTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, heatPump.Name); SetupOutputVariable(state, "Cooling Coil Source Side Outlet Temperature", Constant::Units::C, heatPump.OutletWaterTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, heatPump.Name); } else if (heatPump.WAHPType == DataPlant::PlantEquipmentType::CoilWAHPHeatingParamEst) { // HEATING COIL Setup Report variables for the Heat Pump @@ -874,105 +868,105 @@ namespace WaterToAirHeatPump { "Heating Coil Electricity Rate", Constant::Units::W, heatPump.Power, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, heatPump.Name); SetupOutputVariable(state, "Heating Coil Heating Rate", Constant::Units::W, heatPump.QLoadTotal, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, heatPump.Name); SetupOutputVariable(state, "Heating Coil Sensible Heating Rate", Constant::Units::W, heatPump.QSensible, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, heatPump.Name); SetupOutputVariable(state, "Heating Coil Source Side Heat Transfer Rate", Constant::Units::W, heatPump.QSource, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, heatPump.Name); SetupOutputVariable(state, "Heating Coil Part Load Ratio", Constant::Units::None, heatPump.PartLoadRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, heatPump.Name); SetupOutputVariable(state, "Heating Coil Runtime Fraction", Constant::Units::None, heatPump.RunFrac, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, heatPump.Name); SetupOutputVariable(state, "Heating Coil Air Mass Flow Rate", Constant::Units::kg_s, heatPump.OutletAirMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, heatPump.Name); SetupOutputVariable(state, "Heating Coil Air Inlet Temperature", Constant::Units::C, heatPump.InletAirDBTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, heatPump.Name); SetupOutputVariable(state, "Heating Coil Air Inlet Humidity Ratio", Constant::Units::kgWater_kgDryAir, heatPump.InletAirHumRat, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, heatPump.Name); SetupOutputVariable(state, "Heating Coil Air Outlet Temperature", Constant::Units::C, heatPump.OutletAirDBTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, heatPump.Name); SetupOutputVariable(state, "Heating Coil Air Outlet Humidity Ratio", Constant::Units::kgWater_kgDryAir, heatPump.OutletAirHumRat, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, heatPump.Name); SetupOutputVariable(state, "Heating Coil Source Side Mass Flow Rate", Constant::Units::kg_s, heatPump.OutletWaterMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, heatPump.Name); SetupOutputVariable(state, "Heating Coil Source Side Inlet Temperature", Constant::Units::C, heatPump.InletWaterTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, heatPump.Name); SetupOutputVariable(state, "Heating Coil Source Side Outlet Temperature", Constant::Units::C, heatPump.OutletWaterTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, heatPump.Name); } } diff --git a/src/EnergyPlus/WaterToAirHeatPumpSimple.cc b/src/EnergyPlus/WaterToAirHeatPumpSimple.cc index 1acbd3ecc5f..39c9c27e951 100644 --- a/src/EnergyPlus/WaterToAirHeatPumpSimple.cc +++ b/src/EnergyPlus/WaterToAirHeatPumpSimple.cc @@ -479,49 +479,46 @@ namespace WaterToAirHeatPumpSimple { "Cooling Coil Electricity Energy", Constant::Units::J, simpleWAHP.Energy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, simpleWAHP.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); SetupOutputVariable(state, "Cooling Coil Total Cooling Energy", Constant::Units::J, simpleWAHP.EnergyLoadTotal, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, simpleWAHP.Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::CoolingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::CoolingCoils); SetupOutputVariable(state, "Cooling Coil Sensible Cooling Energy", Constant::Units::J, simpleWAHP.EnergySensible, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, simpleWAHP.Name); SetupOutputVariable(state, "Cooling Coil Latent Cooling Energy", Constant::Units::J, simpleWAHP.EnergyLatent, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, simpleWAHP.Name); SetupOutputVariable(state, "Cooling Coil Source Side Heat Transfer Energy", Constant::Units::J, simpleWAHP.EnergySource, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, simpleWAHP.Name, Constant::eResource::PlantLoopCoolingDemand, - OutputProcessor::SOVEndUseCat::CoolingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::CoolingCoils); // create predefined report entries OutputReportPredefined::PreDefTableEntry(state, state.dataOutRptPredefined->pdchCoolCoilType, simpleWAHP.Name, CurrentModuleObject); @@ -711,35 +708,32 @@ namespace WaterToAirHeatPumpSimple { "Heating Coil Electricity Energy", Constant::Units::J, simpleWAHP.Energy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, simpleWAHP.Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Heating, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Heating); SetupOutputVariable(state, "Heating Coil Heating Energy", Constant::Units::J, simpleWAHP.EnergyLoadTotal, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, simpleWAHP.Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::HeatingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::HeatingCoils); SetupOutputVariable(state, "Heating Coil Source Side Heat Transfer Energy", Constant::Units::J, simpleWAHP.EnergySource, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, simpleWAHP.Name, Constant::eResource::PlantLoopHeatingDemand, - OutputProcessor::SOVEndUseCat::HeatingCoils, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::HeatingCoils); // create predefined report entries OutputReportPredefined::PreDefTableEntry(state, state.dataOutRptPredefined->pdchHeatCoilType, simpleWAHP.Name, CurrentModuleObject); @@ -769,107 +763,107 @@ namespace WaterToAirHeatPumpSimple { "Cooling Coil Electricity Rate", Constant::Units::W, simpleWAHP.Power, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, simpleWAHP.Name); SetupOutputVariable(state, "Cooling Coil Total Cooling Rate", Constant::Units::W, simpleWAHP.QLoadTotal, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, simpleWAHP.Name); SetupOutputVariable(state, "Cooling Coil Sensible Cooling Rate", Constant::Units::W, simpleWAHP.QSensible, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, simpleWAHP.Name); SetupOutputVariable(state, "Cooling Coil Latent Cooling Rate", Constant::Units::W, simpleWAHP.QLatent, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, simpleWAHP.Name); SetupOutputVariable(state, "Cooling Coil Source Side Heat Transfer Rate", Constant::Units::W, simpleWAHP.QSource, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, simpleWAHP.Name); SetupOutputVariable(state, "Cooling Coil Part Load Ratio", Constant::Units::None, simpleWAHP.PartLoadRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, simpleWAHP.Name); SetupOutputVariable(state, "Cooling Coil Runtime Fraction", Constant::Units::None, simpleWAHP.RunFrac, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, simpleWAHP.Name); SetupOutputVariable(state, "Cooling Coil Air Mass Flow Rate", Constant::Units::kg_s, simpleWAHP.AirMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, simpleWAHP.Name); SetupOutputVariable(state, "Cooling Coil Air Inlet Temperature", Constant::Units::C, simpleWAHP.InletAirDBTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, simpleWAHP.Name); SetupOutputVariable(state, "Cooling Coil Air Inlet Humidity Ratio", Constant::Units::kgWater_kgDryAir, simpleWAHP.InletAirHumRat, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, simpleWAHP.Name); SetupOutputVariable(state, "Cooling Coil Air Outlet Temperature", Constant::Units::C, simpleWAHP.OutletAirDBTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, simpleWAHP.Name); SetupOutputVariable(state, "Cooling Coil Air Outlet Humidity Ratio", Constant::Units::kgWater_kgDryAir, simpleWAHP.OutletAirHumRat, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, simpleWAHP.Name); SetupOutputVariable(state, "Cooling Coil Source Side Mass Flow Rate", Constant::Units::kg_s, simpleWAHP.WaterMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, simpleWAHP.Name); SetupOutputVariable(state, "Cooling Coil Source Side Inlet Temperature", Constant::Units::C, simpleWAHP.InletWaterTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, simpleWAHP.Name); SetupOutputVariable(state, "Cooling Coil Source Side Outlet Temperature", Constant::Units::C, simpleWAHP.OutletWaterTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, simpleWAHP.Name); } else if (simpleWAHP.WAHPPlantType == DataPlant::PlantEquipmentType::CoilWAHPHeatingEquationFit) { @@ -878,101 +872,101 @@ namespace WaterToAirHeatPumpSimple { "Heating Coil Electricity Rate", Constant::Units::W, simpleWAHP.Power, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, simpleWAHP.Name); SetupOutputVariable(state, "Heating Coil Heating Rate", Constant::Units::W, simpleWAHP.QLoadTotal, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, simpleWAHP.Name); SetupOutputVariable(state, "Heating Coil Sensible Heating Rate", Constant::Units::W, simpleWAHP.QSensible, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, simpleWAHP.Name); SetupOutputVariable(state, "Heating Coil Source Side Heat Transfer Rate", Constant::Units::W, simpleWAHP.QSource, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, simpleWAHP.Name); SetupOutputVariable(state, "Heating Coil Part Load Ratio", Constant::Units::None, simpleWAHP.PartLoadRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, simpleWAHP.Name); SetupOutputVariable(state, "Heating Coil Runtime Fraction", Constant::Units::None, simpleWAHP.RunFrac, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, simpleWAHP.Name); SetupOutputVariable(state, "Heating Coil Air Mass Flow Rate", Constant::Units::kg_s, simpleWAHP.AirMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, simpleWAHP.Name); SetupOutputVariable(state, "Heating Coil Air Inlet Temperature", Constant::Units::C, simpleWAHP.InletAirDBTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, simpleWAHP.Name); SetupOutputVariable(state, "Heating Coil Air Inlet Humidity Ratio", Constant::Units::kgWater_kgDryAir, simpleWAHP.InletAirHumRat, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, simpleWAHP.Name); SetupOutputVariable(state, "Heating Coil Air Outlet Temperature", Constant::Units::C, simpleWAHP.OutletAirDBTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, simpleWAHP.Name); SetupOutputVariable(state, "Heating Coil Air Outlet Humidity Ratio", Constant::Units::kgWater_kgDryAir, simpleWAHP.OutletAirHumRat, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, simpleWAHP.Name); SetupOutputVariable(state, "Heating Coil Source Side Mass Flow Rate", Constant::Units::kg_s, simpleWAHP.WaterMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, simpleWAHP.Name); SetupOutputVariable(state, "Heating Coil Source Side Inlet Temperature", Constant::Units::C, simpleWAHP.InletWaterTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, simpleWAHP.Name); SetupOutputVariable(state, "Heating Coil Source Side Outlet Temperature", Constant::Units::C, simpleWAHP.OutletWaterTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, simpleWAHP.Name); } } diff --git a/src/EnergyPlus/WaterUse.cc b/src/EnergyPlus/WaterUse.cc index e515d45dbf8..272b5d3ab3e 100644 --- a/src/EnergyPlus/WaterUse.cc +++ b/src/EnergyPlus/WaterUse.cc @@ -597,135 +597,135 @@ namespace WaterUse { "Water Use Equipment Hot Water Mass Flow Rate", Constant::Units::kg_s, this->HotMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Use Equipment Cold Water Mass Flow Rate", Constant::Units::kg_s, this->ColdMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Use Equipment Total Mass Flow Rate", Constant::Units::kg_s, this->TotalMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Use Equipment Hot Water Volume Flow Rate", Constant::Units::m3_s, this->HotVolFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Use Equipment Cold Water Volume Flow Rate", Constant::Units::m3_s, this->ColdVolFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Use Equipment Total Volume Flow Rate", Constant::Units::m3_s, this->TotalVolFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Use Equipment Hot Water Volume", Constant::Units::m3, this->HotVolume, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Water Use Equipment Cold Water Volume", Constant::Units::m3, this->ColdVolume, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Water Use Equipment Total Volume", Constant::Units::m3, this->TotalVolume, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::Water, - OutputProcessor::SOVEndUseCat::WaterSystem, - this->EndUseSubcatName, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::WaterSystem, + this->EndUseSubcatName); SetupOutputVariable(state, "Water Use Equipment Mains Water Volume", Constant::Units::m3, this->TotalVolume, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::MainsWater, - OutputProcessor::SOVEndUseCat::WaterSystem, - this->EndUseSubcatName, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::WaterSystem, + this->EndUseSubcatName); SetupOutputVariable(state, "Water Use Equipment Hot Water Temperature", Constant::Units::C, this->HotTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Use Equipment Cold Water Temperature", Constant::Units::C, this->ColdTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Use Equipment Target Water Temperature", Constant::Units::C, this->TargetTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Use Equipment Mixed Water Temperature", Constant::Units::C, this->MixedTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Use Equipment Drain Water Temperature", Constant::Units::C, this->DrainTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Use Equipment Heating Rate", Constant::Units::W, this->Power, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); if (this->Connections == 0) { @@ -733,39 +733,39 @@ namespace WaterUse { "Water Use Equipment Heating Energy", Constant::Units::J, this->Energy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::DistrictHeatingWater, - OutputProcessor::SOVEndUseCat::WaterSystem, - this->EndUseSubcatName, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::WaterSystem, + this->EndUseSubcatName); } else if (state.dataWaterUse->WaterConnections(this->Connections).StandAlone) { SetupOutputVariable(state, "Water Use Equipment Heating Energy", Constant::Units::J, this->Energy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::DistrictHeatingWater, - OutputProcessor::SOVEndUseCat::WaterSystem, - this->EndUseSubcatName, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::WaterSystem, + this->EndUseSubcatName); } else { // The EQUIPMENT is coupled to a plant loop via a CONNECTIONS object SetupOutputVariable(state, "Water Use Equipment Heating Energy", Constant::Units::J, this->Energy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::EnergyTransfer, - OutputProcessor::SOVEndUseCat::WaterSystem, - this->EndUseSubcatName, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::WaterSystem, + this->EndUseSubcatName); } if (this->Zone > 0) { @@ -773,45 +773,45 @@ namespace WaterUse { "Water Use Equipment Zone Sensible Heat Gain Rate", Constant::Units::W, this->SensibleRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Use Equipment Zone Sensible Heat Gain Energy", Constant::Units::J, this->SensibleEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Water Use Equipment Zone Latent Gain Rate", Constant::Units::W, this->LatentRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Use Equipment Zone Latent Gain Energy", Constant::Units::J, this->LatentEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Water Use Equipment Zone Moisture Gain Mass Flow Rate", Constant::Units::kg_s, this->MoistureRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Use Equipment Zone Moisture Gain Mass", Constant::Units::kg, this->MoistureMass, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupZoneInternalGain(state, @@ -831,88 +831,88 @@ namespace WaterUse { "Water Use Connections Hot Water Mass Flow Rate", Constant::Units::kg_s, this->HotMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Use Connections Cold Water Mass Flow Rate", Constant::Units::kg_s, this->ColdMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Use Connections Total Mass Flow Rate", Constant::Units::kg_s, this->TotalMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Use Connections Drain Water Mass Flow Rate", Constant::Units::kg_s, this->DrainMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Use Connections Heat Recovery Mass Flow Rate", Constant::Units::kg_s, this->RecoveryMassFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Use Connections Hot Water Volume Flow Rate", Constant::Units::m3_s, this->HotVolFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Use Connections Cold Water Volume Flow Rate", Constant::Units::m3_s, this->ColdVolFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Use Connections Total Volume Flow Rate", Constant::Units::m3_s, this->TotalVolFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Use Connections Hot Water Volume", Constant::Units::m3, this->HotVolume, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Water Use Connections Cold Water Volume", Constant::Units::m3, this->ColdVolume, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); SetupOutputVariable(state, "Water Use Connections Total Volume", Constant::Units::m3, this->TotalVolume, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); //, & // ResourceTypeKey='Water', EndUseKey='DHW', EndUseSubKey=EndUseSubcategoryName, GroupKey='Plant') // tHIS WAS double counting @@ -921,71 +921,71 @@ namespace WaterUse { "Water Use Connections Hot Water Temperature", Constant::Units::C, this->HotTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Use Connections Cold Water Temperature", Constant::Units::C, this->ColdTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Use Connections Drain Water Temperature", Constant::Units::C, this->DrainTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Use Connections Return Water Temperature", Constant::Units::C, this->ReturnTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Use Connections Waste Water Temperature", Constant::Units::C, this->WasteTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Use Connections Heat Recovery Water Temperature", Constant::Units::C, this->RecoveryTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Use Connections Heat Recovery Effectiveness", Constant::Units::None, this->Effectiveness, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Use Connections Heat Recovery Rate", Constant::Units::W, this->RecoveryRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, this->Name); SetupOutputVariable(state, "Water Use Connections Heat Recovery Energy", Constant::Units::J, this->RecoveryEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name); // Does this go on a meter? @@ -996,13 +996,12 @@ namespace WaterUse { "Water Use Connections Plant Hot Water Energy", Constant::Units::J, this->Energy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, this->Name, Constant::eResource::PlantLoopHeatingDemand, - OutputProcessor::SOVEndUseCat::WaterSystem, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::WaterSystem); } } diff --git a/src/EnergyPlus/WeatherManager.cc b/src/EnergyPlus/WeatherManager.cc index 726df34a7a9..e809abbe97c 100644 --- a/src/EnergyPlus/WeatherManager.cc +++ b/src/EnergyPlus/WeatherManager.cc @@ -360,274 +360,274 @@ namespace Weather { "Site Outdoor Air Drybulb Temperature", Constant::Units::C, state.dataEnvrn->OutDryBulbTemp, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Environment"); SetupOutputVariable(state, "Site Outdoor Air Dewpoint Temperature", Constant::Units::C, state.dataEnvrn->OutDewPointTemp, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Environment"); SetupOutputVariable(state, "Site Outdoor Air Wetbulb Temperature", Constant::Units::C, state.dataEnvrn->OutWetBulbTemp, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Environment"); SetupOutputVariable(state, "Site Outdoor Air Humidity Ratio", Constant::Units::kgWater_kgDryAir, state.dataEnvrn->OutHumRat, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Environment"); SetupOutputVariable(state, "Site Outdoor Air Relative Humidity", Constant::Units::Perc, state.dataEnvrn->OutRelHum, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Environment"); SetupOutputVariable(state, "Site Outdoor Air Barometric Pressure", Constant::Units::Pa, state.dataEnvrn->OutBaroPress, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Environment"); SetupOutputVariable(state, "Site Wind Speed", Constant::Units::m_s, state.dataEnvrn->WindSpeed, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Environment"); SetupOutputVariable(state, "Site Wind Direction", Constant::Units::deg, state.dataEnvrn->WindDir, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Environment"); SetupOutputVariable(state, "Site Sky Temperature", Constant::Units::C, state.dataEnvrn->SkyTemp, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Environment"); SetupOutputVariable(state, "Site Horizontal Infrared Radiation Rate per Area", Constant::Units::W_m2, state.dataWeather->HorizIRSky, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Environment"); SetupOutputVariable(state, "Site Diffuse Solar Radiation Rate per Area", Constant::Units::W_m2, state.dataEnvrn->DifSolarRad, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Environment"); SetupOutputVariable(state, "Site Direct Solar Radiation Rate per Area", Constant::Units::W_m2, state.dataEnvrn->BeamSolarRad, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Environment"); SetupOutputVariable(state, "Liquid Precipitation Depth", Constant::Units::m, state.dataEnvrn->LiquidPrecipitation, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Environment"); SetupOutputVariable(state, "Site Precipitation Rate", Constant::Units::m_s, state.dataWaterData->RainFall.CurrentRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Environment"); SetupOutputVariable(state, "Site Precipitation Depth", Constant::Units::m, state.dataWaterData->RainFall.CurrentAmount, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Environment"); SetupOutputVariable(state, "Site Ground Reflected Solar Radiation Rate per Area", Constant::Units::W_m2, state.dataEnvrn->GndSolarRad, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Environment"); SetupOutputVariable(state, "Site Ground Temperature", Constant::Units::C, state.dataEnvrn->GroundTemp, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Environment"); SetupOutputVariable(state, "Site Surface Ground Temperature", Constant::Units::C, state.dataEnvrn->GroundTemp_Surface, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Environment"); SetupOutputVariable(state, "Site Deep Ground Temperature", Constant::Units::C, state.dataEnvrn->GroundTemp_Deep, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Environment"); SetupOutputVariable(state, "Site Simple Factor Model Ground Temperature", Constant::Units::C, state.dataEnvrn->GroundTempFC, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Environment"); SetupOutputVariable(state, "Site Total Sky Cover", Constant::Units::None, state.dataEnvrn->TotalCloudCover, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Environment"); SetupOutputVariable(state, "Site Opaque Sky Cover", Constant::Units::None, state.dataEnvrn->OpaqueCloudCover, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Environment"); SetupOutputVariable(state, "Site Outdoor Air Enthalpy", Constant::Units::J_kg, state.dataEnvrn->OutEnthalpy, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Environment"); SetupOutputVariable(state, "Site Outdoor Air Density", Constant::Units::kg_m3, state.dataEnvrn->OutAirDensity, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Environment"); SetupOutputVariable(state, "Site Solar Azimuth Angle", Constant::Units::deg, state.dataWeather->SolarAzimuthAngle, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Environment"); SetupOutputVariable(state, "Site Solar Altitude Angle", Constant::Units::deg, state.dataWeather->SolarAltitudeAngle, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Environment"); SetupOutputVariable(state, "Site Solar Hour Angle", Constant::Units::deg, state.dataWeather->HrAngle, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Environment"); SetupOutputVariable(state, "Site Rain Status", Constant::Units::None, state.dataWeather->RptIsRain, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Environment"); SetupOutputVariable(state, "Site Snow on Ground Status", Constant::Units::None, state.dataWeather->RptIsSnow, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Environment"); SetupOutputVariable(state, "Site Exterior Horizontal Sky Illuminance", Constant::Units::lux, state.dataEnvrn->HISKF, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Environment"); SetupOutputVariable(state, "Site Exterior Horizontal Beam Illuminance", Constant::Units::lux, state.dataEnvrn->HISUNF, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Environment"); SetupOutputVariable(state, "Site Exterior Beam Normal Illuminance", Constant::Units::lux, state.dataEnvrn->HISUNFnorm, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Environment"); SetupOutputVariable(state, "Site Sky Diffuse Solar Radiation Luminous Efficacy", Constant::Units::lum_W, state.dataEnvrn->PDIFLW, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Environment"); SetupOutputVariable(state, "Site Beam Solar Radiation Luminous Efficacy", Constant::Units::lum_W, state.dataEnvrn->PDIRLW, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Environment"); SetupOutputVariable(state, "Site Daylighting Model Sky Clearness", Constant::Units::None, state.dataEnvrn->SkyClearness, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Environment"); SetupOutputVariable(state, "Site Daylighting Model Sky Brightness", Constant::Units::None, state.dataEnvrn->SkyBrightness, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Environment"); SetupOutputVariable(state, "Site Daylight Saving Time Status", Constant::Units::None, state.dataEnvrn->DSTIndicator, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Environment"); SetupOutputVariable(state, "Site Day Type Index", Constant::Units::None, state.dataWeather->RptDayType, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Environment"); SetupOutputVariable(state, "Site Mains Water Temperature", Constant::Units::C, state.dataEnvrn->WaterMainsTemp, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Environment"); if (state.dataGlobal->AnyEnergyManagementSystemInModel) { @@ -5981,8 +5981,8 @@ namespace Weather { "Sizing Period Site Drybulb Temperature Range Modifier Schedule Value", unitType, state.dataWeather->spSiteSchedules(EnvrnNum).OutDryBulbTemp, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, ipsc->cAlphaArgs(4)); } @@ -6179,8 +6179,8 @@ namespace Weather { "Sizing Period Site Humidity Condition Schedule Value", unitType, state.dataWeather->spSiteSchedules(EnvrnNum).OutRelHum, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, ipsc->cAlphaArgs(6)); } @@ -6286,8 +6286,8 @@ namespace Weather { "Sizing Period Site Beam Solar Schedule Value", unitType, state.dataWeather->spSiteSchedules(EnvrnNum).BeamSolarRad, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, ipsc->cAlphaArgs(11)); } @@ -6325,8 +6325,8 @@ namespace Weather { "Sizing Period Site Diffuse Solar Schedule Value", unitType, state.dataWeather->spSiteSchedules(EnvrnNum).DifSolarRad, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, ipsc->cAlphaArgs(12)); } if (!ScheduleManager::CheckDayScheduleValueMinMax(state, desDayInput.DiffuseSolarSchPtr, 0.0, false)) { @@ -6657,8 +6657,8 @@ namespace Weather { "Sizing Period Site Sky Temperature Schedule Value", unitType, state.dataWeather->spSiteSchedules(envFound).SkyTemp, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, ipsc->cAlphaArgs(3)); } wpSkyTemp.IsSchedule = true; diff --git a/src/EnergyPlus/WindTurbine.cc b/src/EnergyPlus/WindTurbine.cc index a8ceafebd34..3de7724f34c 100644 --- a/src/EnergyPlus/WindTurbine.cc +++ b/src/EnergyPlus/WindTurbine.cc @@ -679,40 +679,39 @@ namespace WindTurbine { "Generator Produced AC Electricity Rate", Constant::Units::W, windTurbine.Power, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, windTurbine.Name); SetupOutputVariable(state, "Generator Produced AC Electricity Energy", Constant::Units::J, windTurbine.Energy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, windTurbine.Name, Constant::eResource::ElectricityProduced, - OutputProcessor::SOVEndUseCat::WindTurbine, - {}, - OutputProcessor::SOVGroup::Plant); + OutputProcessor::Group::Plant, + OutputProcessor::EndUseCat::WindTurbine); SetupOutputVariable(state, "Generator Turbine Local Wind Speed", Constant::Units::m_s, windTurbine.LocalWindSpeed, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, windTurbine.Name); SetupOutputVariable(state, "Generator Turbine Local Air Density", Constant::Units::kg_m3, windTurbine.LocalAirDensity, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, windTurbine.Name); SetupOutputVariable(state, "Generator Turbine Tip Speed Ratio", Constant::Units::None, windTurbine.TipSpeedRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, windTurbine.Name); switch (windTurbine.rotorType) { case RotorType::HorizontalAxis: { @@ -720,8 +719,8 @@ namespace WindTurbine { "Generator Turbine Power Coefficient", Constant::Units::None, windTurbine.PowerCoeff, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, windTurbine.Name); } break; case RotorType::VerticalAxis: { @@ -729,29 +728,29 @@ namespace WindTurbine { "Generator Turbine Chordal Component Velocity", Constant::Units::m_s, windTurbine.ChordalVel, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, windTurbine.Name); SetupOutputVariable(state, "Generator Turbine Normal Component Velocity", Constant::Units::m_s, windTurbine.NormalVel, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, windTurbine.Name); SetupOutputVariable(state, "Generator Turbine Relative Flow Velocity", Constant::Units::m_s, windTurbine.RelFlowVel, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, windTurbine.Name); SetupOutputVariable(state, "Generator Turbine Attack Angle", Constant::Units::deg, windTurbine.AngOfAttack, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, windTurbine.Name); } break; default: diff --git a/src/EnergyPlus/WindowAC.cc b/src/EnergyPlus/WindowAC.cc index 1d52ce242fe..5e10c7fada9 100644 --- a/src/EnergyPlus/WindowAC.cc +++ b/src/EnergyPlus/WindowAC.cc @@ -682,78 +682,78 @@ namespace WindowAC { "Zone Window Air Conditioner Total Cooling Rate", Constant::Units::W, state.dataWindowAC->WindAC(WindACNum).TotCoolEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataWindowAC->WindAC(WindACNum).Name); SetupOutputVariable(state, "Zone Window Air Conditioner Total Cooling Energy", Constant::Units::J, state.dataWindowAC->WindAC(WindACNum).TotCoolEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataWindowAC->WindAC(WindACNum).Name); SetupOutputVariable(state, "Zone Window Air Conditioner Sensible Cooling Rate", Constant::Units::W, state.dataWindowAC->WindAC(WindACNum).SensCoolEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataWindowAC->WindAC(WindACNum).Name); SetupOutputVariable(state, "Zone Window Air Conditioner Sensible Cooling Energy", Constant::Units::J, state.dataWindowAC->WindAC(WindACNum).SensCoolEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataWindowAC->WindAC(WindACNum).Name); SetupOutputVariable(state, "Zone Window Air Conditioner Latent Cooling Rate", Constant::Units::W, state.dataWindowAC->WindAC(WindACNum).LatCoolEnergyRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataWindowAC->WindAC(WindACNum).Name); SetupOutputVariable(state, "Zone Window Air Conditioner Latent Cooling Energy", Constant::Units::J, state.dataWindowAC->WindAC(WindACNum).LatCoolEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataWindowAC->WindAC(WindACNum).Name); SetupOutputVariable(state, "Zone Window Air Conditioner Electricity Rate", Constant::Units::W, state.dataWindowAC->WindAC(WindACNum).ElecPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataWindowAC->WindAC(WindACNum).Name); SetupOutputVariable(state, "Zone Window Air Conditioner Electricity Energy", Constant::Units::J, state.dataWindowAC->WindAC(WindACNum).ElecConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataWindowAC->WindAC(WindACNum).Name); SetupOutputVariable(state, "Zone Window Air Conditioner Fan Part Load Ratio", Constant::Units::None, state.dataWindowAC->WindAC(WindACNum).FanPartLoadRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataWindowAC->WindAC(WindACNum).Name); SetupOutputVariable(state, "Zone Window Air Conditioner Compressor Part Load Ratio", Constant::Units::None, state.dataWindowAC->WindAC(WindACNum).CompPartLoadRatio, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataWindowAC->WindAC(WindACNum).Name); SetupOutputVariable(state, "Zone Window Air Conditioner Fan Availability Status", Constant::Units::None, state.dataWindowAC->WindAC(WindACNum).AvailStatus, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataWindowAC->WindAC(WindACNum).Name); if (state.dataGlobal->AnyEnergyManagementSystemInModel) { SetupEMSActuator(state, diff --git a/src/EnergyPlus/ZoneAirLoopEquipmentManager.cc b/src/EnergyPlus/ZoneAirLoopEquipmentManager.cc index 32235de9243..e8eafa14f85 100644 --- a/src/EnergyPlus/ZoneAirLoopEquipmentManager.cc +++ b/src/EnergyPlus/ZoneAirLoopEquipmentManager.cc @@ -415,29 +415,29 @@ namespace ZoneAirLoopEquipmentManager { "Zone Air Terminal Sensible Heating Energy", Constant::Units::J, airDistUnit.HeatGain, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, airDistUnit.Name); SetupOutputVariable(state, "Zone Air Terminal Sensible Cooling Energy", Constant::Units::J, airDistUnit.CoolGain, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, airDistUnit.Name); SetupOutputVariable(state, "Zone Air Terminal Sensible Heating Rate", Constant::Units::W, airDistUnit.HeatRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, airDistUnit.Name); SetupOutputVariable(state, "Zone Air Terminal Sensible Cooling Rate", Constant::Units::W, airDistUnit.CoolRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, airDistUnit.Name); } } diff --git a/src/EnergyPlus/ZoneContaminantPredictorCorrector.cc b/src/EnergyPlus/ZoneContaminantPredictorCorrector.cc index 5d7cc50ef20..fb6ba8f63e4 100644 --- a/src/EnergyPlus/ZoneContaminantPredictorCorrector.cc +++ b/src/EnergyPlus/ZoneContaminantPredictorCorrector.cc @@ -351,8 +351,8 @@ void GetZoneContaminanInputs(EnergyPlusData &state) "Generic Air Contaminant Constant Source Generation Volume Flow Rate", Constant::Units::m3_s, state.dataContaminantBalance->ZoneContamGenericConstant(Loop).GCGenRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataContaminantBalance->ZoneContamGenericConstant(Loop).Name); // Zone total report variables @@ -363,8 +363,8 @@ void GetZoneContaminanInputs(EnergyPlusData &state) "Zone Generic Air Contaminant Generation Volume Flow Rate", Constant::Units::m3_s, state.dataHeatBal->ZoneRpt(ZonePtr).GCRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(ZonePtr).Name); } SetupZoneInternalGain(state, @@ -510,8 +510,8 @@ void GetZoneContaminanInputs(EnergyPlusData &state) "Generic Air Contaminant Pressure Driven Generation Volume Flow Rate", Constant::Units::m3_s, state.dataContaminantBalance->ZoneContamGenericPDriven(Loop).GCGenRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataContaminantBalance->ZoneContamGenericPDriven(Loop).Name); if (state.dataContaminantBalance->ZoneContamGenericPDriven(Loop).SurfNum > 0) { @@ -528,8 +528,8 @@ void GetZoneContaminanInputs(EnergyPlusData &state) "Zone Generic Air Contaminant Generation Volume Flow Rate", Constant::Units::m3_s, state.dataHeatBal->ZoneRpt(ZonePtr).GCRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(ZonePtr).Name); } if (ZonePtr > 0) @@ -654,8 +654,8 @@ void GetZoneContaminanInputs(EnergyPlusData &state) "Generic Air Contaminant Cutoff Model Generation Volume Flow Rate", Constant::Units::m3_s, state.dataContaminantBalance->ZoneContamGenericCutoff(Loop).GCGenRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataContaminantBalance->ZoneContamGenericCutoff(Loop).Name); // Zone total report variables @@ -666,8 +666,8 @@ void GetZoneContaminanInputs(EnergyPlusData &state) "Zone Generic Air Contaminant Generation Volume Flow Rate", Constant::Units::m3_s, state.dataHeatBal->ZoneRpt(ZonePtr).GCRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(ZonePtr).Name); } SetupZoneInternalGain(state, @@ -791,15 +791,15 @@ void GetZoneContaminanInputs(EnergyPlusData &state) "Generic Air Contaminant Decay Model Generation Volume Flow Rate", Constant::Units::m3_s, state.dataContaminantBalance->ZoneContamGenericDecay(Loop).GCGenRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataContaminantBalance->ZoneContamGenericDecay(Loop).Name); SetupOutputVariable(state, "Generic Air Contaminant Decay Model Generation Emission Start Elapsed Time", Constant::Units::s, state.dataContaminantBalance->ZoneContamGenericDecay(Loop).GCTime, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataContaminantBalance->ZoneContamGenericDecay(Loop).Name); // Zone total report variables @@ -810,8 +810,8 @@ void GetZoneContaminanInputs(EnergyPlusData &state) "Zone Generic Air Contaminant Generation Volume Flow Rate", Constant::Units::m3_s, state.dataHeatBal->ZoneRpt(ZonePtr).GCRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(ZonePtr).Name); } SetupZoneInternalGain(state, @@ -934,16 +934,16 @@ void GetZoneContaminanInputs(EnergyPlusData &state) "Generic Air Contaminant Boundary Layer Diffusion Generation Volume Flow Rate", Constant::Units::m3_s, state.dataContaminantBalance->ZoneContamGenericBLDiff(Loop).GCGenRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataContaminantBalance->ZoneContamGenericBLDiff(Loop).Name); if (state.dataContaminantBalance->ZoneContamGenericBLDiff(Loop).SurfNum > 0) { SetupOutputVariable(state, "Generic Air Contaminant Boundary Layer Diffusion Inside Face Concentration", Constant::Units::ppm, state.dataSurface->SurfGenericContam(state.dataContaminantBalance->ZoneContamGenericBLDiff(Loop).SurfNum), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataContaminantBalance->ZoneContamGenericBLDiff(Loop).SurfName); } @@ -955,8 +955,8 @@ void GetZoneContaminanInputs(EnergyPlusData &state) "Zone Generic Air Contaminant Generation Volume Flow Rate", Constant::Units::m3_s, state.dataHeatBal->ZoneRpt(ZonePtr).GCRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(ZonePtr).Name); } SetupZoneInternalGain(state, @@ -1068,8 +1068,8 @@ void GetZoneContaminanInputs(EnergyPlusData &state) "Generic Air Contaminant Deposition Velocity Removal Volume Flow Rate", Constant::Units::m3_s, state.dataContaminantBalance->ZoneContamGenericDVS(Loop).GCGenRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataContaminantBalance->ZoneContamGenericDVS(Loop).Name); ZonePtr = state.dataSurface->Surface(state.dataContaminantBalance->ZoneContamGenericDVS(Loop).SurfNum).Zone; @@ -1080,8 +1080,8 @@ void GetZoneContaminanInputs(EnergyPlusData &state) "Zone Generic Air Contaminant Generation Volume Flow Rate", Constant::Units::m3_s, state.dataHeatBal->ZoneRpt(ZonePtr).GCRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(ZonePtr).Name); } SetupZoneInternalGain(state, @@ -1194,8 +1194,8 @@ void GetZoneContaminanInputs(EnergyPlusData &state) "Generic Air Contaminant Deposition Rate Removal Volume Flow Rate", Constant::Units::m3_s, state.dataContaminantBalance->ZoneContamGenericDRS(Loop).GCGenRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataContaminantBalance->ZoneContamGenericDRS(Loop).Name); ZonePtr = state.dataContaminantBalance->ZoneContamGenericDRS(Loop).ActualZoneNum; @@ -1206,8 +1206,8 @@ void GetZoneContaminanInputs(EnergyPlusData &state) "Zone Generic Air Contaminant Generation Volume Flow Rate", Constant::Units::m3_s, state.dataHeatBal->ZoneRpt(ZonePtr).GCRate, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(ZonePtr).Name); } SetupZoneInternalGain(state, @@ -1559,29 +1559,29 @@ void InitZoneContSetPoints(EnergyPlusData &state) "Zone Air CO2 Concentration", Constant::Units::ppm, state.dataContaminantBalance->ZoneAirCO2(Loop), - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(Loop).Name); SetupOutputVariable(state, "Zone Air CO2 Predicted Load to Setpoint Mass Flow Rate", Constant::Units::kg_s, state.dataContaminantBalance->CO2PredictedRate(Loop), - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(Loop).Name); SetupOutputVariable(state, "Zone Air CO2 Setpoint Concentration", Constant::Units::ppm, state.dataContaminantBalance->ZoneCO2SetPoint(Loop), - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(Loop).Name); SetupOutputVariable(state, "Zone Air CO2 Internal Gain Volume Flow Rate", Constant::Units::m3_s, state.dataContaminantBalance->ZoneCO2Gain(Loop), - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(Loop).Name); } @@ -1627,22 +1627,22 @@ void InitZoneContSetPoints(EnergyPlusData &state) "Zone Air Generic Air Contaminant Concentration", Constant::Units::ppm, state.dataContaminantBalance->ZoneAirGC(Loop), - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(Loop).Name); SetupOutputVariable(state, "Zone Generic Air Contaminant Predicted Load to Setpoint Mass Flow Rate", Constant::Units::kg_s, state.dataContaminantBalance->GCPredictedRate(Loop), - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(Loop).Name); SetupOutputVariable(state, "Zone Generic Air Contaminant Setpoint Concentration", Constant::Units::ppm, state.dataContaminantBalance->ZoneGCSetPoint(Loop), - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->Zone(Loop).Name); } } // Loop diff --git a/src/EnergyPlus/ZoneDehumidifier.cc b/src/EnergyPlus/ZoneDehumidifier.cc index 95aa88d1a5a..6b88b5b327b 100644 --- a/src/EnergyPlus/ZoneDehumidifier.cc +++ b/src/EnergyPlus/ZoneDehumidifier.cc @@ -492,82 +492,81 @@ namespace ZoneDehumidifier { "Zone Dehumidifier Sensible Heating Rate", Constant::Units::W, state.dataZoneDehumidifier->ZoneDehumid(ZoneDehumidIndex).SensHeatingRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataZoneDehumidifier->ZoneDehumid(ZoneDehumidIndex).Name); SetupOutputVariable(state, "Zone Dehumidifier Sensible Heating Energy", Constant::Units::J, state.dataZoneDehumidifier->ZoneDehumid(ZoneDehumidIndex).SensHeatingEnergy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataZoneDehumidifier->ZoneDehumid(ZoneDehumidIndex).Name); SetupOutputVariable(state, "Zone Dehumidifier Removed Water Mass Flow Rate", Constant::Units::kg_s, state.dataZoneDehumidifier->ZoneDehumid(ZoneDehumidIndex).WaterRemovalRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataZoneDehumidifier->ZoneDehumid(ZoneDehumidIndex).Name); SetupOutputVariable(state, "Zone Dehumidifier Removed Water Mass", Constant::Units::kg, state.dataZoneDehumidifier->ZoneDehumid(ZoneDehumidIndex).WaterRemoved, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataZoneDehumidifier->ZoneDehumid(ZoneDehumidIndex).Name); SetupOutputVariable(state, "Zone Dehumidifier Electricity Rate", Constant::Units::W, state.dataZoneDehumidifier->ZoneDehumid(ZoneDehumidIndex).ElecPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataZoneDehumidifier->ZoneDehumid(ZoneDehumidIndex).Name); SetupOutputVariable(state, "Zone Dehumidifier Electricity Energy", Constant::Units::J, state.dataZoneDehumidifier->ZoneDehumid(ZoneDehumidIndex).ElecConsumption, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataZoneDehumidifier->ZoneDehumid(ZoneDehumidIndex).Name, Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::Cooling, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Cooling); SetupOutputVariable(state, "Zone Dehumidifier Off Cycle Parasitic Electricity Rate", Constant::Units::W, state.dataZoneDehumidifier->ZoneDehumid(ZoneDehumidIndex).OffCycleParasiticElecPower, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataZoneDehumidifier->ZoneDehumid(ZoneDehumidIndex).Name); SetupOutputVariable(state, "Zone Dehumidifier Off Cycle Parasitic Electricity Energy", Constant::Units::J, state.dataZoneDehumidifier->ZoneDehumid(ZoneDehumidIndex).OffCycleParasiticElecCons, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataZoneDehumidifier->ZoneDehumid(ZoneDehumidIndex).Name); SetupOutputVariable(state, "Zone Dehumidifier Part Load Ratio", Constant::Units::None, state.dataZoneDehumidifier->ZoneDehumid(ZoneDehumidIndex).DehumidPLR, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataZoneDehumidifier->ZoneDehumid(ZoneDehumidIndex).Name); SetupOutputVariable(state, "Zone Dehumidifier Runtime Fraction", Constant::Units::None, state.dataZoneDehumidifier->ZoneDehumid(ZoneDehumidIndex).DehumidRTF, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataZoneDehumidifier->ZoneDehumid(ZoneDehumidIndex).Name); SetupOutputVariable(state, "Zone Dehumidifier Outlet Air Temperature", Constant::Units::C, state.dataZoneDehumidifier->ZoneDehumid(ZoneDehumidIndex).OutletAirTemp, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataZoneDehumidifier->ZoneDehumid(ZoneDehumidIndex).Name); if (state.dataZoneDehumidifier->ZoneDehumid(ZoneDehumidIndex).CondensateCollectMode == CondensateOutlet::ToTank) { @@ -575,20 +574,19 @@ namespace ZoneDehumidifier { "Zone Dehumidifier Condensate Volume Flow Rate", Constant::Units::m3_s, state.dataZoneDehumidifier->ZoneDehumid(ZoneDehumidIndex).DehumidCondVolFlowRate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataZoneDehumidifier->ZoneDehumid(ZoneDehumidIndex).Name); SetupOutputVariable(state, "Zone Dehumidifier Condensate Volume", Constant::Units::m3, state.dataZoneDehumidifier->ZoneDehumid(ZoneDehumidIndex).DehumidCondVol, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataZoneDehumidifier->ZoneDehumid(ZoneDehumidIndex).Name, Constant::eResource::OnSiteWater, - OutputProcessor::SOVEndUseCat::Condensate, - {}, - OutputProcessor::SOVGroup::HVAC); + OutputProcessor::Group::HVAC, + OutputProcessor::EndUseCat::Condensate); } } } diff --git a/src/EnergyPlus/ZoneTempPredictorCorrector.cc b/src/EnergyPlus/ZoneTempPredictorCorrector.cc index 9b0ee545885..740e4220ac8 100644 --- a/src/EnergyPlus/ZoneTempPredictorCorrector.cc +++ b/src/EnergyPlus/ZoneTempPredictorCorrector.cc @@ -1983,8 +1983,8 @@ void GetZoneAirSetPoints(EnergyPlusData &state) "Zone Thermostat Operative Temperature", Constant::Units::C, state.dataHeatBal->ZnAirRpt(TempControlledZone(TempControlledZoneNum).ActualZoneNum).ThermOperativeTemp, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, Zone(TempControlledZone(TempControlledZoneNum).ActualZoneNum).Name); } } else { @@ -2091,8 +2091,8 @@ void GetZoneAirSetPoints(EnergyPlusData &state) "Zone Thermostat Operative Temperature", Constant::Units::C, state.dataHeatBal->ZnAirRpt(TempControlledZone(TempControlledZoneNum).ActualZoneNum).ThermOperativeTemp, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, Zone(TempControlledZone(TempControlledZoneNum).ActualZoneNum).Name); } // TStat Objects Loop } // found thermostat referene @@ -2912,43 +2912,43 @@ void InitZoneAirSetPoints(EnergyPlusData &state) "Zone Thermostat Air Temperature", Constant::Units::C, state.dataHeatBalFanSys->TempTstatAir(zoneNum), - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisZone.Name); SetupOutputVariable(state, "Zone Thermostat Control Type", Constant::Units::None, TempControlTypeRpt(zoneNum), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, thisZone.Name); SetupOutputVariable(state, "Zone Thermostat Heating Setpoint Temperature", Constant::Units::C, ZoneThermostatSetPointLo(zoneNum), - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisZone.Name); SetupOutputVariable(state, "Zone Thermostat Cooling Setpoint Temperature", Constant::Units::C, ZoneThermostatSetPointHi(zoneNum), - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisZone.Name); SetupOutputVariable(state, "Zone Adaptive Comfort Operative Temperature Set Point", Constant::Units::C, state.dataHeatBalFanSys->AdapComfortCoolingSetPoint(zoneNum), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, thisZone.Name); SetupOutputVariable(state, "Zone Predicted Sensible Load Room Air Correction Factor", Constant::Units::None, state.dataHeatBalFanSys->LoadCorrectionFactor(zoneNum), - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, thisZone.Name); } // zoneNum @@ -2962,22 +2962,22 @@ void InitZoneAirSetPoints(EnergyPlusData &state) "Zone Thermal Comfort Control Type", Constant::Units::None, state.dataHeatBalFanSys->ComfortControlTypeRpt(zoneNum), - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, thisZone.Name); SetupOutputVariable(state, "Zone Thermal Comfort Control Fanger Low Setpoint PMV", Constant::Units::None, state.dataHeatBalFanSys->ZoneComfortControlsFanger(zoneNum).LowPMV, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, thisZone.Name); SetupOutputVariable(state, "Zone Thermal Comfort Control Fanger High Setpoint PMV", Constant::Units::None, state.dataHeatBalFanSys->ZoneComfortControlsFanger(zoneNum).HighPMV, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, thisZone.Name); } } @@ -2988,29 +2988,29 @@ void InitZoneAirSetPoints(EnergyPlusData &state) "Zone List Sensible Heating Energy", Constant::Units::J, state.dataHeatBal->ZoneListSNLoadHeatEnergy(Loop), - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, ZoneList(Loop).Name); SetupOutputVariable(state, "Zone List Sensible Cooling Energy", Constant::Units::J, state.dataHeatBal->ZoneListSNLoadCoolEnergy(Loop), - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, ZoneList(Loop).Name); SetupOutputVariable(state, "Zone List Sensible Heating Rate", Constant::Units::W, state.dataHeatBal->ZoneListSNLoadHeatRate(Loop), - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ZoneList(Loop).Name); SetupOutputVariable(state, "Zone List Sensible Cooling Rate", Constant::Units::W, state.dataHeatBal->ZoneListSNLoadCoolRate(Loop), - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, ZoneList(Loop).Name); } // Loop @@ -3020,29 +3020,29 @@ void InitZoneAirSetPoints(EnergyPlusData &state) "Zone Group Sensible Heating Energy", Constant::Units::J, state.dataHeatBal->ZoneGroupSNLoadHeatEnergy(Loop), - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->ZoneGroup(Loop).Name); SetupOutputVariable(state, "Zone Group Sensible Cooling Energy", Constant::Units::J, state.dataHeatBal->ZoneGroupSNLoadCoolEnergy(Loop), - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, state.dataHeatBal->ZoneGroup(Loop).Name); SetupOutputVariable(state, "Zone Group Sensible Heating Rate", Constant::Units::W, state.dataHeatBal->ZoneGroupSNLoadHeatRate(Loop), - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->ZoneGroup(Loop).Name); SetupOutputVariable(state, "Zone Group Sensible Cooling Rate", Constant::Units::W, state.dataHeatBal->ZoneGroupSNLoadCoolRate(Loop), - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, state.dataHeatBal->ZoneGroup(Loop).Name); } // Loop @@ -3258,29 +3258,29 @@ void ZoneSpaceHeatBalanceData::setUpOutputVars(EnergyPlusData &state, std::strin format("{} Air Temperature", prefix), Constant::Units::C, this->ZT, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name); SetupOutputVariable(state, format("{} Air Humidity Ratio", prefix), Constant::Units::None, this->airHumRat, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name); SetupOutputVariable(state, format("{} Air Relative Humidity", prefix), Constant::Units::Perc, this->airRelHum, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Average, name); SetupOutputVariable(state, format("{} Mean Radiant Temperature", prefix), Constant::Units::C, this->MRT, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::State, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, name); } @@ -6071,22 +6071,22 @@ void DetectOscillatingZoneTemp(EnergyPlusData &state) "Zone Oscillating Temperatures Time", Constant::Units::hr, state.dataZoneTempPredictorCorrector->ZoneTempOscillate(iZone), - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, zone.Name); SetupOutputVariable(state, "Zone Oscillating Temperatures During Occupancy Time", Constant::Units::hr, state.dataZoneTempPredictorCorrector->ZoneTempOscillateDuringOccupancy(iZone), - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, zone.Name); SetupOutputVariable(state, "Zone Oscillating Temperatures in Deadband Time", Constant::Units::hr, state.dataZoneTempPredictorCorrector->ZoneTempOscillateInDeadband(iZone), - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, zone.Name); } // set up a variable covering all zones @@ -6094,22 +6094,22 @@ void DetectOscillatingZoneTemp(EnergyPlusData &state) "Facility Any Zone Oscillating Temperatures Time", Constant::Units::hr, state.dataZoneTempPredictorCorrector->AnyZoneTempOscillate, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, "Facility"); SetupOutputVariable(state, "Facility Any Zone Oscillating Temperatures During Occupancy Time", Constant::Units::hr, state.dataZoneTempPredictorCorrector->AnyZoneTempOscillateDuringOccupancy, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, "Facility"); SetupOutputVariable(state, "Facility Any Zone Oscillating Temperatures in Deadband Time", Constant::Units::hr, state.dataZoneTempPredictorCorrector->AnyZoneTempOscillateInDeadband, - OutputProcessor::SOVTimeStepType::System, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::System, + OutputProcessor::StoreType::Sum, "Facility"); // test if the oscillation variables are even used if (ReportingThisVariable(state, "Zone Oscillating Temperatures Time") || diff --git a/tst/EnergyPlus/unit/CondenserLoopTowers.unit.cc b/tst/EnergyPlus/unit/CondenserLoopTowers.unit.cc index d078fad4b8f..e00d6795042 100644 --- a/tst/EnergyPlus/unit/CondenserLoopTowers.unit.cc +++ b/tst/EnergyPlus/unit/CondenserLoopTowers.unit.cc @@ -497,8 +497,8 @@ TEST_F(EnergyPlusFixture, CondenserLoopTowers_MerkelNoCooling) // OutputProcessor::TimeValue.allocate(2); OutputProcessor::SetupTimePointers( - *state, OutputProcessor::SOVTimeStepType::Zone, state->dataGlobal->TimeStepZone); // Set up Time pointer for HB/Zone Simulation - OutputProcessor::SetupTimePointers(*state, OutputProcessor::SOVTimeStepType::HVAC, state->dataHVACGlobal->TimeStepSys); + *state, OutputProcessor::TimeStepType::Zone, state->dataGlobal->TimeStepZone); // Set up Time pointer for HB/Zone Simulation + OutputProcessor::SetupTimePointers(*state, OutputProcessor::TimeStepType::System, state->dataHVACGlobal->TimeStepSys); createFacilityElectricPowerServiceObject(*state); OutputProcessor::GetReportVariableInput(*state); PlantManager::CheckIfAnyPlant(*state); @@ -890,8 +890,8 @@ TEST_F(EnergyPlusFixture, CondenserLoopTowers_SingleSpeedSizing) // OutputProcessor::TimeValue.allocate(2); OutputProcessor::SetupTimePointers( - *state, OutputProcessor::SOVTimeStepType::Zone, state->dataGlobal->TimeStepZone); // Set up Time pointer for HB/Zone Simulation - OutputProcessor::SetupTimePointers(*state, OutputProcessor::SOVTimeStepType::HVAC, state->dataHVACGlobal->TimeStepSys); + *state, OutputProcessor::TimeStepType::Zone, state->dataGlobal->TimeStepZone); // Set up Time pointer for HB/Zone Simulation + OutputProcessor::SetupTimePointers(*state, OutputProcessor::TimeStepType::System, state->dataHVACGlobal->TimeStepSys); createFacilityElectricPowerServiceObject(*state); OutputProcessor::GetReportVariableInput(*state); PlantManager::CheckIfAnyPlant(*state); @@ -1327,8 +1327,8 @@ TEST_F(EnergyPlusFixture, CondenserLoopTowers_SingleSpeedUserInputTowerSizing) // OutputProcessor::TimeValue.allocate(2); OutputProcessor::SetupTimePointers( - *state, OutputProcessor::SOVTimeStepType::Zone, state->dataGlobal->TimeStepZone); // Set up Time pointer for HB/Zone Simulation - OutputProcessor::SetupTimePointers(*state, OutputProcessor::SOVTimeStepType::HVAC, state->dataHVACGlobal->TimeStepSys); + *state, OutputProcessor::TimeStepType::Zone, state->dataGlobal->TimeStepZone); // Set up Time pointer for HB/Zone Simulation + OutputProcessor::SetupTimePointers(*state, OutputProcessor::TimeStepType::System, state->dataHVACGlobal->TimeStepSys); createFacilityElectricPowerServiceObject(*state); OutputProcessor::GetReportVariableInput(*state); PlantManager::CheckIfAnyPlant(*state); @@ -1747,8 +1747,8 @@ TEST_F(EnergyPlusFixture, CondenserLoopTowers_TwoSpeedUserInputTowerSizing) // OutputProcessor::TimeValue.allocate(2); OutputProcessor::SetupTimePointers( - *state, OutputProcessor::SOVTimeStepType::Zone, state->dataGlobal->TimeStepZone); // Set up Time pointer for HB/Zone Simulation - OutputProcessor::SetupTimePointers(*state, OutputProcessor::SOVTimeStepType::HVAC, state->dataHVACGlobal->TimeStepSys); + *state, OutputProcessor::TimeStepType::Zone, state->dataGlobal->TimeStepZone); // Set up Time pointer for HB/Zone Simulation + OutputProcessor::SetupTimePointers(*state, OutputProcessor::TimeStepType::System, state->dataHVACGlobal->TimeStepSys); createFacilityElectricPowerServiceObject(*state); OutputProcessor::GetReportVariableInput(*state); PlantManager::CheckIfAnyPlant(*state); @@ -2237,8 +2237,8 @@ TEST_F(EnergyPlusFixture, CondenserLoopTowers_MerkelUserInputTowerSizing) // OutputProcessor::TimeValue.allocate(2); OutputProcessor::SetupTimePointers( - *state, OutputProcessor::SOVTimeStepType::Zone, state->dataGlobal->TimeStepZone); // Set up Time pointer for HB/Zone Simulation - OutputProcessor::SetupTimePointers(*state, OutputProcessor::SOVTimeStepType::HVAC, state->dataHVACGlobal->TimeStepSys); + *state, OutputProcessor::TimeStepType::Zone, state->dataGlobal->TimeStepZone); // Set up Time pointer for HB/Zone Simulation + OutputProcessor::SetupTimePointers(*state, OutputProcessor::TimeStepType::System, state->dataHVACGlobal->TimeStepSys); createFacilityElectricPowerServiceObject(*state); OutputProcessor::GetReportVariableInput(*state); PlantManager::CheckIfAnyPlant(*state); @@ -2670,8 +2670,8 @@ TEST_F(EnergyPlusFixture, CondenserLoopTowers_TwoSpeedTowerLowSpeedNomCapSizing) // OutputProcessor::TimeValue.allocate(2); OutputProcessor::SetupTimePointers( - *state, OutputProcessor::SOVTimeStepType::Zone, state->dataGlobal->TimeStepZone); // Set up Time pointer for HB/Zone Simulation - OutputProcessor::SetupTimePointers(*state, OutputProcessor::SOVTimeStepType::HVAC, state->dataHVACGlobal->TimeStepSys); + *state, OutputProcessor::TimeStepType::Zone, state->dataGlobal->TimeStepZone); // Set up Time pointer for HB/Zone Simulation + OutputProcessor::SetupTimePointers(*state, OutputProcessor::TimeStepType::System, state->dataHVACGlobal->TimeStepSys); createFacilityElectricPowerServiceObject(*state); OutputProcessor::GetReportVariableInput(*state); PlantManager::CheckIfAnyPlant(*state); @@ -3059,8 +3059,8 @@ TEST_F(EnergyPlusFixture, CondenserLoopTowers_SingleSpeedUser_SizingError_Sizing // OutputProcessor::TimeValue.allocate(2); OutputProcessor::SetupTimePointers( - *state, OutputProcessor::SOVTimeStepType::Zone, state->dataGlobal->TimeStepZone); // Set up Time pointer for HB/Zone Simulation - OutputProcessor::SetupTimePointers(*state, OutputProcessor::SOVTimeStepType::HVAC, state->dataHVACGlobal->TimeStepSys); + *state, OutputProcessor::TimeStepType::Zone, state->dataGlobal->TimeStepZone); // Set up Time pointer for HB/Zone Simulation + OutputProcessor::SetupTimePointers(*state, OutputProcessor::TimeStepType::System, state->dataHVACGlobal->TimeStepSys); createFacilityElectricPowerServiceObject(*state); OutputProcessor::GetReportVariableInput(*state); PlantManager::CheckIfAnyPlant(*state); @@ -3451,8 +3451,8 @@ TEST_F(EnergyPlusFixture, CondenserLoopTowers_SingleSpeedUser_SizingError_UserSp // OutputProcessor::TimeValue.allocate(2); OutputProcessor::SetupTimePointers( - *state, OutputProcessor::SOVTimeStepType::Zone, state->dataGlobal->TimeStepZone); // Set up Time pointer for HB/Zone Simulation - OutputProcessor::SetupTimePointers(*state, OutputProcessor::SOVTimeStepType::HVAC, state->dataHVACGlobal->TimeStepSys); + *state, OutputProcessor::TimeStepType::Zone, state->dataGlobal->TimeStepZone); // Set up Time pointer for HB/Zone Simulation + OutputProcessor::SetupTimePointers(*state, OutputProcessor::TimeStepType::System, state->dataHVACGlobal->TimeStepSys); createFacilityElectricPowerServiceObject(*state); OutputProcessor::GetReportVariableInput(*state); PlantManager::CheckIfAnyPlant(*state); @@ -3923,8 +3923,8 @@ TEST_F(EnergyPlusFixture, VSCoolingTowers_WaterOutletTempTest) SimulationManager::GetProjectData(*state); OutputReportPredefined::SetPredefinedTables(*state); - OutputProcessor::SetupTimePointers(*state, OutputProcessor::SOVTimeStepType::Zone, state->dataGlobal->TimeStepZone); - OutputProcessor::SetupTimePointers(*state, OutputProcessor::SOVTimeStepType::HVAC, state->dataHVACGlobal->TimeStepSys); + OutputProcessor::SetupTimePointers(*state, OutputProcessor::TimeStepType::Zone, state->dataGlobal->TimeStepZone); + OutputProcessor::SetupTimePointers(*state, OutputProcessor::TimeStepType::System, state->dataHVACGlobal->TimeStepSys); createFacilityElectricPowerServiceObject(*state); OutputProcessor::GetReportVariableInput(*state); PlantManager::CheckIfAnyPlant(*state); diff --git a/tst/EnergyPlus/unit/DXCoils.unit.cc b/tst/EnergyPlus/unit/DXCoils.unit.cc index 292023a52b8..f1a3e83130c 100644 --- a/tst/EnergyPlus/unit/DXCoils.unit.cc +++ b/tst/EnergyPlus/unit/DXCoils.unit.cc @@ -6855,11 +6855,11 @@ TEST_F(EnergyPlusFixture, Test_DHW_End_Use_Cat_Removal) EXPECT_EQ(24, state->dataOutputProcessor->meters.size()); EXPECT_EQ(state->dataOutputProcessor->meters[19]->Name, "WaterSystems:Electricity"); EXPECT_EQ((int)state->dataOutputProcessor->meters[19]->resource, (int)Constant::eResource::Electricity); - EXPECT_EQ((int)state->dataOutputProcessor->meters[19]->sovEndUseCat, (int)OutputProcessor::SOVEndUseCat::WaterSystem); + EXPECT_EQ((int)state->dataOutputProcessor->meters[19]->endUseCat, (int)OutputProcessor::EndUseCat::WaterSystem); EXPECT_EQ(state->dataOutputProcessor->meters[20]->Name, "General:WaterSystems:Electricity"); EXPECT_EQ((int)state->dataOutputProcessor->meters[20]->resource, (int)Constant::eResource::Electricity); - EXPECT_EQ((int)state->dataOutputProcessor->meters[20]->sovEndUseCat, (int)OutputProcessor::SOVEndUseCat::WaterSystem); + EXPECT_EQ((int)state->dataOutputProcessor->meters[20]->endUseCat, (int)OutputProcessor::EndUseCat::WaterSystem); } } // namespace EnergyPlus diff --git a/tst/EnergyPlus/unit/HVACFourPipeBeam.unit.cc b/tst/EnergyPlus/unit/HVACFourPipeBeam.unit.cc index 5b2b101cc49..d966115504b 100644 --- a/tst/EnergyPlus/unit/HVACFourPipeBeam.unit.cc +++ b/tst/EnergyPlus/unit/HVACFourPipeBeam.unit.cc @@ -1731,8 +1731,8 @@ TEST_F(EnergyPlusFixture, Beam_sizeandSimulateOneZone) HeatBalanceManager::SetPreConstructionInputParameters(*state); // establish array bounds for constructions early // OutputProcessor::TimeValue.allocate(2); OutputProcessor::SetupTimePointers( - *state, OutputProcessor::SOVTimeStepType::Zone, state->dataGlobal->TimeStepZone); // Set up Time pointer for HB/Zone Simulation - OutputProcessor::SetupTimePointers(*state, OutputProcessor::SOVTimeStepType::HVAC, state->dataHVACGlobal->TimeStepSys); + *state, OutputProcessor::TimeStepType::Zone, state->dataGlobal->TimeStepZone); // Set up Time pointer for HB/Zone Simulation + OutputProcessor::SetupTimePointers(*state, OutputProcessor::TimeStepType::System, state->dataHVACGlobal->TimeStepSys); PlantManager::CheckIfAnyPlant(*state); createFacilityElectricPowerServiceObject(*state); BranchInputManager::ManageBranchInput(*state); // just gets input and returns. @@ -3310,8 +3310,8 @@ TEST_F(EnergyPlusFixture, Beam_fatalWhenSysSizingOff) HeatBalanceManager::SetPreConstructionInputParameters(*state); // establish array bounds for constructions early // OutputProcessor::TimeValue.allocate(2); OutputProcessor::SetupTimePointers( - *state, OutputProcessor::SOVTimeStepType::Zone, state->dataGlobal->TimeStepZone); // Set up Time pointer for HB/Zone Simulation - OutputProcessor::SetupTimePointers(*state, OutputProcessor::SOVTimeStepType::HVAC, state->dataHVACGlobal->TimeStepSys); + *state, OutputProcessor::TimeStepType::Zone, state->dataGlobal->TimeStepZone); // Set up Time pointer for HB/Zone Simulation + OutputProcessor::SetupTimePointers(*state, OutputProcessor::TimeStepType::System, state->dataHVACGlobal->TimeStepSys); PlantManager::CheckIfAnyPlant(*state); createFacilityElectricPowerServiceObject(*state); BranchInputManager::ManageBranchInput(*state); // just gets input and returns. @@ -4807,8 +4807,8 @@ TEST_F(EnergyPlusFixture, Beam_sizeandSimulateHighOA) HeatBalanceManager::SetPreConstructionInputParameters(*state); // establish array bounds for constructions early // OutputProcessor::TimeValue.allocate(2); OutputProcessor::SetupTimePointers( - *state, OutputProcessor::SOVTimeStepType::Zone, state->dataGlobal->TimeStepZone); // Set up Time pointer for HB/Zone Simulation - OutputProcessor::SetupTimePointers(*state, OutputProcessor::SOVTimeStepType::HVAC, state->dataHVACGlobal->TimeStepSys); + *state, OutputProcessor::TimeStepType::Zone, state->dataGlobal->TimeStepZone); // Set up Time pointer for HB/Zone Simulation + OutputProcessor::SetupTimePointers(*state, OutputProcessor::TimeStepType::System, state->dataHVACGlobal->TimeStepSys); PlantManager::CheckIfAnyPlant(*state); createFacilityElectricPowerServiceObject(*state); BranchInputManager::ManageBranchInput(*state); // just gets input and returns. diff --git a/tst/EnergyPlus/unit/HVACSizingSimulationManager.unit.cc b/tst/EnergyPlus/unit/HVACSizingSimulationManager.unit.cc index b26bb33c5ab..c9b945ad512 100644 --- a/tst/EnergyPlus/unit/HVACSizingSimulationManager.unit.cc +++ b/tst/EnergyPlus/unit/HVACSizingSimulationManager.unit.cc @@ -116,9 +116,8 @@ class HVACSizingSimulationManagerTest : public EnergyPlusFixture state->dataLoopNodes->Node.allocate(1); // OutputProcessor::TimeValue.allocate(2); // set up time related - SetupTimePointers( - *state, OutputProcessor::SOVTimeStepType::Zone, state->dataGlobal->TimeStepZone); // Set up Time pointer for HB/Zone Simulation - SetupTimePointers(*state, OutputProcessor::SOVTimeStepType::HVAC, state->dataHVACGlobal->TimeStepSys); + SetupTimePointers(*state, OutputProcessor::TimeStepType::Zone, state->dataGlobal->TimeStepZone); // Set up Time pointer for HB/Zone Simulation + SetupTimePointers(*state, OutputProcessor::TimeStepType::System, state->dataHVACGlobal->TimeStepSys); state->dataGlobal->NumOfTimeStepInHour = 4; state->dataWeather->TimeStepFraction = 1.0 / double(state->dataGlobal->NumOfTimeStepInHour); diff --git a/tst/EnergyPlus/unit/HeatPumpWaterToWaterSimple.unit.cc b/tst/EnergyPlus/unit/HeatPumpWaterToWaterSimple.unit.cc index 48d901c587f..1f37e659874 100644 --- a/tst/EnergyPlus/unit/HeatPumpWaterToWaterSimple.unit.cc +++ b/tst/EnergyPlus/unit/HeatPumpWaterToWaterSimple.unit.cc @@ -744,8 +744,8 @@ TEST_F(EnergyPlusFixture, PlantLoopSourceSideTest) HeatBalanceManager::SetPreConstructionInputParameters(*state); // establish array bounds for constructions early // OutputProcessor::TimeValue.allocate(2); OutputProcessor::SetupTimePointers( - *state, OutputProcessor::SOVTimeStepType::Zone, state->dataGlobal->TimeStepZone); // Set up Time pointer for HB/Zone Simulation - OutputProcessor::SetupTimePointers(*state, OutputProcessor::SOVTimeStepType::HVAC, state->dataHVACGlobal->TimeStepSys); + *state, OutputProcessor::TimeStepType::Zone, state->dataGlobal->TimeStepZone); // Set up Time pointer for HB/Zone Simulation + OutputProcessor::SetupTimePointers(*state, OutputProcessor::TimeStepType::System, state->dataHVACGlobal->TimeStepSys); createFacilityElectricPowerServiceObject(*state); OutputProcessor::GetReportVariableInput(*state); PlantManager::CheckIfAnyPlant(*state); @@ -1523,8 +1523,8 @@ TEST_F(EnergyPlusFixture, WWHP_AutosizeTest1) HeatBalanceManager::SetPreConstructionInputParameters(*state); // establish array bounds for constructions early // OutputProcessor::TimeValue.allocate(2); OutputProcessor::SetupTimePointers( - *state, OutputProcessor::SOVTimeStepType::Zone, state->dataGlobal->TimeStepZone); // Set up Time pointer for HB/Zone Simulation - OutputProcessor::SetupTimePointers(*state, OutputProcessor::SOVTimeStepType::HVAC, state->dataHVACGlobal->TimeStepSys); + *state, OutputProcessor::TimeStepType::Zone, state->dataGlobal->TimeStepZone); // Set up Time pointer for HB/Zone Simulation + OutputProcessor::SetupTimePointers(*state, OutputProcessor::TimeStepType::System, state->dataHVACGlobal->TimeStepSys); createFacilityElectricPowerServiceObject(*state); OutputProcessor::GetReportVariableInput(*state); PlantManager::CheckIfAnyPlant(*state); diff --git a/tst/EnergyPlus/unit/OutputProcessor.unit.cc b/tst/EnergyPlus/unit/OutputProcessor.unit.cc index dbcd5b61df5..8fb874247db 100644 --- a/tst/EnergyPlus/unit/OutputProcessor.unit.cc +++ b/tst/EnergyPlus/unit/OutputProcessor.unit.cc @@ -108,9 +108,9 @@ namespace OutputProcessor { auto &op = state->dataOutputProcessor; auto &sql = state->dataSQLiteProcedures->sqlite; sql->createSQLiteReportDictionaryRecord( - 1, StoreType::Averaged, "Zone", "Environment", "Site Outdoor Air Drybulb Temperature", TimeStepType::Zone, "C", ReportFreq::Hour, false); + 1, StoreType::Average, "Zone", "Environment", "Site Outdoor Air Drybulb Temperature", TimeStepType::Zone, "C", ReportFreq::Hour, false); sql->createSQLiteReportDictionaryRecord( - 2, StoreType::Summed, "Facility:Electricity", "", "Facility:Electricity", TimeStepType::Zone, "J", ReportFreq::Hour, true); + 2, StoreType::Sum, "Facility:Electricity", "", "Facility:Electricity", TimeStepType::Zone, "J", ReportFreq::Hour, true); Meter *meter1 = new Meter("Meter1"); op->meters.push_back(meter1); @@ -178,9 +178,9 @@ namespace OutputProcessor { auto &op = state->dataOutputProcessor; auto &sql = state->dataSQLiteProcedures->sqlite; sql->createSQLiteReportDictionaryRecord( - 1, StoreType::Averaged, "Zone", "Environment", "Site Outdoor Air Drybulb Temperature", TimeStepType::Zone, "C", ReportFreq::Hour, false); + 1, StoreType::Average, "Zone", "Environment", "Site Outdoor Air Drybulb Temperature", TimeStepType::Zone, "C", ReportFreq::Hour, false); sql->createSQLiteReportDictionaryRecord( - 2, StoreType::Summed, "Facility:Electricity", "", "Facility:Electricity", TimeStepType::Zone, "J", ReportFreq::Hour, true); + 2, StoreType::Sum, "Facility:Electricity", "", "Facility:Electricity", TimeStepType::Zone, "J", ReportFreq::Hour, true); Meter *meter1 = new Meter("Meter1"); op->meters.push_back(meter1); @@ -248,9 +248,9 @@ namespace OutputProcessor { auto &op = state->dataOutputProcessor; auto &sql = state->dataSQLiteProcedures->sqlite; sql->createSQLiteReportDictionaryRecord( - 1, StoreType::Averaged, "Zone", "Environment", "Site Outdoor Air Drybulb Temperature", TimeStepType::Zone, "C", ReportFreq::Hour, false); + 1, StoreType::Average, "Zone", "Environment", "Site Outdoor Air Drybulb Temperature", TimeStepType::Zone, "C", ReportFreq::Hour, false); sql->createSQLiteReportDictionaryRecord( - 2, StoreType::Summed, "Facility:Electricity", "", "Facility:Electricity", TimeStepType::Zone, "J", ReportFreq::Hour, true); + 2, StoreType::Sum, "Facility:Electricity", "", "Facility:Electricity", TimeStepType::Zone, "J", ReportFreq::Hour, true); Meter *meter1 = new Meter("Meter1"); op->meters.push_back(meter1); @@ -314,9 +314,9 @@ namespace OutputProcessor { auto &op = state->dataOutputProcessor; auto &sql = state->dataSQLiteProcedures->sqlite; sql->createSQLiteReportDictionaryRecord( - 1, StoreType::Averaged, "Zone", "Environment", "Site Outdoor Air Drybulb Temperature", TimeStepType::Zone, "C", ReportFreq::Hour, false); + 1, StoreType::Average, "Zone", "Environment", "Site Outdoor Air Drybulb Temperature", TimeStepType::Zone, "C", ReportFreq::Hour, false); sql->createSQLiteReportDictionaryRecord( - 2, StoreType::Summed, "Facility:Electricity", "", "Facility:Electricity", TimeStepType::Zone, "J", ReportFreq::Hour, true); + 2, StoreType::Sum, "Facility:Electricity", "", "Facility:Electricity", TimeStepType::Zone, "J", ReportFreq::Hour, true); Meter *meter1 = new Meter("Meter1"); op->meters.push_back(meter1); @@ -393,9 +393,9 @@ namespace OutputProcessor { auto &op = state->dataOutputProcessor; auto &sql = state->dataSQLiteProcedures->sqlite; sql->createSQLiteReportDictionaryRecord( - 1, StoreType::Averaged, "Zone", "Environment", "Site Outdoor Air Drybulb Temperature", TimeStepType::Zone, "C", ReportFreq::Hour, false); + 1, StoreType::Average, "Zone", "Environment", "Site Outdoor Air Drybulb Temperature", TimeStepType::Zone, "C", ReportFreq::Hour, false); sql->createSQLiteReportDictionaryRecord( - 2, StoreType::Summed, "Facility:Electricity", "", "Facility:Electricity", TimeStepType::Zone, "J", ReportFreq::Hour, true); + 2, StoreType::Sum, "Facility:Electricity", "", "Facility:Electricity", TimeStepType::Zone, "J", ReportFreq::Hour, true); Meter *meter1 = new Meter("Meter1"); op->meters.push_back(meter1); @@ -472,9 +472,9 @@ namespace OutputProcessor { auto &op = state->dataOutputProcessor; auto &sql = state->dataSQLiteProcedures->sqlite; sql->createSQLiteReportDictionaryRecord( - 1, StoreType::Averaged, "Zone", "Environment", "Site Outdoor Air Drybulb Temperature", TimeStepType::Zone, "C", ReportFreq::Hour, false); + 1, StoreType::Average, "Zone", "Environment", "Site Outdoor Air Drybulb Temperature", TimeStepType::Zone, "C", ReportFreq::Hour, false); sql->createSQLiteReportDictionaryRecord( - 2, StoreType::Summed, "Facility:Electricity", "", "Facility:Electricity", TimeStepType::Zone, "J", ReportFreq::Hour, true); + 2, StoreType::Sum, "Facility:Electricity", "", "Facility:Electricity", TimeStepType::Zone, "J", ReportFreq::Hour, true); Meter *meter1 = new Meter("Meter1"); op->meters.push_back(meter1); @@ -551,9 +551,9 @@ namespace OutputProcessor { auto &op = state->dataOutputProcessor; auto &sql = state->dataSQLiteProcedures->sqlite; sql->createSQLiteReportDictionaryRecord( - 1, StoreType::Averaged, "Zone", "Environment", "Site Outdoor Air Drybulb Temperature", TimeStepType::Zone, "C", ReportFreq::Hour, false); + 1, StoreType::Average, "Zone", "Environment", "Site Outdoor Air Drybulb Temperature", TimeStepType::Zone, "C", ReportFreq::Hour, false); sql->createSQLiteReportDictionaryRecord( - 2, StoreType::Summed, "Facility:Electricity", "", "Facility:Electricity", TimeStepType::Zone, "J", ReportFreq::Hour, true); + 2, StoreType::Sum, "Facility:Electricity", "", "Facility:Electricity", TimeStepType::Zone, "J", ReportFreq::Hour, true); Meter *meter1 = new Meter("Meter1"); op->meters.push_back(meter1); @@ -780,52 +780,68 @@ namespace OutputProcessor { sql->createSQLiteTimeIndexRecord(ReportFreq::Simulation, 1, 1, 0, 2017, false); sql->createSQLiteReportDictionaryRecord( - 1, StoreType::Averaged, "Zone", "Environment", "Site Outdoor Air Drybulb Temperature", TimeStepType::Zone, "C", ReportFreq::Hour, false); + 1, StoreType::Average, "Zone", "Environment", "Site Outdoor Air Drybulb Temperature", TimeStepType::Zone, "C", ReportFreq::Hour, false); - WriteReportMeterData(*state, 1, 999.9, ReportFreq::TimeStep, 0.0, 0, 0.0, 0, false); + MeterPeriod mp; + mp.RptNum = 1; + mp.Value = 999.9; + mp.MinVal = mp.MaxVal = 0.0; + mp.MinValDate = mp.MaxValDate = 0; + mp.RptFO = false; + + mp.WriteReportData(*state, ReportFreq::TimeStep); EXPECT_TRUE(compare_mtr_stream(delimited_string({"1,999.9"}, "\n"))); EXPECT_TRUE(compare_eso_stream(delimited_string({"1,999.9"}, "\n"))); - WriteReportMeterData(*state, 1, 999.9, ReportFreq::EachCall, 0.0, 0, 0.0, 0, false); + mp.WriteReportData(*state, ReportFreq::EachCall); EXPECT_TRUE(compare_mtr_stream(delimited_string({"1,999.9"}, "\n"))); EXPECT_TRUE(compare_eso_stream(delimited_string({"1,999.9"}, "\n"))); - WriteReportMeterData(*state, 1, 616771620.98702729, ReportFreq::Hour, 4283136.2516839253, 12210110, 4283136.2587211775, 12212460, false); + mp.Value = 616771620.98702729; + mp.MinVal = 4283136.2516839253; + mp.MinValDate = 12210110; + mp.MaxVal = 4283136.2587211775; + mp.MaxValDate = 12212460; + mp.WriteReportData(*state, ReportFreq::Hour); EXPECT_TRUE(compare_mtr_stream(delimited_string({"1,616771620.9870273"}, "\n"))); EXPECT_TRUE(compare_eso_stream(delimited_string({"1,616771620.9870273"}, "\n"))); - WriteReportMeterData(*state, 1, 616771620.98702729, ReportFreq::Day, 4283136.2516839253, 12210110, 4283136.2587211775, 12212460, false); + mp.WriteReportData(*state, ReportFreq::Day); EXPECT_TRUE(compare_mtr_stream(delimited_string({"1,616771620.9870273,4283136.251683925, 1,10,4283136.2587211775,24,60"}, "\n"))); EXPECT_TRUE(compare_eso_stream(delimited_string({"1,616771620.9870273,4283136.251683925, 1,10,4283136.2587211775,24,60"}, "\n"))); - WriteReportMeterData(*state, 1, 616771620.98702729, ReportFreq::Month, 4283136.2516839253, 12210110, 4283136.2587211775, 12212460, false); + mp.WriteReportData(*state, ReportFreq::Month); EXPECT_TRUE(compare_mtr_stream(delimited_string({"1,616771620.9870273,4283136.251683925,21, 1,10,4283136.2587211775,21,24,60"}, "\n"))); EXPECT_TRUE(compare_eso_stream(delimited_string({"1,616771620.9870273,4283136.251683925,21, 1,10,4283136.2587211775,21,24,60"}, "\n"))); - WriteReportMeterData( - *state, 1, 616771620.98702729, ReportFreq::Simulation, 4283136.2516839253, 12210110, 4283136.2587211775, 12212460, false); + mp.WriteReportData(*state, ReportFreq::Simulation); EXPECT_TRUE(compare_mtr_stream(delimited_string({"1,616771620.9870273,4283136.251683925,12,21, 1,10,4283136.2587211775,12,21,24,60"}, "\n"))); EXPECT_TRUE(compare_eso_stream(delimited_string({"1,616771620.9870273,4283136.251683925,12,21, 1,10,4283136.2587211775,12,21,24,60"}, "\n"))); - WriteReportMeterData(*state, 1, 616771620.98702729, ReportFreq::TimeStep, 4283136.2516839253, 12210110, 4283136.2587211775, 12212460, true); + mp.RptFO = true; + mp.WriteReportData(*state, ReportFreq::TimeStep); EXPECT_TRUE(compare_mtr_stream(delimited_string({"1,616771620.9870273"}, "\n"))); - WriteReportMeterData(*state, 1, 616771620.98702729, ReportFreq::EachCall, 4283136.2516839253, 12210110, 4283136.2587211775, 12212460, true); + mp.WriteReportData(*state, ReportFreq::EachCall); EXPECT_TRUE(compare_mtr_stream(delimited_string({"1,616771620.9870273"}, "\n"))); - WriteReportMeterData(*state, 1, 616771620.98702729, ReportFreq::Hour, 4283136.2516839253, 12210110, 4283136.2587211775, 12212460, true); + mp.WriteReportData(*state, ReportFreq::Hour); EXPECT_TRUE(compare_mtr_stream(delimited_string({"1,616771620.9870273"}, "\n"))); - WriteReportMeterData(*state, 1, 616771620.98702729, ReportFreq::Day, 4283136.2516839253, 12210110, 4283136.2587211775, 12212460, true); + mp.WriteReportData(*state, ReportFreq::Day); EXPECT_TRUE(compare_mtr_stream(delimited_string({"1,616771620.9870273,4283136.251683925, 1,10,4283136.2587211775,24,60"}, "\n"))); - WriteReportMeterData(*state, 1, 616771620.98702729, ReportFreq::Month, 4283136.2516839253, 12210110, 4283136.2587211775, 12212460, true); + mp.WriteReportData(*state, ReportFreq::Month); EXPECT_TRUE(compare_mtr_stream(delimited_string({"1,616771620.9870273,4283136.251683925,21, 1,10,4283136.2587211775,21,24,60"}, "\n"))); - WriteReportMeterData(*state, 1, 616771620.98702729, ReportFreq::Simulation, 4283136.2516839253, 12210110, 4283136.2587211775, 12212460, true); + mp.WriteReportData(*state, ReportFreq::Simulation); EXPECT_TRUE(compare_mtr_stream(delimited_string({"1,616771620.9870273,4283136.251683925,12,21, 1,10,4283136.2587211775,12,21,24,60"}, "\n"))); - WriteReportMeterData(*state, 1, 0, ReportFreq::TimeStep, 0.0, 0, 0.0, 0, false); + mp.Value = 0; + mp.MinVal = mp.MaxVal = 0.0; + mp.MinValDate = mp.MaxValDate = 0; + mp.RptFO = false; + mp.WriteReportData(*state, ReportFreq::TimeStep); EXPECT_TRUE(compare_mtr_stream(delimited_string({"1,0.0"}, "\n"))); EXPECT_TRUE(compare_eso_stream(delimited_string({"1,0.0"}, "\n"))); @@ -865,62 +881,79 @@ namespace OutputProcessor { auto &sql = state->dataSQLiteProcedures->sqlite; sql->createSQLiteTimeIndexRecord(ReportFreq::Simulation, 1, 1, 0, 2017, false); sql->createSQLiteReportDictionaryRecord( - 1, StoreType::Averaged, "Zone", "Environment", "Site Outdoor Air Drybulb Temperature", TimeStepType::Zone, "C", ReportFreq::Hour, false); - - WriteReportRealData(*state, 1, 999.9, StoreType::Summed, 1, ReportFreq::TimeStep, 0.0, 0, 0.0, 0); + 1, StoreType::Average, "Zone", "Environment", "Site Outdoor Air Drybulb Temperature", TimeStepType::Zone, "C", ReportFreq::Hour, false); + + OutVarReal rVar; + rVar.ReportID = 1; + rVar.StoreValue = 999.9; + rVar.storeType = StoreType::Sum; + rVar.NumStored = 1; + rVar.MinValue = rVar.MaxValue = 0.0; + rVar.minValueDate = rVar.maxValueDate = 0; + rVar.freq = ReportFreq::TimeStep; + + rVar.writeReportData(*state); EXPECT_TRUE(compare_eso_stream(delimited_string({"1,999.9"}, "\n"))); - WriteReportRealData(*state, 1, 999.9, StoreType::Summed, 1, ReportFreq::EachCall, 0.0, 0, 0.0, 0); + rVar.freq = ReportFreq::EachCall; + rVar.writeReportData(*state); EXPECT_TRUE(compare_eso_stream(delimited_string({"1,999.9"}, "\n"))); - WriteReportRealData(*state, 1, 999.9, StoreType::Summed, 1, ReportFreq::Hour, 0.0, 0, 0.0, 0); + rVar.freq = ReportFreq::Hour; + rVar.writeReportData(*state); EXPECT_TRUE(compare_eso_stream(delimited_string({"1,999.9"}, "\n"))); - WriteReportRealData( - *state, 1, 616771620.98702729, StoreType::Summed, 1, ReportFreq::Day, 4283136.2516839253, 12210110, 4283136.2587211775, 12212460); + rVar.StoreValue = 616771620.98702729; + rVar.MinValue = 4283136.2516839253; + rVar.minValueDate = 12210110; + rVar.MaxValue = 4283136.2587211775; + rVar.maxValueDate = 12212460; + rVar.freq = ReportFreq::Day; + + rVar.writeReportData(*state); EXPECT_TRUE(compare_eso_stream(delimited_string({"1,616771620.9870273,4283136.251683925, 1,10,4283136.2587211775,24,60"}, "\n"))); - WriteReportRealData( - *state, 1, 616771620.98702729, StoreType::Summed, 1, ReportFreq::Month, 4283136.2516839253, 12210110, 4283136.2587211775, 12212460); + rVar.freq = ReportFreq::Month; + rVar.writeReportData(*state); EXPECT_TRUE(compare_eso_stream(delimited_string({"1,616771620.9870273,4283136.251683925,21, 1,10,4283136.2587211775,21,24,60"}, "\n"))); - WriteReportRealData( - *state, 1, 616771620.98702729, StoreType::Summed, 1, ReportFreq::Simulation, 4283136.2516839253, 12210110, 4283136.2587211775, 12212460); + rVar.freq = ReportFreq::Simulation; + rVar.writeReportData(*state); EXPECT_TRUE(compare_eso_stream(delimited_string({"1,616771620.9870273,4283136.251683925,12,21, 1,10,4283136.2587211775,12,21,24,60"}, "\n"))); - WriteReportRealData( - *state, 1, 616771620.98702729, StoreType::Averaged, 10, ReportFreq::TimeStep, 4283136.2516839253, 12210110, 4283136.2587211775, 12212460); + rVar.storeType = StoreType::Average; + rVar.NumStored = 10; + rVar.freq = ReportFreq::TimeStep; + rVar.writeReportData(*state); EXPECT_TRUE(compare_eso_stream(delimited_string({"1,61677162.09870273"}, "\n"))); - WriteReportRealData( - *state, 1, 616771620.98702729, StoreType::Averaged, 10, ReportFreq::EachCall, 4283136.2516839253, 12210110, 4283136.2587211775, 12212460); + rVar.freq = ReportFreq::EachCall; + rVar.writeReportData(*state); EXPECT_TRUE(compare_eso_stream(delimited_string({"1,61677162.09870273"}, "\n"))); - WriteReportRealData( - *state, 1, 616771620.98702729, StoreType::Averaged, 10, ReportFreq::Hour, 4283136.2516839253, 12210110, 4283136.2587211775, 12212460); + rVar.freq = ReportFreq::Hour; + rVar.writeReportData(*state); EXPECT_TRUE(compare_eso_stream(delimited_string({"1,61677162.09870273"}, "\n"))); - WriteReportRealData( - *state, 1, 616771620.98702729, StoreType::Averaged, 10, ReportFreq::Day, 4283136.2516839253, 12210110, 4283136.2587211775, 12212460); + rVar.freq = ReportFreq::Day; + rVar.writeReportData(*state); EXPECT_TRUE(compare_eso_stream(delimited_string({"1,61677162.09870273,4283136.251683925, 1,10,4283136.2587211775,24,60"}, "\n"))); - WriteReportRealData( - *state, 1, 616771620.98702729, StoreType::Averaged, 10, ReportFreq::Month, 4283136.2516839253, 12210110, 4283136.2587211775, 12212460); + rVar.freq = ReportFreq::Month; + rVar.writeReportData(*state); EXPECT_TRUE(compare_eso_stream(delimited_string({"1,61677162.09870273,4283136.251683925,21, 1,10,4283136.2587211775,21,24,60"}, "\n"))); - WriteReportRealData(*state, - 1, - 616771620.98702729, - StoreType::Averaged, - 10, - ReportFreq::Simulation, - 4283136.2516839253, - 12210110, - 4283136.2587211775, - 12212460); + rVar.freq = ReportFreq::Simulation; + rVar.writeReportData(*state); EXPECT_TRUE(compare_eso_stream(delimited_string({"1,61677162.09870273,4283136.251683925,12,21, 1,10,4283136.2587211775,12,21,24,60"}, "\n"))); - WriteReportRealData(*state, 1, 0, StoreType::Summed, 1, ReportFreq::TimeStep, 0.0, 0, 0.0, 0); + rVar.StoreValue = 0; + rVar.NumStored = 1; + rVar.MinValue = rVar.MaxValue = 0.0; + rVar.minValueDate = rVar.maxValueDate = 0; + rVar.freq = ReportFreq::TimeStep; + + rVar.writeReportData(*state); EXPECT_TRUE(compare_eso_stream(delimited_string({"1,0.0"}, "\n"))); auto reportDataResults = queryResult("SELECT * FROM ReportData;", "ReportData"); @@ -957,49 +990,100 @@ namespace OutputProcessor { auto &sql = state->dataSQLiteProcedures->sqlite; sql->createSQLiteTimeIndexRecord(ReportFreq::Simulation, 1, 1, 0, 2017, false); sql->createSQLiteReportDictionaryRecord( - 1, StoreType::Averaged, "Zone", "Environment", "Site Outdoor Air Drybulb Temperature", TimeStepType::Zone, "C", ReportFreq::Hour, false); - - WriteReportIntegerData(*state, 1, 999.9, StoreType::Summed, 1, ReportFreq::TimeStep, 0, 0, 0, 0); + 1, StoreType::Average, "Zone", "Environment", "Site Outdoor Air Drybulb Temperature", TimeStepType::Zone, "C", ReportFreq::Hour, false); + + OutVarInt iVar; + iVar.ReportID = 1; + iVar.StoreValue = 999.9; + iVar.storeType = StoreType::Sum; + iVar.NumStored = 1; + iVar.MinValue = iVar.MaxValue = 0; + iVar.minValueDate = iVar.maxValueDate = 0; + iVar.freq = ReportFreq::TimeStep; + + iVar.writeReportData(*state); EXPECT_TRUE(compare_eso_stream(delimited_string({"1,999.900000"}, "\n"))); - WriteReportIntegerData(*state, 1, 999.9, StoreType::Summed, 1, ReportFreq::EachCall, 0, 0, 0, 0); + iVar.freq = ReportFreq::EachCall; + iVar.writeReportData(*state); EXPECT_TRUE(compare_eso_stream(delimited_string({"1,999.900000"}, "\n"))); - WriteReportIntegerData(*state, 1, 999.9, StoreType::Summed, 1, ReportFreq::Hour, 0, 0, 0, 0); + iVar.freq = ReportFreq::Hour; + iVar.writeReportData(*state); EXPECT_TRUE(compare_eso_stream(delimited_string({"1,999.900000"}, "\n"))); - WriteReportIntegerData(*state, 1, 616771620.98702729, StoreType::Summed, 1, ReportFreq::Day, 4283136, 12210110, 4283196, 12212460); - EXPECT_TRUE(compare_eso_stream(delimited_string({"1,616771620.987027,4283136, 1,10,4283196,24,60"}, "\n"))); + iVar.StoreValue = 616771620.98702729; + iVar.MinValue = 4283136; + iVar.minValueDate = 12210110; + iVar.MaxValue = 4283196; + iVar.maxValueDate = 12212460; + iVar.freq = ReportFreq::Day; - WriteReportIntegerData(*state, 1, 616771620.98702729, StoreType::Summed, 1, ReportFreq::Month, 4283136, 12210110, 4283196, 12212460); - EXPECT_TRUE(compare_eso_stream(delimited_string({"1,616771620.987027,4283136,21, 1,10,4283196,21,24,60"}, "\n"))); + iVar.writeReportData(*state); + EXPECT_TRUE(compare_eso_stream(delimited_string({"1,616771620.987027,4283136.0, 1,10,4283196.0,24,60"}, "\n"))); - WriteReportIntegerData(*state, 1, 616771620.98702729, StoreType::Summed, 1, ReportFreq::Simulation, 4283136, 12210110, 4283196, 12212460); - EXPECT_TRUE(compare_eso_stream(delimited_string({"1,616771620.987027,4283136,12,21, 1,10,4283196,12,21,24,60"}, "\n"))); + iVar.freq = ReportFreq::Month; + iVar.writeReportData(*state); + EXPECT_TRUE(compare_eso_stream(delimited_string({"1,616771620.987027,4283136.0,21, 1,10,4283196.0,21,24,60"}, "\n"))); - WriteReportIntegerData(*state, 1, 616771620.98702729, StoreType::Averaged, 10, ReportFreq::TimeStep, 0, 0, 0, 0); - EXPECT_TRUE(compare_eso_stream(delimited_string({"1,61677162.098703"}, "\n"))); + iVar.freq = ReportFreq::Simulation; + iVar.writeReportData(*state); + EXPECT_TRUE(compare_eso_stream(delimited_string({"1,616771620.987027,4283136.0,12,21, 1,10,4283196.0,12,21,24,60"}, "\n"))); - WriteReportIntegerData(*state, 1, 616771620.98702729, StoreType::Averaged, 10, ReportFreq::EachCall, 0, 0, 0, 0); - EXPECT_TRUE(compare_eso_stream(delimited_string({"1,61677162.098703"}, "\n"))); + iVar.storeType = StoreType::Average; + iVar.NumStored = 10; + iVar.MinValue = iVar.MaxValue = 0; + iVar.minValueDate = iVar.maxValueDate = 0; + iVar.freq = ReportFreq::TimeStep; - WriteReportIntegerData(*state, 1, 616771620.98702729, StoreType::Averaged, 10, ReportFreq::Hour, 0, 0, 0, 0); + iVar.writeReportData(*state); EXPECT_TRUE(compare_eso_stream(delimited_string({"1,61677162.098703"}, "\n"))); - WriteReportIntegerData(*state, 1, 616771620.98702729, StoreType::Averaged, 10, ReportFreq::Day, 4283136, 12210110, 4283196, 12212460); - EXPECT_TRUE(compare_eso_stream(delimited_string({"1,61677162.098703,4283136, 1,10,4283196,24,60"}, "\n"))); - - WriteReportIntegerData(*state, 1, 616771620.98702729, StoreType::Averaged, 10, ReportFreq::Month, 4283136, 12210110, 4283196, 12212460); - EXPECT_TRUE(compare_eso_stream(delimited_string({"1,61677162.098703,4283136,21, 1,10,4283196,21,24,60"}, "\n"))); + iVar.freq = ReportFreq::EachCall; + iVar.writeReportData(*state); + EXPECT_TRUE(compare_eso_stream(delimited_string({"1,61677162.098703"}, "\n"))); - WriteReportIntegerData(*state, 1, 616771620.98702729, StoreType::Averaged, 10, ReportFreq::Simulation, 4283136, 12210110, 4283196, 12212460); - EXPECT_TRUE(compare_eso_stream(delimited_string({"1,61677162.098703,4283136,12,21, 1,10,4283196,12,21,24,60"}, "\n"))); + iVar.freq = ReportFreq::Hour; + iVar.writeReportData(*state); + EXPECT_TRUE(compare_eso_stream(delimited_string({"1,61677162.098703"}, "\n"))); - WriteReportIntegerData(*state, 1, 0, StoreType::Summed, 1, ReportFreq::TimeStep, 0, 0, 0, 0); + iVar.MinValue = 4283136; + iVar.minValueDate = 12210110; + iVar.MaxValue = 4283196; + iVar.maxValueDate = 12212460; + iVar.freq = ReportFreq::Day; + iVar.writeReportData(*state); + EXPECT_TRUE(compare_eso_stream(delimited_string({"1,61677162.098703,4283136.0, 1,10,4283196.0,24,60"}, "\n"))); + + iVar.freq = ReportFreq::Month; + iVar.writeReportData(*state); + EXPECT_TRUE(compare_eso_stream(delimited_string({"1,61677162.098703,4283136.0,21, 1,10,4283196.0,21,24,60"}, "\n"))); + + iVar.freq = ReportFreq::Simulation; + iVar.writeReportData(*state); + EXPECT_TRUE(compare_eso_stream(delimited_string({"1,61677162.098703,4283136.0,12,21, 1,10,4283196.0,12,21,24,60"}, "\n"))); + + iVar.storeType = StoreType::Sum; + iVar.StoreValue = 0; + iVar.NumStored = 1; + iVar.MinValue = iVar.MaxValue = 0; + iVar.minValueDate = iVar.minValueDate = 0; + iVar.freq = ReportFreq::TimeStep; + + iVar.writeReportData(*state); EXPECT_TRUE(compare_eso_stream(delimited_string({"1,0.0"}, "\n"))); - WriteReportIntegerData(*state, 1, 25.75, StoreType::Averaged, 720, ReportFreq::Month, 0, 4010115, 1, 4011560); - EXPECT_TRUE(compare_eso_stream(delimited_string({"1,0.035764,0, 1, 1,15,1, 1,15,60"}, "\n"))); + iVar.StoreValue = 25.75; + iVar.storeType = StoreType::Average; + iVar.NumStored = 720; + iVar.MinValue = 0; + iVar.MaxValue = 1; + iVar.minValueDate = 4010115; + iVar.maxValueDate = 4011560; + iVar.freq = ReportFreq::Month; + + iVar.writeReportData(*state); + EXPECT_TRUE(compare_eso_stream(delimited_string({"1,0.035764,0.0, 1, 1,15,1.0, 1,15,60"}, "\n"))); auto reportDataResults = queryResult("SELECT * FROM ReportData;", "ReportData"); auto reportExtendedDataResults = queryResult("SELECT * FROM ReportExtendedData;", "ReportExtendedData"); @@ -1037,7 +1121,7 @@ namespace OutputProcessor { auto &sql = state->dataSQLiteProcedures->sqlite; sql->createSQLiteTimeIndexRecord(ReportFreq::Simulation, 1, 1, 0, 2017, false); sql->createSQLiteReportDictionaryRecord( - 1, StoreType::Averaged, "Zone", "Environment", "Site Outdoor Air Drybulb Temperature", TimeStepType::Zone, "C", ReportFreq::Hour, false); + 1, StoreType::Average, "Zone", "Environment", "Site Outdoor Air Drybulb Temperature", TimeStepType::Zone, "C", ReportFreq::Hour, false); WriteNumericData(*state, 1, 999); EXPECT_TRUE(compare_eso_stream(delimited_string({"1,999"}, "\n"))); @@ -1164,24 +1248,10 @@ namespace OutputProcessor { } } - TEST_F(SQLiteFixture, OutputProcessor_validateTimeStepType) - { - std::map const resource_map = {// Zone - {SOVTimeStepType::Zone, TimeStepType::Zone}, - // System - {SOVTimeStepType::HVAC, TimeStepType::System}, - {SOVTimeStepType::System, TimeStepType::System}, - {SOVTimeStepType::Plant, TimeStepType::System}}; - - for (auto const &indexGroup : resource_map) { - EXPECT_EQ((int)indexGroup.second, (int)sovTimeStep2TimeStep[(int)indexGroup.first]); - } - } - TEST_F(SQLiteFixture, OutputProcessor_standardIndexTypeKey) { - EXPECT_EQ("Zone", timeStepNames[(int)TimeStepType::Zone]); - EXPECT_EQ("HVAC", timeStepNames[(int)TimeStepType::System]); + EXPECT_EQ("Zone", timeStepTypeNames[(int)TimeStepType::Zone]); + EXPECT_EQ("System", timeStepTypeNames[(int)TimeStepType::System]); // It's no longer possible to pass something that isn't part of the enum, that's kind of the point of using an enum! // EXPECT_EQ("UNKW", StandardTimeStepTypeKey(0)); @@ -1189,22 +1259,10 @@ namespace OutputProcessor { // EXPECT_EQ("UNKW", StandardTimeStepTypeKey(3)); } - TEST_F(SQLiteFixture, OutputProcessor_validateVariableType) - { - std::map const resource_map = {{SOVStoreType::State, StoreType::Averaged}, - {SOVStoreType::Average, StoreType::Averaged}, - {SOVStoreType::NonState, StoreType::Summed}, - {SOVStoreType::Summed, StoreType::Summed}}; - - for (auto const &variableType : resource_map) { - EXPECT_EQ((int)variableType.second, (int)sovStoreType2StoreType[(int)variableType.first]); - } - } - TEST_F(SQLiteFixture, OutputProcessor_standardVariableTypeKey) { - EXPECT_EQ("Average", storeTypeNames[(int)StoreType::Averaged]); - EXPECT_EQ("Sum", storeTypeNames[(int)StoreType::Summed]); + EXPECT_EQ("Average", storeTypeNames[(int)StoreType::Average]); + EXPECT_EQ("Sum", storeTypeNames[(int)StoreType::Sum]); } TEST_F(SQLiteFixture, OutputProcessor_determineMeterIPUnits) @@ -1299,147 +1357,122 @@ namespace OutputProcessor { sql->createSQLiteTimeIndexRecord(ReportFreq::Simulation, 1, 1, 0, 2017, false); - WriteMeterDictionaryItem( - *state, ReportFreq::TimeStep, StoreType::Averaged, 1, -999, "indexGroup", "meterName", Constant::Units::J, false, false); + WriteMeterDictionaryItem(*state, ReportFreq::TimeStep, StoreType::Average, 1, "indexGroup", "meterName", Constant::Units::J, false, false); EXPECT_TRUE(compare_mtr_stream(delimited_string({"1,1,meterName [J] !TimeStep"}, "\n"))); EXPECT_TRUE(compare_eso_stream(delimited_string({"1,1,meterName [J] !TimeStep"}, "\n"))); - WriteMeterDictionaryItem( - *state, ReportFreq::TimeStep, StoreType::Summed, 2, -999, "indexGroup", "meterName", Constant::Units::W, false, false); + WriteMeterDictionaryItem(*state, ReportFreq::TimeStep, StoreType::Sum, 2, "indexGroup", "meterName", Constant::Units::W, false, false); EXPECT_TRUE(compare_mtr_stream(delimited_string({"2,1,meterName [W] !TimeStep"}, "\n"))); EXPECT_TRUE(compare_eso_stream(delimited_string({"2,1,meterName [W] !TimeStep"}, "\n"))); - WriteMeterDictionaryItem( - *state, ReportFreq::TimeStep, StoreType::Averaged, 3, -999, "indexGroup", "meterName", Constant::Units::J, true, false); + WriteMeterDictionaryItem(*state, ReportFreq::TimeStep, StoreType::Average, 3, "indexGroup", "meterName", Constant::Units::J, true, false); EXPECT_TRUE(compare_mtr_stream(delimited_string({"3,1,Cumulative meterName [J] !TimeStep"}, "\n"))); EXPECT_TRUE(compare_eso_stream(delimited_string({"3,1,Cumulative meterName [J] !TimeStep"}, "\n"))); - WriteMeterDictionaryItem( - *state, ReportFreq::TimeStep, StoreType::Averaged, 4, -999, "indexGroup", "meterName", Constant::Units::W, false, true); + WriteMeterDictionaryItem(*state, ReportFreq::TimeStep, StoreType::Average, 4, "indexGroup", "meterName", Constant::Units::W, false, true); EXPECT_TRUE(compare_mtr_stream(delimited_string({"4,1,meterName [W] !TimeStep"}, "\n"))); - WriteMeterDictionaryItem( - *state, ReportFreq::TimeStep, StoreType::Averaged, 5, -999, "indexGroup", "meterName", Constant::Units::W, true, true); + WriteMeterDictionaryItem(*state, ReportFreq::TimeStep, StoreType::Average, 5, "indexGroup", "meterName", Constant::Units::W, true, true); EXPECT_TRUE(compare_mtr_stream(delimited_string({"5,1,Cumulative meterName [W] !TimeStep"}, "\n"))); - WriteMeterDictionaryItem( - *state, ReportFreq::EachCall, StoreType::Averaged, 6, -999, "indexGroup", "meterName", Constant::Units::J, false, false); + WriteMeterDictionaryItem(*state, ReportFreq::EachCall, StoreType::Average, 6, "indexGroup", "meterName", Constant::Units::J, false, false); EXPECT_TRUE(compare_mtr_stream(delimited_string({"6,1,meterName [J] !Each Call"}, "\n"))); EXPECT_TRUE(compare_eso_stream(delimited_string({"6,1,meterName [J] !Each Call"}, "\n"))); - WriteMeterDictionaryItem( - *state, ReportFreq::EachCall, StoreType::Summed, 7, -999, "indexGroup", "meterName", Constant::Units::J, false, false); + WriteMeterDictionaryItem(*state, ReportFreq::EachCall, StoreType::Sum, 7, "indexGroup", "meterName", Constant::Units::J, false, false); EXPECT_TRUE(compare_mtr_stream(delimited_string({"7,1,meterName [J] !Each Call"}, "\n"))); EXPECT_TRUE(compare_eso_stream(delimited_string({"7,1,meterName [J] !Each Call"}, "\n"))); - WriteMeterDictionaryItem( - *state, ReportFreq::EachCall, StoreType::Averaged, 8, -999, "indexGroup", "meterName", Constant::Units::J, true, false); + WriteMeterDictionaryItem(*state, ReportFreq::EachCall, StoreType::Average, 8, "indexGroup", "meterName", Constant::Units::J, true, false); EXPECT_TRUE(compare_mtr_stream(delimited_string({"8,1,Cumulative meterName [J] !Each Call"}, "\n"))); EXPECT_TRUE(compare_eso_stream(delimited_string({"8,1,Cumulative meterName [J] !Each Call"}, "\n"))); - WriteMeterDictionaryItem( - *state, ReportFreq::EachCall, StoreType::Averaged, 9, -999, "indexGroup", "meterName", Constant::Units::J, false, true); + WriteMeterDictionaryItem(*state, ReportFreq::EachCall, StoreType::Average, 9, "indexGroup", "meterName", Constant::Units::J, false, true); EXPECT_TRUE(compare_mtr_stream(delimited_string({"9,1,meterName [J] !Each Call"}, "\n"))); - WriteMeterDictionaryItem( - *state, ReportFreq::EachCall, StoreType::Averaged, 10, -999, "indexGroup", "meterName", Constant::Units::J, true, true); + WriteMeterDictionaryItem(*state, ReportFreq::EachCall, StoreType::Average, 10, "indexGroup", "meterName", Constant::Units::J, true, true); EXPECT_TRUE(compare_mtr_stream(delimited_string({"10,1,Cumulative meterName [J] !Each Call"}, "\n"))); - WriteMeterDictionaryItem( - *state, ReportFreq::Hour, StoreType::Averaged, 11, -999, "indexGroup", "meterName", Constant::Units::J, false, false); + WriteMeterDictionaryItem(*state, ReportFreq::Hour, StoreType::Average, 11, "indexGroup", "meterName", Constant::Units::J, false, false); EXPECT_TRUE(compare_mtr_stream(delimited_string({"11,1,meterName [J] !Hourly"}, "\n"))); EXPECT_TRUE(compare_eso_stream(delimited_string({"11,1,meterName [J] !Hourly"}, "\n"))); - WriteMeterDictionaryItem( - *state, ReportFreq::Hour, StoreType::Summed, 12, -999, "indexGroup", "meterName", Constant::Units::None, false, false); + WriteMeterDictionaryItem(*state, ReportFreq::Hour, StoreType::Sum, 12, "indexGroup", "meterName", Constant::Units::None, false, false); EXPECT_TRUE(compare_mtr_stream(delimited_string({"12,1,meterName [] !Hourly"}, "\n"))); EXPECT_TRUE(compare_eso_stream(delimited_string({"12,1,meterName [] !Hourly"}, "\n"))); - WriteMeterDictionaryItem( - *state, ReportFreq::Hour, StoreType::Averaged, 13, -999, "indexGroup", "meterName", Constant::Units::None, true, false); + WriteMeterDictionaryItem(*state, ReportFreq::Hour, StoreType::Average, 13, "indexGroup", "meterName", Constant::Units::None, true, false); EXPECT_TRUE(compare_mtr_stream(delimited_string({"13,1,Cumulative meterName [] !Hourly"}, "\n"))); EXPECT_TRUE(compare_eso_stream(delimited_string({"13,1,Cumulative meterName [] !Hourly"}, "\n"))); - WriteMeterDictionaryItem( - *state, ReportFreq::Hour, StoreType::Averaged, 14, -999, "indexGroup", "meterName", Constant::Units::None, false, true); + WriteMeterDictionaryItem(*state, ReportFreq::Hour, StoreType::Average, 14, "indexGroup", "meterName", Constant::Units::None, false, true); EXPECT_TRUE(compare_mtr_stream(delimited_string({"14,1,meterName [] !Hourly"}, "\n"))); - WriteMeterDictionaryItem( - *state, ReportFreq::Hour, StoreType::Averaged, 15, -999, "indexGroup", "meterName", Constant::Units::None, true, true); + WriteMeterDictionaryItem(*state, ReportFreq::Hour, StoreType::Average, 15, "indexGroup", "meterName", Constant::Units::None, true, true); EXPECT_TRUE(compare_mtr_stream(delimited_string({"15,1,Cumulative meterName [] !Hourly"}, "\n"))); - WriteMeterDictionaryItem( - *state, ReportFreq::Day, StoreType::Averaged, 16, -999, "indexGroup", "meterName", Constant::Units::None, false, false); + WriteMeterDictionaryItem(*state, ReportFreq::Day, StoreType::Average, 16, "indexGroup", "meterName", Constant::Units::None, false, false); EXPECT_TRUE(compare_mtr_stream(delimited_string({"16,7,meterName [] !Daily [Value,Min,Hour,Minute,Max,Hour,Minute]"}, "\n"))); EXPECT_TRUE(compare_eso_stream(delimited_string({"16,7,meterName [] !Daily [Value,Min,Hour,Minute,Max,Hour,Minute]"}, "\n"))); - WriteMeterDictionaryItem( - *state, ReportFreq::Day, StoreType::Summed, 17, -999, "indexGroup", "meterName", Constant::Units::None, false, false); + WriteMeterDictionaryItem(*state, ReportFreq::Day, StoreType::Sum, 17, "indexGroup", "meterName", Constant::Units::None, false, false); EXPECT_TRUE(compare_mtr_stream(delimited_string({"17,7,meterName [] !Daily [Value,Min,Hour,Minute,Max,Hour,Minute]"}, "\n"))); EXPECT_TRUE(compare_eso_stream(delimited_string({"17,7,meterName [] !Daily [Value,Min,Hour,Minute,Max,Hour,Minute]"}, "\n"))); - WriteMeterDictionaryItem( - *state, ReportFreq::Day, StoreType::Averaged, 18, -999, "indexGroup", "meterName", Constant::Units::deltaC, true, false); + WriteMeterDictionaryItem(*state, ReportFreq::Day, StoreType::Average, 18, "indexGroup", "meterName", Constant::Units::deltaC, true, false); EXPECT_TRUE(compare_mtr_stream(delimited_string({"18,1,Cumulative meterName [deltaC] !Daily "}, "\n"))); EXPECT_TRUE(compare_eso_stream(delimited_string({"18,1,Cumulative meterName [deltaC] !Daily "}, "\n"))); - WriteMeterDictionaryItem( - *state, ReportFreq::Day, StoreType::Averaged, 19, -999, "indexGroup", "meterName", Constant::Units::deltaC, false, true); + WriteMeterDictionaryItem(*state, ReportFreq::Day, StoreType::Average, 19, "indexGroup", "meterName", Constant::Units::deltaC, false, true); EXPECT_TRUE(compare_mtr_stream(delimited_string({"19,7,meterName [deltaC] !Daily [Value,Min,Hour,Minute,Max,Hour,Minute]"}, "\n"))); - WriteMeterDictionaryItem( - *state, ReportFreq::Day, StoreType::Averaged, 20, -999, "indexGroup", "meterName", Constant::Units::deltaC, true, true); + WriteMeterDictionaryItem(*state, ReportFreq::Day, StoreType::Average, 20, "indexGroup", "meterName", Constant::Units::deltaC, true, true); EXPECT_TRUE(compare_mtr_stream(delimited_string({"20,1,Cumulative meterName [deltaC] !Daily "}, "\n"))); - WriteMeterDictionaryItem( - *state, ReportFreq::Month, StoreType::Averaged, 21, -999, "indexGroup", "meterName", Constant::Units::deltaC, false, false); + WriteMeterDictionaryItem(*state, ReportFreq::Month, StoreType::Average, 21, "indexGroup", "meterName", Constant::Units::deltaC, false, false); EXPECT_TRUE(compare_mtr_stream(delimited_string({"21,9,meterName [deltaC] !Monthly [Value,Min,Day,Hour,Minute,Max,Day,Hour,Minute]"}, "\n"))); EXPECT_TRUE(compare_eso_stream(delimited_string({"21,9,meterName [deltaC] !Monthly [Value,Min,Day,Hour,Minute,Max,Day,Hour,Minute]"}, "\n"))); - WriteMeterDictionaryItem( - *state, ReportFreq::Month, StoreType::Summed, 22, -999, "indexGroup", "meterName", Constant::Units::deltaC, false, false); + WriteMeterDictionaryItem(*state, ReportFreq::Month, StoreType::Sum, 22, "indexGroup", "meterName", Constant::Units::deltaC, false, false); EXPECT_TRUE(compare_mtr_stream(delimited_string({"22,9,meterName [deltaC] !Monthly [Value,Min,Day,Hour,Minute,Max,Day,Hour,Minute]"}, "\n"))); EXPECT_TRUE(compare_eso_stream(delimited_string({"22,9,meterName [deltaC] !Monthly [Value,Min,Day,Hour,Minute,Max,Day,Hour,Minute]"}, "\n"))); - WriteMeterDictionaryItem( - *state, ReportFreq::Month, StoreType::Averaged, 23, -999, "indexGroup", "meterName", Constant::Units::deltaC, true, false); + WriteMeterDictionaryItem(*state, ReportFreq::Month, StoreType::Average, 23, "indexGroup", "meterName", Constant::Units::deltaC, true, false); EXPECT_TRUE(compare_mtr_stream(delimited_string({"23,1,Cumulative meterName [deltaC] !Monthly "}, "\n"))); EXPECT_TRUE(compare_eso_stream(delimited_string({"23,1,Cumulative meterName [deltaC] !Monthly "}, "\n"))); - WriteMeterDictionaryItem( - *state, ReportFreq::Month, StoreType::Averaged, 24, -999, "indexGroup", "meterName", Constant::Units::deltaC, false, true); + WriteMeterDictionaryItem(*state, ReportFreq::Month, StoreType::Average, 24, "indexGroup", "meterName", Constant::Units::deltaC, false, true); EXPECT_TRUE(compare_mtr_stream(delimited_string({"24,9,meterName [deltaC] !Monthly [Value,Min,Day,Hour,Minute,Max,Day,Hour,Minute]"}, "\n"))); - WriteMeterDictionaryItem( - *state, ReportFreq::Month, StoreType::Averaged, 25, -999, "indexGroup", "meterName", Constant::Units::deltaC, true, true); + WriteMeterDictionaryItem(*state, ReportFreq::Month, StoreType::Average, 25, "indexGroup", "meterName", Constant::Units::deltaC, true, true); EXPECT_TRUE(compare_mtr_stream(delimited_string({"25,1,Cumulative meterName [deltaC] !Monthly "}, "\n"))); WriteMeterDictionaryItem( - *state, ReportFreq::Simulation, StoreType::Averaged, 26, -999, "indexGroup", "meterName", Constant::Units::deltaC, false, false); + *state, ReportFreq::Simulation, StoreType::Average, 26, "indexGroup", "meterName", Constant::Units::deltaC, false, false); EXPECT_TRUE(compare_mtr_stream( delimited_string({"26,11,meterName [deltaC] !RunPeriod [Value,Min,Month,Day,Hour,Minute,Max,Month,Day,Hour,Minute]"}, "\n"))); EXPECT_TRUE(compare_eso_stream( delimited_string({"26,11,meterName [deltaC] !RunPeriod [Value,Min,Month,Day,Hour,Minute,Max,Month,Day,Hour,Minute]"}, "\n"))); WriteMeterDictionaryItem( - *state, ReportFreq::Simulation, StoreType::Summed, 27, -999, "indexGroup", "meterName", Constant::Units::deltaC, false, false); + *state, ReportFreq::Simulation, StoreType::Sum, 27, "indexGroup", "meterName", Constant::Units::deltaC, false, false); EXPECT_TRUE(compare_mtr_stream( delimited_string({"27,11,meterName [deltaC] !RunPeriod [Value,Min,Month,Day,Hour,Minute,Max,Month,Day,Hour,Minute]"}, "\n"))); EXPECT_TRUE(compare_eso_stream( delimited_string({"27,11,meterName [deltaC] !RunPeriod [Value,Min,Month,Day,Hour,Minute,Max,Month,Day,Hour,Minute]"}, "\n"))); WriteMeterDictionaryItem( - *state, ReportFreq::Simulation, StoreType::Averaged, 28, -999, "indexGroup", "meterName", Constant::Units::deltaC, true, false); + *state, ReportFreq::Simulation, StoreType::Average, 28, "indexGroup", "meterName", Constant::Units::deltaC, true, false); EXPECT_TRUE(compare_mtr_stream(delimited_string({"28,1,Cumulative meterName [deltaC] !RunPeriod "}, "\n"))); EXPECT_TRUE(compare_eso_stream(delimited_string({"28,1,Cumulative meterName [deltaC] !RunPeriod "}, "\n"))); WriteMeterDictionaryItem( - *state, ReportFreq::Simulation, StoreType::Averaged, 29, -999, "indexGroup", "meterName", Constant::Units::deltaC, false, true); + *state, ReportFreq::Simulation, StoreType::Average, 29, "indexGroup", "meterName", Constant::Units::deltaC, false, true); EXPECT_TRUE(compare_mtr_stream( delimited_string({"29,11,meterName [deltaC] !RunPeriod [Value,Min,Month,Day,Hour,Minute,Max,Month,Day,Hour,Minute]"}, "\n"))); WriteMeterDictionaryItem( - *state, ReportFreq::Simulation, StoreType::Averaged, 30, -999, "indexGroup", "meterName", Constant::Units::deltaC, true, true); + *state, ReportFreq::Simulation, StoreType::Average, 30, "indexGroup", "meterName", Constant::Units::deltaC, true, true); EXPECT_TRUE(compare_mtr_stream(delimited_string({"30,1,Cumulative meterName [deltaC] !RunPeriod "}, "\n"))); auto reportDataDictionaryResults = queryResult("SELECT * FROM ReportDataDictionary;", "ReportDataDictionary"); @@ -1507,482 +1540,212 @@ namespace OutputProcessor { TimeStepType aThirdTimeStepType = TimeStepType::Zone; std::string aThirdTimeStepString = timeStepZoneString; - WriteReportVariableDictionaryItem(*state, - ReportFreq::TimeStep, - StoreType::Averaged, - 1, - -999, - "indexGroup", - "keyedValue", - "variableName", - TimeStepType::Zone, - Constant::Units::m3_s, - "", - ""); + OutVarReal rVar; + rVar.freq = ReportFreq::TimeStep; + rVar.storeType = StoreType::Average; + rVar.timeStepType = TimeStepType::Zone; + rVar.units = Constant::Units::m3_s; + rVar.ReportID = 1; + rVar.indexGroup = "indexGroup"; + rVar.key = "keyedValue"; + rVar.name = "variableName"; + rVar.unitNameCustomEMS = ""; + rVar.SchedPtr = 0; + + rVar.writeReportDictionaryItem(*state); EXPECT_TRUE(compare_eso_stream(delimited_string({"1,1,keyedValue,variableName [m3/s] !TimeStep"}, "\n"))); - WriteReportVariableDictionaryItem(*state, - ReportFreq::TimeStep, - StoreType::Summed, - 2, - -999, - "indexGroup", - "keyedValue", - "variableName", - TimeStepType::Zone, - Constant::Units::m3_s, - "", - ""); + rVar.freq = ReportFreq::TimeStep; + rVar.storeType = StoreType::Sum; + rVar.ReportID = 2; + + rVar.writeReportDictionaryItem(*state); EXPECT_TRUE(compare_eso_stream(delimited_string({"2,1,keyedValue,variableName [m3/s] !TimeStep"}, "\n"))); - WriteReportVariableDictionaryItem(*state, - ReportFreq::TimeStep, - StoreType::Averaged, - 3, - -999, - "indexGroup", - "keyedValue", - "variableName", - TimeStepType::Zone, - Constant::Units::m3_s, - "", - "scheduleName"); + state->dataScheduleMgr->Schedule.allocate(1); + state->dataScheduleMgr->Schedule(1).Name = "scheduleName"; + + rVar.ReportID = 3; + rVar.storeType = StoreType::Average; + rVar.SchedPtr = 1; + + rVar.writeReportDictionaryItem(*state); EXPECT_TRUE(compare_eso_stream(delimited_string({"3,1,keyedValue,variableName [m3/s] !TimeStep,scheduleName"}, "\n"))); - WriteReportVariableDictionaryItem(*state, - ReportFreq::TimeStep, - StoreType::Averaged, - 4, - -999, - "indexGroup", - "keyedValue", - "variableName", - TimeStepType::System, - Constant::Units::m3_s, - "", - ""); + rVar.ReportID = 4; + rVar.timeStepType = TimeStepType::System; + rVar.SchedPtr = 0; + + rVar.writeReportDictionaryItem(*state); EXPECT_TRUE(compare_eso_stream(delimited_string({"4,1,keyedValue,variableName [m3/s] !TimeStep"}, "\n"))); - // Hum, can no longer pass Something else than what's in the enum... - WriteReportVariableDictionaryItem(*state, - ReportFreq::TimeStep, - StoreType::Averaged, - 5, - -999, - "indexGroup", - "keyedValue", - "variableName", - aThirdTimeStepType, - Constant::Units::m3_s, - "", - ""); - EXPECT_TRUE(compare_eso_stream(delimited_string({"5,1,keyedValue,variableName [m3/s] !TimeStep"}, "\n"))); - - WriteReportVariableDictionaryItem(*state, - ReportFreq::EachCall, - StoreType::Averaged, - 6, - -999, - "indexGroup", - "keyedValue", - "variableName", - TimeStepType::Zone, - Constant::Units::m3_s, - "", - ""); + rVar.ReportID = 6; + rVar.freq = ReportFreq::EachCall; + rVar.timeStepType = TimeStepType::Zone; + + rVar.writeReportDictionaryItem(*state); EXPECT_TRUE(compare_eso_stream(delimited_string({"6,1,keyedValue,variableName [m3/s] !Each Call"}, "\n"))); - WriteReportVariableDictionaryItem(*state, - ReportFreq::EachCall, - StoreType::Summed, - 7, - -999, - "indexGroup", - "keyedValue", - "variableName", - TimeStepType::Zone, - Constant::Units::m3_s, - "", - ""); + rVar.ReportID = 7; + rVar.storeType = StoreType::Sum; + rVar.indexGroup = "indexGroup"; + + rVar.writeReportDictionaryItem(*state); EXPECT_TRUE(compare_eso_stream(delimited_string({"7,1,keyedValue,variableName [m3/s] !Each Call"}, "\n"))); - WriteReportVariableDictionaryItem(*state, - ReportFreq::EachCall, - StoreType::Averaged, - 8, - -999, - "indexGroup", - "keyedValue", - "variableName", - TimeStepType::Zone, - Constant::Units::m3_s, - "", - "scheduleName"); + rVar.ReportID = 8; + rVar.storeType = StoreType::Average; + rVar.SchedPtr = 1; + + rVar.writeReportDictionaryItem(*state); EXPECT_TRUE(compare_eso_stream(delimited_string({"8,1,keyedValue,variableName [m3/s] !Each Call,scheduleName"}, "\n"))); - WriteReportVariableDictionaryItem(*state, - ReportFreq::EachCall, - StoreType::Averaged, - 9, - -999, - "indexGroup", - "keyedValue", - "variableName", - TimeStepType::System, - Constant::Units::m3_s, - "", - ""); + rVar.ReportID = 9; + rVar.SchedPtr = 0; + rVar.timeStepType = TimeStepType::System; + + rVar.writeReportDictionaryItem(*state); EXPECT_TRUE(compare_eso_stream(delimited_string({"9,1,keyedValue,variableName [m3/s] !Each Call"}, "\n"))); - WriteReportVariableDictionaryItem(*state, - ReportFreq::EachCall, - StoreType::Averaged, - 10, - -999, - "indexGroup", - "keyedValue", - "variableName", - aThirdTimeStepType, - Constant::Units::m3_s, - "", - ""); - EXPECT_TRUE(compare_eso_stream(delimited_string({"10,1,keyedValue,variableName [m3/s] !Each Call"}, "\n"))); - - WriteReportVariableDictionaryItem(*state, - ReportFreq::Hour, - StoreType::Averaged, - 11, - -999, - "indexGroup", - "keyedValue", - "variableName", - TimeStepType::Zone, - Constant::Units::m3_s, - "", - ""); + rVar.ReportID = 11; + rVar.freq = ReportFreq::Hour; + rVar.timeStepType = TimeStepType::Zone; + rVar.writeReportDictionaryItem(*state); EXPECT_TRUE(op->freqTrackingVariables[(int)ReportFreq::Hour]); op->freqTrackingVariables[(int)ReportFreq::Hour] = false; EXPECT_TRUE(compare_eso_stream(delimited_string({"11,1,keyedValue,variableName [m3/s] !Hourly"}, "\n"))); - WriteReportVariableDictionaryItem(*state, - ReportFreq::Hour, - StoreType::Summed, - 12, - -999, - "indexGroup", - "keyedValue", - "variableName", - TimeStepType::Zone, - Constant::Units::m3_s, - "", - ""); + rVar.ReportID = 12; + rVar.storeType = StoreType::Sum; + rVar.freq = ReportFreq::Hour; + rVar.writeReportDictionaryItem(*state); EXPECT_TRUE(op->freqTrackingVariables[(int)ReportFreq::Hour]); op->freqTrackingVariables[(int)ReportFreq::Hour] = false; EXPECT_TRUE(compare_eso_stream(delimited_string({"12,1,keyedValue,variableName [m3/s] !Hourly"}, "\n"))); - WriteReportVariableDictionaryItem(*state, - ReportFreq::Hour, - StoreType::Averaged, - 13, - -999, - "indexGroup", - "keyedValue", - "variableName", - TimeStepType::Zone, - Constant::Units::m3_s, - "", - "scheduleName"); + rVar.ReportID = 13; + rVar.storeType = StoreType::Average; + rVar.SchedPtr = 1; + rVar.writeReportDictionaryItem(*state); EXPECT_TRUE(op->freqTrackingVariables[(int)ReportFreq::Hour]); op->freqTrackingVariables[(int)ReportFreq::Hour] = false; EXPECT_TRUE(compare_eso_stream(delimited_string({"13,1,keyedValue,variableName [m3/s] !Hourly,scheduleName"}, "\n"))); - WriteReportVariableDictionaryItem(*state, - ReportFreq::Hour, - StoreType::Averaged, - 14, - -999, - "indexGroup", - "keyedValue", - "variableName", - TimeStepType::System, - Constant::Units::m3_s, - "", - ""); + rVar.ReportID = 14; + rVar.SchedPtr = 0; + rVar.timeStepType = TimeStepType::System; + rVar.writeReportDictionaryItem(*state); EXPECT_TRUE(op->freqTrackingVariables[(int)ReportFreq::Hour]); op->freqTrackingVariables[(int)ReportFreq::Hour] = false; EXPECT_TRUE(compare_eso_stream(delimited_string({"14,1,keyedValue,variableName [m3/s] !Hourly"}, "\n"))); - WriteReportVariableDictionaryItem(*state, - ReportFreq::Hour, - StoreType::Averaged, - 15, - -999, - "indexGroup", - "keyedValue", - "variableName", - aThirdTimeStepType, - Constant::Units::m3_s, - "", - ""); - EXPECT_TRUE(op->freqTrackingVariables[(int)ReportFreq::Hour]); - op->freqTrackingVariables[(int)ReportFreq::Hour] = false; - EXPECT_TRUE(compare_eso_stream(delimited_string({"15,1,keyedValue,variableName [m3/s] !Hourly"}, "\n"))); - - WriteReportVariableDictionaryItem(*state, - ReportFreq::Day, - StoreType::Averaged, - 16, - -999, - "indexGroup", - "keyedValue", - "variableName", - TimeStepType::Zone, - Constant::Units::m3_s, - "", - ""); + rVar.ReportID = 16; + rVar.freq = ReportFreq::Day; + rVar.timeStepType = TimeStepType::Zone; + rVar.writeReportDictionaryItem(*state); EXPECT_TRUE(op->freqTrackingVariables[(int)ReportFreq::Day]); op->freqTrackingVariables[(int)ReportFreq::Day] = false; EXPECT_TRUE( compare_eso_stream(delimited_string({"16,7,keyedValue,variableName [m3/s] !Daily [Value,Min,Hour,Minute,Max,Hour,Minute]"}, "\n"))); - WriteReportVariableDictionaryItem(*state, - ReportFreq::Day, - StoreType::Summed, - 17, - -999, - "indexGroup", - "keyedValue", - "variableName", - TimeStepType::Zone, - Constant::Units::m3_s, - "", - ""); + rVar.ReportID = 17; + rVar.storeType = StoreType::Sum; + rVar.freq = ReportFreq::Day; + rVar.timeStepType = TimeStepType::Zone; + rVar.writeReportDictionaryItem(*state); EXPECT_TRUE(op->freqTrackingVariables[(int)ReportFreq::Day]); op->freqTrackingVariables[(int)ReportFreq::Day] = false; EXPECT_TRUE( compare_eso_stream(delimited_string({"17,7,keyedValue,variableName [m3/s] !Daily [Value,Min,Hour,Minute,Max,Hour,Minute]"}, "\n"))); - WriteReportVariableDictionaryItem(*state, - ReportFreq::Day, - StoreType::Averaged, - 18, - -999, - "indexGroup", - "keyedValue", - "variableName", - TimeStepType::Zone, - Constant::Units::m3_s, - "", - "scheduleName"); + rVar.ReportID = 18; + rVar.storeType = StoreType::Average; + rVar.SchedPtr = 1; + rVar.writeReportDictionaryItem(*state); EXPECT_TRUE(op->freqTrackingVariables[(int)ReportFreq::Day]); op->freqTrackingVariables[(int)ReportFreq::Day] = false; EXPECT_TRUE(compare_eso_stream( delimited_string({"18,7,keyedValue,variableName [m3/s] !Daily [Value,Min,Hour,Minute,Max,Hour,Minute],scheduleName"}, "\n"))); - WriteReportVariableDictionaryItem(*state, - ReportFreq::Day, - StoreType::Averaged, - 19, - -999, - "indexGroup", - "keyedValue", - "variableName", - TimeStepType::System, - Constant::Units::m3_s, - "", - ""); + rVar.ReportID = 19; + rVar.timeStepType = TimeStepType::System; + rVar.SchedPtr = 0; + rVar.writeReportDictionaryItem(*state); EXPECT_TRUE(op->freqTrackingVariables[(int)ReportFreq::Day]); op->freqTrackingVariables[(int)ReportFreq::Day] = false; EXPECT_TRUE( compare_eso_stream(delimited_string({"19,7,keyedValue,variableName [m3/s] !Daily [Value,Min,Hour,Minute,Max,Hour,Minute]"}, "\n"))); - WriteReportVariableDictionaryItem(*state, - ReportFreq::Day, - StoreType::Averaged, - 20, - -999, - "indexGroup", - "keyedValue", - "variableName", - aThirdTimeStepType, - Constant::Units::m3_s, - "", - ""); - EXPECT_TRUE(op->freqTrackingVariables[(int)ReportFreq::Day]); - op->freqTrackingVariables[(int)ReportFreq::Day] = false; - EXPECT_TRUE( - compare_eso_stream(delimited_string({"20,7,keyedValue,variableName [m3/s] !Daily [Value,Min,Hour,Minute,Max,Hour,Minute]"}, "\n"))); - - WriteReportVariableDictionaryItem(*state, - ReportFreq::Month, - StoreType::Averaged, - 21, - -999, - "indexGroup", - "keyedValue", - "variableName", - TimeStepType::Zone, - Constant::Units::m3_s, - "", - ""); + rVar.ReportID = 21; + rVar.freq = ReportFreq::Month; + rVar.timeStepType = TimeStepType::Zone; + rVar.writeReportDictionaryItem(*state); EXPECT_TRUE(op->freqTrackingVariables[(int)ReportFreq::Month]); op->freqTrackingVariables[(int)ReportFreq::Month] = false; EXPECT_TRUE(compare_eso_stream( delimited_string({"21,9,keyedValue,variableName [m3/s] !Monthly [Value,Min,Day,Hour,Minute,Max,Day,Hour,Minute]"}, "\n"))); - WriteReportVariableDictionaryItem(*state, - ReportFreq::Month, - StoreType::Summed, - 22, - -999, - "indexGroup", - "keyedValue", - "variableName", - TimeStepType::Zone, - Constant::Units::m3_s, - "", - ""); + rVar.ReportID = 22; + rVar.storeType = StoreType::Sum; + rVar.writeReportDictionaryItem(*state); EXPECT_TRUE(op->freqTrackingVariables[(int)ReportFreq::Month]); op->freqTrackingVariables[(int)ReportFreq::Month] = false; EXPECT_TRUE(compare_eso_stream( delimited_string({"22,9,keyedValue,variableName [m3/s] !Monthly [Value,Min,Day,Hour,Minute,Max,Day,Hour,Minute]"}, "\n"))); - WriteReportVariableDictionaryItem(*state, - ReportFreq::Month, - StoreType::Averaged, - 23, - -999, - "indexGroup", - "keyedValue", - "variableName", - TimeStepType::Zone, - Constant::Units::m3_s, - "", - "scheduleName"); + rVar.ReportID = 23; + rVar.storeType = StoreType::Average; + rVar.SchedPtr = 1; + rVar.writeReportDictionaryItem(*state); EXPECT_TRUE(op->freqTrackingVariables[(int)ReportFreq::Month]); op->freqTrackingVariables[(int)ReportFreq::Month] = false; EXPECT_TRUE(compare_eso_stream( delimited_string({"23,9,keyedValue,variableName [m3/s] !Monthly [Value,Min,Day,Hour,Minute,Max,Day,Hour,Minute],scheduleName"}, "\n"))); - WriteReportVariableDictionaryItem(*state, - ReportFreq::Month, - StoreType::Averaged, - 24, - -999, - "indexGroup", - "keyedValue", - "variableName", - TimeStepType::System, - Constant::Units::m3_s, - "", - ""); + rVar.ReportID = 24; + rVar.timeStepType = TimeStepType::System; + rVar.SchedPtr = 0; + rVar.writeReportDictionaryItem(*state); EXPECT_TRUE(op->freqTrackingVariables[(int)ReportFreq::Month]); op->freqTrackingVariables[(int)ReportFreq::Month] = false; EXPECT_TRUE(compare_eso_stream( delimited_string({"24,9,keyedValue,variableName [m3/s] !Monthly [Value,Min,Day,Hour,Minute,Max,Day,Hour,Minute]"}, "\n"))); - WriteReportVariableDictionaryItem(*state, - ReportFreq::Month, - StoreType::Averaged, - 25, - -999, - "indexGroup", - "keyedValue", - "variableName", - aThirdTimeStepType, - Constant::Units::m3_s, - "", - ""); - EXPECT_TRUE(op->freqTrackingVariables[(int)ReportFreq::Month]); - op->freqTrackingVariables[(int)ReportFreq::Month] = false; - EXPECT_TRUE(compare_eso_stream( - delimited_string({"25,9,keyedValue,variableName [m3/s] !Monthly [Value,Min,Day,Hour,Minute,Max,Day,Hour,Minute]"}, "\n"))); - - WriteReportVariableDictionaryItem(*state, - ReportFreq::Simulation, - StoreType::Averaged, - 26, - -999, - "indexGroup", - "keyedValue", - "variableName", - TimeStepType::Zone, - Constant::Units::m3_s, - "", - ""); + rVar.ReportID = 26; + rVar.freq = ReportFreq::Simulation; + rVar.timeStepType = TimeStepType::Zone; + rVar.writeReportDictionaryItem(*state); EXPECT_TRUE(op->freqTrackingVariables[(int)ReportFreq::Simulation]); op->freqTrackingVariables[(int)ReportFreq::Simulation] = false; EXPECT_TRUE(compare_eso_stream( delimited_string({"26,11,keyedValue,variableName [m3/s] !RunPeriod [Value,Min,Month,Day,Hour,Minute,Max,Month,Day,Hour,Minute]"}, "\n"))); - WriteReportVariableDictionaryItem(*state, - ReportFreq::Simulation, - StoreType::Summed, - 27, - -999, - "indexGroup", - "keyedValue", - "variableName", - TimeStepType::Zone, - Constant::Units::m3_s, - "", - ""); + rVar.ReportID = 27; + rVar.storeType = StoreType::Sum; + rVar.writeReportDictionaryItem(*state); EXPECT_TRUE(op->freqTrackingVariables[(int)ReportFreq::Simulation]); op->freqTrackingVariables[(int)ReportFreq::Simulation] = false; EXPECT_TRUE(compare_eso_stream( delimited_string({"27,11,keyedValue,variableName [m3/s] !RunPeriod [Value,Min,Month,Day,Hour,Minute,Max,Month,Day,Hour,Minute]"}, "\n"))); - WriteReportVariableDictionaryItem(*state, - ReportFreq::Simulation, - StoreType::Averaged, - 28, - -999, - "indexGroup", - "keyedValue", - "variableName", - TimeStepType::Zone, - Constant::Units::m3_s, - "", - "scheduleName"); + rVar.ReportID = 28; + rVar.storeType = StoreType::Average; + rVar.SchedPtr = 1; + rVar.writeReportDictionaryItem(*state); EXPECT_TRUE(op->freqTrackingVariables[(int)ReportFreq::Simulation]); op->freqTrackingVariables[(int)ReportFreq::Simulation] = false; EXPECT_TRUE(compare_eso_stream(delimited_string( {"28,11,keyedValue,variableName [m3/s] !RunPeriod [Value,Min,Month,Day,Hour,Minute,Max,Month,Day,Hour,Minute],scheduleName"}, "\n"))); - WriteReportVariableDictionaryItem(*state, - ReportFreq::Simulation, - StoreType::Averaged, - 29, - -999, - "indexGroup", - "keyedValue", - "variableName", - TimeStepType::System, - Constant::Units::m3_s, - "", - ""); + rVar.ReportID = 29; + rVar.timeStepType = TimeStepType::System; + rVar.SchedPtr = 0; + rVar.writeReportDictionaryItem(*state); EXPECT_TRUE(op->freqTrackingVariables[(int)ReportFreq::Simulation]); op->freqTrackingVariables[(int)ReportFreq::Simulation] = false; EXPECT_TRUE(compare_eso_stream( delimited_string({"29,11,keyedValue,variableName [m3/s] !RunPeriod [Value,Min,Month,Day,Hour,Minute,Max,Month,Day,Hour,Minute]"}, "\n"))); - WriteReportVariableDictionaryItem(*state, - ReportFreq::Simulation, - StoreType::Averaged, - 30, - -999, - "indexGroup", - "keyedValue", - "variableName", - aThirdTimeStepType, - Constant::Units::m3_s, - "", - ""); - EXPECT_TRUE(op->freqTrackingVariables[(int)ReportFreq::Simulation]); - op->freqTrackingVariables[(int)ReportFreq::Simulation] = false; - EXPECT_TRUE(compare_eso_stream( - delimited_string({"30,11,keyedValue,variableName [m3/s] !RunPeriod [Value,Min,Month,Day,Hour,Minute,Max,Month,Day,Hour,Minute]"}, "\n"))); - auto reportDataDictionaryResults = queryResult("SELECT * FROM ReportDataDictionary;", "ReportDataDictionary"); std::vector> reportDataDictionary( @@ -1990,33 +1753,30 @@ namespace OutputProcessor { {"2", "0", "Sum", "indexGroup", timeStepZoneString, "keyedValue", "variableName", "Zone Timestep", "", "m3/s"}, {"3", "0", "Avg", "indexGroup", timeStepZoneString, "keyedValue", "variableName", "Zone Timestep", "scheduleName", "m3/s"}, {"4", "0", "Avg", "indexGroup", timeStepSystemString, "keyedValue", "variableName", "Zone Timestep", "", "m3/s"}, - {"5", "0", "Avg", "indexGroup", aThirdTimeStepString, "keyedValue", "variableName", "Zone Timestep", "", "m3/s"}, {"6", "0", "Avg", "indexGroup", timeStepZoneString, "keyedValue", "variableName", "HVAC System Timestep", "", "m3/s"}, {"7", "0", "Sum", "indexGroup", timeStepZoneString, "keyedValue", "variableName", "HVAC System Timestep", "", "m3/s"}, {"8", "0", "Avg", "indexGroup", timeStepZoneString, "keyedValue", "variableName", "HVAC System Timestep", "scheduleName", "m3/s"}, {"9", "0", "Avg", "indexGroup", timeStepSystemString, "keyedValue", "variableName", "HVAC System Timestep", "", "m3/s"}, - {"10", "0", "Avg", "indexGroup", aThirdTimeStepString, "keyedValue", "variableName", "HVAC System Timestep", "", "m3/s"}, {"11", "0", "Avg", "indexGroup", timeStepZoneString, "keyedValue", "variableName", "Hourly", "", "m3/s"}, {"12", "0", "Sum", "indexGroup", timeStepZoneString, "keyedValue", "variableName", "Hourly", "", "m3/s"}, {"13", "0", "Avg", "indexGroup", timeStepZoneString, "keyedValue", "variableName", "Hourly", "scheduleName", "m3/s"}, {"14", "0", "Avg", "indexGroup", timeStepSystemString, "keyedValue", "variableName", "Hourly", "", "m3/s"}, - {"15", "0", "Avg", "indexGroup", aThirdTimeStepString, "keyedValue", "variableName", "Hourly", "", "m3/s"}, {"16", "0", "Avg", "indexGroup", timeStepZoneString, "keyedValue", "variableName", "Daily", "", "m3/s"}, {"17", "0", "Sum", "indexGroup", timeStepZoneString, "keyedValue", "variableName", "Daily", "", "m3/s"}, {"18", "0", "Avg", "indexGroup", timeStepZoneString, "keyedValue", "variableName", "Daily", "scheduleName", "m3/s"}, {"19", "0", "Avg", "indexGroup", timeStepSystemString, "keyedValue", "variableName", "Daily", "", "m3/s"}, - {"20", "0", "Avg", "indexGroup", aThirdTimeStepString, "keyedValue", "variableName", "Daily", "", "m3/s"}, {"21", "0", "Avg", "indexGroup", timeStepZoneString, "keyedValue", "variableName", "Monthly", "", "m3/s"}, {"22", "0", "Sum", "indexGroup", timeStepZoneString, "keyedValue", "variableName", "Monthly", "", "m3/s"}, {"23", "0", "Avg", "indexGroup", timeStepZoneString, "keyedValue", "variableName", "Monthly", "scheduleName", "m3/s"}, {"24", "0", "Avg", "indexGroup", timeStepSystemString, "keyedValue", "variableName", "Monthly", "", "m3/s"}, - {"25", "0", "Avg", "indexGroup", aThirdTimeStepString, "keyedValue", "variableName", "Monthly", "", "m3/s"}, {"26", "0", "Avg", "indexGroup", timeStepZoneString, "keyedValue", "variableName", "Run Period", "", "m3/s"}, {"27", "0", "Sum", "indexGroup", timeStepZoneString, "keyedValue", "variableName", "Run Period", "", "m3/s"}, {"28", "0", "Avg", "indexGroup", timeStepZoneString, "keyedValue", "variableName", "Run Period", "scheduleName", "m3/s"}, - {"29", "0", "Avg", "indexGroup", timeStepSystemString, "keyedValue", "variableName", "Run Period", "", "m3/s"}, - {"30", "0", "Avg", "indexGroup", aThirdTimeStepString, "keyedValue", "variableName", "Run Period", "", "m3/s"}}); - EXPECT_EQ(reportDataDictionary, reportDataDictionaryResults); + {"29", "0", "Avg", "indexGroup", timeStepSystemString, "keyedValue", "variableName", "Run Period", "", "m3/s"}}); + + EXPECT_EQ(reportDataDictionary.size(), reportDataDictionaryResults.size()); + for (int i = 0; i < reportDataDictionary.size(); ++i) + EXPECT_EQ(reportDataDictionary[i], reportDataDictionaryResults[i]); } TEST_F(SQLiteFixture, OutputProcessor_writeCumulativeReportMeterData) @@ -2024,7 +1784,7 @@ namespace OutputProcessor { auto &sql = state->dataSQLiteProcedures->sqlite; sql->createSQLiteTimeIndexRecord(ReportFreq::Simulation, 1, 1, 0, 2017, false); sql->createSQLiteReportDictionaryRecord( - 1, StoreType::Averaged, "Zone", "Environment", "Site Outdoor Air Drybulb Temperature", TimeStepType::Zone, "C", ReportFreq::Hour, false); + 1, StoreType::Average, "Zone", "Environment", "Site Outdoor Air Drybulb Temperature", TimeStepType::Zone, "C", ReportFreq::Hour, false); WriteCumulativeReportMeterData(*state, 1, 616771620.98702729, true); EXPECT_TRUE(compare_mtr_stream(delimited_string({"1,616771620.9870273"}, "\n"))); @@ -2061,7 +1821,7 @@ namespace OutputProcessor { auto &sql = state->dataSQLiteProcedures->sqlite; sql->createSQLiteTimeIndexRecord(ReportFreq::Simulation, 1, 1, 0, 2017, false); sql->createSQLiteReportDictionaryRecord( - 1, StoreType::Averaged, "Zone", "Environment", "Site Outdoor Air Drybulb Temperature", TimeStepType::Zone, "C", ReportFreq::Hour, false); + 1, StoreType::Average, "Zone", "Environment", "Site Outdoor Air Drybulb Temperature", TimeStepType::Zone, "C", ReportFreq::Hour, false); WriteNumericData(*state, 1, 0); EXPECT_TRUE(compare_eso_stream(delimited_string({"1,0"}, "\n"))); @@ -2329,21 +2089,21 @@ namespace OutputProcessor { auto const name("testMeter"); Constant::Units const units(Constant::Units::J); Constant::eResource resource = Constant::eResource::Electricity; - SOVEndUseCat sovEndUseCat = SOVEndUseCat::ExteriorLights; + EndUseCat endUseCat = EndUseCat::ExteriorLights; auto const endUseSub("testEndUseSub"); - SOVGroup sovGroup = SOVGroup::Building; + Group group = Group::Building; EXPECT_EQ(0ul, op->meters.size()); - AddMeter(*state, name, units, resource, sovEndUseCat, endUseSub, sovGroup, -1); + AddMeter(*state, name, units, resource, endUseCat, endUseSub, group, -1); ASSERT_EQ(1ul, op->meters.size()); EXPECT_EQ(name, op->meters[0]->Name); EXPECT_EQ((int)resource, (int)op->meters[0]->resource); - EXPECT_EQ((int)sovEndUseCat, (int)op->meters[0]->sovEndUseCat); + EXPECT_EQ((int)endUseCat, (int)op->meters[0]->endUseCat); EXPECT_EQ(endUseSub, op->meters[0]->EndUseSub); - EXPECT_EQ((int)sovGroup, (int)op->meters[0]->sovGroup); + EXPECT_EQ((int)group, (int)op->meters[0]->group); EXPECT_EQ((int)units, (int)op->meters[0]->units); EXPECT_EQ(1, op->meters[0]->periods[(int)ReportFreq::TimeStep].RptNum); EXPECT_EQ(2, op->meters[0]->periods[(int)ReportFreq::Hour].RptNum); @@ -2365,10 +2125,10 @@ namespace OutputProcessor { auto const name2("testMeter2"); Constant::Units const units2 = Constant::Units::unknown; // was "kwh" Constant::eResource resource2 = Constant::eResource::None; - SOVEndUseCat sovEndUseCat2 = SOVEndUseCat::Refrigeration; + EndUseCat endUseCat2 = EndUseCat::Refrigeration; auto const endUseSub2("testEndUseSub2"); - SOVGroup sovGroup2 = SOVGroup::Plant; - AddMeter(*state, name2, units2, resource2, sovEndUseCat2, endUseSub2, sovGroup2, -1); + Group group2 = Group::Plant; + AddMeter(*state, name2, units2, resource2, endUseCat2, endUseSub2, group2, -1); auto errorData = queryResult("SELECT * FROM Errors;", "Errors"); @@ -2550,19 +2310,19 @@ namespace OutputProcessor { bool errorFound = false; for (auto &meter : input_map) { errorFound = false; - SOVEndUseCat sovEndUseCat = static_cast(getEnumValue(sovEndUseCatNamesUC, meter[2])); - std::string stdEndUseSub = standardizeEndUseSub(sovEndUseCat, meter[3]); - SOVGroup sovGroup = static_cast(getEnumValue(sovGroupNamesUC, meter[4])); + EndUseCat endUseCat = static_cast(getEnumValue(endUseCatNamesUC, meter[2])); + std::string stdEndUseSub = standardizeEndUseSub(endUseCat, meter[3]); + Group group = static_cast(getEnumValue(groupNamesUC, meter[4])); - EXPECT_FALSE(compare_enums(SOVEndUseCat::Invalid, sovEndUseCat, false)); - EXPECT_FALSE(compare_enums(SOVGroup::Invalid, sovGroup, false)); + EXPECT_FALSE(compare_enums(EndUseCat::Invalid, endUseCat, false)); + EXPECT_FALSE(compare_enums(Group::Invalid, group, false)); AttachMeters(*state, Constant::Units::J, Constant::eResource::Electricity, - sovEndUseCat, + endUseCat, meter[3], - sovGroup, + group, (meter.size() == 6) ? meter[5] : "", "", -1); @@ -2583,14 +2343,14 @@ namespace OutputProcessor { auto &op = state->dataOutputProcessor; Real64 timeStep = 1.0; - SetupTimePointers(*state, SOVTimeStepType::Zone, timeStep); + SetupTimePointers(*state, TimeStepType::Zone, timeStep); EXPECT_DOUBLE_EQ(timeStep, *op->TimeValue[(int)TimeStepType::Zone].TimeStep); EXPECT_DOUBLE_EQ(0.0, op->TimeValue[(int)TimeStepType::Zone].CurMinute); timeStep = 2.0; - SetupTimePointers(*state, SOVTimeStepType::HVAC, timeStep); + SetupTimePointers(*state, TimeStepType::System, timeStep); EXPECT_DOUBLE_EQ(timeStep, *op->TimeValue[(int)TimeStepType::System].TimeStep); EXPECT_DOUBLE_EQ(0.0, op->TimeValue[(int)TimeStepType::System].CurMinute); @@ -2669,7 +2429,7 @@ namespace OutputProcessor { Real64 faketmp = 0; SetupOutputVariable( - *state, "Site Outdoor Air Drybulb Temperature", Constant::Units::C, faketmp, SOVTimeStepType::Zone, SOVStoreType::Average, "Environment"); + *state, "Site Outdoor Air Drybulb Temperature", Constant::Units::C, faketmp, TimeStepType::Zone, StoreType::Average, "Environment"); // EXPECT_EQ(5, op->NumExtraVars); EXPECT_EQ(6, op->reqVars.size()); @@ -2742,22 +2502,22 @@ namespace OutputProcessor { Real64 ilgrAttic = 0.0; SetupOutputVariable( - *state, "Zone Total Internal Latent Gain Rate", Constant::Units::J, ilgrGarage, SOVTimeStepType::Zone, SOVStoreType::Summed, "Garage"); + *state, "Zone Total Internal Latent Gain Rate", Constant::Units::J, ilgrGarage, TimeStepType::Zone, StoreType::Sum, "Garage"); SetupOutputVariable( - *state, "Zone Total Internal Latent Gain Rate", Constant::Units::J, ilgrLiving, SOVTimeStepType::Zone, SOVStoreType::Summed, "Living"); + *state, "Zone Total Internal Latent Gain Rate", Constant::Units::J, ilgrLiving, TimeStepType::Zone, StoreType::Sum, "Living"); SetupOutputVariable( - *state, "Zone Total Internal Latent Gain Rate", Constant::Units::J, ilgrAttic, SOVTimeStepType::Zone, SOVStoreType::Summed, "Attic"); + *state, "Zone Total Internal Latent Gain Rate", Constant::Units::J, ilgrAttic, TimeStepType::Zone, StoreType::Sum, "Attic"); Real64 isgrGarage = 0.0; Real64 isgrLiving = 0.0; Real64 isgrAttic = 0.0; SetupOutputVariable( - *state, "Zone Total Internal Sensible Gain Rate", Constant::Units::J, isgrGarage, SOVTimeStepType::Zone, SOVStoreType::Summed, "Garage"); + *state, "Zone Total Internal Sensible Gain Rate", Constant::Units::J, isgrGarage, TimeStepType::Zone, StoreType::Sum, "Garage"); SetupOutputVariable( - *state, "Zone Total Internal Sensible Gain Rate", Constant::Units::J, isgrLiving, SOVTimeStepType::Zone, SOVStoreType::Summed, "Living"); + *state, "Zone Total Internal Sensible Gain Rate", Constant::Units::J, isgrLiving, TimeStepType::Zone, StoreType::Sum, "Living"); SetupOutputVariable( - *state, "Zone Total Internal Sensible Gain Rate", Constant::Units::J, isgrAttic, SOVTimeStepType::Zone, SOVStoreType::Summed, "Attic"); + *state, "Zone Total Internal Sensible Gain Rate", Constant::Units::J, isgrAttic, TimeStepType::Zone, StoreType::Sum, "Attic"); state->dataGlobal->DoWeathSim = true; state->dataGlobal->TimeStepZone = 0.25; @@ -2788,21 +2548,21 @@ namespace OutputProcessor { resetReqRepVarsUsed(); SetupOutputVariable( - *state, "Zone Total Internal Latent Gain Rate", Constant::Units::W, fakeVar, SOVTimeStepType::Zone, SOVStoreType::Average, "LIVING"); + *state, "Zone Total Internal Latent Gain Rate", Constant::Units::W, fakeVar, TimeStepType::Zone, StoreType::Average, "LIVING"); EXPECT_EQ(1, countReqRepVarsUsed()); // EXPECT_EQ(1, op->NumExtraVars); resetReqRepVarsUsed(); SetupOutputVariable( - *state, "Zone Total Internal Latent Gain Rate", Constant::Units::W, fakeVar, SOVTimeStepType::Zone, SOVStoreType::Average, "GARAGE"); + *state, "Zone Total Internal Latent Gain Rate", Constant::Units::W, fakeVar, TimeStepType::Zone, StoreType::Average, "GARAGE"); EXPECT_EQ(0, countReqRepVarsUsed()); // Garage not part of the list // EXPECT_EQ(1, op->NumExtraVars); resetReqRepVarsUsed(); SetupOutputVariable( - *state, "Zone Total Internal Latent Gain Rate", Constant::Units::W, fakeVar, SOVTimeStepType::Zone, SOVStoreType::Average, "ATTIC"); + *state, "Zone Total Internal Latent Gain Rate", Constant::Units::W, fakeVar, TimeStepType::Zone, StoreType::Average, "ATTIC"); EXPECT_EQ(1, countReqRepVarsUsed()); // EXPECT_EQ(1, op->NumExtraVars); } @@ -2831,22 +2591,22 @@ namespace OutputProcessor { Real64 ilgrLiving2; SetupOutputVariable( - *state, "Zone Total Internal Latent Gain Rate", Constant::Units::J, ilgrGarage, SOVTimeStepType::Zone, SOVStoreType::Summed, "Garage"); + *state, "Zone Total Internal Latent Gain Rate", Constant::Units::J, ilgrGarage, TimeStepType::Zone, StoreType::Sum, "Garage"); SetupOutputVariable( - *state, "Zone Total Internal Latent Gain Rate", Constant::Units::J, ilgrLiving1, SOVTimeStepType::Zone, SOVStoreType::Summed, "Living1"); + *state, "Zone Total Internal Latent Gain Rate", Constant::Units::J, ilgrLiving1, TimeStepType::Zone, StoreType::Sum, "Living1"); SetupOutputVariable( - *state, "Zone Total Internal Latent Gain Rate", Constant::Units::J, ilgrLiving2, SOVTimeStepType::Zone, SOVStoreType::Summed, "Living2"); + *state, "Zone Total Internal Latent Gain Rate", Constant::Units::J, ilgrLiving2, TimeStepType::Zone, StoreType::Sum, "Living2"); Real64 isgrGarage; Real64 isgrLiving; Real64 isgrAttic; SetupOutputVariable( - *state, "Zone Total Internal Sensible Gain Rate", Constant::Units::J, isgrGarage, SOVTimeStepType::Zone, SOVStoreType::Summed, "Garage"); + *state, "Zone Total Internal Sensible Gain Rate", Constant::Units::J, isgrGarage, TimeStepType::Zone, StoreType::Sum, "Garage"); SetupOutputVariable( - *state, "Zone Total Internal Sensible Gain Rate", Constant::Units::J, isgrLiving, SOVTimeStepType::Zone, SOVStoreType::Summed, "Living1"); + *state, "Zone Total Internal Sensible Gain Rate", Constant::Units::J, isgrLiving, TimeStepType::Zone, StoreType::Sum, "Living1"); SetupOutputVariable( - *state, "Zone Total Internal Sensible Gain Rate", Constant::Units::J, isgrAttic, SOVTimeStepType::Zone, SOVStoreType::Summed, "Living2"); + *state, "Zone Total Internal Sensible Gain Rate", Constant::Units::J, isgrAttic, TimeStepType::Zone, StoreType::Sum, "Living2"); state->dataGlobal->DoWeathSim = true; state->dataGlobal->TimeStepZone = 0.25; @@ -2894,7 +2654,7 @@ namespace OutputProcessor { resetReqRepVarsUsed(); SetupOutputVariable( - *state, "Zone Total Internal Latent Gain Rate", Constant::Units::J, ilgrGarage, SOVTimeStepType::Zone, SOVStoreType::Summed, "LIVING1"); + *state, "Zone Total Internal Latent Gain Rate", Constant::Units::J, ilgrGarage, TimeStepType::Zone, StoreType::Sum, "LIVING1"); EXPECT_EQ(1, countReqRepVarsUsed()); // EXPECT_EQ(1, op->NumExtraVars); EXPECT_TRUE(varLatentRegex->Used); @@ -2904,7 +2664,7 @@ namespace OutputProcessor { resetReqRepVarsUsed(); SetupOutputVariable( - *state, "Zone Total Internal Latent Gain Rate", Constant::Units::J, ilgrGarage, SOVTimeStepType::Zone, SOVStoreType::Summed, "LIVING"); + *state, "Zone Total Internal Latent Gain Rate", Constant::Units::J, ilgrGarage, TimeStepType::Zone, StoreType::Sum, "LIVING"); EXPECT_EQ(1, countReqRepVarsUsed()); // EXPECT_EQ(1, op->NumExtraVars); EXPECT_TRUE(varLatentRegex->Used); @@ -2912,7 +2672,7 @@ namespace OutputProcessor { resetReqRepVarsUsed(); SetupOutputVariable( - *state, "Zone Total Internal Latent Gain Rate", Constant::Units::J, ilgrGarage, SOVTimeStepType::Zone, SOVStoreType::Summed, "GARAGE"); + *state, "Zone Total Internal Latent Gain Rate", Constant::Units::J, ilgrGarage, TimeStepType::Zone, StoreType::Sum, "GARAGE"); EXPECT_EQ(0, countReqRepVarsUsed()); // When NumExtraVars is 0 after CheckReportVariable, it resets to 1... // EXPECT_EQ(1, op->NumExtraVars); @@ -2939,7 +2699,7 @@ namespace OutputProcessor { Real64 fakeVar = 0.0; SetupOutputVariable( - *state, "Site Outdoor Air Drybulb Temperature", Constant::Units::C, fakeVar, SOVTimeStepType::Zone, SOVStoreType::Average, "Environment"); + *state, "Site Outdoor Air Drybulb Temperature", Constant::Units::C, fakeVar, TimeStepType::Zone, StoreType::Average, "Environment"); // EXPECT_EQ(5, op->NumExtraVars); // EXPECT_EQ(1, op->ReportList(1)); @@ -3022,18 +2782,14 @@ namespace OutputProcessor { ASSERT_TRUE(process_idf(idf_objects)); - AddDDOutVar(*state, "Site Outdoor Air Drybulb Temperature", TimeStepType::Zone, StoreType::Averaged, VariableType::Real, Constant::Units::C); - AddDDOutVar(*state, "Site Outdoor Air Wetbulb Temperature", TimeStepType::Zone, StoreType::Averaged, VariableType::Real, Constant::Units::C); - AddDDOutVar(*state, - "Site Outdoor Air Humidity Ratio", - TimeStepType::Zone, - StoreType::Averaged, - VariableType::Real, - Constant::Units::kgWater_kgDryAir); - AddDDOutVar(*state, "Site Outdoor Air Relative Humidity", TimeStepType::Zone, StoreType::Averaged, VariableType::Real, Constant::Units::Perc); + AddDDOutVar(*state, "Site Outdoor Air Drybulb Temperature", TimeStepType::Zone, StoreType::Average, VariableType::Real, Constant::Units::C); + AddDDOutVar(*state, "Site Outdoor Air Wetbulb Temperature", TimeStepType::Zone, StoreType::Average, VariableType::Real, Constant::Units::C); + AddDDOutVar( + *state, "Site Outdoor Air Humidity Ratio", TimeStepType::Zone, StoreType::Average, VariableType::Real, Constant::Units::kgWater_kgDryAir); + AddDDOutVar(*state, "Site Outdoor Air Relative Humidity", TimeStepType::Zone, StoreType::Average, VariableType::Real, Constant::Units::Perc); EXPECT_EQ((int)TimeStepType::Zone, (int)op->ddOutVars[0]->timeStepType); - EXPECT_EQ((int)StoreType::Averaged, (int)op->ddOutVars[0]->storeType); + EXPECT_EQ((int)StoreType::Average, (int)op->ddOutVars[0]->storeType); EXPECT_EQ((int)VariableType::Real, (int)op->ddOutVars[0]->variableType); EXPECT_EQ(-1, op->ddOutVars[0]->Next); EXPECT_FALSE(op->ddOutVars[0]->ReportedOnDDFile); @@ -3041,7 +2797,7 @@ namespace OutputProcessor { EXPECT_EQ((int)Constant::Units::C, (int)op->ddOutVars[0]->units); EXPECT_EQ((int)TimeStepType::Zone, (int)op->ddOutVars[1]->timeStepType); - EXPECT_EQ((int)StoreType::Averaged, (int)op->ddOutVars[1]->storeType); + EXPECT_EQ((int)StoreType::Average, (int)op->ddOutVars[1]->storeType); EXPECT_EQ((int)VariableType::Real, (int)op->ddOutVars[1]->variableType); EXPECT_EQ(-1, op->ddOutVars[1]->Next); EXPECT_FALSE(op->ddOutVars[1]->ReportedOnDDFile); @@ -3049,7 +2805,7 @@ namespace OutputProcessor { EXPECT_EQ((int)Constant::Units::C, (int)op->ddOutVars[1]->units); EXPECT_EQ((int)TimeStepType::Zone, (int)op->ddOutVars[2]->timeStepType); - EXPECT_EQ((int)StoreType::Averaged, (int)op->ddOutVars[2]->storeType); + EXPECT_EQ((int)StoreType::Average, (int)op->ddOutVars[2]->storeType); EXPECT_EQ((int)VariableType::Real, (int)op->ddOutVars[2]->variableType); EXPECT_EQ(-1, op->ddOutVars[2]->Next); EXPECT_FALSE(op->ddOutVars[2]->ReportedOnDDFile); @@ -3057,7 +2813,7 @@ namespace OutputProcessor { EXPECT_EQ((int)Constant::Units::kgWater_kgDryAir, (int)op->ddOutVars[2]->units); EXPECT_EQ((int)TimeStepType::Zone, (int)op->ddOutVars[3]->timeStepType); - EXPECT_EQ((int)StoreType::Averaged, (int)op->ddOutVars[3]->storeType); + EXPECT_EQ((int)StoreType::Average, (int)op->ddOutVars[3]->storeType); EXPECT_EQ((int)VariableType::Real, (int)op->ddOutVars[3]->variableType); EXPECT_EQ(-1, op->ddOutVars[3]->Next); EXPECT_FALSE(op->ddOutVars[3]->ReportedOnDDFile); @@ -3079,8 +2835,8 @@ namespace OutputProcessor { "Site Outdoor Air Drybulb Temperature", Constant::Units::C, state->dataEnvrn->OutDryBulbTemp, - SOVTimeStepType::Zone, - SOVStoreType::Average, + TimeStepType::Zone, + StoreType::Average, "Environment"); auto reportDataDictionaryResults = queryResult("SELECT * FROM ReportDataDictionary;", "ReportDataDictionary"); @@ -3099,7 +2855,7 @@ namespace OutputProcessor { EXPECT_EQ(true, op->reqVars[0]->Used); EXPECT_EQ((int)TimeStepType::Zone, (int)op->ddOutVars[0]->timeStepType); - EXPECT_EQ((int)StoreType::Averaged, (int)op->ddOutVars[0]->storeType); + EXPECT_EQ((int)StoreType::Average, (int)op->ddOutVars[0]->storeType); EXPECT_EQ((int)VariableType::Real, (int)op->ddOutVars[0]->variableType); EXPECT_EQ(-1, op->ddOutVars[0]->Next); EXPECT_FALSE(op->ddOutVars[0]->ReportedOnDDFile); @@ -3125,27 +2881,26 @@ namespace OutputProcessor { "Chiller Electricity Energy", Constant::Units::J, cooling_consumption, - SOVTimeStepType::System, - SOVStoreType::Summed, + TimeStepType::System, + StoreType::Sum, "Cool-1", Constant::eResource::Electricity, - SOVEndUseCat::Cooling, - {}, // EndUseSubKey - SOVGroup::Plant); + Group::Plant, + EndUseCat::Cooling); Real64 light_consumption = 0.; SetupOutputVariable(*state, "Lights Electricity Energy", Constant::Units::J, light_consumption, - SOVTimeStepType::Zone, - SOVStoreType::Summed, + TimeStepType::Zone, + StoreType::Sum, "LIGHTS 1", Constant::eResource::Electricity, - SOVEndUseCat::InteriorLights, + Group::Building, + EndUseCat::InteriorLights, "RailroadCrossing", // EndUseSubKey - SOVGroup::Building, - "SPACE1-1", + "SPACE1-1", // Zone 1, 1); @@ -3154,13 +2909,12 @@ namespace OutputProcessor { "Environmental Impact Fuel Oil No 2 CO2 Emissions Mass", Constant::Units::kg, fuel_oil_co2, - SOVTimeStepType::System, - SOVStoreType::Summed, + TimeStepType::System, + StoreType::Sum, "Site", Constant::eResource::CO2, - SOVEndUseCat::FuelOilNo2Emissions, - {}, // EndUseSubKey - SOVGroup::Invalid); + Group::Invalid, + EndUseCat::FuelOilNo2Emissions); // Cooling // testing an ABUPS end use with no sub end use specified @@ -3170,13 +2924,13 @@ namespace OutputProcessor { auto found = op->meterMap.find(Util::makeUPPER("Cooling:Electricity")); EXPECT_NE(found, op->meterMap.end()); EXPECT_EQ((int)Constant::eResource::Electricity, (int)op->meters[found->second]->resource); - EXPECT_EQ((int)SOVEndUseCat::Cooling, (int)op->meters[found->second]->sovEndUseCat); + EXPECT_EQ((int)EndUseCat::Cooling, (int)op->meters[found->second]->endUseCat); EXPECT_EQ("", op->meters[found->second]->EndUseSub); found = op->meterMap.find(Util::makeUPPER("General:Cooling:Electricity")); EXPECT_NE(found, op->meterMap.end()); EXPECT_EQ((int)Constant::eResource::Electricity, (int)op->meters[found->second]->resource); - EXPECT_EQ((int)SOVEndUseCat::Cooling, (int)op->meters[found->second]->sovEndUseCat); + EXPECT_EQ((int)EndUseCat::Cooling, (int)op->meters[found->second]->endUseCat); EXPECT_EQ("General", op->meters[found->second]->EndUseSub); // lighting @@ -3187,7 +2941,7 @@ namespace OutputProcessor { found = op->meterMap.find(Util::makeUPPER("InteriorLights:Electricity")); EXPECT_NE(found, op->meterMap.end()); EXPECT_EQ((int)Constant::eResource::Electricity, (int)op->meters[found->second]->resource); - EXPECT_EQ((int)SOVEndUseCat::InteriorLights, (int)op->meters[found->second]->sovEndUseCat); + EXPECT_EQ((int)EndUseCat::InteriorLights, (int)op->meters[found->second]->endUseCat); EXPECT_EQ("", op->meters[found->second]->EndUseSub); found = op->meterMap.find(Util::makeUPPER("General:InteriorLights:Electricity")); @@ -3196,7 +2950,7 @@ namespace OutputProcessor { found = op->meterMap.find(Util::makeUPPER("RailroadCrossing:InteriorLights:Electricity")); EXPECT_NE(found, op->meterMap.end()); EXPECT_EQ((int)Constant::eResource::Electricity, (int)op->meters[found->second]->resource); - EXPECT_EQ((int)SOVEndUseCat::InteriorLights, (int)op->meters[found->second]->sovEndUseCat); + EXPECT_EQ((int)EndUseCat::InteriorLights, (int)op->meters[found->second]->endUseCat); EXPECT_EQ("RailroadCrossing", op->meters[found->second]->EndUseSub); // fuel oil CO2 emissions @@ -3204,7 +2958,7 @@ namespace OutputProcessor { found = op->meterMap.find(Util::makeUPPER("FuelOilNo2Emissions:CO2")); EXPECT_NE(found, op->meterMap.end()); EXPECT_EQ((int)Constant::eResource::CO2, (int)op->meters[found->second]->resource); - EXPECT_EQ((int)SOVEndUseCat::FuelOilNo2Emissions, (int)op->meters[found->second]->sovEndUseCat); + EXPECT_EQ((int)EndUseCat::FuelOilNo2Emissions, (int)op->meters[found->second]->endUseCat); EXPECT_EQ("", op->meters[found->second]->EndUseSub); } @@ -3216,12 +2970,9 @@ namespace OutputProcessor { GetReportVariableInput(*state); Real64 fuel_used = 999; - SetupOutputVariable( - *state, "Boiler NaturalGas Rate", Constant::Units::W, fuel_used, SOVTimeStepType::System, SOVStoreType::Average, "Boiler1"); - SetupOutputVariable( - *state, "Boiler NaturalGas Rate", Constant::Units::W, fuel_used, SOVTimeStepType::System, SOVStoreType::Average, "Boiler2"); - SetupOutputVariable( - *state, "Boiler NaturalGas Rate", Constant::Units::W, fuel_used, SOVTimeStepType::System, SOVStoreType::Average, "Boiler3"); + SetupOutputVariable(*state, "Boiler NaturalGas Rate", Constant::Units::W, fuel_used, TimeStepType::System, StoreType::Average, "Boiler1"); + SetupOutputVariable(*state, "Boiler NaturalGas Rate", Constant::Units::W, fuel_used, TimeStepType::System, StoreType::Average, "Boiler2"); + SetupOutputVariable(*state, "Boiler NaturalGas Rate", Constant::Units::W, fuel_used, TimeStepType::System, StoreType::Average, "Boiler3"); auto reportDataDictionaryResults = queryResult("SELECT * FROM ReportDataDictionary;", "ReportDataDictionary"); @@ -3251,12 +3002,9 @@ namespace OutputProcessor { GetReportVariableInput(*state); Real64 fuel_used = 999; - SetupOutputVariable( - *state, "Boiler NaturalGas Rate", Constant::Units::W, fuel_used, SOVTimeStepType::System, SOVStoreType::Average, "Boiler1"); - SetupOutputVariable( - *state, "Boiler NaturalGas Rate", Constant::Units::W, fuel_used, SOVTimeStepType::System, SOVStoreType::Average, "Boiler2"); - SetupOutputVariable( - *state, "Boiler NaturalGas Rate", Constant::Units::W, fuel_used, SOVTimeStepType::System, SOVStoreType::Average, "Boiler3"); + SetupOutputVariable(*state, "Boiler NaturalGas Rate", Constant::Units::W, fuel_used, TimeStepType::System, StoreType::Average, "Boiler1"); + SetupOutputVariable(*state, "Boiler NaturalGas Rate", Constant::Units::W, fuel_used, TimeStepType::System, StoreType::Average, "Boiler2"); + SetupOutputVariable(*state, "Boiler NaturalGas Rate", Constant::Units::W, fuel_used, TimeStepType::System, StoreType::Average, "Boiler3"); auto reportDataDictionaryResults = queryResult("SELECT * FROM ReportDataDictionary;", "ReportDataDictionary"); @@ -3284,12 +3032,9 @@ namespace OutputProcessor { GetReportVariableInput(*state); Real64 fuel_used = 999; - SetupOutputVariable( - *state, "Boiler NaturalGas Rate", Constant::Units::W, fuel_used, SOVTimeStepType::System, SOVStoreType::Average, "Boiler1"); - SetupOutputVariable( - *state, "Boiler NaturalGas Rate", Constant::Units::W, fuel_used, SOVTimeStepType::System, SOVStoreType::Average, "Boiler2"); - SetupOutputVariable( - *state, "Boiler NaturalGas Rate", Constant::Units::W, fuel_used, SOVTimeStepType::System, SOVStoreType::Average, "Boiler3"); + SetupOutputVariable(*state, "Boiler NaturalGas Rate", Constant::Units::W, fuel_used, TimeStepType::System, StoreType::Average, "Boiler1"); + SetupOutputVariable(*state, "Boiler NaturalGas Rate", Constant::Units::W, fuel_used, TimeStepType::System, StoreType::Average, "Boiler2"); + SetupOutputVariable(*state, "Boiler NaturalGas Rate", Constant::Units::W, fuel_used, TimeStepType::System, StoreType::Average, "Boiler3"); auto reportDataDictionaryResults = queryResult("SELECT * FROM ReportDataDictionary;", "ReportDataDictionary"); @@ -3323,29 +3068,29 @@ namespace OutputProcessor { "AFN Linkage Node 1 to Node 2 Volume Flow Rate", Constant::Units::m3_s, vol_flow, - SOVTimeStepType::System, - SOVStoreType::Average, + TimeStepType::System, + StoreType::Average, "Zn003:Wall001"); SetupOutputVariable(*state, "AFN Linkage Node 1 to Node 2 Volume Flow Rate", Constant::Units::m3_s, vol_flow, - SOVTimeStepType::System, - SOVStoreType::Average, + TimeStepType::System, + StoreType::Average, "Zn003:Wall002"); SetupOutputVariable(*state, "AFN Linkage Node 1 to Node 2 Volume Flow Rate", Constant::Units::m3_s, vol_flow, - SOVTimeStepType::System, - SOVStoreType::Average, + TimeStepType::System, + StoreType::Average, "Zn003:Wall002:Win001"); SetupOutputVariable(*state, "AFN Linkage Node 1 to Node 2 Volume Flow Rate", Constant::Units::m3_s, vol_flow, - SOVTimeStepType::System, - SOVStoreType::Average, + TimeStepType::System, + StoreType::Average, "Zn003:Wall003"); auto reportDataDictionaryResults = queryResult("SELECT * FROM ReportDataDictionary;", "ReportDataDictionary"); @@ -3395,29 +3140,29 @@ namespace OutputProcessor { "AFN Linkage Node 1 to Node 2 Volume Flow Rate", Constant::Units::m3_s, vol_flow, - SOVTimeStepType::System, - SOVStoreType::Average, + TimeStepType::System, + StoreType::Average, "ZN003:WALL001"); SetupOutputVariable(*state, "AFN Linkage Node 1 to Node 2 Volume Flow Rate", Constant::Units::m3_s, vol_flow, - SOVTimeStepType::System, - SOVStoreType::Average, + TimeStepType::System, + StoreType::Average, "ZN003:WALL002"); SetupOutputVariable(*state, "AFN Linkage Node 1 to Node 2 Volume Flow Rate", Constant::Units::m3_s, vol_flow, - SOVTimeStepType::System, - SOVStoreType::Average, + TimeStepType::System, + StoreType::Average, "ZN003:WALL002:WIN001"); SetupOutputVariable(*state, "AFN Linkage Node 1 to Node 2 Volume Flow Rate", Constant::Units::m3_s, vol_flow, - SOVTimeStepType::System, - SOVStoreType::Average, + TimeStepType::System, + StoreType::Average, "ZN003:WALL003"); auto reportDataDictionaryResults = queryResult("SELECT * FROM ReportDataDictionary;", "ReportDataDictionary"); @@ -3527,13 +3272,13 @@ namespace OutputProcessor { "Lights Electricity Energy", Constant::Units::J, light_consumption, - SOVTimeStepType::Zone, - SOVStoreType::Summed, + TimeStepType::Zone, + StoreType::Sum, format("SPACE {} LIGHTS", i), Constant::eResource::Electricity, - SOVEndUseCat::InteriorLights, + Group::Building, + EndUseCat::InteriorLights, "GeneralLights", - SOVGroup::Building, "SPACE" + std::to_string(i), 1, 1); @@ -3592,13 +3337,13 @@ namespace OutputProcessor { "Lights Electricity Energy", Constant::Units::J, light_consumption, - SOVTimeStepType::Zone, - SOVStoreType::Summed, + TimeStepType::Zone, + StoreType::Sum, "SPACE1-1 LIGHTS 1", Constant::eResource::Electricity, - SOVEndUseCat::InteriorLights, + Group::Building, + EndUseCat::InteriorLights, "GeneralLights", - SOVGroup::Building, "SPACE1-1", 1, 1); @@ -3606,13 +3351,13 @@ namespace OutputProcessor { "Lights Electricity Energy", Constant::Units::J, light_consumption, - SOVTimeStepType::Zone, - SOVStoreType::Summed, + TimeStepType::Zone, + StoreType::Sum, "SPACE2-1 LIGHTS 1", Constant::eResource::Electricity, - SOVEndUseCat::InteriorLights, + Group::Building, + EndUseCat::InteriorLights, "GeneralLights", - SOVGroup::Building, "SPACE2-1", 1, 1); @@ -3620,13 +3365,13 @@ namespace OutputProcessor { "Lights Electricity Energy", Constant::Units::J, light_consumption, - SOVTimeStepType::Zone, - SOVStoreType::Summed, + TimeStepType::Zone, + StoreType::Sum, "SPACE3-1 LIGHTS 1", Constant::eResource::Electricity, - SOVEndUseCat::InteriorLights, + Group::Building, + EndUseCat::InteriorLights, "GeneralLights", - SOVGroup::Building, "SPACE3-1", 1, 1); @@ -3634,13 +3379,13 @@ namespace OutputProcessor { "Lights Electricity Energy", Constant::Units::J, light_consumption, - SOVTimeStepType::Zone, - SOVStoreType::Summed, + TimeStepType::Zone, + StoreType::Sum, "SPACE4-1 LIGHTS 1", Constant::eResource::Electricity, - SOVEndUseCat::InteriorLights, + Group::Building, + EndUseCat::InteriorLights, "GeneralLights", - SOVGroup::Building, "SPACE4-1", 1, 1); @@ -3648,13 +3393,13 @@ namespace OutputProcessor { "Lights Electricity Energy", Constant::Units::J, light_consumption, - SOVTimeStepType::Zone, - SOVStoreType::Summed, + TimeStepType::Zone, + StoreType::Sum, "SPACE5-1 LIGHTS 1", Constant::eResource::Electricity, - SOVEndUseCat::InteriorLights, + Group::Building, + EndUseCat::InteriorLights, "GeneralLights", - SOVGroup::Building, "SPACE5-1", 1, 1); @@ -3663,36 +3408,36 @@ namespace OutputProcessor { "Zone Infiltration Total Heat Loss Energy", Constant::Units::J, zone_infil_total_loss, - SOVTimeStepType::System, - SOVStoreType::Summed, + TimeStepType::System, + StoreType::Sum, "SPACE1-1"); SetupOutputVariable(*state, "Zone Infiltration Total Heat Loss Energy", Constant::Units::J, zone_infil_total_loss, - SOVTimeStepType::System, - SOVStoreType::Summed, + TimeStepType::System, + StoreType::Sum, "SPACE2-1"); SetupOutputVariable(*state, "Zone Infiltration Total Heat Loss Energy", Constant::Units::J, zone_infil_total_loss, - SOVTimeStepType::System, - SOVStoreType::Summed, + TimeStepType::System, + StoreType::Sum, "SPACE3-1"); SetupOutputVariable(*state, "Zone Infiltration Total Heat Loss Energy", Constant::Units::J, zone_infil_total_loss, - SOVTimeStepType::System, - SOVStoreType::Summed, + TimeStepType::System, + StoreType::Sum, "SPACE4-1"); SetupOutputVariable(*state, "Zone Infiltration Total Heat Loss Energy", Constant::Units::J, zone_infil_total_loss, - SOVTimeStepType::System, - SOVStoreType::Summed, + TimeStepType::System, + StoreType::Sum, "SPACE5-1"); bool errors_found = false; @@ -3703,170 +3448,165 @@ namespace OutputProcessor { ASSERT_EQ(22, op->meters.size()); - std::vector> - meter_result = {std::make_tuple(MeterType::Normal, - "Electricity:Facility", - Constant::eResource::Electricity, - SOVEndUseCat::Invalid, - "", - SOVGroup::Invalid, - Constant::Units::J), - std::make_tuple(MeterType::Normal, - "Electricity:Building", - Constant::eResource::Electricity, - SOVEndUseCat::Invalid, - "", - SOVGroup::Building, - Constant::Units::J), - std::make_tuple(MeterType::Normal, - "Electricity:Zone:SPACE1-1", - Constant::eResource::Electricity, - SOVEndUseCat::Invalid, - "", - SOVGroup::Zone, - Constant::Units::J), - std::make_tuple(MeterType::Normal, - "InteriorLights:Electricity", - Constant::eResource::Electricity, - SOVEndUseCat::InteriorLights, - "", - SOVGroup::Invalid, - Constant::Units::J), - std::make_tuple(MeterType::Normal, - "InteriorLights:Electricity:Zone:SPACE1-1", - Constant::eResource::Electricity, - SOVEndUseCat::InteriorLights, - "", - SOVGroup::Zone, - Constant::Units::J), - std::make_tuple(MeterType::Normal, - "GeneralLights:InteriorLights:Electricity", - Constant::eResource::Electricity, - SOVEndUseCat::InteriorLights, - "GeneralLights", - SOVGroup::Invalid, - Constant::Units::J), - std::make_tuple(MeterType::Normal, - "GeneralLights:InteriorLights:Electricity:Zone:SPACE1-1", - Constant::eResource::Electricity, - SOVEndUseCat::InteriorLights, - "GeneralLights", - SOVGroup::Zone, - Constant::Units::J), - std::make_tuple(MeterType::Normal, - "Electricity:Zone:SPACE2-1", - Constant::eResource::Electricity, - SOVEndUseCat::Invalid, - "", - SOVGroup::Zone, - Constant::Units::J), - std::make_tuple(MeterType::Normal, - "InteriorLights:Electricity:Zone:SPACE2-1", - Constant::eResource::Electricity, - SOVEndUseCat::InteriorLights, - "", - SOVGroup::Zone, - Constant::Units::J), - std::make_tuple(MeterType::Normal, - "GeneralLights:InteriorLights:Electricity:Zone:SPACE2-1", - Constant::eResource::Electricity, - SOVEndUseCat::InteriorLights, - "GeneralLights", - SOVGroup::Zone, - Constant::Units::J), - std::make_tuple(MeterType::Normal, - "Electricity:Zone:SPACE3-1", - Constant::eResource::Electricity, - SOVEndUseCat::Invalid, - "", - SOVGroup::Zone, - Constant::Units::J), - std::make_tuple(MeterType::Normal, - "InteriorLights:Electricity:Zone:SPACE3-1", - Constant::eResource::Electricity, - SOVEndUseCat::InteriorLights, - "", - SOVGroup::Zone, - Constant::Units::J), - std::make_tuple(MeterType::Normal, - "GeneralLights:InteriorLights:Electricity:Zone:SPACE3-1", - Constant::eResource::Electricity, - SOVEndUseCat::InteriorLights, - "GeneralLights", - SOVGroup::Zone, - Constant::Units::J), - std::make_tuple(MeterType::Normal, - "Electricity:Zone:SPACE4-1", - Constant::eResource::Electricity, - SOVEndUseCat::Invalid, - "", - SOVGroup::Zone, - Constant::Units::J), - std::make_tuple(MeterType::Normal, - "InteriorLights:Electricity:Zone:SPACE4-1", - Constant::eResource::Electricity, - SOVEndUseCat::InteriorLights, - "", - SOVGroup::Zone, - Constant::Units::J), - std::make_tuple(MeterType::Normal, - "GeneralLights:InteriorLights:Electricity:Zone:SPACE4-1", - Constant::eResource::Electricity, - SOVEndUseCat::InteriorLights, - "GeneralLights", - SOVGroup::Zone, - Constant::Units::J), - std::make_tuple(MeterType::Normal, - "Electricity:Zone:SPACE5-1", - Constant::eResource::Electricity, - SOVEndUseCat::Invalid, - "", - SOVGroup::Zone, - Constant::Units::J), - std::make_tuple(MeterType::Normal, - "InteriorLights:Electricity:Zone:SPACE5-1", - Constant::eResource::Electricity, - SOVEndUseCat::InteriorLights, - "", - SOVGroup::Zone, - Constant::Units::J), - std::make_tuple(MeterType::Normal, - "GeneralLights:InteriorLights:Electricity:Zone:SPACE5-1", - Constant::eResource::Electricity, - SOVEndUseCat::InteriorLights, - "GeneralLights", - SOVGroup::Zone, - Constant::Units::J), - std::make_tuple(MeterType::Custom, - "MYGENERALLIGHTS", - Constant::eResource::Electricity, - SOVEndUseCat::Invalid, - "", - SOVGroup::Invalid, - Constant::Units::J), - std::make_tuple(MeterType::Custom, - "BUILDING INFILTRATION HEAT LOSS", - Constant::eResource::Generic, - SOVEndUseCat::Invalid, - "", - SOVGroup::Invalid, - Constant::Units::J), - std::make_tuple(MeterType::CustomDec, - "MYBUILDINGOTHER", - Constant::eResource::Electricity, - SOVEndUseCat::Invalid, - "", - SOVGroup::Invalid, - Constant::Units::J)}; + std::vector> meter_result = + {std::make_tuple(MeterType::Normal, + "Electricity:Facility", + Constant::eResource::Electricity, + EndUseCat::Invalid, + "", + Group::Invalid, + Constant::Units::J), + std::make_tuple(MeterType::Normal, + "Electricity:Building", + Constant::eResource::Electricity, + EndUseCat::Invalid, + "", + Group::Building, + Constant::Units::J), + std::make_tuple(MeterType::Normal, + "Electricity:Zone:SPACE1-1", + Constant::eResource::Electricity, + EndUseCat::Invalid, + "", + Group::Zone, + Constant::Units::J), + std::make_tuple(MeterType::Normal, + "InteriorLights:Electricity", + Constant::eResource::Electricity, + EndUseCat::InteriorLights, + "", + Group::Invalid, + Constant::Units::J), + std::make_tuple(MeterType::Normal, + "InteriorLights:Electricity:Zone:SPACE1-1", + Constant::eResource::Electricity, + EndUseCat::InteriorLights, + "", + Group::Zone, + Constant::Units::J), + std::make_tuple(MeterType::Normal, + "GeneralLights:InteriorLights:Electricity", + Constant::eResource::Electricity, + EndUseCat::InteriorLights, + "GeneralLights", + Group::Invalid, + Constant::Units::J), + std::make_tuple(MeterType::Normal, + "GeneralLights:InteriorLights:Electricity:Zone:SPACE1-1", + Constant::eResource::Electricity, + EndUseCat::InteriorLights, + "GeneralLights", + Group::Zone, + Constant::Units::J), + std::make_tuple(MeterType::Normal, + "Electricity:Zone:SPACE2-1", + Constant::eResource::Electricity, + EndUseCat::Invalid, + "", + Group::Zone, + Constant::Units::J), + std::make_tuple(MeterType::Normal, + "InteriorLights:Electricity:Zone:SPACE2-1", + Constant::eResource::Electricity, + EndUseCat::InteriorLights, + "", + Group::Zone, + Constant::Units::J), + std::make_tuple(MeterType::Normal, + "GeneralLights:InteriorLights:Electricity:Zone:SPACE2-1", + Constant::eResource::Electricity, + EndUseCat::InteriorLights, + "GeneralLights", + Group::Zone, + Constant::Units::J), + std::make_tuple(MeterType::Normal, + "Electricity:Zone:SPACE3-1", + Constant::eResource::Electricity, + EndUseCat::Invalid, + "", + Group::Zone, + Constant::Units::J), + std::make_tuple(MeterType::Normal, + "InteriorLights:Electricity:Zone:SPACE3-1", + Constant::eResource::Electricity, + EndUseCat::InteriorLights, + "", + Group::Zone, + Constant::Units::J), + std::make_tuple(MeterType::Normal, + "GeneralLights:InteriorLights:Electricity:Zone:SPACE3-1", + Constant::eResource::Electricity, + EndUseCat::InteriorLights, + "GeneralLights", + Group::Zone, + Constant::Units::J), + std::make_tuple(MeterType::Normal, + "Electricity:Zone:SPACE4-1", + Constant::eResource::Electricity, + EndUseCat::Invalid, + "", + Group::Zone, + Constant::Units::J), + std::make_tuple(MeterType::Normal, + "InteriorLights:Electricity:Zone:SPACE4-1", + Constant::eResource::Electricity, + EndUseCat::InteriorLights, + "", + Group::Zone, + Constant::Units::J), + std::make_tuple(MeterType::Normal, + "GeneralLights:InteriorLights:Electricity:Zone:SPACE4-1", + Constant::eResource::Electricity, + EndUseCat::InteriorLights, + "GeneralLights", + Group::Zone, + Constant::Units::J), + std::make_tuple(MeterType::Normal, + "Electricity:Zone:SPACE5-1", + Constant::eResource::Electricity, + EndUseCat::Invalid, + "", + Group::Zone, + Constant::Units::J), + std::make_tuple(MeterType::Normal, + "InteriorLights:Electricity:Zone:SPACE5-1", + Constant::eResource::Electricity, + EndUseCat::InteriorLights, + "", + Group::Zone, + Constant::Units::J), + std::make_tuple(MeterType::Normal, + "GeneralLights:InteriorLights:Electricity:Zone:SPACE5-1", + Constant::eResource::Electricity, + EndUseCat::InteriorLights, + "GeneralLights", + Group::Zone, + Constant::Units::J), + std::make_tuple( + MeterType::Custom, "MYGENERALLIGHTS", Constant::eResource::Electricity, EndUseCat::Invalid, "", Group::Invalid, Constant::Units::J), + std::make_tuple(MeterType::Custom, + "BUILDING INFILTRATION HEAT LOSS", + Constant::eResource::Generic, + EndUseCat::Invalid, + "", + Group::Invalid, + Constant::Units::J), + std::make_tuple(MeterType::CustomDec, + "MYBUILDINGOTHER", + Constant::eResource::Electricity, + EndUseCat::Invalid, + "", + Group::Invalid, + Constant::Units::J)}; for (int i = 0; i < (int)meter_result.size(); ++i) { EXPECT_EQ((int)std::get<0>(meter_result[i]), (int)op->meters[i]->type); EXPECT_EQ(std::get<1>(meter_result[i]), op->meters[i]->Name); EXPECT_EQ((int)std::get<2>(meter_result[i]), (int)op->meters[i]->resource); - EXPECT_EQ((int)std::get<3>(meter_result[i]), (int)op->meters[i]->sovEndUseCat); + EXPECT_EQ((int)std::get<3>(meter_result[i]), (int)op->meters[i]->endUseCat); EXPECT_EQ(std::get<4>(meter_result[i]), op->meters[i]->EndUseSub); - EXPECT_EQ((int)std::get<5>(meter_result[i]), (int)op->meters[i]->sovGroup); + EXPECT_EQ((int)std::get<5>(meter_result[i]), (int)op->meters[i]->group); EXPECT_EQ((int)std::get<6>(meter_result[i]), (int)op->meters[i]->units); } } @@ -3887,95 +3627,95 @@ namespace OutputProcessor { InitializeOutput(*state); Constant::eResource resource = Constant::eResource::Electricity; - SOVEndUseCat sovEndUseCat = SOVEndUseCat::InteriorLights; + EndUseCat endUseCat = EndUseCat::InteriorLights; std::string endUseSub("GeneralLights"); - SOVGroup sovGroup = SOVGroup::Building; + Group group = Group::Building; std::string const zoneName("SPACE1-1"); std::string const spaceType("OFFICE"); - AttachMeters(*state, Constant::Units::J, resource, sovEndUseCat, endUseSub, sovGroup, zoneName, spaceType, -1); + AttachMeters(*state, Constant::Units::J, resource, endUseCat, endUseSub, group, zoneName, spaceType, -1); ASSERT_EQ(10, op->meters.size()); - std::vector> - meter_result = {std::make_tuple(MeterType::Normal, - "Electricity:Facility", - Constant::eResource::Electricity, - SOVEndUseCat::Invalid, - "", - SOVGroup::Invalid, - Constant::Units::J), - std::make_tuple(MeterType::Normal, - "Electricity:Building", - Constant::eResource::Electricity, - SOVEndUseCat::Invalid, - "", - SOVGroup::Building, - Constant::Units::J), - std::make_tuple(MeterType::Normal, - "Electricity:Zone:SPACE1-1", - Constant::eResource::Electricity, - SOVEndUseCat::Invalid, - "", - SOVGroup::Zone, - Constant::Units::J), - std::make_tuple(MeterType::Normal, - "Electricity:SpaceType:OFFICE", - Constant::eResource::Electricity, - SOVEndUseCat::Invalid, - "", - SOVGroup::SpaceType, - Constant::Units::J), - std::make_tuple(MeterType::Normal, - "InteriorLights:Electricity", - Constant::eResource::Electricity, - SOVEndUseCat::InteriorLights, - "", - SOVGroup::Invalid, - Constant::Units::J), - std::make_tuple(MeterType::Normal, - "InteriorLights:Electricity:Zone:SPACE1-1", - Constant::eResource::Electricity, - SOVEndUseCat::InteriorLights, - "", - SOVGroup::Zone, - Constant::Units::J), - std::make_tuple(MeterType::Normal, - "InteriorLights:Electricity:SpaceType:OFFICE", - Constant::eResource::Electricity, - SOVEndUseCat::InteriorLights, - "", - SOVGroup::SpaceType, - Constant::Units::J), - std::make_tuple(MeterType::Normal, - "GeneralLights:InteriorLights:Electricity", - Constant::eResource::Electricity, - SOVEndUseCat::InteriorLights, - "GeneralLights", - SOVGroup::Invalid, - Constant::Units::J), - std::make_tuple(MeterType::Normal, - "GeneralLights:InteriorLights:Electricity:Zone:SPACE1-1", - Constant::eResource::Electricity, - SOVEndUseCat::InteriorLights, - "GeneralLights", - SOVGroup::Zone, - Constant::Units::J), - std::make_tuple(MeterType::Normal, - "GeneralLights:InteriorLights:Electricity:SpaceType:OFFICE", - Constant::eResource::Electricity, - SOVEndUseCat::InteriorLights, - "GeneralLights", - SOVGroup::SpaceType, - Constant::Units::J)}; + std::vector> meter_result = + {std::make_tuple(MeterType::Normal, + "Electricity:Facility", + Constant::eResource::Electricity, + EndUseCat::Invalid, + "", + Group::Invalid, + Constant::Units::J), + std::make_tuple(MeterType::Normal, + "Electricity:Building", + Constant::eResource::Electricity, + EndUseCat::Invalid, + "", + Group::Building, + Constant::Units::J), + std::make_tuple(MeterType::Normal, + "Electricity:Zone:SPACE1-1", + Constant::eResource::Electricity, + EndUseCat::Invalid, + "", + Group::Zone, + Constant::Units::J), + std::make_tuple(MeterType::Normal, + "Electricity:SpaceType:OFFICE", + Constant::eResource::Electricity, + EndUseCat::Invalid, + "", + Group::SpaceType, + Constant::Units::J), + std::make_tuple(MeterType::Normal, + "InteriorLights:Electricity", + Constant::eResource::Electricity, + EndUseCat::InteriorLights, + "", + Group::Invalid, + Constant::Units::J), + std::make_tuple(MeterType::Normal, + "InteriorLights:Electricity:Zone:SPACE1-1", + Constant::eResource::Electricity, + EndUseCat::InteriorLights, + "", + Group::Zone, + Constant::Units::J), + std::make_tuple(MeterType::Normal, + "InteriorLights:Electricity:SpaceType:OFFICE", + Constant::eResource::Electricity, + EndUseCat::InteriorLights, + "", + Group::SpaceType, + Constant::Units::J), + std::make_tuple(MeterType::Normal, + "GeneralLights:InteriorLights:Electricity", + Constant::eResource::Electricity, + EndUseCat::InteriorLights, + "GeneralLights", + Group::Invalid, + Constant::Units::J), + std::make_tuple(MeterType::Normal, + "GeneralLights:InteriorLights:Electricity:Zone:SPACE1-1", + Constant::eResource::Electricity, + EndUseCat::InteriorLights, + "GeneralLights", + Group::Zone, + Constant::Units::J), + std::make_tuple(MeterType::Normal, + "GeneralLights:InteriorLights:Electricity:SpaceType:OFFICE", + Constant::eResource::Electricity, + EndUseCat::InteriorLights, + "GeneralLights", + Group::SpaceType, + Constant::Units::J)}; for (int i = 0; i < (int)meter_result.size(); ++i) { EXPECT_EQ((int)std::get<0>(meter_result[i]), (int)op->meters[i]->type); EXPECT_EQ(std::get<1>(meter_result[i]), op->meters[i]->Name); EXPECT_EQ((int)std::get<2>(meter_result[i]), (int)op->meters[i]->resource); - EXPECT_EQ((int)std::get<3>(meter_result[i]), (int)op->meters[i]->sovEndUseCat); + EXPECT_EQ((int)std::get<3>(meter_result[i]), (int)op->meters[i]->endUseCat); EXPECT_EQ(std::get<4>(meter_result[i]), op->meters[i]->EndUseSub); - EXPECT_EQ((int)std::get<5>(meter_result[i]), (int)op->meters[i]->sovGroup); + EXPECT_EQ((int)std::get<5>(meter_result[i]), (int)op->meters[i]->group); EXPECT_EQ((int)std::get<6>(meter_result[i]), (int)op->meters[i]->units); } } @@ -4027,8 +3767,8 @@ namespace OutputProcessor { Real64 timeStep = 1.0 / 6; - SetupTimePointers(*state, SOVTimeStepType::Zone, timeStep); - SetupTimePointers(*state, SOVTimeStepType::HVAC, timeStep); + SetupTimePointers(*state, TimeStepType::Zone, timeStep); + SetupTimePointers(*state, TimeStepType::System, timeStep); op->TimeValue[(int)TimeStepType::Zone].CurMinute = 50; op->TimeValue[(int)TimeStepType::System].CurMinute = 50; @@ -4038,21 +3778,21 @@ namespace OutputProcessor { "Site Outdoor Air Drybulb Temperature", Constant::Units::C, state->dataEnvrn->OutDryBulbTemp, - SOVTimeStepType::Zone, - SOVStoreType::Average, + TimeStepType::Zone, + StoreType::Average, "Environment"); Real64 light_consumption = 999; SetupOutputVariable(*state, "Lights Electricity Energy", Constant::Units::J, light_consumption, - SOVTimeStepType::Zone, - SOVStoreType::Summed, + TimeStepType::Zone, + StoreType::Sum, "SPACE1-1 LIGHTS 1", Constant::eResource::Electricity, - SOVEndUseCat::InteriorLights, + Group::Building, + EndUseCat::InteriorLights, "GeneralLights", - SOVGroup::Building, "SPACE1-1", 1, 1); @@ -4060,13 +3800,13 @@ namespace OutputProcessor { "Lights Electricity Energy", Constant::Units::J, light_consumption, - SOVTimeStepType::Zone, - SOVStoreType::Summed, + TimeStepType::Zone, + StoreType::Sum, "SPACE2-1 LIGHTS 1", Constant::eResource::Electricity, - SOVEndUseCat::InteriorLights, + Group::Building, + EndUseCat::InteriorLights, "GeneralLights", - SOVGroup::Building, "SPACE2-1", 1, 1); @@ -4074,13 +3814,13 @@ namespace OutputProcessor { "Lights Electricity Energy", Constant::Units::J, light_consumption, - SOVTimeStepType::Zone, - SOVStoreType::Summed, + TimeStepType::Zone, + StoreType::Sum, "SPACE3-1 LIGHTS 1", Constant::eResource::Electricity, - SOVEndUseCat::InteriorLights, + Group::Building, + EndUseCat::InteriorLights, "GeneralLights", - SOVGroup::Building, "SPACE3-1", 1, 1); @@ -4088,13 +3828,13 @@ namespace OutputProcessor { "Lights Electricity Energy", Constant::Units::J, light_consumption, - SOVTimeStepType::Zone, - SOVStoreType::Summed, + TimeStepType::Zone, + StoreType::Sum, "SPACE4-1 LIGHTS 1", Constant::eResource::Electricity, - SOVEndUseCat::InteriorLights, + Group::Building, + EndUseCat::InteriorLights, "GeneralLights", - SOVGroup::Building, "SPACE4-1", 1, 1); @@ -4102,13 +3842,13 @@ namespace OutputProcessor { "Lights Electricity Energy", Constant::Units::J, light_consumption, - SOVTimeStepType::Zone, - SOVStoreType::Summed, + TimeStepType::Zone, + StoreType::Sum, "SPACE5-1 LIGHTS 1", Constant::eResource::Electricity, - SOVEndUseCat::InteriorLights, + Group::Building, + EndUseCat::InteriorLights, "GeneralLights", - SOVGroup::Building, "SPACE5-1", 1, 1); @@ -4117,36 +3857,36 @@ namespace OutputProcessor { "Zone Infiltration Total Heat Loss Energy", Constant::Units::J, zone_infil_total_loss, - SOVTimeStepType::System, - SOVStoreType::Summed, + TimeStepType::System, + StoreType::Sum, "SPACE1-1"); SetupOutputVariable(*state, "Zone Infiltration Total Heat Loss Energy", Constant::Units::J, zone_infil_total_loss, - SOVTimeStepType::System, - SOVStoreType::Summed, + TimeStepType::System, + StoreType::Sum, "SPACE2-1"); SetupOutputVariable(*state, "Zone Infiltration Total Heat Loss Energy", Constant::Units::J, zone_infil_total_loss, - SOVTimeStepType::System, - SOVStoreType::Summed, + TimeStepType::System, + StoreType::Sum, "SPACE3-1"); SetupOutputVariable(*state, "Zone Infiltration Total Heat Loss Energy", Constant::Units::J, zone_infil_total_loss, - SOVTimeStepType::System, - SOVStoreType::Summed, + TimeStepType::System, + StoreType::Sum, "SPACE4-1"); SetupOutputVariable(*state, "Zone Infiltration Total Heat Loss Energy", Constant::Units::J, zone_infil_total_loss, - SOVTimeStepType::System, - SOVStoreType::Summed, + TimeStepType::System, + StoreType::Sum, "SPACE5-1"); UpdateMeterReporting(*state); @@ -4316,8 +4056,8 @@ namespace OutputProcessor { auto timeStep = 1.0 / 6; - SetupTimePointers(*state, SOVTimeStepType::Zone, timeStep); - SetupTimePointers(*state, SOVTimeStepType::HVAC, timeStep); + SetupTimePointers(*state, TimeStepType::Zone, timeStep); + SetupTimePointers(*state, TimeStepType::System, timeStep); op->TimeValue[(int)TimeStepType::Zone].CurMinute = 50; op->TimeValue[(int)TimeStepType::System].CurMinute = 50; @@ -4327,21 +4067,21 @@ namespace OutputProcessor { "Site Outdoor Air Drybulb Temperature", Constant::Units::C, state->dataEnvrn->OutDryBulbTemp, - SOVTimeStepType::Zone, - SOVStoreType::Average, + TimeStepType::Zone, + StoreType::Average, "Environment"); Real64 light_consumption = 999; SetupOutputVariable(*state, "Lights Electricity Energy", Constant::Units::J, light_consumption, - SOVTimeStepType::Zone, - SOVStoreType::Summed, + TimeStepType::Zone, + StoreType::Sum, "SPACE1-1 LIGHTS 1", Constant::eResource::Electricity, - SOVEndUseCat::InteriorLights, + Group::Building, + EndUseCat::InteriorLights, "GeneralLights", - SOVGroup::Building, "SPACE1-1", 1, 1); @@ -4349,13 +4089,13 @@ namespace OutputProcessor { "Lights Electricity Energy", Constant::Units::J, light_consumption, - SOVTimeStepType::Zone, - SOVStoreType::Summed, + TimeStepType::Zone, + StoreType::Sum, "SPACE2-1 LIGHTS 1", Constant::eResource::Electricity, - SOVEndUseCat::InteriorLights, + Group::Building, + EndUseCat::InteriorLights, "GeneralLights", - SOVGroup::Building, "SPACE2-1", 1, 1); @@ -4363,13 +4103,13 @@ namespace OutputProcessor { "Lights Electricity Energy", Constant::Units::J, light_consumption, - SOVTimeStepType::Zone, - SOVStoreType::Summed, + TimeStepType::Zone, + StoreType::Sum, "SPACE3-1 LIGHTS 1", Constant::eResource::Electricity, - SOVEndUseCat::InteriorLights, + Group::Building, + EndUseCat::InteriorLights, "GeneralLights", - SOVGroup::Building, "SPACE3-1", 1, 1); @@ -4377,13 +4117,13 @@ namespace OutputProcessor { "Lights Electricity Energy", Constant::Units::J, light_consumption, - SOVTimeStepType::Zone, - SOVStoreType::Summed, + TimeStepType::Zone, + StoreType::Sum, "SPACE4-1 LIGHTS 1", Constant::eResource::Electricity, - SOVEndUseCat::InteriorLights, + Group::Building, + EndUseCat::InteriorLights, "GeneralLights", - SOVGroup::Building, "SPACE4-1", 1, 1); @@ -4391,13 +4131,13 @@ namespace OutputProcessor { "Lights Electricity Energy", Constant::Units::J, light_consumption, - SOVTimeStepType::Zone, - SOVStoreType::Summed, + TimeStepType::Zone, + StoreType::Sum, "SPACE5-1 LIGHTS 1", Constant::eResource::Electricity, - SOVEndUseCat::InteriorLights, + Group::Building, + EndUseCat::InteriorLights, "GeneralLights", - SOVGroup::Building, "SPACE5-1", 1, 1); @@ -4406,43 +4146,41 @@ namespace OutputProcessor { "Zone Infiltration Total Heat Loss Energy", Constant::Units::J, zone_infil_total_loss, - SOVTimeStepType::System, - SOVStoreType::Summed, + TimeStepType::System, + StoreType::Sum, "SPACE1-1"); SetupOutputVariable(*state, "Zone Infiltration Total Heat Loss Energy", Constant::Units::J, zone_infil_total_loss, - SOVTimeStepType::System, - SOVStoreType::Summed, + TimeStepType::System, + StoreType::Sum, "SPACE2-1"); SetupOutputVariable(*state, "Zone Infiltration Total Heat Loss Energy", Constant::Units::J, zone_infil_total_loss, - SOVTimeStepType::System, - SOVStoreType::Summed, + TimeStepType::System, + StoreType::Sum, "SPACE3-1"); SetupOutputVariable(*state, "Zone Infiltration Total Heat Loss Energy", Constant::Units::J, zone_infil_total_loss, - SOVTimeStepType::System, - SOVStoreType::Summed, + TimeStepType::System, + StoreType::Sum, "SPACE4-1"); SetupOutputVariable(*state, "Zone Infiltration Total Heat Loss Energy", Constant::Units::J, zone_infil_total_loss, - SOVTimeStepType::System, - SOVStoreType::Summed, + TimeStepType::System, + StoreType::Sum, "SPACE5-1"); Real64 fuel_used = 999; Real64 boiler_load = 999; - SetupOutputVariable( - *state, "Boiler Heating Rate", Constant::Units::W, boiler_load, SOVTimeStepType::System, SOVStoreType::Average, "Boiler1"); - SetupOutputVariable( - *state, "Boiler NaturalGas Rate", Constant::Units::W, fuel_used, SOVTimeStepType::System, SOVStoreType::Average, "Boiler1"); + SetupOutputVariable(*state, "Boiler Heating Rate", Constant::Units::W, boiler_load, TimeStepType::System, StoreType::Average, "Boiler1"); + SetupOutputVariable(*state, "Boiler NaturalGas Rate", Constant::Units::W, fuel_used, TimeStepType::System, StoreType::Average, "Boiler1"); UpdateMeterReporting(*state); @@ -4619,8 +4357,8 @@ namespace OutputProcessor { Real64 timeStep = 1.0 / 6; - SetupTimePointers(*state, SOVTimeStepType::Zone, timeStep); - SetupTimePointers(*state, SOVTimeStepType::HVAC, timeStep); + SetupTimePointers(*state, TimeStepType::Zone, timeStep); + SetupTimePointers(*state, TimeStepType::System, timeStep); op->TimeValue[(int)TimeStepType::Zone].CurMinute = 50; op->TimeValue[(int)TimeStepType::System].CurMinute = 50; @@ -4630,21 +4368,21 @@ namespace OutputProcessor { "Site Outdoor Air Drybulb Temperature", Constant::Units::C, state->dataEnvrn->OutDryBulbTemp, - SOVTimeStepType::Zone, - SOVStoreType::Average, + TimeStepType::Zone, + StoreType::Average, "Environment"); Real64 light_consumption = 999; SetupOutputVariable(*state, "Lights Electricity Energy", Constant::Units::J, light_consumption, - SOVTimeStepType::Zone, - SOVStoreType::Summed, + TimeStepType::Zone, + StoreType::Sum, "SPACE1-1 LIGHTS 1", Constant::eResource::Electricity, - SOVEndUseCat::InteriorLights, + Group::Building, + EndUseCat::InteriorLights, "GeneralLights", - SOVGroup::Building, "SPACE1-1", 1, 1); @@ -4652,13 +4390,13 @@ namespace OutputProcessor { "Lights Electricity Energy", Constant::Units::J, light_consumption, - SOVTimeStepType::Zone, - SOVStoreType::Summed, + TimeStepType::Zone, + StoreType::Sum, "SPACE2-1 LIGHTS 1", Constant::eResource::Electricity, - SOVEndUseCat::InteriorLights, + Group::Building, + EndUseCat::InteriorLights, "GeneralLights", - SOVGroup::Building, "SPACE2-1", 1, 1); @@ -4666,13 +4404,13 @@ namespace OutputProcessor { "Lights Electricity Energy", Constant::Units::J, light_consumption, - SOVTimeStepType::Zone, - SOVStoreType::Summed, + TimeStepType::Zone, + StoreType::Sum, "SPACE3-1 LIGHTS 1", Constant::eResource::Electricity, - SOVEndUseCat::InteriorLights, + Group::Building, + EndUseCat::InteriorLights, "GeneralLights", - SOVGroup::Building, "SPACE3-1", 1, 1); @@ -4680,13 +4418,13 @@ namespace OutputProcessor { "Lights Electricity Energy", Constant::Units::J, light_consumption, - SOVTimeStepType::Zone, - SOVStoreType::Summed, + TimeStepType::Zone, + StoreType::Sum, "SPACE4-1 LIGHTS 1", Constant::eResource::Electricity, - SOVEndUseCat::InteriorLights, + Group::Building, + EndUseCat::InteriorLights, "GeneralLights", - SOVGroup::Building, "SPACE4-1", 1, 1); @@ -4694,13 +4432,13 @@ namespace OutputProcessor { "Lights Electricity Energy", Constant::Units::J, light_consumption, - SOVTimeStepType::Zone, - SOVStoreType::Summed, + TimeStepType::Zone, + StoreType::Sum, "SPACE5-1 LIGHTS 1", Constant::eResource::Electricity, - SOVEndUseCat::InteriorLights, + Group::Building, + EndUseCat::InteriorLights, "GeneralLights", - SOVGroup::Building, "SPACE5-1", 1, 1); @@ -4709,43 +4447,41 @@ namespace OutputProcessor { "Zone Infiltration Total Heat Loss Energy", Constant::Units::J, zone_infil_total_loss, - SOVTimeStepType::System, - SOVStoreType::Summed, + TimeStepType::System, + StoreType::Sum, "SPACE1-1"); SetupOutputVariable(*state, "Zone Infiltration Total Heat Loss Energy", Constant::Units::J, zone_infil_total_loss, - SOVTimeStepType::System, - SOVStoreType::Summed, + TimeStepType::System, + StoreType::Sum, "SPACE2-1"); SetupOutputVariable(*state, "Zone Infiltration Total Heat Loss Energy", Constant::Units::J, zone_infil_total_loss, - SOVTimeStepType::System, - SOVStoreType::Summed, + TimeStepType::System, + StoreType::Sum, "SPACE3-1"); SetupOutputVariable(*state, "Zone Infiltration Total Heat Loss Energy", Constant::Units::J, zone_infil_total_loss, - SOVTimeStepType::System, - SOVStoreType::Summed, + TimeStepType::System, + StoreType::Sum, "SPACE4-1"); SetupOutputVariable(*state, "Zone Infiltration Total Heat Loss Energy", Constant::Units::J, zone_infil_total_loss, - SOVTimeStepType::System, - SOVStoreType::Summed, + TimeStepType::System, + StoreType::Sum, "SPACE5-1"); Real64 fuel_used = 999; Real64 boiler_load = 999; - SetupOutputVariable( - *state, "Boiler Heating Rate", Constant::Units::W, boiler_load, SOVTimeStepType::System, SOVStoreType::Average, "Boiler1"); - SetupOutputVariable( - *state, "Boiler NaturalGas Rate", Constant::Units::W, fuel_used, SOVTimeStepType::System, SOVStoreType::Average, "Boiler1"); + SetupOutputVariable(*state, "Boiler Heating Rate", Constant::Units::W, boiler_load, TimeStepType::System, StoreType::Average, "Boiler1"); + SetupOutputVariable(*state, "Boiler NaturalGas Rate", Constant::Units::W, fuel_used, TimeStepType::System, StoreType::Average, "Boiler1"); UpdateMeterReporting(*state); @@ -4862,8 +4598,8 @@ namespace OutputProcessor { Real64 timeStep = 1.0 / 6; - SetupTimePointers(*state, SOVTimeStepType::Zone, timeStep); - SetupTimePointers(*state, SOVTimeStepType::HVAC, timeStep); + SetupTimePointers(*state, TimeStepType::Zone, timeStep); + SetupTimePointers(*state, TimeStepType::System, timeStep); op->TimeValue[(int)TimeStepType::Zone].CurMinute = 50; op->TimeValue[(int)TimeStepType::System].CurMinute = 50; @@ -4874,13 +4610,13 @@ namespace OutputProcessor { "Lights Electricity Energy", Constant::Units::J, light_consumption, - SOVTimeStepType::Zone, - SOVStoreType::Summed, + TimeStepType::Zone, + StoreType::Sum, "SPACE1-1 LIGHTS 1", Constant::eResource::Electricity, - SOVEndUseCat::InteriorLights, + Group::Building, + EndUseCat::InteriorLights, "GeneralLights", - SOVGroup::Building, "SPACE1-1", 1, 1); @@ -4949,8 +4685,8 @@ namespace OutputProcessor { Real64 timeStep = 1.0 / 6; - SetupTimePointers(*state, SOVTimeStepType::Zone, timeStep); - SetupTimePointers(*state, SOVTimeStepType::HVAC, timeStep); + SetupTimePointers(*state, TimeStepType::Zone, timeStep); + SetupTimePointers(*state, TimeStepType::System, timeStep); op->TimeValue[(int)TimeStepType::Zone].CurMinute = 50; op->TimeValue[(int)TimeStepType::System].CurMinute = 50; @@ -4960,21 +4696,21 @@ namespace OutputProcessor { "Site Outdoor Air Drybulb Temperature", Constant::Units::C, state->dataEnvrn->OutDryBulbTemp, - SOVTimeStepType::Zone, - SOVStoreType::Average, + TimeStepType::Zone, + StoreType::Average, "Environment"); Real64 light_consumption = 999; SetupOutputVariable(*state, "Lights Electricity Energy", Constant::Units::J, light_consumption, - SOVTimeStepType::Zone, - SOVStoreType::Summed, + TimeStepType::Zone, + StoreType::Sum, "SPACE1-1 LIGHTS 1", Constant::eResource::Electricity, - SOVEndUseCat::InteriorLights, + Group::Building, + EndUseCat::InteriorLights, "GeneralLights", - SOVGroup::Building, "SPACE1-1", 1, 1); @@ -5033,8 +4769,8 @@ namespace OutputProcessor { Real64 timeStep = 1.0 / 6; - SetupTimePointers(*state, SOVTimeStepType::Zone, timeStep); - SetupTimePointers(*state, SOVTimeStepType::HVAC, timeStep); + SetupTimePointers(*state, TimeStepType::Zone, timeStep); + SetupTimePointers(*state, TimeStepType::System, timeStep); op->TimeValue[(int)TimeStepType::Zone].CurMinute = 50; op->TimeValue[(int)TimeStepType::System].CurMinute = 50; @@ -5061,21 +4797,21 @@ namespace OutputProcessor { "Site Outdoor Air Drybulb Temperature", Constant::Units::C, state->dataEnvrn->OutDryBulbTemp, - SOVTimeStepType::Zone, - SOVStoreType::Average, + TimeStepType::Zone, + StoreType::Average, "Environment"); Real64 light_consumption = 999; SetupOutputVariable(*state, "Lights Electricity Energy", Constant::Units::J, light_consumption, - SOVTimeStepType::Zone, - SOVStoreType::Summed, + TimeStepType::Zone, + StoreType::Sum, "SPACE1-1 LIGHTS 1", Constant::eResource::Electricity, - SOVEndUseCat::InteriorLights, + Group::Building, + EndUseCat::InteriorLights, "GeneralLights", - SOVGroup::Building, "SPACE1-1", 1, 1); @@ -5087,8 +4823,8 @@ namespace OutputProcessor { "System Node Setpoint Temperature", Constant::Units::C, fakeVar, - SOVTimeStepType::System, - SOVStoreType::Average, + TimeStepType::System, + StoreType::Average, // TODO: is that supposed to look like a regex?! // SetupOutputVariable is the only one that used to call BuildKeyVarList // So it should pass actual NodeID(NodeNum) @@ -5101,8 +4837,8 @@ namespace OutputProcessor { "System Node Temperature", Constant::Units::C, fakeVar, - SOVTimeStepType::System, - SOVStoreType::Average, + TimeStepType::System, + StoreType::Average, // TODO: is that supposed to look like a regex?! "Air Loop 1 InletNode"); // BuildKeyVarList(*state, "Air Loop 1|AirSupply InletNode", "SYSTEM NODE TEMPERATURE", 1, 2); @@ -5255,54 +4991,28 @@ namespace OutputProcessor { "Surface Average Face Conduction Heat Transfer Energy", Constant::Units::J, transferredenergy, - SOVTimeStepType::Zone, - SOVStoreType::Summed, + TimeStepType::Zone, + StoreType::Sum, "*"); SetupOutputVariable( - *state, "Surface Window Heat Loss Energy", Constant::Units::J, transferredenergy, SOVTimeStepType::Zone, SOVStoreType::Summed, "*"); + *state, "Surface Window Heat Loss Energy", Constant::Units::J, transferredenergy, TimeStepType::Zone, StoreType::Sum, "*"); SetupOutputVariable( - *state, "Zone Windows Total Heat Gain Energy", Constant::Units::J, transferredenergy, SOVTimeStepType::Zone, SOVStoreType::Summed, "*"); + *state, "Zone Windows Total Heat Gain Energy", Constant::Units::J, transferredenergy, TimeStepType::Zone, StoreType::Sum, "*"); SetupOutputVariable( - *state, "Surface Window Heat Gain Energy", Constant::Units::J, transferredenergy, SOVTimeStepType::Zone, SOVStoreType::Summed, "*"); - SetupOutputVariable(*state, - "Zone Ventilation Total Heat Gain Energy", - Constant::Units::J, - transferredenergy, - SOVTimeStepType::Zone, - SOVStoreType::Summed, - "*"); - SetupOutputVariable(*state, - "Zone Ventilation Total Heat Loss Energy", - Constant::Units::J, - transferredenergy, - SOVTimeStepType::Zone, - SOVStoreType::Summed, - "*"); - SetupOutputVariable(*state, - "Zone Infiltration Total Heat Gain Energy", - Constant::Units::J, - transferredenergy, - SOVTimeStepType::Zone, - SOVStoreType::Summed, - "*"); - SetupOutputVariable(*state, - "Zone Infiltration Total Heat Loss Energy", - Constant::Units::J, - transferredenergy, - SOVTimeStepType::Zone, - SOVStoreType::Summed, - "*"); - SetupOutputVariable(*state, - "Zone Electric Equipment Total Heating Energy", - Constant::Units::J, - transferredenergy, - SOVTimeStepType::Zone, - SOVStoreType::Summed, - "*"); + *state, "Surface Window Heat Gain Energy", Constant::Units::J, transferredenergy, TimeStepType::Zone, StoreType::Sum, "*"); + SetupOutputVariable( + *state, "Zone Ventilation Total Heat Gain Energy", Constant::Units::J, transferredenergy, TimeStepType::Zone, StoreType::Sum, "*"); + SetupOutputVariable( + *state, "Zone Ventilation Total Heat Loss Energy", Constant::Units::J, transferredenergy, TimeStepType::Zone, StoreType::Sum, "*"); + SetupOutputVariable( + *state, "Zone Infiltration Total Heat Gain Energy", Constant::Units::J, transferredenergy, TimeStepType::Zone, StoreType::Sum, "*"); + SetupOutputVariable( + *state, "Zone Infiltration Total Heat Loss Energy", Constant::Units::J, transferredenergy, TimeStepType::Zone, StoreType::Sum, "*"); SetupOutputVariable( - *state, "Zone Lights Total Heating Energy", Constant::Units::J, transferredenergy, SOVTimeStepType::Zone, SOVStoreType::Summed, "*"); + *state, "Zone Electric Equipment Total Heating Energy", Constant::Units::J, transferredenergy, TimeStepType::Zone, StoreType::Sum, "*"); SetupOutputVariable( - *state, "People Total Heating Energy", Constant::Units::J, transferredenergy, SOVTimeStepType::Zone, SOVStoreType::Summed, "*"); + *state, "Zone Lights Total Heating Energy", Constant::Units::J, transferredenergy, TimeStepType::Zone, StoreType::Sum, "*"); + SetupOutputVariable(*state, "People Total Heating Energy", Constant::Units::J, transferredenergy, TimeStepType::Zone, StoreType::Sum, "*"); SystemReports::AllocateAndSetUpVentReports(*state); GetCustomMeterInput(*state, errors_found); EXPECT_FALSE(errors_found); @@ -5372,29 +5082,29 @@ namespace OutputProcessor { TEST_F(EnergyPlusFixture, OutputProcessor_unitStringFromDDitem) { - AddDDOutVar(*state, "energy variable 1", TimeStepType::Zone, StoreType::Averaged, VariableType::Integer, Constant::Units::J); - AddDDOutVar(*state, "energy variable 2", TimeStepType::Zone, StoreType::Averaged, VariableType::Integer, Constant::Units::J); - AddDDOutVar(*state, "energy variable 3", TimeStepType::Zone, StoreType::Averaged, VariableType::Integer, Constant::Units::J); + AddDDOutVar(*state, "energy variable 1", TimeStepType::Zone, StoreType::Average, VariableType::Integer, Constant::Units::J); + AddDDOutVar(*state, "energy variable 2", TimeStepType::Zone, StoreType::Average, VariableType::Integer, Constant::Units::J); + AddDDOutVar(*state, "energy variable 3", TimeStepType::Zone, StoreType::Average, VariableType::Integer, Constant::Units::J); AddDDOutVar( - *state, "humidity ratio variable 1", TimeStepType::Zone, StoreType::Averaged, VariableType::Integer, Constant::Units::kgWater_kgDryAir); + *state, "humidity ratio variable 1", TimeStepType::Zone, StoreType::Average, VariableType::Integer, Constant::Units::kgWater_kgDryAir); AddDDOutVar( - *state, "humidity ratio variable 2", TimeStepType::Zone, StoreType::Averaged, VariableType::Integer, Constant::Units::kgWater_kgDryAir); + *state, "humidity ratio variable 2", TimeStepType::Zone, StoreType::Average, VariableType::Integer, Constant::Units::kgWater_kgDryAir); - AddDDOutVar(*state, "flow variable 1", TimeStepType::Zone, StoreType::Averaged, VariableType::Integer, Constant::Units::kgWater_s); - AddDDOutVar(*state, "flow variable 2", TimeStepType::Zone, StoreType::Averaged, VariableType::Integer, Constant::Units::kgWater_s); + AddDDOutVar(*state, "flow variable 1", TimeStepType::Zone, StoreType::Average, VariableType::Integer, Constant::Units::kgWater_s); + AddDDOutVar(*state, "flow variable 2", TimeStepType::Zone, StoreType::Average, VariableType::Integer, Constant::Units::kgWater_s); AddDDOutVar(*state, "user defined EMS variable 1", TimeStepType::Zone, - StoreType::Averaged, + StoreType::Average, VariableType::Integer, Constant::Units::customEMS, "ergs/century"); AddDDOutVar(*state, "user defined EMS variable 2", TimeStepType::Zone, - StoreType::Averaged, + StoreType::Average, VariableType::Integer, Constant::Units::customEMS, "swamps/county"); @@ -5500,9 +5210,9 @@ namespace OutputProcessor { TEST_F(SQLiteFixture, OutputProcessor_SetupOutputVariable_enum) { auto &op = state->dataOutputProcessor; - // Test SOV calls for PR 10231 for extended tests on Calling SOV using new enum parameter drivers, upon different varieties such as: - // 1). SOV calls for average, summed variables (regular and meters etc.) - // 2). SOV handling on Output:variable processed results + // Test calls for PR 10231 for extended tests on Calling using new enum parameter drivers, upon different varieties such as: + // 1). calls for average, summed variables (regular and meters etc.) + // 2). handling on Output:variable processed results // 3). Wild cards // 4). Report frequencies; // 5). Emissions categories; @@ -5523,8 +5233,8 @@ namespace OutputProcessor { "Site Outdoor Air Drybulb Temperature", Constant::Units::C, state->dataEnvrn->OutDryBulbTemp, - SOVTimeStepType::Zone, - SOVStoreType::Average, + TimeStepType::Zone, + StoreType::Average, "Environment"); Real64 cooling_consumption = 0.; @@ -5532,26 +5242,25 @@ namespace OutputProcessor { "Chiller Electricity Energy", Constant::Units::J, cooling_consumption, - SOVTimeStepType::System, - SOVStoreType::Summed, + TimeStepType::System, + StoreType::Sum, "Cool-1", Constant::eResource::Electricity, - SOVEndUseCat::Cooling, - {}, // EndUseSubKey - SOVGroup::Plant); + Group::Plant, + EndUseCat::Cooling); Real64 light_consumption = 0.; SetupOutputVariable(*state, "Lights Electricity Energy", Constant::Units::J, light_consumption, - SOVTimeStepType::Zone, - SOVStoreType::Summed, + TimeStepType::Zone, + StoreType::Sum, "LIGHTS 1", Constant::eResource::Electricity, - SOVEndUseCat::InteriorLights, + Group::Building, + EndUseCat::InteriorLights, "RailroadCrossing", // EndUseSubKey - SOVGroup::Building, "SPACE1-1", 1, 1); @@ -5561,13 +5270,12 @@ namespace OutputProcessor { "Environmental Impact Fuel Oil No 2 CO2 Emissions Mass", Constant::Units::kg, fuel_oil_co2, - SOVTimeStepType::System, - SOVStoreType::Summed, + TimeStepType::System, + StoreType::Sum, "Site", Constant::eResource::CO2, - SOVEndUseCat::FuelOilNo2Emissions, - {}, // EndUseSubKey - SOVGroup::Invalid); + Group::Invalid, + EndUseCat::FuelOilNo2Emissions); auto reportDataDictionaryResults = queryResult("SELECT * FROM ReportDataDictionary;", "ReportDataDictionary"); @@ -5581,7 +5289,7 @@ namespace OutputProcessor { EXPECT_EQ(true, op->reqVars[0]->Used); EXPECT_EQ((int)TimeStepType::Zone, (int)op->ddOutVars[0]->timeStepType); - EXPECT_EQ((int)StoreType::Averaged, (int)op->ddOutVars[0]->storeType); + EXPECT_EQ((int)StoreType::Average, (int)op->ddOutVars[0]->storeType); EXPECT_EQ((int)VariableType::Real, (int)op->ddOutVars[0]->variableType); EXPECT_EQ(-1, op->ddOutVars[0]->Next); EXPECT_FALSE(op->ddOutVars[0]->ReportedOnDDFile); @@ -5594,13 +5302,13 @@ namespace OutputProcessor { int found = GetMeterIndex(*state, "COOLING:ELECTRICITY"); EXPECT_NE(-1, found); EXPECT_EQ((int)Constant::eResource::Electricity, (int)op->meters[found]->resource); - EXPECT_EQ((int)SOVEndUseCat::Cooling, (int)op->meters[found]->sovEndUseCat); + EXPECT_EQ((int)EndUseCat::Cooling, (int)op->meters[found]->endUseCat); EXPECT_EQ("", op->meters[found]->EndUseSub); found = GetMeterIndex(*state, "GENERAL:COOLING:ELECTRICITY"); EXPECT_NE(-1, found); EXPECT_EQ((int)Constant::eResource::Electricity, (int)op->meters[found]->resource); - EXPECT_EQ((int)SOVEndUseCat::Cooling, (int)op->meters[found]->sovEndUseCat); + EXPECT_EQ((int)EndUseCat::Cooling, (int)op->meters[found]->endUseCat); EXPECT_EQ("General", op->meters[found]->EndUseSub); // lighting @@ -5611,7 +5319,7 @@ namespace OutputProcessor { found = GetMeterIndex(*state, "INTERIORLIGHTS:ELECTRICITY"); EXPECT_NE(-1, found); EXPECT_EQ((int)Constant::eResource::Electricity, (int)op->meters[found]->resource); - EXPECT_EQ((int)SOVEndUseCat::InteriorLights, (int)op->meters[found]->sovEndUseCat); + EXPECT_EQ((int)EndUseCat::InteriorLights, (int)op->meters[found]->endUseCat); EXPECT_EQ("", op->meters[found]->EndUseSub); found = GetMeterIndex(*state, "GENERAL:INTERIORLIGHTS:ELECTRICITY"); @@ -5620,7 +5328,7 @@ namespace OutputProcessor { found = GetMeterIndex(*state, "RAILROADCROSSING:INTERIORLIGHTS:ELECTRICITY"); EXPECT_NE(-1, found); EXPECT_EQ((int)Constant::eResource::Electricity, (int)op->meters[found]->resource); - EXPECT_EQ((int)SOVEndUseCat::InteriorLights, (int)op->meters[found]->sovEndUseCat); + EXPECT_EQ((int)EndUseCat::InteriorLights, (int)op->meters[found]->endUseCat); EXPECT_EQ("RailroadCrossing", op->meters[found]->EndUseSub); // fuel oil CO2 emissions @@ -5628,7 +5336,7 @@ namespace OutputProcessor { found = GetMeterIndex(*state, "FUELOILNO2EMISSIONS:CO2"); EXPECT_NE(-1, found); EXPECT_EQ((int)Constant::eResource::CO2, (int)op->meters[found]->resource); - EXPECT_EQ((int)SOVEndUseCat::FuelOilNo2Emissions, (int)op->meters[found]->sovEndUseCat); + EXPECT_EQ((int)EndUseCat::FuelOilNo2Emissions, (int)op->meters[found]->endUseCat); EXPECT_EQ("", op->meters[found]->EndUseSub); std::vector> reportDataDictionary( diff --git a/tst/EnergyPlus/unit/OutputReportData.unit.cc b/tst/EnergyPlus/unit/OutputReportData.unit.cc index 6b6819cb57d..9fafc7880cc 100644 --- a/tst/EnergyPlus/unit/OutputReportData.unit.cc +++ b/tst/EnergyPlus/unit/OutputReportData.unit.cc @@ -89,52 +89,55 @@ TEST_F(EnergyPlusFixture, OutputReportData_getVariableKeys) "Exterior Lights Electric Energy", Constant::Units::J, extLitUse, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Lite1", Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::ExteriorLights, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::ExteriorLights, "General"); SetupOutputVariable(*state, "Exterior Lights Electric Energy", Constant::Units::J, extLitUse, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Lite2", Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::ExteriorLights, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::ExteriorLights, "General"); SetupOutputVariable(*state, "Exterior Lights Electric Energy", Constant::Units::J, extLitUse, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Lite3", Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::ExteriorLights, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::ExteriorLights, "General"); SetupOutputVariable(*state, "Exterior Lights Electric Power", Constant::Units::W, extLitPow, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Lite1"); SetupOutputVariable(*state, "Exterior Lights Electric Power", Constant::Units::W, extLitPow, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Lite2"); SetupOutputVariable(*state, "Exterior Lights Electric Power", Constant::Units::W, extLitPow, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Lite3"); int keyCount = 0; diff --git a/tst/EnergyPlus/unit/OutputReportTabular.unit.cc b/tst/EnergyPlus/unit/OutputReportTabular.unit.cc index 8b2cce531cb..fab247bc02f 100644 --- a/tst/EnergyPlus/unit/OutputReportTabular.unit.cc +++ b/tst/EnergyPlus/unit/OutputReportTabular.unit.cc @@ -3540,31 +3540,34 @@ TEST_F(EnergyPlusFixture, OutputReportTabularMonthly_ResetMonthlyGathering) "Exterior Lights Electricity Energy", Constant::Units::J, extLitUse, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Lite1", Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::ExteriorLights, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::ExteriorLights, "General"); SetupOutputVariable(*state, "Exterior Lights Electricity Energy", Constant::Units::J, extLitUse, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Lite2", Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::ExteriorLights, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::ExteriorLights, "General"); SetupOutputVariable(*state, "Exterior Lights Electricity Energy", Constant::Units::J, extLitUse, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Lite3", Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::ExteriorLights, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::ExteriorLights, "General"); state->dataGlobal->DoWeathSim = true; @@ -3605,31 +3608,34 @@ TEST_F(EnergyPlusFixture, OutputReportTabular_ConfirmResetBEPSGathering) "Exterior Lights Electricity Energy", Constant::Units::J, extLitUse, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Lite1", Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::ExteriorLights, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::ExteriorLights, "General"); SetupOutputVariable(*state, "Exterior Lights Electricity Energy", Constant::Units::J, extLitUse, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Lite2", Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::ExteriorLights, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::ExteriorLights, "General"); SetupOutputVariable(*state, "Exterior Lights Electricity Energy", Constant::Units::J, extLitUse, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Lite3", Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::ExteriorLights, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::ExteriorLights, "General"); state->dataGlobal->DoWeathSim = true; @@ -3641,8 +3647,8 @@ TEST_F(EnergyPlusFixture, OutputReportTabular_ConfirmResetBEPSGathering) auto timeStep = 1.0; - SetupTimePointers(*state, OutputProcessor::SOVTimeStepType::Zone, timeStep); - SetupTimePointers(*state, OutputProcessor::SOVTimeStepType::HVAC, timeStep); + SetupTimePointers(*state, OutputProcessor::TimeStepType::Zone, timeStep); + SetupTimePointers(*state, OutputProcessor::TimeStepType::System, timeStep); *state->dataOutputProcessor->TimeValue[(int)OutputProcessor::TimeStepType::Zone].TimeStep = 60; *state->dataOutputProcessor->TimeValue[(int)OutputProcessor::TimeStepType::System].TimeStep = 60; @@ -6582,31 +6588,34 @@ TEST_F(EnergyPlusFixture, OutputReportTabularMonthly_invalidAggregationOrder) "Exterior Lights Electricity Energy", Constant::Units::J, extLitUse, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Lite1", Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::ExteriorLights, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::ExteriorLights, "General"); SetupOutputVariable(*state, "Exterior Lights Electricity Energy", Constant::Units::J, extLitUse, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Lite2", Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::ExteriorLights, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::ExteriorLights, "General"); SetupOutputVariable(*state, "Exterior Lights Electricity Energy", Constant::Units::J, extLitUse, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Lite3", Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::ExteriorLights, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::ExteriorLights, "General"); state->dataGlobal->DoWeathSim = true; @@ -7428,37 +7437,37 @@ TEST_F(EnergyPlusFixture, OutputReportTabularMonthlyPredefined_FindNeededOutputV "Zone Mean Air Temperature", Constant::Units::C, zoneTemp, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, ZoneNames[i]); SetupOutputVariable(*state, "Zone Heating Setpoint Not Met Time", Constant::Units::hr, timeNotMet, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, ZoneNames[i]); SetupOutputVariable(*state, "Zone Heating Setpoint Not Met While Occupied Time", Constant::Units::hr, timeNotMet, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, ZoneNames[i]); SetupOutputVariable(*state, "Zone Cooling Setpoint Not Met Time", Constant::Units::hr, timeNotMet, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, ZoneNames[i]); SetupOutputVariable(*state, "Zone Cooling Setpoint Not Met While Occupied Time", Constant::Units::hr, timeNotMet, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, ZoneNames[i]); } @@ -8065,61 +8074,67 @@ TEST_F(SQLiteFixture, OutputReportTabular_EndUseBySubcategorySQL) "Exterior Lights Electricity Energy", Constant::Units::J, extLitUse, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Lite1", Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::ExteriorLights, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::ExteriorLights, "General"); SetupOutputVariable(*state, "Exterior Lights Electricity Energy", Constant::Units::J, extLitUse, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Lite2", Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::ExteriorLights, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::ExteriorLights, "AnotherEndUseSubCat"); SetupOutputVariable(*state, "Exterior Lights Electricity Energy", Constant::Units::J, extLitUse, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Lite3", Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::ExteriorLights, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::ExteriorLights, "General"); SetupOutputVariable(*state, "Heating Coal Energy", Constant::Units::J, CoalHeating, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Lite4", Constant::eResource::Coal, - OutputProcessor::SOVEndUseCat::Heating, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::Heating, "General"); SetupOutputVariable(*state, "Heating Gasoline Energy", Constant::Units::J, GasolineHeating, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Lite5", Constant::eResource::Gasoline, - OutputProcessor::SOVEndUseCat::Heating, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::Heating, "General"); SetupOutputVariable(*state, "Heating Propane Energy", Constant::Units::J, PropaneHeating, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Lite6", Constant::eResource::Propane, - OutputProcessor::SOVEndUseCat::Heating, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::Heating, "General"); state->dataGlobal->DoWeathSim = true; state->dataGlobal->TimeStepZone = 1.0; @@ -8130,8 +8145,8 @@ TEST_F(SQLiteFixture, OutputReportTabular_EndUseBySubcategorySQL) auto timeStep = 1.0; - SetupTimePointers(*state, OutputProcessor::SOVTimeStepType::Zone, timeStep); - SetupTimePointers(*state, OutputProcessor::SOVTimeStepType::HVAC, timeStep); + SetupTimePointers(*state, OutputProcessor::TimeStepType::Zone, timeStep); + SetupTimePointers(*state, OutputProcessor::TimeStepType::System, timeStep); *state->dataOutputProcessor->TimeValue[(int)OutputProcessor::TimeStepType::Zone].TimeStep = 60; *state->dataOutputProcessor->TimeValue[(int)OutputProcessor::TimeStepType::System].TimeStep = 60; @@ -8617,21 +8632,23 @@ TEST_F(EnergyPlusFixture, OutputReportTabularMonthly_8317_ValidateOutputTableMon "Exterior Lights Electricity Energy", Constant::Units::J, extLitUse, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Lite1", Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::ExteriorLights, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::ExteriorLights, "General"); SetupOutputVariable(*state, "Exterior Lights Electricity Rate", Constant::Units::W, extLitUse, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Lite2", Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::ExteriorLights, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::ExteriorLights, "General"); state->dataGlobal->DoWeathSim = true; @@ -8648,13 +8665,13 @@ TEST_F(EnergyPlusFixture, OutputReportTabularMonthly_8317_ValidateOutputTableMon // AttachMeters(*state, Constant::Units::J, resource, sovEndUseCat, endUseSub, sovGroup, zoneName, spaceType, -1); Meter *meter1 = new Meter("NATURALGAS:FACILITY"); meter1->resource = Constant::eResource::NaturalGas; - meter1->sovEndUseCat = OutputProcessor::SOVEndUseCat::Invalid; + meter1->endUseCat = OutputProcessor::EndUseCat::Invalid; state->dataOutputProcessor->meters.push_back(meter1); state->dataOutputProcessor->meterMap.insert_or_assign("NATURALGAS:FACILITY", state->dataOutputProcessor->meters.size() - 1); Meter *meter2 = new Meter("HEATING:NATURALGAS"); meter2->resource = Constant::eResource::NaturalGas; - meter2->sovEndUseCat = OutputProcessor::SOVEndUseCat::Heating; + meter2->endUseCat = OutputProcessor::EndUseCat::Heating; state->dataOutputProcessor->meters.push_back(meter2); state->dataOutputProcessor->meterMap.insert_or_assign("HEATING:NATURALGAS", state->dataOutputProcessor->meters.size() - 1); @@ -9590,61 +9607,67 @@ TEST_F(SQLiteFixture, ORT_EndUseBySubcategorySQL_DualUnits) "Exterior Lights Electricity Energy", Constant::Units::J, extLitUse, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Lite1", Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::ExteriorLights, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::ExteriorLights, "General"); SetupOutputVariable(*state, "Exterior Lights Electricity Energy", Constant::Units::J, extLitUse, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Lite2", Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::ExteriorLights, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::ExteriorLights, "AnotherEndUseSubCat"); SetupOutputVariable(*state, "Exterior Lights Electricity Energy", Constant::Units::J, extLitUse, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Lite3", Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::ExteriorLights, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::ExteriorLights, "General"); SetupOutputVariable(*state, "Heating Coal Energy", Constant::Units::J, CoalHeating, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Lite4", Constant::eResource::Coal, - OutputProcessor::SOVEndUseCat::Heating, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::Heating, "General"); SetupOutputVariable(*state, "Heating Gasoline Energy", Constant::Units::J, GasolineHeating, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Lite5", Constant::eResource::Gasoline, - OutputProcessor::SOVEndUseCat::Heating, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::Heating, "General"); SetupOutputVariable(*state, "Heating Propane Energy", Constant::Units::J, PropaneHeating, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Lite6", Constant::eResource::Propane, - OutputProcessor::SOVEndUseCat::Heating, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::Heating, "General"); state->dataGlobal->DoWeathSim = true; state->dataGlobal->TimeStepZone = 1.0; @@ -9655,8 +9678,8 @@ TEST_F(SQLiteFixture, ORT_EndUseBySubcategorySQL_DualUnits) auto timeStep = 1.0; - SetupTimePointers(*state, OutputProcessor::SOVTimeStepType::Zone, timeStep); - SetupTimePointers(*state, OutputProcessor::SOVTimeStepType::HVAC, timeStep); + SetupTimePointers(*state, OutputProcessor::TimeStepType::Zone, timeStep); + SetupTimePointers(*state, OutputProcessor::TimeStepType::System, timeStep); *state->dataOutputProcessor->TimeValue[(int)OutputProcessor::TimeStepType::Zone].TimeStep = 60; *state->dataOutputProcessor->TimeValue[(int)OutputProcessor::TimeStepType::System].TimeStep = 60; @@ -12638,11 +12661,12 @@ TEST_F(EnergyPlusFixture, OutputReportTabularMonthly_WarnMonthly) "Exterior Lights Electricity Energy", Constant::Units::J, extLitUse, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Lite1", Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::ExteriorLights, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::ExteriorLights, "General"); state->dataGlobal->DoWeathSim = true; @@ -12702,11 +12726,12 @@ TEST_F(EnergyPlusFixture, OutputReportTabularMonthly_WarnMonthly_AlwaysIfWeather "Exterior Lights Electricity Energy", Constant::Units::J, extLitUse, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Lite1", Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::ExteriorLights, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::ExteriorLights, "General"); // In a regular simulation with the above SimulationControl, when InitializeTabularMonthly is called it's DesignDay @@ -12753,22 +12778,24 @@ TEST_F(EnergyPlusFixture, OutputReportTabularMonthly_WarnMonthlyDisplayExtraWarn "Exterior Lights Electricity Energy", Constant::Units::J, extLitUse, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Lite1", Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::ExteriorLights, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::ExteriorLights, "General"); SetupOutputVariable(*state, "Exterior Lights Electricity Energy", Constant::Units::J, extLitUse, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Lite2", Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::ExteriorLights, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::ExteriorLights, "General"); state->dataGlobal->DoWeathSim = true; @@ -12815,22 +12842,24 @@ TEST_F(EnergyPlusFixture, OutputReportTabularMonthly_WarnMonthlyBlankVariable) "Exterior Lights Electricity Energy", Constant::Units::J, extLitUse, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Lite1", Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::ExteriorLights, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::ExteriorLights, "General"); SetupOutputVariable(*state, "Exterior Lights Electricity Energy", Constant::Units::J, extLitUse, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Lite2", Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::ExteriorLights, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::ExteriorLights, "General"); state->dataGlobal->DoWeathSim = true; @@ -12875,22 +12904,24 @@ TEST_F(EnergyPlusFixture, OutputReportTabularMonthly_NoWarnMonthlIfNoWeatherFile "Exterior Lights Electricity Energy", Constant::Units::J, extLitUse, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Lite1", Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::ExteriorLights, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::ExteriorLights, "General"); SetupOutputVariable(*state, "Exterior Lights Electricity Energy", Constant::Units::J, extLitUse, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Lite2", Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::ExteriorLights, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::ExteriorLights, "General"); state->dataGlobal->DoWeathSim = false; // <- here @@ -12929,11 +12960,12 @@ TEST_F(EnergyPlusFixture, OutputReportTabularMonthly_DontWarnMonthlyIfOnlyNamedR "Exterior Lights Electricity Energy", Constant::Units::J, extLitUse, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Lite1", Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::ExteriorLights, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::ExteriorLights, "General"); state->dataGlobal->DoWeathSim = true; @@ -12977,11 +13009,12 @@ TEST_F(SQLiteFixture, OutputReportTabular_DistrictHeating) "Exterior Equipment DistrictHeatingWater Energy", Constant::Units::J, DistrictHeatingWater, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "DHWaterExtEq", Constant::eResource::DistrictHeatingWater, - OutputProcessor::SOVEndUseCat::ExteriorEquipment, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::ExteriorEquipment, "General"); Real64 DistrictHeatingSteam = 5e8; @@ -12989,11 +13022,12 @@ TEST_F(SQLiteFixture, OutputReportTabular_DistrictHeating) "Exterior Equipment DistrictHeatingSteam Energy", Constant::Units::J, DistrictHeatingSteam, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "DHSteamExtEq", Constant::eResource::DistrictHeatingSteam, - OutputProcessor::SOVEndUseCat::ExteriorEquipment, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::ExteriorEquipment, "General"); state->dataGlobal->DoWeathSim = true; @@ -13005,8 +13039,8 @@ TEST_F(SQLiteFixture, OutputReportTabular_DistrictHeating) auto timeStep = 1.0; - SetupTimePointers(*state, OutputProcessor::SOVTimeStepType::Zone, timeStep); - SetupTimePointers(*state, OutputProcessor::SOVTimeStepType::HVAC, timeStep); + SetupTimePointers(*state, OutputProcessor::TimeStepType::Zone, timeStep); + SetupTimePointers(*state, OutputProcessor::TimeStepType::System, timeStep); *state->dataOutputProcessor->TimeValue[(int)OutputProcessor::TimeStepType::Zone].TimeStep = 60; *state->dataOutputProcessor->TimeValue[(int)OutputProcessor::TimeStepType::System].TimeStep = 60; @@ -13381,61 +13415,67 @@ TEST_F(SQLiteFixture, ORT_EndUseBySubcategorySQL_IPUnitExceptElec) "Exterior Lights Electricity Energy", Constant::Units::J, extLitUse, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Lite1", Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::ExteriorLights, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::ExteriorLights, "General"); SetupOutputVariable(*state, "Exterior Lights Electricity Energy", Constant::Units::J, extLitUse, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Lite2", Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::ExteriorLights, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::ExteriorLights, "AnotherEndUseSubCat"); SetupOutputVariable(*state, "Exterior Lights Electricity Energy", Constant::Units::J, extLitUse, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Lite3", Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::ExteriorLights, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::ExteriorLights, "General"); SetupOutputVariable(*state, "Heating Coal Energy", Constant::Units::J, CoalHeating, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Lite4", Constant::eResource::Coal, - OutputProcessor::SOVEndUseCat::Heating, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::Heating, "General"); SetupOutputVariable(*state, "Heating Gasoline Energy", Constant::Units::J, GasolineHeating, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Lite5", Constant::eResource::Gasoline, - OutputProcessor::SOVEndUseCat::Heating, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::Heating, "General"); SetupOutputVariable(*state, "Heating Propane Energy", Constant::Units::J, PropaneHeating, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Lite6", Constant::eResource::Propane, - OutputProcessor::SOVEndUseCat::Heating, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::Heating, "General"); state->dataGlobal->DoWeathSim = true; state->dataGlobal->TimeStepZone = 1.0; @@ -13446,8 +13486,8 @@ TEST_F(SQLiteFixture, ORT_EndUseBySubcategorySQL_IPUnitExceptElec) auto timeStep = 1.0; - SetupTimePointers(*state, OutputProcessor::SOVTimeStepType::Zone, timeStep); - SetupTimePointers(*state, OutputProcessor::SOVTimeStepType::HVAC, timeStep); + SetupTimePointers(*state, OutputProcessor::TimeStepType::Zone, timeStep); + SetupTimePointers(*state, OutputProcessor::TimeStepType::System, timeStep); *state->dataOutputProcessor->TimeValue[(int)OutputProcessor::TimeStepType::Zone].TimeStep = 60; *state->dataOutputProcessor->TimeValue[(int)OutputProcessor::TimeStepType::System].TimeStep = 60; diff --git a/tst/EnergyPlus/unit/OutputReportTabularAnnual.unit.cc b/tst/EnergyPlus/unit/OutputReportTabularAnnual.unit.cc index 11e2ad7b60f..d76f2ddbcf0 100644 --- a/tst/EnergyPlus/unit/OutputReportTabularAnnual.unit.cc +++ b/tst/EnergyPlus/unit/OutputReportTabularAnnual.unit.cc @@ -137,52 +137,55 @@ TEST_F(EnergyPlusFixture, OutputReportTabularAnnual_SetupGathering) "Exterior Lights Electric Energy", Constant::Units::J, extLitUse, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Lite1", Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::ExteriorLights, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::ExteriorLights, "General"); SetupOutputVariable(*state, "Exterior Lights Electric Energy", Constant::Units::J, extLitUse, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Lite2", Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::ExteriorLights, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::ExteriorLights, "General"); SetupOutputVariable(*state, "Exterior Lights Electric Energy", Constant::Units::J, extLitUse, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Lite3", Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::ExteriorLights, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::ExteriorLights, "General"); SetupOutputVariable(*state, "Exterior Lights Electric Power", Constant::Units::W, extLitPow, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Lite1"); SetupOutputVariable(*state, "Exterior Lights Electric Power", Constant::Units::W, extLitPow, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Lite2"); SetupOutputVariable(*state, "Exterior Lights Electric Power", Constant::Units::W, extLitPow, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Lite3"); state->dataGlobal->DoWeathSim = true; @@ -195,10 +198,10 @@ TEST_F(EnergyPlusFixture, OutputReportTabularAnnual_SetupGathering) EXPECT_EQ(fieldSetParams[0], "EXTERIOR LIGHTS ELECTRIC ENERGY"); EXPECT_EQ(fieldSetParams[2], "J"); // m_varUnits - EXPECT_EQ(fieldSetParams[4], "2"); // m_typeOfVar + EXPECT_EQ(fieldSetParams[4], "1"); // m_typeOfVar EXPECT_EQ(fieldSetParams[5], "3"); // m_keyCount - EXPECT_EQ(fieldSetParams[6], "2"); // m_varAvgSum - EXPECT_EQ(fieldSetParams[7], "1"); // m_varStepType + EXPECT_EQ(fieldSetParams[6], "1"); // m_varAvgSum + EXPECT_EQ(fieldSetParams[7], "0"); // m_varStepType } TEST_F(EnergyPlusFixture, OutputReportTabularAnnual_GatherResults) @@ -226,52 +229,55 @@ TEST_F(EnergyPlusFixture, OutputReportTabularAnnual_GatherResults) "Exterior Lights Electric Energy", Constant::Units::J, extLitUse, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Lite1", Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::ExteriorLights, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::ExteriorLights, "General"); SetupOutputVariable(*state, "Exterior Lights Electric Energy", Constant::Units::J, extLitUse, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Lite2", Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::ExteriorLights, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::ExteriorLights, "General"); SetupOutputVariable(*state, "Exterior Lights Electric Energy", Constant::Units::J, extLitUse, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Lite3", Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::ExteriorLights, + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::ExteriorLights, "General"); SetupOutputVariable(*state, "Exterior Lights Electric Power", Constant::Units::W, extLitPow, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Lite1"); SetupOutputVariable(*state, "Exterior Lights Electric Power", Constant::Units::W, extLitPow, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Lite2"); SetupOutputVariable(*state, "Exterior Lights Electric Power", Constant::Units::W, extLitPow, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Average, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Average, "Lite3"); state->dataGlobal->DoWeathSim = true; @@ -377,12 +383,13 @@ TEST_F(EnergyPlusFixture, OutputReportTabularAnnual_columnHeadersToTitleCase) "Misc Facility Electric Energy", Constant::Units::J, facilUse, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Lite1", Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::InteriorLights, // Was "Facility" - "General"); // create an electric meter + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::InteriorLights, // Was "Facility" + "General"); // create an electric meter Meter *meter1 = new Meter("Electricity:Facility"); meter1->units = Constant::Units::None; @@ -405,15 +412,15 @@ TEST_F(EnergyPlusFixture, OutputReportTabularAnnual_columnHeadersToTitleCase) std::vector fieldSetParams = firstTable->inspectTableFieldSets(0); EXPECT_EQ(fieldSetParams[0], "ONPEAKTIME"); // m_colHead - EXPECT_EQ(fieldSetParams[4], "4"); // m_typeOfVar = OutputProcessor::VarType_Schedule + EXPECT_EQ(fieldSetParams[4], "3"); // m_typeOfVar = OutputProcessor::VarType_Schedule fieldSetParams = firstTable->inspectTableFieldSets(1); EXPECT_EQ(fieldSetParams[0], "Electricity:Facility"); // m_colHead - EXPECT_EQ(fieldSetParams[4], "3"); // m_typeOfVar = OutputProcessor::VarType_Meter + EXPECT_EQ(fieldSetParams[4], "2"); // m_typeOfVar = OutputProcessor::VarType_Meter fieldSetParams = firstTable->inspectTableFieldSets(2); EXPECT_EQ(fieldSetParams[0], "Misc Facility Electric Energy"); // m_colHead - EXPECT_EQ(fieldSetParams[4], "2"); // m_typeOfVar = OutputProcessor::VarType_Real + EXPECT_EQ(fieldSetParams[4], "1"); // m_typeOfVar = OutputProcessor::VarType_Real } TEST_F(EnergyPlusFixture, OutputReportTabularAnnual_invalidAggregationOrder) @@ -440,12 +447,13 @@ TEST_F(EnergyPlusFixture, OutputReportTabularAnnual_invalidAggregationOrder) "Misc Facility Electric Energy", Constant::Units::J, facilUse, - OutputProcessor::SOVTimeStepType::Zone, - OutputProcessor::SOVStoreType::Summed, + OutputProcessor::TimeStepType::Zone, + OutputProcessor::StoreType::Sum, "Lite1", Constant::eResource::Electricity, - OutputProcessor::SOVEndUseCat::InteriorLights, // Was "Facility" - "General"); // create an electric meter + OutputProcessor::Group::Invalid, + OutputProcessor::EndUseCat::InteriorLights, // Was "Facility" + "General"); // create an electric meter Meter *meter1 = new Meter("ELECTRICITY:FACILITY"); meter1->units = Constant::Units::None; diff --git a/tst/EnergyPlus/unit/PlantHeatExchangerFluidToFluid.unit.cc b/tst/EnergyPlus/unit/PlantHeatExchangerFluidToFluid.unit.cc index 3e0b066e14c..1ee0b3b5922 100644 --- a/tst/EnergyPlus/unit/PlantHeatExchangerFluidToFluid.unit.cc +++ b/tst/EnergyPlus/unit/PlantHeatExchangerFluidToFluid.unit.cc @@ -1069,8 +1069,8 @@ TEST_F(EnergyPlusFixture, PlantHXModulatedDualDeadDefectFileHi) HeatBalanceManager::SetPreConstructionInputParameters(*state); // establish array bounds for constructions early // OutputProcessor::TimeValue.allocate(2); OutputProcessor::SetupTimePointers( - *state, OutputProcessor::SOVTimeStepType::Zone, state->dataGlobal->TimeStepZone); // Set up Time pointer for HB/Zone Simulation - OutputProcessor::SetupTimePointers(*state, OutputProcessor::SOVTimeStepType::HVAC, state->dataHVACGlobal->TimeStepSys); + *state, OutputProcessor::TimeStepType::Zone, state->dataGlobal->TimeStepZone); // Set up Time pointer for HB/Zone Simulation + OutputProcessor::SetupTimePointers(*state, OutputProcessor::TimeStepType::System, state->dataHVACGlobal->TimeStepSys); PlantManager::CheckIfAnyPlant(*state); createFacilityElectricPowerServiceObject(*state); BranchInputManager::ManageBranchInput(*state); // just gets input and returns. @@ -2161,8 +2161,8 @@ TEST_F(EnergyPlusFixture, PlantHXModulatedDualDeadDefectFileLo) HeatBalanceManager::SetPreConstructionInputParameters(*state); // establish array bounds for constructions early // OutputProcessor::TimeValue.allocate(2); OutputProcessor::SetupTimePointers( - *state, OutputProcessor::SOVTimeStepType::Zone, state->dataGlobal->TimeStepZone); // Set up Time pointer for HB/Zone Simulation - OutputProcessor::SetupTimePointers(*state, OutputProcessor::SOVTimeStepType::HVAC, state->dataHVACGlobal->TimeStepSys); + *state, OutputProcessor::TimeStepType::Zone, state->dataGlobal->TimeStepZone); // Set up Time pointer for HB/Zone Simulation + OutputProcessor::SetupTimePointers(*state, OutputProcessor::TimeStepType::System, state->dataHVACGlobal->TimeStepSys); PlantManager::CheckIfAnyPlant(*state); createFacilityElectricPowerServiceObject(*state); BranchInputManager::ManageBranchInput(*state); // just gets input and returns. diff --git a/tst/EnergyPlus/unit/PlantLoopHeatPumpEIR.unit.cc b/tst/EnergyPlus/unit/PlantLoopHeatPumpEIR.unit.cc index a1cdaf628d2..27ff3abcef8 100644 --- a/tst/EnergyPlus/unit/PlantLoopHeatPumpEIR.unit.cc +++ b/tst/EnergyPlus/unit/PlantLoopHeatPumpEIR.unit.cc @@ -3166,11 +3166,11 @@ TEST_F(EnergyPlusFixture, CoolingMetering) EXPECT_EQ(2, NumFound); EXPECT_TRUE(compare_enums(meteredVars(1).resource, Constant::eResource::EnergyTransfer)); // ENERGYTRANSFER - EXPECT_TRUE(compare_enums(meteredVars(1).sovEndUseCat, OutputProcessor::SOVEndUseCat::Invalid)); - EXPECT_TRUE(compare_enums(meteredVars(1).sovGroup, OutputProcessor::SOVGroup::Plant)); + EXPECT_TRUE(compare_enums(meteredVars(1).endUseCat, OutputProcessor::EndUseCat::Invalid)); + EXPECT_TRUE(compare_enums(meteredVars(1).group, OutputProcessor::Group::Plant)); EXPECT_TRUE(compare_enums(meteredVars(2).resource, Constant::eResource::Electricity)); // Electric - EXPECT_TRUE(compare_enums(meteredVars(2).sovEndUseCat, OutputProcessor::SOVEndUseCat::Cooling)); - EXPECT_TRUE(compare_enums(meteredVars(2).sovGroup, OutputProcessor::SOVGroup::Plant)); + EXPECT_TRUE(compare_enums(meteredVars(2).endUseCat, OutputProcessor::EndUseCat::Cooling)); + EXPECT_TRUE(compare_enums(meteredVars(2).group, OutputProcessor::Group::Plant)); } TEST_F(EnergyPlusFixture, HeatingMetering) @@ -3257,11 +3257,11 @@ TEST_F(EnergyPlusFixture, HeatingMetering) EXPECT_EQ(2, NumFound); EXPECT_TRUE(compare_enums(meteredVars(1).resource, Constant::eResource::EnergyTransfer)); // ENERGYTRANSFER - EXPECT_TRUE(compare_enums(meteredVars(1).sovEndUseCat, OutputProcessor::SOVEndUseCat::Invalid)); - EXPECT_TRUE(compare_enums(meteredVars(1).sovGroup, OutputProcessor::SOVGroup::Plant)); + EXPECT_TRUE(compare_enums(meteredVars(1).endUseCat, OutputProcessor::EndUseCat::Invalid)); + EXPECT_TRUE(compare_enums(meteredVars(1).group, OutputProcessor::Group::Plant)); EXPECT_TRUE(compare_enums(meteredVars(2).resource, Constant::eResource::Electricity)); // Electric - EXPECT_TRUE(compare_enums(meteredVars(2).sovEndUseCat, OutputProcessor::SOVEndUseCat::Heating)); - EXPECT_TRUE(compare_enums(meteredVars(2).sovGroup, OutputProcessor::SOVGroup::Plant)); + EXPECT_TRUE(compare_enums(meteredVars(2).endUseCat, OutputProcessor::EndUseCat::Heating)); + EXPECT_TRUE(compare_enums(meteredVars(2).group, OutputProcessor::Group::Plant)); } TEST_F(EnergyPlusFixture, TestOperatingFlowRates_FullyAutosized_AirSource) diff --git a/tst/EnergyPlus/unit/PoweredInductionUnits.unit.cc b/tst/EnergyPlus/unit/PoweredInductionUnits.unit.cc index 116de366ef5..5168d9e8ef7 100644 --- a/tst/EnergyPlus/unit/PoweredInductionUnits.unit.cc +++ b/tst/EnergyPlus/unit/PoweredInductionUnits.unit.cc @@ -1947,8 +1947,8 @@ TEST_F(EnergyPlusFixture, PIU_InducedAir_Plenums) HeatBalanceManager::SetPreConstructionInputParameters(*state); // establish array bounds for constructions early // OutputProcessor::TimeValue.allocate(2); OutputProcessor::SetupTimePointers( - *state, OutputProcessor::SOVTimeStepType::Zone, state->dataGlobal->TimeStepZone); // Set up Time pointer for HB/Zone Simulation - OutputProcessor::SetupTimePointers(*state, OutputProcessor::SOVTimeStepType::HVAC, state->dataHVACGlobal->TimeStepSys); + *state, OutputProcessor::TimeStepType::Zone, state->dataGlobal->TimeStepZone); // Set up Time pointer for HB/Zone Simulation + OutputProcessor::SetupTimePointers(*state, OutputProcessor::TimeStepType::System, state->dataHVACGlobal->TimeStepSys); PlantManager::CheckIfAnyPlant(*state); EnergyPlus::createFacilityElectricPowerServiceObject(*state); BranchInputManager::ManageBranchInput(*state); // just gets input and returns. diff --git a/tst/EnergyPlus/unit/SQLite.unit.cc b/tst/EnergyPlus/unit/SQLite.unit.cc index 8475f589c10..92229c26516 100644 --- a/tst/EnergyPlus/unit/SQLite.unit.cc +++ b/tst/EnergyPlus/unit/SQLite.unit.cc @@ -239,14 +239,14 @@ TEST_F(SQLiteFixture, SQLiteProcedures_createSQLiteReportDictionaryRecord) auto &sql = state->dataSQLiteProcedures->sqlite; sql->sqliteBegin(); sql->createSQLiteReportDictionaryRecord( - 1, StoreType::Averaged, "Zone", "Environment", "Site Outdoor Air Drybulb Temperature", TimeStepType::Zone, "C", ReportFreq::Hour, false); + 1, StoreType::Average, "Zone", "Environment", "Site Outdoor Air Drybulb Temperature", TimeStepType::Zone, "C", ReportFreq::Hour, false); sql->createSQLiteReportDictionaryRecord( - 2, StoreType::Summed, "Facility:Electricity", "", "Facility:Electricity", TimeStepType::Zone, "J", ReportFreq::Hour, true); + 2, StoreType::Sum, "Facility:Electricity", "", "Facility:Electricity", TimeStepType::Zone, "J", ReportFreq::Hour, true); sql->createSQLiteReportDictionaryRecord( - 3, StoreType::Summed, "Facility:Electricity", "", "Facility:Electricity", TimeStepType::Zone, "J", ReportFreq::Month, true); - sql->createSQLiteReportDictionaryRecord(4, StoreType::Averaged, "HVAC", "", "AHU-1", TimeStepType::System, "", ReportFreq::Hour, false); + 3, StoreType::Sum, "Facility:Electricity", "", "Facility:Electricity", TimeStepType::Zone, "J", ReportFreq::Month, true); + sql->createSQLiteReportDictionaryRecord(4, StoreType::Average, "HVAC", "", "AHU-1", TimeStepType::System, "", ReportFreq::Hour, false); sql->createSQLiteReportDictionaryRecord( - 5, StoreType::Averaged, "HVAC", "", "AHU-1", TimeStepType::System, "", ReportFreq::Hour, false, "test schedule"); + 5, StoreType::Average, "HVAC", "", "AHU-1", TimeStepType::System, "", ReportFreq::Hour, false, "test schedule"); auto result = queryResult("SELECT * FROM ReportDataDictionary;", "ReportDataDictionary"); sql->sqliteCommit(); @@ -267,10 +267,10 @@ TEST_F(SQLiteFixture, SQLiteProcedures_createSQLiteReportDictionaryRecord) sql->createSQLiteReportDictionaryRecord( 6, StoreType::Invalid, "Zone", "Environment", "Site Outdoor Air Drybulb Temperature", TimeStepType::Zone, "C", ReportFreq::Hour, false); sql->createSQLiteReportDictionaryRecord( - 7, StoreType::Summed, "Facility:Electricity", "", "Facility:Electricity", TimeStepType::Invalid, "J", ReportFreq::Hour, true); + 7, StoreType::Sum, "Facility:Electricity", "", "Facility:Electricity", TimeStepType::Invalid, "J", ReportFreq::Hour, true); sql->createSQLiteReportDictionaryRecord( - 8, StoreType::Summed, "Facility:Electricity", "", "Facility:Electricity", TimeStepType::Zone, "J", ReportFreq::Invalid, true); - sql->createSQLiteReportDictionaryRecord(9, StoreType::Averaged, "HVAC", "", "AHU-1", TimeStepType::System, "", ReportFreq::Invalid, false); + 8, StoreType::Sum, "Facility:Electricity", "", "Facility:Electricity", TimeStepType::Zone, "J", ReportFreq::Invalid, true); + sql->createSQLiteReportDictionaryRecord(9, StoreType::Average, "HVAC", "", "AHU-1", TimeStepType::System, "", ReportFreq::Invalid, false); result = queryResult("SELECT * FROM ReportDataDictionary;", "ReportDataDictionary"); sql->sqliteCommit(); @@ -413,7 +413,7 @@ TEST_F(SQLiteFixture, SQLiteProcedures_createSQLiteReportDataRecord) sql->sqliteBegin(); sql->createSQLiteTimeIndexRecord(ReportFreq::Simulation, 1, 1, 0, 2017, false); sql->createSQLiteReportDictionaryRecord( - 1, StoreType::Averaged, "Zone", "Environment", "Site Outdoor Air Drybulb Temperature", TimeStepType::Zone, "C", ReportFreq::Hour, false); + 1, StoreType::Average, "Zone", "Environment", "Site Outdoor Air Drybulb Temperature", TimeStepType::Zone, "C", ReportFreq::Hour, false); sql->createSQLiteReportDataRecord(1, 999.9); sql->createSQLiteReportDataRecord(1, 999.9, ReportFreq::Day, 0, 1310459, 100, 7031530, 15); sql->createSQLiteReportDataRecord(1, 999.9, ReportFreq::TimeStep, 0, 1310459, 100, 7031530, 15); diff --git a/tst/EnergyPlus/unit/SizingAnalysisObjects.unit.cc b/tst/EnergyPlus/unit/SizingAnalysisObjects.unit.cc index b46ed799b4a..8678f9f1b36 100644 --- a/tst/EnergyPlus/unit/SizingAnalysisObjects.unit.cc +++ b/tst/EnergyPlus/unit/SizingAnalysisObjects.unit.cc @@ -109,8 +109,8 @@ class SizingAnalysisObjectsTest : public EnergyPlusFixture state->dataWeather->Environment(4).DesignDayNum = 2; state->dataWeather->Environment(4).SeedEnvrnNum = 2; - OutputProcessor::SetupTimePointers(*state, OutputProcessor::SOVTimeStepType::Zone, state->dataGlobal->TimeStepZone); - OutputProcessor::SetupTimePointers(*state, OutputProcessor::SOVTimeStepType::HVAC, state->dataHVACGlobal->TimeStepSys); + OutputProcessor::SetupTimePointers(*state, OutputProcessor::TimeStepType::Zone, state->dataGlobal->TimeStepZone); + OutputProcessor::SetupTimePointers(*state, OutputProcessor::TimeStepType::System, state->dataHVACGlobal->TimeStepSys); state->dataSize->PlantSizData.allocate(1); diff --git a/tst/EnergyPlus/unit/UnitHeater.unit.cc b/tst/EnergyPlus/unit/UnitHeater.unit.cc index b87e22a71dc..5e8253278b8 100644 --- a/tst/EnergyPlus/unit/UnitHeater.unit.cc +++ b/tst/EnergyPlus/unit/UnitHeater.unit.cc @@ -1126,8 +1126,8 @@ TEST_F(EnergyPlusFixture, UnitHeater_HWHeatingCoilUAAutoSizingTest) state->dataLoopNodes->MoreNodeInfo.allocate(20); state->dataHVACGlobal->TimeStepSys = state->dataGlobal->TimeStepZone; state->dataHVACGlobal->TimeStepSysSec = state->dataHVACGlobal->TimeStepSys * Constant::SecInHour; - SetupTimePointers(*state, OutputProcessor::SOVTimeStepType::Zone, state->dataGlobal->TimeStepZone); - SetupTimePointers(*state, OutputProcessor::SOVTimeStepType::HVAC, state->dataHVACGlobal->TimeStepSys); + SetupTimePointers(*state, OutputProcessor::TimeStepType::Zone, state->dataGlobal->TimeStepZone); + SetupTimePointers(*state, OutputProcessor::TimeStepType::System, state->dataHVACGlobal->TimeStepSys); UpdateMeterReporting(*state); diff --git a/tst/EnergyPlus/unit/UnitaryHybridAirConditioner.unit.cc b/tst/EnergyPlus/unit/UnitaryHybridAirConditioner.unit.cc index 0770d6de282..5350a90943d 100644 --- a/tst/EnergyPlus/unit/UnitaryHybridAirConditioner.unit.cc +++ b/tst/EnergyPlus/unit/UnitaryHybridAirConditioner.unit.cc @@ -432,29 +432,29 @@ TEST_F(EnergyPlusFixture, Test_UnitaryHybridAirConditioner_Unittest) // Check the meters associated with the ZoneHVAC:HybridUnitaryHVAC outputs EXPECT_EQ(14, NumFound); EXPECT_TRUE(compare_enums(meteredVars(1).resource, Constant::eResource::EnergyTransfer)); // ENERGYTRANSFER - Cooling - EXPECT_TRUE(compare_enums(meteredVars(1).sovEndUseCat, OutputProcessor::SOVEndUseCat::CoolingCoils)); - EXPECT_TRUE(compare_enums(meteredVars(1).sovGroup, OutputProcessor::SOVGroup::HVAC)); + EXPECT_TRUE(compare_enums(meteredVars(1).endUseCat, OutputProcessor::EndUseCat::CoolingCoils)); + EXPECT_TRUE(compare_enums(meteredVars(1).group, OutputProcessor::Group::HVAC)); EXPECT_TRUE(compare_enums(meteredVars(2).resource, Constant::eResource::EnergyTransfer)); // ENERGYTRANSFER - Heating - EXPECT_TRUE(compare_enums(meteredVars(2).sovEndUseCat, OutputProcessor::SOVEndUseCat::HeatingCoils)); - EXPECT_TRUE(compare_enums(meteredVars(2).sovGroup, OutputProcessor::SOVGroup::HVAC)); + EXPECT_TRUE(compare_enums(meteredVars(2).endUseCat, OutputProcessor::EndUseCat::HeatingCoils)); + EXPECT_TRUE(compare_enums(meteredVars(2).group, OutputProcessor::Group::HVAC)); EXPECT_TRUE(compare_enums(meteredVars(3).resource, Constant::eResource::Electricity)); // ELECTRIC - Cooling Energy - EXPECT_TRUE(compare_enums(meteredVars(3).sovEndUseCat, OutputProcessor::SOVEndUseCat::Cooling)); - EXPECT_TRUE(compare_enums(meteredVars(3).sovGroup, OutputProcessor::SOVGroup::HVAC)); + EXPECT_TRUE(compare_enums(meteredVars(3).endUseCat, OutputProcessor::EndUseCat::Cooling)); + EXPECT_TRUE(compare_enums(meteredVars(3).group, OutputProcessor::Group::HVAC)); EXPECT_TRUE(compare_enums(meteredVars(4).resource, Constant::eResource::Electricity)); // ELECTRIC - Fan Energy - EXPECT_TRUE(compare_enums(meteredVars(4).sovEndUseCat, OutputProcessor::SOVEndUseCat::Fans)); - EXPECT_TRUE(compare_enums(meteredVars(4).sovGroup, OutputProcessor::SOVGroup::HVAC)); + EXPECT_TRUE(compare_enums(meteredVars(4).endUseCat, OutputProcessor::EndUseCat::Fans)); + EXPECT_TRUE(compare_enums(meteredVars(4).group, OutputProcessor::Group::HVAC)); EXPECT_TRUE(compare_enums(meteredVars(5).resource, Constant::eResource::NaturalGas)); // NATURALGAS - Secondary Fuel Type - specified in UnitaryHybridUnitTest_DOSA.idf - EXPECT_TRUE(compare_enums(meteredVars(5).sovEndUseCat, OutputProcessor::SOVEndUseCat::Cooling)); - EXPECT_TRUE(compare_enums(meteredVars(5).sovGroup, OutputProcessor::SOVGroup::HVAC)); + EXPECT_TRUE(compare_enums(meteredVars(5).endUseCat, OutputProcessor::EndUseCat::Cooling)); + EXPECT_TRUE(compare_enums(meteredVars(5).group, OutputProcessor::Group::HVAC)); EXPECT_TRUE( compare_enums(meteredVars(6).resource, Constant::eResource::DistrictCooling)); // DISTRICTCOOLING - Third Fuel Type - specified in UnitaryHybridUnitTest_DOSA.idf - EXPECT_TRUE(compare_enums(meteredVars(6).sovEndUseCat, OutputProcessor::SOVEndUseCat::Cooling)); - EXPECT_TRUE(compare_enums(meteredVars(6).sovGroup, OutputProcessor::SOVGroup::HVAC)); + EXPECT_TRUE(compare_enums(meteredVars(6).endUseCat, OutputProcessor::EndUseCat::Cooling)); + EXPECT_TRUE(compare_enums(meteredVars(6).group, OutputProcessor::Group::HVAC)); EXPECT_TRUE(compare_enums(meteredVars(7).resource, Constant::eResource::Water)); // WATER - Cooling Water Use - EXPECT_TRUE(compare_enums(meteredVars(7).sovEndUseCat, OutputProcessor::SOVEndUseCat::Cooling)); - EXPECT_TRUE(compare_enums(meteredVars(7).sovGroup, OutputProcessor::SOVGroup::HVAC)); + EXPECT_TRUE(compare_enums(meteredVars(7).endUseCat, OutputProcessor::EndUseCat::Cooling)); + EXPECT_TRUE(compare_enums(meteredVars(7).group, OutputProcessor::Group::HVAC)); // Check that unit is included in Component Sizing Summary Report EXPECT_EQ("ZoneHVAC:HybridUnitaryHVAC", state->dataOutRptPredefined->CompSizeTableEntry(1).typeField); diff --git a/tst/EnergyPlus/unit/WaterManager.unit.cc b/tst/EnergyPlus/unit/WaterManager.unit.cc index 01b0f356e3f..172abcf7688 100644 --- a/tst/EnergyPlus/unit/WaterManager.unit.cc +++ b/tst/EnergyPlus/unit/WaterManager.unit.cc @@ -372,7 +372,7 @@ TEST_F(EnergyPlusFixture, WaterManager_MainsWater_Meter_Test) EXPECT_EQ(state->dataOutputProcessor->meters[3]->Name, "General:WaterSystems:MainsWater"); EXPECT_TRUE(compare_enums(state->dataOutputProcessor->meters[3]->resource, Constant::eResource::MainsWater)); - EXPECT_TRUE(compare_enums(state->dataOutputProcessor->meters[3]->sovEndUseCat, OutputProcessor::SOVEndUseCat::WaterSystem)); + EXPECT_TRUE(compare_enums(state->dataOutputProcessor->meters[3]->endUseCat, OutputProcessor::EndUseCat::WaterSystem)); EXPECT_EQ(state->dataOutputProcessor->meters[3]->EndUseSub, "General"); - EXPECT_TRUE(compare_enums(state->dataOutputProcessor->meters[3]->sovGroup, OutputProcessor::SOVGroup::Invalid)); + EXPECT_TRUE(compare_enums(state->dataOutputProcessor->meters[3]->group, OutputProcessor::Group::Invalid)); }