Skip to content

Commit 4303dda

Browse files
authored
Merge pull request #5334 from NREL/5189-AFNScheduleTypeRegistry
Fix #5189 - Register AFN scheduleTypeRegistry.
2 parents 22cfabc + 7313467 commit 4303dda

4 files changed

+14
-9
lines changed

src/model/AirflowNetworkOccupantVentilationControl.cpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,15 @@ namespace model {
5151
}
5252

5353
std::vector<ScheduleTypeKey> AirflowNetworkOccupantVentilationControl_Impl::getScheduleTypeKeys(const Schedule& schedule) const {
54-
// TODO: Check schedule display names.
5554
std::vector<ScheduleTypeKey> result;
5655
UnsignedVector fieldIndices = getSourceIndices(schedule.handle());
5756
UnsignedVector::const_iterator b(fieldIndices.begin());
5857
UnsignedVector::const_iterator e(fieldIndices.end());
5958
if (std::find(b, e, OS_AirflowNetworkOccupantVentilationControlFields::OpeningProbabilityScheduleName) != e) {
60-
result.push_back(ScheduleTypeKey("AirflowNetworkOccupantVentilationControl", "Opening Probability"));
59+
result.emplace_back("AirflowNetworkOccupantVentilationControl", "Opening Probability");
6160
}
6261
if (std::find(b, e, OS_AirflowNetworkOccupantVentilationControlFields::ClosingProbabilityScheduleName) != e) {
63-
result.push_back(ScheduleTypeKey("AirflowNetworkOccupantVentilationControl", "Closing Probability"));
62+
result.emplace_back("AirflowNetworkOccupantVentilationControl", "Closing Probability");
6463
}
6564
return result;
6665
}

src/model/AirflowNetworkSurface.cpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,15 @@ namespace model {
6060
}
6161

6262
std::vector<ScheduleTypeKey> AirflowNetworkSurface_Impl::getScheduleTypeKeys(const Schedule& schedule) const {
63-
// TODO: Check schedule display names.
6463
std::vector<ScheduleTypeKey> result;
6564
UnsignedVector fieldIndices = getSourceIndices(schedule.handle());
6665
UnsignedVector::const_iterator b(fieldIndices.begin());
6766
UnsignedVector::const_iterator e(fieldIndices.end());
6867
if (std::find(b, e, OS_AirflowNetworkSurfaceFields::VentilationControlZoneTemperatureSetpointScheduleName) != e) {
69-
result.push_back(ScheduleTypeKey("AirflowNetworkSurface", "Ventilation Control Zone Temperature Setpoint"));
68+
result.emplace_back("AirflowNetworkSurface", "Ventilation Control Zone Temperature Setpoint");
7069
}
7170
if (std::find(b, e, OS_AirflowNetworkSurfaceFields::VentingAvailabilityScheduleName) != e) {
72-
result.push_back(ScheduleTypeKey("AirflowNetworkSurface", "Venting Availability"));
71+
result.emplace_back("AirflowNetworkSurface", "Venting Availability");
7372
}
7473
return result;
7574
}

src/model/AirflowNetworkZone.cpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,15 @@ namespace model {
5252
}
5353

5454
std::vector<ScheduleTypeKey> AirflowNetworkZone_Impl::getScheduleTypeKeys(const Schedule& schedule) const {
55-
// TODO: Check schedule display names.
5655
std::vector<ScheduleTypeKey> result;
5756
UnsignedVector fieldIndices = getSourceIndices(schedule.handle());
5857
UnsignedVector::const_iterator b(fieldIndices.begin());
5958
UnsignedVector::const_iterator e(fieldIndices.end());
6059
if (std::find(b, e, OS_AirflowNetworkZoneFields::VentilationControlZoneTemperatureSetpointScheduleName) != e) {
61-
result.push_back(ScheduleTypeKey("AirflowNetworkZone", "Ventilation Control Zone Temperature Setpoint"));
60+
result.emplace_back("AirflowNetworkZone", "Ventilation Control Zone Temperature Setpoint");
6261
}
6362
if (std::find(b, e, OS_AirflowNetworkZoneFields::VentingAvailabilityScheduleName) != e) {
64-
result.push_back(ScheduleTypeKey("AirflowNetworkZone", "Venting Availability"));
63+
result.emplace_back("AirflowNetworkZone", "Venting Availability");
6564
}
6665
return result;
6766
}

src/model/ScheduleTypeRegistry.cpp

+8
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,14 @@ namespace model {
9494
1.0},
9595
{"AirConditionerVariableRefrigerantFlow", "Thermostat Priority Schedule", "thermostatPrioritySchedule", false, "ControlMode", 0.0, 1.0},
9696
{"AirConditionerVariableRefrigerantFlow", "Basin Heater Operating Schedule", "basinHeaterOperatingSchedule", false, "Availability", 0.0, 1.0},
97+
{"AirflowNetworkOccupantVentilationControl", "Opening Probability", "openingProbabilitySchedule", true, "", 0.0, 1.0},
98+
{"AirflowNetworkOccupantVentilationControl", "Closing Probability", "closingProbabilitySchedule", true, "", 0.0, 1.0},
99+
{"AirflowNetworkSurface", "Ventilation Control Zone Temperature Setpoint", "ventilationControlZoneTemperatureSetpointSchedule", true,
100+
"Temperature", OptionalDouble(), OptionalDouble()},
101+
{"AirflowNetworkSurface", "Venting Availability", "ventingAvailabilitySchedule", false, "Availability", 0.0, 1.0},
102+
{"AirflowNetworkZone", "Ventilation Control Zone Temperature Setpoint", "ventilationControlZoneTemperatureSetpointSchedule", true,
103+
"Temperature", OptionalDouble(), OptionalDouble()},
104+
{"AirflowNetworkZone", "Venting Availability", "ventingAvailabilitySchedule", false, "Availability", 0.0, 1.0},
97105
{"AirLoopHVAC", "Return Air Bypass Flow Temperature Setpoint", "returnAirBypassFlowTemperatureSetpointSchedule", true, "Temperature",
98106
OptionalDouble(), OptionalDouble()},
99107
{"AirLoopHVACDedicatedOutdoorAirSystem", "Availability Schedule", "availabilitySchedule", false, "Availability", 0.0, 1.0},

0 commit comments

Comments
 (0)