-
Notifications
You must be signed in to change notification settings - Fork 425
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Hotfix #10961 - New E+ 25.1 warnings for Schedule:Year + #10955 #10966
base: develop
Are you sure you want to change the base?
Conversation
for (int i = 0; i < (int)s_sched->scheduleTypes.size(); ++i) { | ||
if (s_sched->scheduleTypes[i]->Name == name) { | ||
return i; | ||
} | ||
} | ||
return SchedNum_Invalid; |
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.
Return the same constexpr int for clarity.
And use braces so we can set a breakpoint if we want to. (we should tell clang-format to always do that IMHO)
@@ -1094,7 +1097,7 @@ namespace Sched { | |||
if (lAlphaBlanks(2)) { | |||
ShowWarningEmptyField(state, eoh, cAlphaFields(2)); | |||
ShowContinueError(state, "Schedule will not be validated."); | |||
} else if ((sched->schedTypeNum = GetScheduleTypeNum(state, Alphas(2))) == 0) { | |||
} else if ((sched->schedTypeNum = GetScheduleTypeNum(state, Alphas(2))) == SchedNum_Invalid) { |
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.
Fix for Schedule:Year
@@ -3119,8 +3119,7 @@ void OpenOutputTabularFile(EnergyPlusData &state) | |||
open_tbl_stream(state, iStyle, state.dataStrGlobals->outputTblXmlFilePath, state.files.outputControl.tabular); | |||
tbl_stream << "<?xml version=\"1.0\"?>\n"; | |||
tbl_stream << "<EnergyPlusTabularReports>\n"; | |||
tbl_stream << " <state.dataHeatBal->BuildingName>" << ConvertToEscaped(state.dataHeatBal->BuildingName) | |||
<< "</state.dataHeatBal->BuildingName>\n"; | |||
tbl_stream << " <BuildingName>" << ConvertToEscaped(state.dataHeatBal->BuildingName) << "</BuildingName>\n"; |
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.
- Fix for unintended xml output #10955
|
|
|
|
diffs in AtticRoof_RadiantBarriers eplusout.err ---
+++
@@ -1,46 +1,4 @@
-line skipped-- ** Warning ** ProcessScheduleInput: Schedule:Year = LIGHTING SCHEDULE
- ** ~~~ ** Schedule Type Limits Name = FRACTIONAL, item not found.
- ** ~~~ ** Schedule will not be validated.
- ** Warning ** ProcessScheduleInput: Schedule:Year = CLOTHES DRYER EXHAUST SCHEDULE
- ** ~~~ ** Schedule Type Limits Name = FRACTIONAL, item not found.
- ** ~~~ ** Schedule will not be validated.
- ** Warning ** ProcessScheduleInput: Schedule:Year = CLOTHES DRYER SCHEDULE
- ** ~~~ ** Schedule Type Limits Name = FRACTIONAL, item not found.
- ** ~~~ ** Schedule will not be validated.
- ** Warning ** ProcessScheduleInput: Schedule:Year = CLOTHES WASHER SCHEDULE
- ** ~~~ ** Schedule Type Limits Name = FRACTIONAL, item not found.
- ** ~~~ ** Schedule will not be validated.
- ** Warning ** ProcessScheduleInput: Schedule:Year = COOKING RANGE
- ** ~~~ ** Schedule Type Limits Name = FRACTIONAL, item not found.
- ** ~~~ ** Schedule will not be validated.
- ** Warning ** ProcessScheduleInput: Schedule:Year = COOLING SEASON SCHEDULE
- ** ~~~ ** Schedule Type Limits Name = FRACTIONAL, item not found.
- ** ~~~ ** Schedule will not be validated.
- ** Warning ** ProcessScheduleInput: Schedule:Year = DHW FIXTURES SCHEDULE
- ** ~~~ ** Schedule Type Limits Name = FRACTIONAL, item not found.
- ** ~~~ ** Schedule will not be validated.
- ** Warning ** ProcessScheduleInput: Schedule:Year = DISHWASHER SCHEDULE
- ** ~~~ ** Schedule Type Limits Name = FRACTIONAL, item not found.
- ** ~~~ ** Schedule will not be validated.
- ** Warning ** ProcessScheduleInput: Schedule:Year = EXTERIOR LIGHTING SCHEDULE
- ** ~~~ ** Schedule Type Limits Name = FRACTIONAL, item not found.
- ** ~~~ ** Schedule will not be validated.
- ** Warning ** ProcessScheduleInput: Schedule:Year = FRIDGE
- ** ~~~ ** Schedule Type Limits Name = FRACTIONAL, item not found.
- ** ~~~ ** Schedule will not be validated.
- ** Warning ** ProcessScheduleInput: Schedule:Year = HEATING SEASON SCHEDULE
- ** ~~~ ** Schedule Type Limits Name = FRACTIONAL, item not found.
- ** ~~~ ** Schedule will not be validated.
- ** Warning ** ProcessScheduleInput: Schedule:Year = MISC PLUG LOADS SCHEDULE
- ** ~~~ ** Schedule Type Limits Name = FRACTIONAL, item not found.
- ** ~~~ ** Schedule will not be validated.
- ** Warning ** ProcessScheduleInput: Schedule:Year = MISC TV SCHEDULE
- ** ~~~ ** Schedule Type Limits Name = FRACTIONAL, item not found.
- ** ~~~ ** Schedule will not be validated.
- ** Warning ** ProcessScheduleInput: Schedule:Year = OCCUPANTS SCHEDULE
- ** ~~~ ** Schedule Type Limits Name = FRACTIONAL, item not found.
- ** ~~~ ** Schedule will not be validated.
************* Note that the following warning(s) may/will occur if you have not enclosed your zone completely.
** Warning ** Entered Zone Volumes differ from calculated zone volume(s).
** ~~~ ** ...use Output:Diagnostics,DisplayExtraWarnings; to show more details on individual zones. |
Pull request overview
GetScheduleTypeNum returns 0 for the first one found (vector is 0-indexed)
Pull Request Author
Reviewer