Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions idd/Energy+.idd.in
Original file line number Diff line number Diff line change
Expand Up @@ -50617,7 +50617,7 @@ SpaceHVAC:EquipmentConnections,
\memo Specifies the HVAC equipment connections for a space. Node names are specified for the
\memo space air node, air inlet nodes, air exhaust nodes, and the air return node.
\memo If any space in a zone has a SpaceHVAC:EquipmentConnections object, then all spaces in the zone must have one.
\memo Used only when ZoneAirHeatBalanceAlgorithm "Do Space Heat Balance for Sizing"is Yes.
\memo Used only when ZoneAirHeatBalanceAlgorithm "Do Space Heat Balance for Simulation" is Yes.
Copy link
Member

Choose a reason for hiding this comment

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

How strict shall I be regarding IO changes... need to decide...

\min-fields 4
A1 , \field Space Name
\required-field
Expand Down Expand Up @@ -50650,7 +50650,7 @@ SpaceHVAC:ZoneEquipmentSplitter,
\memo Distributes the output from a piece of zone equipment to one or more Spaces in the Zone.
\memo If any equipment in a zone has a SpaceHVAC:ZoneEquipmentSplitter, then all equipment in the zone must have one.
\memo except Fan:ZoneExhaust. All spaces in the zone must also have a SpaceHVAC:EquipmentConnections object.
\memo Used only when ZoneAirHeatBalanceAlgorithm "Do Space Heat Balance for Sizing" = Yes.
\memo Used only when ZoneAirHeatBalanceAlgorithm "Do Space Heat Balance for Simulation" is Yes.
\min-fields 10
A1, \field Name
\required-field
Expand Down Expand Up @@ -50774,7 +50774,7 @@ SpaceHVAC:ZoneEquipmentMixer,
\extensible:3
\memo Mixes the airflow from one or more Spaces into a piece of zone equipment.
\memo All spaces in the zone must also have a SpaceHVAC:EquipmentConnections object.
\memo Used only when ZoneAirHeatBalanceAlgorithm "Do Space Heat Balance for Sizing" = Yes.
\memo Used only when ZoneAirHeatBalanceAlgorithm "Do Space Heat Balance for Simulation" is Yes.
\min-fields 7
A1, \field Name
\required-field
Expand Down Expand Up @@ -50845,7 +50845,7 @@ SpaceHVAC:ZoneReturnMixer,
\extensible:2
\memo Mixes the return airflow from one or more Spaces into a zone return node.
\memo All spaces in the zone must also have a SpaceHVAC:EquipmentConnections object.
\memo Used only when ZoneAirHeatBalanceAlgorithm "Do Space Heat Balance for Sizing" = Yes.
\memo Used only when ZoneAirHeatBalanceAlgorithm "Do Space Heat Balance for Simulation" is Yes.
\min-fields 5
A1, \field Name
\required-field
Expand Down
42 changes: 28 additions & 14 deletions src/EnergyPlus/ZoneEquipmentManager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2346,14 +2346,18 @@ std::string sizingPeakTimeStamp(EnergyPlusData const &state, int timeStepIndex)
void writeZszSpsz(EnergyPlusData &state,
EnergyPlus::InputOutputFile &outputFile,
int const numSpacesOrZones,
Array1D<DataZoneEquipment::EquipConfiguration> const &zsEquipConfig,
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is no longer needed.

EPVector<DataSizing::ZoneSizingData> const &zsCalcFinalSizing,
Array2D<DataSizing::ZoneSizingData> const &zsCalcSizing)
Array2D<DataSizing::ZoneSizingData> const &zsCalcSizing,
bool const forSpaces)
{
char const colSep = state.dataSize->SizingFileColSep;
print(outputFile, "Time");
for (int i = 1; i <= numSpacesOrZones; ++i) {
if (!zsEquipConfig(i).IsControlled) continue;
int zoneNum = i;
if (forSpaces) {
zoneNum = state.dataHeatBal->space(i).zoneNum;
}
if (!state.dataHeatBal->Zone(zoneNum).IsControlled) continue;
auto &thisCalcFS = zsCalcFinalSizing(i);

static constexpr std::string_view ZSizeFmt11("{}{}:{}{}{}{}:{}{}{}{}:{}{}{}{}:{}{}{}{}:{}{}{}{}:{}{}{}{}:{}{}{}{}:{}{}{}{}:{}{}{}{}:{"
Expand Down Expand Up @@ -2441,7 +2445,11 @@ void writeZszSpsz(EnergyPlusData &state,
static constexpr std::string_view ZSizeFmt20("{:02}:{:02}:00");
print(outputFile, ZSizeFmt20, HourPrint, Minutes);
for (int i = 1; i <= numSpacesOrZones; ++i) {
if (!zsEquipConfig(i).IsControlled) continue;
int zoneNum = i;
if (forSpaces) {
zoneNum = state.dataHeatBal->space(i).zoneNum;
}
if (!state.dataHeatBal->Zone(zoneNum).IsControlled) continue;
auto &thisCalcFS = zsCalcFinalSizing(i);
static constexpr std::string_view ZSizeFmt21("{}{:12.6E}{}{:12.6E}{}{:12.6E}{}{:12.6E}{}{:12.6E}{}{:12.6E}{}{:12.6E}{}{:12."
"6E}{}{:12.6E}{}{:12.6E}{}{:12.6E}{}{:12.6E}{}{:12.6E}{}{:12.6E}{}{:12.6E}{}{:12.6E}");
Expand Down Expand Up @@ -2506,7 +2514,11 @@ void writeZszSpsz(EnergyPlusData &state,
print(outputFile, "Peak");

for (int i = 1; i <= numSpacesOrZones; ++i) {
if (!zsEquipConfig(i).IsControlled) continue;
int zoneNum = i;
if (forSpaces) {
zoneNum = state.dataHeatBal->space(i).zoneNum;
}
if (!state.dataHeatBal->Zone(zoneNum).IsControlled) continue;
auto &thisCalcFS = zsCalcFinalSizing(i);

static constexpr std::string_view ZSizeFmt31("{}{:12.6E}{}{:12.6E}{}{:12.6E}{}{:12.6E}{}{:12.6E}{}{:12.6E}{}{:12.6E}{}{:12.6E}{}{:12."
Expand Down Expand Up @@ -2546,7 +2558,11 @@ void writeZszSpsz(EnergyPlusData &state,

print(outputFile, "\nPeak Vol Flow (m3/s)");
for (int i = 1; i <= numSpacesOrZones; ++i) {
if (!zsEquipConfig(i).IsControlled) continue;
int zoneNum = i;
if (forSpaces) {
zoneNum = state.dataHeatBal->space(i).zoneNum;
}
if (!state.dataHeatBal->Zone(zoneNum).IsControlled) continue;
Copy link
Collaborator

Choose a reason for hiding this comment

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

Only if you have any other changes.

int zoneNum = (forSpaces) ? state.dataHeatBal->space(i).zoneNum : i;

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, of course. That construct still is not my first thought, or second, or ...

Copy link
Member

Choose a reason for hiding this comment

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

To add on, the parentheses around forSpaces is not needed unless you need it for order of operations. (Ternary has a very low operation precedence, so most things will be evaluated before it is applied.)

auto &thisCalcFS = zsCalcFinalSizing(i);
static constexpr std::string_view ZSizeFmt41("{}{}{}{:12.6E}{}{:12.6E}{}{}{}{:12.6E}{}{:12.6E}{}{}{}{}{}{}{}{}");
print(outputFile,
Expand Down Expand Up @@ -3302,19 +3318,17 @@ void UpdateZoneSizing(EnergyPlusData &state, Constant::CallIndicator const CallI
}
}

writeZszSpsz(state,
state.files.zsz,
state.dataGlobal->NumOfZones,
state.dataZoneEquip->ZoneEquipConfig,
state.dataSize->CalcFinalZoneSizing,
state.dataSize->CalcZoneSizing);
bool forSpaces = false;
writeZszSpsz(
state, state.files.zsz, state.dataGlobal->NumOfZones, state.dataSize->CalcFinalZoneSizing, state.dataSize->CalcZoneSizing, forSpaces);
if (state.dataHeatBal->doSpaceHeatBalanceSizing) {
forSpaces = true;
writeZszSpsz(state,
state.files.spsz,
state.dataGlobal->numSpaces,
state.dataZoneEquip->spaceEquipConfig,
state.dataSize->CalcFinalSpaceSizing,
state.dataSize->CalcSpaceSizing);
state.dataSize->CalcSpaceSizing,
forSpaces);
}

// Move sizing data into final sizing array according to sizing method
Expand Down
4 changes: 2 additions & 2 deletions src/EnergyPlus/ZoneEquipmentManager.hh
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,9 @@ namespace ZoneEquipmentManager {
void writeZszSpsz(EnergyPlusData &state,
EnergyPlus::InputOutputFile &outputFile,
int const numSpacesOrZones,
Array1D<DataZoneEquipment::EquipConfiguration> const &zsEquipConfig,
EPVector<DataSizing::ZoneSizingData> const &zsCalcFinalSizing,
Array2D<DataSizing::ZoneSizingData> const &zsCalcSizing);
Array2D<DataSizing::ZoneSizingData> const &zsCalcSizing,
bool const forSpaces);

std::string sizingPeakTimeStamp(EnergyPlusData const &state, int timeStepIndex);

Expand Down