Add new people schedule columns to EIO/initialization summary to address #10314 #10437
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2691,9 +2691,9 @@ namespace ScheduleManager { | |
| // na | ||
|
|
||
| // Checking if valid index is passed is necessary | ||
| if (ScheduleIndex == ScheduleManager::ScheduleAlwaysOn) { | ||
| return 1.0; | ||
| } else if (ScheduleIndex == ScheduleManager::ScheduleAlwaysOff) { | ||
| return 0.0; | ||
| } else if (!state.dataScheduleMgr->Schedule(ScheduleIndex).EMSActuatedOn) { | ||
| return state.dataScheduleMgr->Schedule(ScheduleIndex) | ||
|
|
@@ -2771,9 +2771,9 @@ namespace ScheduleManager { | |
| // Return value | ||
| Real64 scheduleValue(0.0); | ||
|
|
||
| if (ScheduleIndex == ScheduleManager::ScheduleAlwaysOn) { | ||
| return 1.0; | ||
| } else if (ScheduleIndex == ScheduleManager::ScheduleAlwaysOff) { | ||
| return 0.0; | ||
| } | ||
|
|
||
|
|
@@ -2990,10 +2990,10 @@ namespace ScheduleManager { | |
| state.dataScheduleMgr->ScheduleInputProcessed = true; | ||
| } | ||
|
|
||
| if (ScheduleIndex == ScheduleManager::ScheduleAlwaysOn) { | ||
| DayValues({1, state.dataGlobal->NumOfTimeStepInHour}, {1, 24}) = 1.0; | ||
| return; | ||
| } else if (ScheduleIndex == ScheduleManager::ScheduleAlwaysOff) { | ||
| DayValues({1, state.dataGlobal->NumOfTimeStepInHour}, {1, 24}) = 0.0; | ||
| return; | ||
| } | ||
|
|
@@ -3744,10 +3744,10 @@ namespace ScheduleManager { | |
| Real64 MinValue(0.0); // For total minimum | ||
| Real64 MaxValue(0.0); // For total maximum | ||
|
|
||
| if (ScheduleIndex == ScheduleManager::ScheduleAlwaysOn) { | ||
| MinValue = 1.0; | ||
| MaxValue = 1.0; | ||
| } else if (ScheduleIndex == ScheduleManager::ScheduleAlwaysOff) { | ||
| MinValue = 0.0; | ||
| MaxValue = 0.0; | ||
| } else if (ScheduleIndex < 1 || ScheduleIndex > state.dataScheduleMgr->NumSchedules) { | ||
|
|
@@ -3810,11 +3810,11 @@ namespace ScheduleManager { | |
| bool MinValueOk = true; | ||
| bool MaxValueOk = true; | ||
|
|
||
| if (schedNum == ScheduleManager::ScheduleAlwaysOn) { | ||
| assert(clusiveMin == Clusivity::Inclusive && clusiveMax == Clusivity::Inclusive); | ||
| MinValueOk = (Minimum == 1.0); | ||
| MaxValueOk = (Maximum == 1.0); | ||
| } else if (schedNum == ScheduleManager::ScheduleAlwaysOff) { | ||
| assert(clusiveMin == Clusivity::Inclusive && clusiveMax == Clusivity::Inclusive); | ||
| MinValueOk = (Minimum == 0.0); | ||
| MaxValueOk = (Maximum == 0.0); | ||
|
|
@@ -3853,9 +3853,9 @@ namespace ScheduleManager { | |
|
|
||
| Real64 MinValue(0.0); // For total minimum | ||
|
|
||
| if (schedNum == ScheduleManager::ScheduleAlwaysOn) { | ||
| MinValue = 1.0; | ||
| } else if (schedNum == ScheduleManager::ScheduleAlwaysOff) { | ||
| MinValue = 0.0; | ||
| } else if (schedNum > 0 && schedNum > state.dataScheduleMgr->NumSchedules) { | ||
| if (!state.dataScheduleMgr->Schedule(schedNum).MaxMinSet) { // Set Minimum/Maximums for this schedule | ||
|
|
@@ -3893,10 +3893,10 @@ namespace ScheduleManager { | |
| bool MinValueOk; | ||
| bool MaxValueOk; | ||
|
|
||
| if (schedNum == ScheduleManager::ScheduleAlwaysOn) { | ||
| MinValueOk = (Minimum == 1.0); | ||
| MaxValueOk = (Maximum == 1.0); | ||
| } else if (schedNum == ScheduleManager::ScheduleAlwaysOff) { | ||
| MinValueOk = (Minimum == 0.0); | ||
| MaxValueOk = (Maximum == 0.0); | ||
| } else if (schedNum > 0 && schedNum <= state.dataScheduleMgr->NumSchedules) { | ||
|
|
@@ -3962,9 +3962,9 @@ namespace ScheduleManager { | |
|
|
||
| CheckScheduleValue = false; | ||
|
|
||
| if (ScheduleIndex == ScheduleManager::ScheduleAlwaysOn) { | ||
| CheckScheduleValue = (Value == 1.0); | ||
| } else if (ScheduleIndex == ScheduleManager::ScheduleAlwaysOff) { | ||
| CheckScheduleValue = (Value == 0.0); | ||
| } else if (ScheduleIndex < 1 || ScheduleIndex > state.dataScheduleMgr->NumSchedules) { | ||
| ShowFatalError(state, "CheckScheduleValue called with ScheduleIndex out of range"); | ||
|
|
@@ -4034,9 +4034,9 @@ namespace ScheduleManager { | |
| int WkSch; // Pointer for WeekSchedule value | ||
|
|
||
| CheckScheduleValue = false; | ||
| if (ScheduleIndex == ScheduleManager::ScheduleAlwaysOn) { | ||
| CheckScheduleValue = (Value == 1); | ||
| } else if (ScheduleIndex == ScheduleManager::ScheduleAlwaysOff) { | ||
| CheckScheduleValue = (Value == 0); | ||
| } else if (ScheduleIndex < 1 || ScheduleIndex > state.dataScheduleMgr->NumSchedules) { | ||
| ShowFatalError(state, "CheckScheduleValue called with ScheduleIndex out of range"); | ||
|
|
@@ -4109,10 +4109,10 @@ namespace ScheduleManager { | |
| bool MinValueOk; | ||
| bool MaxValueOk; | ||
|
|
||
| if (ScheduleIndex == ScheduleManager::ScheduleAlwaysOn) { | ||
| MinValue = 1.0; | ||
| MaxValue = 1.0; | ||
| } else if (ScheduleIndex == ScheduleManager::ScheduleAlwaysOff) { | ||
| MinValue = 0.0; | ||
| MaxValue = 0.0; | ||
| } else if (ScheduleIndex < 1 || ScheduleIndex > state.dataScheduleMgr->NumDaySchedules) { | ||
|
|
@@ -4191,9 +4191,9 @@ namespace ScheduleManager { | |
| Real64 MinValue(0.0); // For total minimum | ||
| bool MinValueOk; | ||
|
|
||
| if (ScheduleIndex == ScheduleManager::ScheduleAlwaysOn) { | ||
| MinValue = 1.0; | ||
| } else if (ScheduleIndex == ScheduleManager::ScheduleAlwaysOff) { | ||
| MinValue = 0.0; | ||
| } else if (ScheduleIndex < 1 || ScheduleIndex > state.dataScheduleMgr->NumDaySchedules) { | ||
| ShowFatalError(state, "CheckDayScheduleValueMinMax called with ScheduleIndex out of range"); | ||
|
|
@@ -4260,7 +4260,7 @@ namespace ScheduleManager { | |
| int Hour; | ||
| int TStep; | ||
|
|
||
| if (ScheduleIndex == ScheduleManager::ScheduleAlwaysOn || ScheduleIndex == ScheduleManager::ScheduleAlwaysOff) { | ||
|
|
||
| } else if (ScheduleIndex < 1 || ScheduleIndex > state.dataScheduleMgr->NumSchedules) { | ||
| ShowFatalError(state, "HasFractionalScheduleValue called with ScheduleIndex out of range"); | ||
|
|
@@ -4351,10 +4351,10 @@ namespace ScheduleManager { | |
| int DayT; | ||
| int Loop; | ||
|
|
||
| if (ScheduleIndex == ScheduleManager::ScheduleAlwaysOn) { | ||
| MinValue = 1.0; | ||
| MaxValue = 1.0; | ||
| } else if (ScheduleIndex == ScheduleManager::ScheduleAlwaysOff) { | ||
| MinValue = 0.0; | ||
| MaxValue = 0.0; | ||
| } else if (ScheduleIndex < 1 || ScheduleIndex > state.dataScheduleMgr->NumSchedules) { | ||
|
|
@@ -4442,10 +4442,10 @@ namespace ScheduleManager { | |
| int DayT; | ||
| int Loop; | ||
|
|
||
| if (ScheduleIndex == ScheduleManager::ScheduleAlwaysOn) { | ||
| MinValue = 1.0; | ||
| MaxValue = 1.0; | ||
| } else if (ScheduleIndex == ScheduleManager::ScheduleAlwaysOff) { | ||
| MinValue = 0.0; | ||
| MaxValue = 0.0; | ||
| } else if (ScheduleIndex < 1 || ScheduleIndex > state.dataScheduleMgr->NumSchedules) { | ||
|
|
@@ -4491,6 +4491,78 @@ namespace ScheduleManager { | |
| return MaximumValue; | ||
| } | ||
|
|
||
| std::pair<Real64, Real64> getScheduleMinMaxByDayType(EnergyPlusData &state, int const ScheduleIndex, DayTypeGroup const days) | ||
| { | ||
| // J. Glazer - March 2024 | ||
| // finds the minimum and maximum for a specific set of day types for a given schedule | ||
| Real64 MinValue = Constant::BigNumber; | ||
| Real64 MaxValue = -Constant::BigNumber; | ||
| // Sun Mon Tues Wed Thur Fri Sat Hol Summer Winter Cust1 Cust2 | ||
| constexpr std::array<bool, maxDayTypes> dayTypeFilterWkDy = {false, true, true, true, true, true, false, false, false, false, false, false}; | ||
| constexpr std::array<bool, maxDayTypes> dayTypeFilterWeHo = {true, false, false, false, false, false, true, true, false, false, false, false}; | ||
| // Sun Mon Tues Wed Thur Fri Sat Hol Summer Winter Cust1 Cust2 | ||
| constexpr std::array<bool, maxDayTypes> dayTypeFilterSumDsDy = { | ||
| false, false, false, false, false, false, false, false, true, false, false, false}; | ||
| constexpr std::array<bool, maxDayTypes> dayTypeFilterWinDsDy = { | ||
| false, false, false, false, false, false, false, false, false, true, false, false}; | ||
| constexpr std::array<bool, maxDayTypes> dayTypeFilterNone = { | ||
| false, false, false, false, false, false, false, false, false, false, false, false}; | ||
| if (ScheduleIndex > 0 && ScheduleIndex <= state.dataScheduleMgr->NumSchedules) { | ||
| int curDayTypeGroup = static_cast<int>(days); | ||
| auto &curSch = state.dataScheduleMgr->Schedule(ScheduleIndex); | ||
| if (!curSch.MaxMinByDayTypeSet[curDayTypeGroup]) { | ||
| std::array<bool, maxDayTypes> dayTypeFilter; | ||
| switch (days) { | ||
| case DayTypeGroup::Weekday: | ||
| dayTypeFilter = dayTypeFilterWkDy; | ||
| break; | ||
| case DayTypeGroup::WeekEndHoliday: | ||
| dayTypeFilter = dayTypeFilterWeHo; | ||
| break; | ||
| case DayTypeGroup::SummerDesignDay: | ||
| dayTypeFilter = dayTypeFilterSumDsDy; | ||
| break; | ||
| case DayTypeGroup::WinterDesignDay: | ||
| dayTypeFilter = dayTypeFilterWinDsDy; | ||
| break; | ||
| default: | ||
| dayTypeFilter = dayTypeFilterNone; | ||
| break; | ||
| } | ||
| for (int iDayOfYear = 1; iDayOfYear <= 366; ++iDayOfYear) { | ||
| int WkSch = curSch.WeekSchedulePointer(iDayOfYear); | ||
| auto &weekSch = state.dataScheduleMgr->WeekSchedule(WkSch); | ||
| for (int jType = 1; jType <= maxDayTypes; ++jType) { | ||
| if (dayTypeFilter[jType - 1]) { | ||
| auto &daySch = state.dataScheduleMgr->DaySchedule(weekSch.DaySchedulePointer(jType)); | ||
| MinValue = min(MinValue, minval(daySch.TSValue)); | ||
| MaxValue = max(MaxValue, maxval(daySch.TSValue)); | ||
| } | ||
|
There was a problem hiding this comment. Rather than cycle through the entire schedule for every daytype group, why not cycle through once and store the max/min for each day type first? Then cycle through those to sort into the DayTypeGroups. There was a problem hiding this comment. @mjwitte I did some optimization of this loop that should greatly improve it's performance although it is not exactly using the approach you suggested. |
||
| } | ||
| } | ||
| if (MinValue == Constant::BigNumber) MinValue = 0; | ||
| if (MaxValue == -Constant::BigNumber) MaxValue = 0; | ||
| // store for the next call of the same schedule | ||
| curSch.MaxByDayType[curDayTypeGroup] = MaxValue; | ||
| curSch.MinByDayType[curDayTypeGroup] = MinValue; | ||
| curSch.MaxMinByDayTypeSet[curDayTypeGroup] = true; | ||
|
There was a problem hiding this comment. There is another loop over people schedules in DetermineSystemPopulationDiversity. Not sure if this could help there or if when checking those people schedules these 3 values could be set to save even more simulation time. |
||
| } else { | ||
| // retrieve previously found min and max by day type | ||
| MaxValue = curSch.MaxByDayType[curDayTypeGroup]; | ||
| MinValue = curSch.MinByDayType[curDayTypeGroup]; | ||
| } | ||
| } else if (ScheduleIndex == ScheduleManager::ScheduleAlwaysOn) { | ||
| MinValue = 1.0; | ||
| MaxValue = 1.0; | ||
| } else if (ScheduleIndex == ScheduleManager::ScheduleAlwaysOff) { | ||
| MinValue = 0.0; | ||
| MaxValue = 0.0; | ||
| } else { | ||
| ShowFatalError(state, "getScheduleMinMaxByDayType called with ScheduleIndex out of range"); | ||
| } | ||
| return std::make_pair(MinValue, MaxValue); | ||
| } | ||
|
|
||
| std::string GetScheduleName(EnergyPlusData &state, int const ScheduleIndex) | ||
| { | ||
| // FUNCTION INFORMATION: | ||
|
|
@@ -4536,9 +4608,9 @@ namespace ScheduleManager { | |
|
|
||
| if (ScheduleIndex > 0) { | ||
| ScheduleName = state.dataScheduleMgr->Schedule(ScheduleIndex).Name; | ||
| } else if (ScheduleIndex == ScheduleManager::ScheduleAlwaysOn) { | ||
| ScheduleName = "Constant-1.0"; | ||
| } else if (ScheduleIndex == ScheduleManager::ScheduleAlwaysOff) { | ||
| ScheduleName = "Constant-0.0"; | ||
| } else { | ||
| ScheduleName = "N/A-Invalid"; | ||
|
|
@@ -4694,7 +4766,7 @@ namespace ScheduleManager { | |
| DaysInYear = 365; | ||
| } | ||
|
|
||
| if (ScheduleIndex < ScheduleManager::ScheduleAlwaysOn || ScheduleIndex > state.dataScheduleMgr->NumSchedules) { | ||
| ShowFatalError(state, "ScheduleAnnualFullLoadHours called with ScheduleIndex out of range"); | ||
| } | ||
|
|
||
|
|
@@ -4741,7 +4813,7 @@ namespace ScheduleManager { | |
| WeeksInYear = 365.0 / 7.0; | ||
| } | ||
|
|
||
| if (ScheduleIndex < ScheduleManager::ScheduleAlwaysOn || ScheduleIndex > state.dataScheduleMgr->NumSchedules) { | ||
| ShowFatalError(state, "ScheduleAverageHoursPerWeek called with ScheduleIndex out of range"); | ||
| } | ||
|
|
||
|
|
@@ -4768,7 +4840,7 @@ namespace ScheduleManager { | |
| DaysInYear = 365; | ||
| } | ||
|
|
||
| if (ScheduleIndex < ScheduleManager::ScheduleAlwaysOn || ScheduleIndex > state.dataScheduleMgr->NumSchedules) { | ||
| ShowFatalError(state, "ScheduleHoursGT1perc called with ScheduleIndex out of range"); | ||
| } | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| Output Changes | ||
| ============== | ||
|
|
||
| This file documents the structural changes on the output of EnergyPlus that could affect interfaces, etc. | ||
|
|
||
| ### Description | ||
|
|
||
| This will eventually become a more structured file, but currently it isn't clear what format is best. As an intermediate solution, and to allow the form to be formed organically, this plain text file is being used. Entries should be clearly delimited. It isn't expected that there will be but maybe a couple each release at most. Entries should also include some reference back to the repo. At least a PR number or whatever. | ||
|
|
||
| ### EIO Internal Gains and Initialization report | ||
|
|
||
| For the EIO lines for: | ||
|
|
||
| - People Internal Gains Nominal | ||
| - Lights Internal Gains Nominal | ||
| - ElectricEquipment Internal Gains Nominal | ||
| - GasEquipment Internal Gains Nominal | ||
| - HotWaterEquipment Internal Gains Nominal | ||
| - SteamEquipment Internal Gains Nominal | ||
| - OtherEquipment Internal Gains Nominal | ||
|
|
||
| replaced the colums: | ||
|
|
||
| - Nominal Minimum | ||
| - Nominal Maximum | ||
|
|
||
| with | ||
|
|
||
| - Minimum for All Day Types | ||
| - Maximum for All Day Types | ||
| - Minimum for Weekdays | ||
| - Maximum for Weekdays | ||
| - Minimum for Weekends/Holidays | ||
| - Maximum for Weekends/Holidays | ||
| - Minimum for Summer Design Days | ||
| - Maximum for Summer Design Days | ||
| - Minimum for Winter Design Days | ||
| - Maximum for Winter Design Days | ||
|
|
||
| These changes will also make corresponding changes in the HTML Intialization Summary report |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am trying to convince myself that it is even possible for ScheduleIndex > NumSchedules. Not all functions in ScheduleManager use this check (i.e., ScheduleIndex <= NumSchedules). The only way to get an index is to call GetScheduleIndex, which uses FindItemInList and will either return a valid index or 0. I'm not convinced yet so nothing to do here. While investigating this I noticed in GetScheduleIndex that
WeekSchedule(Schedule().WeekSchedulePointer()).UsedandWeekSchedule(Schedule().WeekSchedulePointer()).DaySchedulePointer().Usedare set but never used anywhere.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Usedvariables are never used. Alanis would be proud of that irony.