Skip to content
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.

Sign up for GitHub

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

Fix #5189 - Register AFN scheduleTypeRegistry. #5334

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
+14 −9
Open

Fix #5189 - Register AFN scheduleTypeRegistry. #5334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 2 additions & 3 deletions src/model/AirflowNetworkOccupantVentilationControl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,15 @@ namespace model {
}

std::vector<ScheduleTypeKey> AirflowNetworkOccupantVentilationControl_Impl::getScheduleTypeKeys(const Schedule& schedule) const {
// TODO: Check schedule display names.
std::vector<ScheduleTypeKey> result;
UnsignedVector fieldIndices = getSourceIndices(schedule.handle());
UnsignedVector::const_iterator b(fieldIndices.begin());
UnsignedVector::const_iterator e(fieldIndices.end());
if (std::find(b, e, OS_AirflowNetworkOccupantVentilationControlFields::OpeningProbabilityScheduleName) != e) {
result.push_back(ScheduleTypeKey("AirflowNetworkOccupantVentilationControl", "Opening Probability"));
result.emplace_back("AirflowNetworkOccupantVentilationControl", "Opening Probability");
}
if (std::find(b, e, OS_AirflowNetworkOccupantVentilationControlFields::ClosingProbabilityScheduleName) != e) {
result.push_back(ScheduleTypeKey("AirflowNetworkOccupantVentilationControl", "Closing Probability"));
result.emplace_back("AirflowNetworkOccupantVentilationControl", "Closing Probability");
}
return result;
}
Expand Down
5 changes: 2 additions & 3 deletions src/model/AirflowNetworkSurface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,16 +60,15 @@ namespace model {
}

std::vector<ScheduleTypeKey> AirflowNetworkSurface_Impl::getScheduleTypeKeys(const Schedule& schedule) const {
// TODO: Check schedule display names.
std::vector<ScheduleTypeKey> result;
UnsignedVector fieldIndices = getSourceIndices(schedule.handle());
UnsignedVector::const_iterator b(fieldIndices.begin());
UnsignedVector::const_iterator e(fieldIndices.end());
if (std::find(b, e, OS_AirflowNetworkSurfaceFields::VentilationControlZoneTemperatureSetpointScheduleName) != e) {
result.push_back(ScheduleTypeKey("AirflowNetworkSurface", "Ventilation Control Zone Temperature Setpoint"));
result.emplace_back("AirflowNetworkSurface", "Ventilation Control Zone Temperature Setpoint");
}
if (std::find(b, e, OS_AirflowNetworkSurfaceFields::VentingAvailabilityScheduleName) != e) {
result.push_back(ScheduleTypeKey("AirflowNetworkSurface", "Venting Availability"));
result.emplace_back("AirflowNetworkSurface", "Venting Availability");
}
return result;
}
Expand Down
5 changes: 2 additions & 3 deletions src/model/AirflowNetworkZone.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,16 +52,15 @@ namespace model {
}

std::vector<ScheduleTypeKey> AirflowNetworkZone_Impl::getScheduleTypeKeys(const Schedule& schedule) const {
// TODO: Check schedule display names.
std::vector<ScheduleTypeKey> result;
UnsignedVector fieldIndices = getSourceIndices(schedule.handle());
UnsignedVector::const_iterator b(fieldIndices.begin());
UnsignedVector::const_iterator e(fieldIndices.end());
if (std::find(b, e, OS_AirflowNetworkZoneFields::VentilationControlZoneTemperatureSetpointScheduleName) != e) {
result.push_back(ScheduleTypeKey("AirflowNetworkZone", "Ventilation Control Zone Temperature Setpoint"));
result.emplace_back("AirflowNetworkZone", "Ventilation Control Zone Temperature Setpoint");
}
if (std::find(b, e, OS_AirflowNetworkZoneFields::VentingAvailabilityScheduleName) != e) {
result.push_back(ScheduleTypeKey("AirflowNetworkZone", "Venting Availability"));
result.emplace_back("AirflowNetworkZone", "Venting Availability");
}
return result;
}
Expand Down
8 changes: 8 additions & 0 deletions src/model/ScheduleTypeRegistry.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,14 @@ namespace model {
1.0},
{"AirConditionerVariableRefrigerantFlow", "Thermostat Priority Schedule", "thermostatPrioritySchedule", false, "ControlMode", 0.0, 1.0},
{"AirConditionerVariableRefrigerantFlow", "Basin Heater Operating Schedule", "basinHeaterOperatingSchedule", false, "Availability", 0.0, 1.0},
{"AirflowNetworkOccupantVentilationControl", "Opening Probability", "openingProbabilitySchedule", true, "", 0.0, 1.0},
{"AirflowNetworkOccupantVentilationControl", "Closing Probability", "closingProbabilitySchedule", true, "", 0.0, 1.0},
Comment on lines +97 to +98
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Note for opening/closing prob, it's expected in [0, 1]

cf https://github.com/NREL/EnergyPlus/blob/acda84e38db4e8aecbc178cb970055d3721ee321/src/EnergyPlus/AirflowNetwork/src/Solver.cpp#L12908-L12914

{"AirflowNetworkSurface", "Ventilation Control Zone Temperature Setpoint", "ventilationControlZoneTemperatureSetpointSchedule", true,
"Temperature", OptionalDouble(), OptionalDouble()},
{"AirflowNetworkSurface", "Venting Availability", "ventingAvailabilitySchedule", false, "Availability", 0.0, 1.0},
{"AirflowNetworkZone", "Ventilation Control Zone Temperature Setpoint", "ventilationControlZoneTemperatureSetpointSchedule", true,
"Temperature", OptionalDouble(), OptionalDouble()},
{"AirflowNetworkZone", "Venting Availability", "ventingAvailabilitySchedule", false, "Availability", 0.0, 1.0},
Comment on lines +99 to +104
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

rest

{"AirLoopHVAC", "Return Air Bypass Flow Temperature Setpoint", "returnAirBypassFlowTemperatureSetpointSchedule", true, "Temperature",
OptionalDouble(), OptionalDouble()},
{"AirLoopHVACDedicatedOutdoorAirSystem", "Availability Schedule", "availabilitySchedule", false, "Availability", 0.0, 1.0},
Expand Down
Loading