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.

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

Addresses #5227, updates to Controller:OutdoorAir #5237

Merged
merged 28 commits into from
Oct 9, 2024
Merged
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
e4e6558
Add humidistat control zone getters and setters.
joseph-robertson Aug 16, 2024
b9a8c14
Update ft and rt for humidistat control zone.
joseph-robertson Aug 16, 2024
7f2a379
Add a model test.
joseph-robertson Aug 16, 2024
07f5034
Formatting.
joseph-robertson Aug 16, 2024
ba9bc10
Add electronic enthalpy limit curve getters and setters.
joseph-robertson Aug 16, 2024
6f7f67b
Update ft and rt for curves and schedules.
joseph-robertson Aug 16, 2024
3f249dc
Formatting.
joseph-robertson Aug 16, 2024
4c58131
Clean up.
joseph-robertson Aug 19, 2024
f1c8943
Deprecate setHighHumidityControl and instead use setHumidistatControl…
joseph-robertson Aug 19, 2024
5d7a6bf
Update ft for checking that humidistat control zone has a zone contro…
joseph-robertson Aug 19, 2024
5d20d04
Clean up getters, ft, and model tests.
joseph-robertson Oct 4, 2024
4293bd4
Remove remaining extra getXXX methods.
joseph-robertson Oct 4, 2024
96e3ca8
Clean up cpp file.
joseph-robertson Oct 4, 2024
936ae1f
Fix typos in rt file.
joseph-robertson Oct 4, 2024
009e003
More typos, and update rt.
joseph-robertson Oct 4, 2024
4e54e88
Typos in model test.
joseph-robertson Oct 4, 2024
34fdbb3
Clean up old bool get methods.
joseph-robertson Oct 7, 2024
199d8ee
Fix setting high humidity control to Yes or No based on other fields.
joseph-robertson Oct 7, 2024
325ef2d
Make other humidity fields required, add vt, and deprecate humidity c…
joseph-robertson Oct 8, 2024
1202392
Formatting.
joseph-robertson Oct 8, 2024
457dae1
Typos in model test file.
joseph-robertson Oct 8, 2024
f3b874f
Update model and vt test files.
joseph-robertson Oct 8, 2024
26520c9
Remove optional from newly required fields and break getters.
joseph-robertson Oct 8, 2024
8790298
Typo in cpp file.
joseph-robertson Oct 8, 2024
c36adbe
Make the 3.8.0 release notes + update template with YAML header for p…
jmarrec Oct 9, 2024
1430a0e
Start a 3.9.0 release Notes and add the API break in there (and the u…
jmarrec Oct 9, 2024
622a258
Clean up and fix ctor.
joseph-robertson Oct 9, 2024
330ad0c
Update and fix vt tests.
joseph-robertson Oct 9, 2024
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
Prev Previous commit
Next Next commit
Remove remaining extra getXXX methods.
joseph-robertson committed Oct 4, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 4293bd4a6992ba425aa94ca90212fea76b278b27
65 changes: 0 additions & 65 deletions src/model/ControllerOutdoorAir.cpp
joseph-robertson marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -88,11 +88,6 @@ namespace model {
// return any children objects in the hierarchy
std::vector<ModelObject> ControllerOutdoorAir_Impl::children() const {
std::vector<ModelObject> result;
//result.push_back(this->getElectronicEnthalpyLimitCurve());
//result.push_back(this->getMinimumOutdoorAirSchedule());
//result.push_back(this->getMinimumFractionOfOutdoorAirSchedule());
//result.push_back(this->getMaximumFractionOfOutdoorAirSchedule());
//result.push_back(this->getTimeOfDayEconomizerControlSchedule());
std::vector<AirflowNetworkOutdoorAirflow> myAFNItems =
getObject<ModelObject>().getModelObjectSources<AirflowNetworkOutdoorAirflow>(AirflowNetworkOutdoorAirflow::iddObjectType());
result.insert(result.end(), myAFNItems.begin(), myAFNItems.end());
@@ -119,50 +114,6 @@ namespace model {
OS_ASSERT(result);
}

ScheduleCompact ControllerOutdoorAir_Impl::getMinimumOutdoorAirSchedule() const {
try {
OptionalWorkspaceObject wo = this->getTarget(openstudio::OS_Controller_OutdoorAirFields::MinimumOutdoorAirScheduleName);
OptionalScheduleCompact schedule = wo->optionalCast<ScheduleCompact>();
return *schedule;
} catch (...) {
LOG(Error, "Failed to retrieve minimum outdoor air schedule")
throw;
}
}

ScheduleCompact ControllerOutdoorAir_Impl::getMinimumFractionOfOutdoorAirSchedule() const {
try {
OptionalWorkspaceObject wo = this->getTarget(openstudio::OS_Controller_OutdoorAirFields::MinimumFractionofOutdoorAirScheduleName);
OptionalScheduleCompact schedule = wo->optionalCast<ScheduleCompact>();
return *schedule;
} catch (...) {
LOG(Error, "Failed to retrieve minimum fraciton of outdoor air schedule")
throw;
}
}

ScheduleCompact ControllerOutdoorAir_Impl::getMaximumFractionOfOutdoorAirSchedule() const {
try {
OptionalWorkspaceObject wo = this->getTarget(openstudio::OS_Controller_OutdoorAirFields::MaximumFractionofOutdoorAirScheduleName);
OptionalScheduleCompact schedule = wo->optionalCast<ScheduleCompact>();
return *schedule;
} catch (...) {
LOG(Error, "Failed to retrieve maximum fraction of outdoor air schedule")
throw;
}
}

ScheduleCompact ControllerOutdoorAir_Impl::getTimeOfDayEconomizerControlSchedule() const {
try {
OptionalWorkspaceObject wo = this->getTarget(openstudio::OS_Controller_OutdoorAirFields::TimeofDayEconomizerControlScheduleName);
OptionalScheduleCompact schedule = wo->optionalCast<ScheduleCompact>();
return *schedule;
} catch (...) {
LOG(Error, "Failed to retrieve time of day economizer control schedule")
throw;
}
}

OptionalAirLoopHVACOutdoorAirSystem ControllerOutdoorAir_Impl::airLoopHVACOutdoorAirSystem() const {
AirLoopHVACOutdoorAirSystemVector oaSystems;
oaSystems = this->model().getConcreteModelObjects<AirLoopHVACOutdoorAirSystem>();
@@ -650,22 +601,6 @@ namespace model {
getImpl<detail::ControllerOutdoorAir_Impl>()->resetElectronicEnthalpyLimitCurve();
}

ScheduleCompact ControllerOutdoorAir::getMinimumOutdoorAirSchedule() const {
return getImpl<detail::ControllerOutdoorAir_Impl>()->getMinimumOutdoorAirSchedule();
}

ScheduleCompact ControllerOutdoorAir::getMinimumFractionOfOutdoorAirSchedule() const {
return getImpl<detail::ControllerOutdoorAir_Impl>()->getMinimumFractionOfOutdoorAirSchedule();
}

ScheduleCompact ControllerOutdoorAir::getMaximumFractionOfOutdoorAirSchedule() const {
return getImpl<detail::ControllerOutdoorAir_Impl>()->getMaximumFractionOfOutdoorAirSchedule();
}

ScheduleCompact ControllerOutdoorAir::getTimeOfDayEconomizerControlSchedule() const {
return getImpl<detail::ControllerOutdoorAir_Impl>()->getTimeOfDayEconomizerControlSchedule();
}

boost::optional<AirLoopHVACOutdoorAirSystem> ControllerOutdoorAir::airLoopHVACOutdoorAirSystem() const {
return getImpl<detail::ControllerOutdoorAir_Impl>()->airLoopHVACOutdoorAirSystem();
}
8 changes: 0 additions & 8 deletions src/model/ControllerOutdoorAir.hpp
Original file line number Diff line number Diff line change
@@ -151,14 +151,6 @@ namespace model {
explicit ControllerOutdoorAir(std::shared_ptr<detail::ControllerOutdoorAir_Impl> impl);

private:
ScheduleCompact getMinimumOutdoorAirSchedule() const;

ScheduleCompact getMinimumFractionOfOutdoorAirSchedule() const;

ScheduleCompact getMaximumFractionOfOutdoorAirSchedule() const;

ScheduleCompact getTimeOfDayEconomizerControlSchedule() const;

ControllerOutdoorAir(const Handle& handle, const Model& model);

REGISTER_LOGGER("openstudio.model.ControllerOutdoorAir");
4 changes: 0 additions & 4 deletions src/model/ControllerOutdoorAir_Impl.hpp
Original file line number Diff line number Diff line change
@@ -122,22 +122,18 @@ namespace model {

bool setControllerMechanicalVentilation(const ControllerMechanicalVentilation& controllerMechanicalVentilation);

ScheduleCompact getMinimumOutdoorAirSchedule() const;
boost::optional<Schedule> minimumOutdoorAirSchedule() const;
bool setMinimumOutdoorAirSchedule(Schedule& schedule);
void resetMinimumOutdoorAirSchedule();

ScheduleCompact getMinimumFractionOfOutdoorAirSchedule() const;
boost::optional<Schedule> minimumFractionofOutdoorAirSchedule() const;
bool setMinimumFractionofOutdoorAirSchedule(Schedule& schedule);
void resetMinimumFractionofOutdoorAirSchedule();

ScheduleCompact getMaximumFractionOfOutdoorAirSchedule() const;
boost::optional<Schedule> maximumFractionofOutdoorAirSchedule() const;
bool setMaximumFractionofOutdoorAirSchedule(Schedule& schedule);
void resetMaximumFractionofOutdoorAirSchedule();

ScheduleCompact getTimeOfDayEconomizerControlSchedule() const;
boost::optional<Schedule> timeofDayEconomizerControlSchedule() const;
bool setTimeofDayEconomizerControlSchedule(Schedule& schedule);
void resetTimeofDayEconomizerControlSchedule();