From 09e0c40121543ce07c960c3a7a6940e7172c165f Mon Sep 17 00:00:00 2001 From: Julien Marrec Date: Tue, 6 Jun 2023 21:07:10 +0200 Subject: [PATCH 1/5] Rename OpenStudio.in to OpenStudio.hxx.in for clarity --- CMakeLists.txt | 2 +- OpenStudio.hxx.in | 95 +++++++++++++++++++++++++++++++++++++++++++++++ OpenStudio.in | 89 -------------------------------------------- 3 files changed, 96 insertions(+), 90 deletions(-) create mode 100644 OpenStudio.hxx.in delete mode 100644 OpenStudio.in diff --git a/CMakeLists.txt b/CMakeLists.txt index 31a0e4b57b..51f4e09115 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -206,7 +206,7 @@ set(ENERGYPLUS_REPO "NREL") set(RADIANCE_VERSION "5.0.a.12") # configure file with version information -configure_file(${PROJECT_SOURCE_DIR}/OpenStudio.in ${PROJECT_BINARY_DIR}/src/OpenStudio.hxx) +configure_file(${PROJECT_SOURCE_DIR}/OpenStudio.hxx.in ${PROJECT_BINARY_DIR}/src/OpenStudio.hxx) # Deployment target if(APPLE) diff --git a/OpenStudio.hxx.in b/OpenStudio.hxx.in new file mode 100644 index 0000000000..cf2ba971cf --- /dev/null +++ b/OpenStudio.hxx.in @@ -0,0 +1,95 @@ +#ifndef OPENSTUDIO_HXX +#define OPENSTUDIO_HXX + +#include +#include + +// Support for Ninja on Windows (Ninja isn't multi-configuration while MSVC is) +#cmakedefine NINJA + +// Return the version in MAJOR.MINOR.PATCH format (eg '3.0.0') +inline std::string openStudioVersion() { + return "${OPENSTUDIO_VERSION}"; +} + +// Includes prerelease tag if any, and build sha, eg: '3.0.0-rc1+baflkdhsia' +inline std::string openStudioLongVersion() { + return "${OPENSTUDIO_LONG_VERSION}"; +} + +inline std::string openStudioVersionMajor() { + return "${PROJECT_VERSION_MAJOR}"; +} + +inline std::string openStudioVersionMinor() { + return "${PROJECT_VERSION_MINOR}"; +} + +inline std::string openStudioVersionPatch() { + return "${PROJECT_VERSION_PATCH}"; +} + +inline std::string openStudioVersionPrerelease() { + return "${PROJECT_VERSION_PRERELEASE}"; +} + +inline std::string openStudioVersionBuildSHA() { + return "${PROJECT_VERSION_BUILD}"; +} + +inline int energyPlusVersionMajor() { + return ${ENERGYPLUS_VERSION_MAJOR}; +} + +inline int energyPlusVersionMinor() { + return ${ENERGYPLUS_VERSION_MINOR}; +} + +inline int energyPlusVersionPatch() { + return ${ENERGYPLUS_VERSION_PATCH}; +} + +inline std::string energyPlusVersion() { + return "${ENERGYPLUS_VERSION}"; +} + +inline std::string energyPlusBuildSHA() { + return "${ENERGYPLUS_BUILD_SHA}"; +} + +inline std::string rubyLibDir() { + return "${PROJECT_SOURCE_DIR}/ruby/"; +} + +inline std::string rubyOpenStudioDir() { +#ifdef WIN32 +# ifdef NINJA + return "${PROJECT_BINARY_DIR}/ruby/"; +# else + return "${PROJECT_BINARY_DIR}/ruby/" + std::string(CMAKE_INTDIR) + "/"; +# endif +#else + return "${PROJECT_BINARY_DIR}/ruby/"; +#endif +} + +namespace openstudio { +namespace detail { + +inline constexpr int cx_openStudioVersionMajor() { + return ${PROJECT_VERSION_MAJOR}; +} +inline constexpr int cx_openStudioVersionMinor() { + return ${PROJECT_VERSION_MINOR}; +} +inline constexpr int cx_openStudioVersionPatch() { + return ${PROJECT_VERSION_PATCH}; +} +inline constexpr std::string_view cx_openStudioVersion() { + return "${OPENSTUDIO_VERSION}"; +} + +} // namespace detail +} // namespace openstudio + +#endif // OPENSTUDIO_HXX diff --git a/OpenStudio.in b/OpenStudio.in deleted file mode 100644 index 9f97a996e7..0000000000 --- a/OpenStudio.in +++ /dev/null @@ -1,89 +0,0 @@ -#ifndef OPENSTUDIO_HXX -#define OPENSTUDIO_HXX - -// Support for Ninja on Windows (Ninja isn't multi-configuration while MSVC is) -#cmakedefine NINJA - -// Return the version in MAJOR.MINOR.PATCH format (eg '3.0.0') -inline std::string openStudioVersion() -{ - return "${OPENSTUDIO_VERSION}"; -} - -// Includes prerelease tag if any, and build sha, eg: '3.0.0-rc1+baflkdhsia' -inline std::string openStudioLongVersion() -{ - return "${OPENSTUDIO_LONG_VERSION}"; -} - -inline std::string openStudioVersionMajor() -{ - return "${PROJECT_VERSION_MAJOR}"; -} - -inline std::string openStudioVersionMinor() -{ - return "${PROJECT_VERSION_MINOR}"; -} - -inline std::string openStudioVersionPatch() -{ - return "${PROJECT_VERSION_PATCH}"; -} - -inline std::string openStudioVersionPrerelease() -{ - return "${PROJECT_VERSION_PRERELEASE}"; -} - -inline std::string openStudioVersionBuildSHA() -{ - return "${PROJECT_VERSION_BUILD}"; -} - -inline int energyPlusVersionMajor() -{ - return ${ENERGYPLUS_VERSION_MAJOR}; -} - -inline int energyPlusVersionMinor() -{ - return ${ENERGYPLUS_VERSION_MINOR}; -} - -inline int energyPlusVersionPatch() -{ - return ${ENERGYPLUS_VERSION_PATCH}; -} - -inline std::string energyPlusVersion() -{ - return "${ENERGYPLUS_VERSION}"; -} - -inline std::string energyPlusBuildSHA() -{ - return "${ENERGYPLUS_BUILD_SHA}"; -} - -inline std::string rubyLibDir() -{ - return "${PROJECT_SOURCE_DIR}/ruby/"; -} - -inline std::string rubyOpenStudioDir() -{ - #ifdef WIN32 - #ifdef NINJA - return "${PROJECT_BINARY_DIR}/ruby/"; - #else - return "${PROJECT_BINARY_DIR}/ruby/" + std::string(CMAKE_INTDIR) + "/"; - #endif - #else - return "${PROJECT_BINARY_DIR}/ruby/"; - #endif -} - - -#endif // OPENSTUDIO_HXX - From bfadb323b8e2edc9ece4796e639f67af17419de6 Mon Sep 17 00:00:00 2001 From: Julien Marrec Date: Fri, 2 Jun 2023 08:53:18 +0200 Subject: [PATCH 2/5] Add deprecated helpers + use it in a couple of files --- .../CoilCoolingDXMultiSpeedStageData.cpp | 37 +++++----- src/model/CoilHeatingDXSingleSpeed.cpp | 37 +++++----- src/model/ZoneMixing.cpp | 28 +++----- src/utilities/CMakeLists.txt | 1 + src/utilities/core/DeprecatedHelpers.hpp | 72 +++++++++++++++++++ 5 files changed, 121 insertions(+), 54 deletions(-) create mode 100644 src/utilities/core/DeprecatedHelpers.hpp diff --git a/src/model/CoilCoolingDXMultiSpeedStageData.cpp b/src/model/CoilCoolingDXMultiSpeedStageData.cpp index 416c416d00..49f242f6b9 100644 --- a/src/model/CoilCoolingDXMultiSpeedStageData.cpp +++ b/src/model/CoilCoolingDXMultiSpeedStageData.cpp @@ -43,6 +43,7 @@ #include #include "../utilities/units/Unit.hpp" #include "../utilities/core/Assert.hpp" +#include "../utilities/core/DeprecatedHelpers.hpp" namespace openstudio { namespace model { @@ -752,12 +753,6 @@ namespace model { return getImpl()->isRatedAirFlowRateAutosized(); } - double CoilCoolingDXMultiSpeedStageData::ratedEvaporatorFanPowerPerVolumeFlowRate() const { - LOG(Warn, "As of 3.5.0, ratedEvaporatorFanPowerPerVolumeFlowRate is deprecated. Use ratedEvaporatorFanPowerPerVolumeFlowRate2017 instead. It " - "will be removed within three releases."); - return getImpl()->ratedEvaporatorFanPowerPerVolumeFlowRate2017(); - } - double CoilCoolingDXMultiSpeedStageData::ratedEvaporatorFanPowerPerVolumeFlowRate2017() const { return getImpl()->ratedEvaporatorFanPowerPerVolumeFlowRate2017(); } @@ -858,13 +853,6 @@ namespace model { getImpl()->autosizeRatedAirFlowRate(); } - bool CoilCoolingDXMultiSpeedStageData::setRatedEvaporatorFanPowerPerVolumeFlowRate(double ratedEvaporatorFanPowerPerVolumeFlowRate) { - LOG(Warn, "As of 3.5.0, setRatedEvaporatorFanPowerPerVolumeFlowRate is deprecated. Use setRatedEvaporatorFanPowerPerVolumeFlowRate2017 instead. " - "It will be removed within three releases."); - return getImpl()->setRatedEvaporatorFanPowerPerVolumeFlowRate2017( - ratedEvaporatorFanPowerPerVolumeFlowRate); - } - bool CoilCoolingDXMultiSpeedStageData::setRatedEvaporatorFanPowerPerVolumeFlowRate2017(double ratedEvaporatorFanPowerPerVolumeFlowRate2017) { return getImpl()->setRatedEvaporatorFanPowerPerVolumeFlowRate2017( ratedEvaporatorFanPowerPerVolumeFlowRate2017); @@ -943,11 +931,6 @@ namespace model { getImpl()->autosizeRatedEvaporativeCondenserPumpPowerConsumption(); } - /// @cond - CoilCoolingDXMultiSpeedStageData::CoilCoolingDXMultiSpeedStageData(std::shared_ptr impl) - : ParentObject(std::move(impl)) {} - /// @endcond - boost::optional CoilCoolingDXMultiSpeedStageData::autosizedGrossRatedTotalCoolingCapacity() const { return getImpl()->autosizedGrossRatedTotalCoolingCapacity(); } @@ -984,5 +967,23 @@ namespace model { return getImpl()->stageIndexAndParentCoil(); } + /// @cond + CoilCoolingDXMultiSpeedStageData::CoilCoolingDXMultiSpeedStageData(std::shared_ptr impl) + : ParentObject(std::move(impl)) {} + + // DEPRECATED + double CoilCoolingDXMultiSpeedStageData::ratedEvaporatorFanPowerPerVolumeFlowRate() const { + DEPRECATED_AT_MSG("3.5.0", "Use ratedEvaporatorFanPowerPerVolumeFlowRate2017 instead."); + return getImpl()->ratedEvaporatorFanPowerPerVolumeFlowRate2017(); + } + + bool CoilCoolingDXMultiSpeedStageData::setRatedEvaporatorFanPowerPerVolumeFlowRate(double ratedEvaporatorFanPowerPerVolumeFlowRate) { + DEPRECATED_AT_MSG("3.5.0", "Use setRatedEvaporatorFanPowerPerVolumeFlowRate2017 instead."); + return getImpl()->setRatedEvaporatorFanPowerPerVolumeFlowRate2017( + ratedEvaporatorFanPowerPerVolumeFlowRate); + } + + /// @endcond + } // namespace model } // namespace openstudio diff --git a/src/model/CoilHeatingDXSingleSpeed.cpp b/src/model/CoilHeatingDXSingleSpeed.cpp index 152ea873c9..9a3b4e5edd 100644 --- a/src/model/CoilHeatingDXSingleSpeed.cpp +++ b/src/model/CoilHeatingDXSingleSpeed.cpp @@ -66,6 +66,8 @@ #include "../utilities/core/Assert.hpp" #include "../utilities/data/DataEnums.hpp" +#include "../utilities/core/DeprecatedHelpers.hpp" // For deprecation + namespace openstudio { namespace model { @@ -1086,18 +1088,6 @@ namespace model { getImpl()->setDefrostEnergyInputRatioFunctionofTemperatureCurve(boost::none); } - double CoilHeatingDXSingleSpeed::ratedSupplyFanPowerPerVolumeFlowRate() const { - LOG(Warn, "As of 3.5.0, ratedSupplyFanPowerPerVolumeFlowRate is deprecated. Use ratedSupplyFanPowerPerVolumeFlowRate2017 instead. It will be " - "removed within three releases."); - return getImpl()->ratedSupplyFanPowerPerVolumeFlowRate2017(); - } - - bool CoilHeatingDXSingleSpeed::setRatedSupplyFanPowerPerVolumeFlowRate(double ratedSupplyFanPowerPerVolumeFlowRate) { - LOG(Warn, "As of 3.5.0, setRatedSupplyFanPowerPerVolumeFlowRate is deprecated. Use setRatedSupplyFanPowerPerVolumeFlowRate2017 instead. It will " - "be removed within three releases."); - return getImpl()->setRatedSupplyFanPowerPerVolumeFlowRate2017(ratedSupplyFanPowerPerVolumeFlowRate); - } - double CoilHeatingDXSingleSpeed::ratedSupplyFanPowerPerVolumeFlowRate2017() const { return getImpl()->ratedSupplyFanPowerPerVolumeFlowRate2017(); } @@ -1122,12 +1112,6 @@ namespace model { return getImpl()->airflowNetworkEquivalentDuct(); } - /// @cond - CoilHeatingDXSingleSpeed::CoilHeatingDXSingleSpeed(std::shared_ptr impl) - : StraightComponent(std::move(impl)) {} - - /// @endcond - boost::optional CoilHeatingDXSingleSpeed::autosizedRatedTotalHeatingCapacity() const { return getImpl()->autosizedRatedTotalHeatingCapacity(); } @@ -1140,6 +1124,23 @@ namespace model { return getImpl()->autosizedResistiveDefrostHeaterCapacity(); } + /// @cond + CoilHeatingDXSingleSpeed::CoilHeatingDXSingleSpeed(std::shared_ptr impl) + : StraightComponent(std::move(impl)) {} + + // DEPRECATED + double CoilHeatingDXSingleSpeed::ratedSupplyFanPowerPerVolumeFlowRate() const { + DEPRECATED_AT_MSG("3.5.0", "Use ratedSupplyFanPowerPerVolumeFlowRate2017 instead."); + return getImpl()->ratedSupplyFanPowerPerVolumeFlowRate2017(); + } + + bool CoilHeatingDXSingleSpeed::setRatedSupplyFanPowerPerVolumeFlowRate(double ratedSupplyFanPowerPerVolumeFlowRate) { + DEPRECATED_AT_MSG("3.5.0", "Use setRatedSupplyFanPowerPerVolumeFlowRate2017 instead."); + return getImpl()->setRatedSupplyFanPowerPerVolumeFlowRate2017(ratedSupplyFanPowerPerVolumeFlowRate); + } + + /// @endcond + } // namespace model } // namespace openstudio diff --git a/src/model/ZoneMixing.cpp b/src/model/ZoneMixing.cpp index 44d78903c2..2644010e79 100644 --- a/src/model/ZoneMixing.cpp +++ b/src/model/ZoneMixing.cpp @@ -46,6 +46,7 @@ #include "../utilities/units/Unit.hpp" #include "../utilities/core/Assert.hpp" +#include "../utilities/core/DeprecatedHelpers.hpp" namespace openstudio { namespace model { @@ -691,57 +692,48 @@ namespace model { // DEPRECATED void ZoneMixing::resetSourceZone() { - LOG(Warn, "As of 3.5.0, resetSourceZone is deprecated. Use resetSourceZoneOrSpace instead. It will be " - "removed within three releases."); + DEPRECATED_AT_MSG("3.5.0", "Use resetSourceZoneOrSpace instead."); getImpl()->resetSourceZoneOrSpace(); } boost::optional ZoneMixing::flowRateperZoneFloorArea() const { - LOG(Warn, "As of 3.5.0, flowRateperZoneFloorArea is deprecated. Use flowRateperFloorArea instead. It will be " - "removed within three releases."); + DEPRECATED_AT_MSG("3.5.0", "Use flowRateperFloorArea instead."); return getImpl()->flowRateperFloorArea(); } bool ZoneMixing::setFlowRateperZoneFloorArea(double flowRateperZoneFloorArea) { - LOG(Warn, "As of 3.5.0, setFlowRateperZoneFloorArea is deprecated. Use setFlowRateperFloorArea instead. It will be " - "removed within three releases."); + DEPRECATED_AT_MSG("3.5.0", "Use setFlowRateperFloorArea instead."); return getImpl()->setFlowRateperFloorArea(flowRateperZoneFloorArea); } // ReceivingTemperatureSchedule boost::optional ZoneMixing::minimumZoneTemperatureSchedule() const { - LOG(Warn, "As of 3.5.0, minimumZoneTemperatureSchedule is deprecated. Use minimumReceivingTemperatureSchedule instead. It will be " - "removed within three releases."); + DEPRECATED_AT_MSG("3.5.0", "Use minimumReceivingTemperatureSchedule instead."); return getImpl()->minimumReceivingTemperatureSchedule(); } bool ZoneMixing::setMinimumZoneTemperatureSchedule(Schedule& schedule) { - LOG(Warn, "As of 3.5.0, setMinimumZoneTemperatureSchedule is deprecated. Use setMinimumReceivingTemperatureSchedule instead. It will be " - "removed within three releases."); + DEPRECATED_AT_MSG("3.5.0", "Use setMinimumReceivingTemperatureSchedule instead."); return getImpl()->setMinimumReceivingTemperatureSchedule(schedule); } void ZoneMixing::resetMinimumZoneTemperatureSchedule() { - LOG(Warn, "As of 3.5.0, resetMinimumZoneTemperatureSchedule is deprecated. Use resetMinimumReceivingTemperatureSchedule instead. It will be " - "removed within three releases."); + DEPRECATED_AT_MSG("3.5.0", "Use resetMinimumReceivingTemperatureSchedule instead."); getImpl()->resetMinimumReceivingTemperatureSchedule(); } boost::optional ZoneMixing::maximumZoneTemperatureSchedule() const { - LOG(Warn, "As of 3.5.0, maximumZoneTemperatureSchedule is deprecated. Use maximumReceivingTemperatureSchedule instead. It will be " - "removed within three releases."); + DEPRECATED_AT_MSG("3.5.0", "Use maximumReceivingTemperatureSchedule instead."); return getImpl()->maximumReceivingTemperatureSchedule(); } bool ZoneMixing::setMaximumZoneTemperatureSchedule(Schedule& schedule) { - LOG(Warn, "As of 3.5.0, setMaximumZoneTemperatureSchedule is deprecated. Use setMaximumReceivingTemperatureSchedule instead. It will be " - "removed within three releases."); + DEPRECATED_AT_MSG("3.5.0", "Use setMaximumReceivingTemperatureSchedule instead."); return getImpl()->setMaximumReceivingTemperatureSchedule(schedule); } void ZoneMixing::resetMaximumZoneTemperatureSchedule() { - LOG(Warn, "As of 3.5.0, resetMaximumZoneTemperatureSchedule is deprecated. Use resetMaximumReceivingTemperatureSchedule instead. It will be " - "removed within three releases."); + DEPRECATED_AT_MSG("3.5.0", "Use resetMaximumReceivingTemperatureSchedule instead."); getImpl()->resetMaximumReceivingTemperatureSchedule(); } diff --git a/src/utilities/CMakeLists.txt b/src/utilities/CMakeLists.txt index 863ac833fc..e9db04116a 100644 --- a/src/utilities/CMakeLists.txt +++ b/src/utilities/CMakeLists.txt @@ -24,6 +24,7 @@ set(core_src core/Containers.hpp core/Containers.cpp core/Deprecated.hpp + core/DeprecatedHelpers.hpp core/DynamicLibrary.hpp core/DynamicLibraryPOSIX.hpp core/DynamicLibraryWindows.hpp diff --git a/src/utilities/core/DeprecatedHelpers.hpp b/src/utilities/core/DeprecatedHelpers.hpp new file mode 100644 index 0000000000..aa300edb8b --- /dev/null +++ b/src/utilities/core/DeprecatedHelpers.hpp @@ -0,0 +1,72 @@ +/*********************************************************************************************************************** +* OpenStudio(R), Copyright (c) 2008-2023, Alliance for Sustainable Energy, LLC, and other contributors. All rights reserved. +* +* Redistribution and use in source and binary forms, with or without modification, are permitted provided that the +* following conditions are met: +* +* (1) Redistributions of source code must retain the above copyright notice, this list of conditions and the following +* disclaimer. +* +* (2) Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following +* disclaimer in the documentation and/or other materials provided with the distribution. +* +* (3) Neither the name of the copyright holder nor the names of any contributors may be used to endorse or promote products +* derived from this software without specific prior written permission from the respective party. +* +* (4) Other than as required in clauses (1) and (2), distributions in any form of modifications or other derivative works +* may not use the "OpenStudio" trademark, "OS", "os", or any other confusingly similar designation without specific prior +* written permission from Alliance for Sustainable Energy, LLC. +* +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND ANY CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, +* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER(S), ANY CONTRIBUTORS, THE UNITED STATES GOVERNMENT, OR THE UNITED +* STATES DEPARTMENT OF ENERGY, NOR ANY OF THEIR EMPLOYEES, BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF +* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +***********************************************************************************************************************/ + +#ifndef UTILITIES_CORE_DEPRECATEDHELPERS_HPP +#define UTILITIES_CORE_DEPRECATEDHELPERS_HPP + +#include "Compare.hpp" +#include "Exception.hpp" +#include "Logger.hpp" + +#include + +#include +#include + +#include + +#define DEPRECATED_AT(__deprecatedAt__) \ + openstudio::detail::log_deprecation_and_throw_if_time_to_remove(__deprecatedAt__, logChannel(), BOOST_CURRENT_FUNCTION) + +#define DEPRECATED_AT_MSG(__deprecatedAt__, __message__) \ + openstudio::detail::log_deprecation_and_throw_if_time_to_remove(__deprecatedAt__, logChannel(), BOOST_CURRENT_FUNCTION, __message__) + +namespace openstudio { + +namespace detail { + inline void log_deprecation_and_throw_if_time_to_remove(const std::string& deprecatedAt, const std::string& logChannel, + const std::string& methodName, const std::string& extraMessage = "") { + if (extraMessage.empty()) { + LOG_FREE(Warn, logChannel, "As of " << deprecatedAt << ", " << methodName << " is deprecated."); + } else { + LOG_FREE(Warn, logChannel, "As of " << deprecatedAt << ", " << methodName << " is deprecated. " << extraMessage); + } + + const VersionString currentVersion(openStudioVersion()); + const VersionString deprecatedAtVersion(deprecatedAt); + const bool isTimeToRemoveDeprecated = + ((currentVersion.major() == deprecatedAtVersion.major()) || (currentVersion.minor() >= deprecatedAtVersion.minor() + 3)); + if (isTimeToRemoveDeprecated) { + throw openstudio::Exception(fmt::format("Time to remove {} from the API", methodName)); + } + } +} // namespace detail +} // namespace openstudio + +#endif // UTILITIES_CORE_DEPRECATEDHELPERS_HPP From e74e6640f27c0c6cd39d7547da05c5879cf6fa05 Mon Sep 17 00:00:00 2001 From: Julien Marrec Date: Tue, 6 Jun 2023 21:07:54 +0200 Subject: [PATCH 3/5] Change to a static_assert with a custom error message so we get a compile-time error when it's time to remove deprecated --- .../AirConditionerVariableRefrigerantFlow.cpp | 16 ++++ src/model/AirTerminalSingleDuctVAVReheat.cpp | 5 +- src/model/CoilCoolingDXCurveFitSpeed.cpp | 30 ++++--- .../CoilCoolingDXMultiSpeedStageData.cpp | 5 +- src/model/CoilCoolingDXSingleSpeed.cpp | 47 +++++----- src/model/CoilCoolingDXSingleSpeed.hpp | 2 +- ...ilCoolingWaterToAirHeatPumpEquationFit.cpp | 89 ++++++++----------- .../CoilHeatingDXMultiSpeedStageData.cpp | 36 ++++---- src/model/CoilHeatingDXSingleSpeed.cpp | 4 +- ...ilHeatingWaterToAirHeatPumpEquationFit.cpp | 51 +++++------ src/model/ConstructionAirBoundary.cpp | 25 +++--- src/model/CurveDoubleExponentialDecay.cpp | 10 ++- src/model/DesignDay.cpp | 28 ++++++ ...HeatPumpWaterToWaterEquationFitCooling.cpp | 48 +++++----- ...HeatPumpWaterToWaterEquationFitHeating.cpp | 49 +++++----- src/model/ScheduleFile.cpp | 7 +- src/model/SubSurface.cpp | 4 + src/model/ZoneAirMassFlowConservation.cpp | 15 ++-- src/model/ZoneHVACLowTempRadiantConstFlow.cpp | 7 +- src/model/ZoneMixing.cpp | 36 ++++---- src/utilities/bcl/RemoteBCL.cpp | 9 +- src/utilities/core/DeprecatedHelpers.hpp | 43 ++++++--- 22 files changed, 308 insertions(+), 258 deletions(-) diff --git a/src/model/AirConditionerVariableRefrigerantFlow.cpp b/src/model/AirConditionerVariableRefrigerantFlow.cpp index 96358a147c..e1a8307090 100644 --- a/src/model/AirConditionerVariableRefrigerantFlow.cpp +++ b/src/model/AirConditionerVariableRefrigerantFlow.cpp @@ -62,6 +62,8 @@ #include #include +#include "../utilities/core/DeprecatedHelpers.hpp" + namespace openstudio { namespace model { @@ -3073,58 +3075,72 @@ namespace model { // DEPRECATED bool AirConditionerVariableRefrigerantFlow::setRatedTotalCoolingCapacity(double grossRatedTotalCoolingCapacity) { + DEPRECATED_AT_MSG(2, 9, 0, "Use setGrossRatedTotalCoolingCapacity instead."); return getImpl()->setGrossRatedTotalCoolingCapacity(grossRatedTotalCoolingCapacity); } void AirConditionerVariableRefrigerantFlow::autosizeRatedTotalCoolingCapacity() { + DEPRECATED_AT_MSG(2, 9, 0, "Use autosizeGrossRatedTotalCoolingCapacity instead."); getImpl()->autosizeGrossRatedTotalCoolingCapacity(); } bool AirConditionerVariableRefrigerantFlow::setRatedCoolingCOP(double grossRatedCoolingCOP) { + DEPRECATED_AT_MSG(2, 9, 0, "Use setGrossRatedCoolingCOP instead."); return getImpl()->setGrossRatedCoolingCOP(grossRatedCoolingCOP); } boost::optional AirConditionerVariableRefrigerantFlow::ratedTotalCoolingCapacity() const { + DEPRECATED_AT_MSG(2, 9, 0, "Use grossRatedTotalCoolingCapacity instead."); return getImpl()->grossRatedTotalCoolingCapacity(); } bool AirConditionerVariableRefrigerantFlow::isRatedTotalCoolingCapacityAutosized() const { + DEPRECATED_AT_MSG(2, 9, 0, "Use isGrossRatedTotalCoolingCapacityAutosized instead."); return getImpl()->isGrossRatedTotalCoolingCapacityAutosized(); } double AirConditionerVariableRefrigerantFlow::ratedCoolingCOP() const { + DEPRECATED_AT_MSG(2, 9, 0, "Use grossRatedCoolingCOP instead."); return getImpl()->grossRatedCoolingCOP(); } boost::optional AirConditionerVariableRefrigerantFlow::ratedTotalHeatingCapacity() const { + DEPRECATED_AT_MSG(2, 9, 0, "Use grossRatedHeatingCapacity instead."); return getImpl()->grossRatedHeatingCapacity(); } bool AirConditionerVariableRefrigerantFlow::isRatedTotalHeatingCapacityAutosized() const { + DEPRECATED_AT_MSG(2, 9, 0, "Use isGrossRatedHeatingCapacityAutosized instead."); return getImpl()->isGrossRatedHeatingCapacityAutosized(); } double AirConditionerVariableRefrigerantFlow::ratedTotalHeatingCapacitySizingRatio() const { + DEPRECATED_AT_MSG(2, 9, 0, "Use ratedHeatingCapacitySizingRatio instead."); return getImpl()->ratedHeatingCapacitySizingRatio(); } bool AirConditionerVariableRefrigerantFlow::setRatedTotalHeatingCapacity(double grossRatedHeatingCapacity) { + DEPRECATED_AT_MSG(2, 9, 0, "Use setGrossRatedHeatingCapacity instead."); return getImpl()->setGrossRatedHeatingCapacity(grossRatedHeatingCapacity); } void AirConditionerVariableRefrigerantFlow::autosizeRatedTotalHeatingCapacity() { + DEPRECATED_AT_MSG(2, 9, 0, "Use autosizeGrossRatedHeatingCapacity instead."); getImpl()->autosizeGrossRatedHeatingCapacity(); } bool AirConditionerVariableRefrigerantFlow::setRatedTotalHeatingCapacitySizingRatio(double ratedHeatingCapacitySizingRatio) { + DEPRECATED_AT_MSG(2, 9, 0, "Use setRatedHeatingCapacitySizingRatio instead."); return getImpl()->setRatedHeatingCapacitySizingRatio(ratedHeatingCapacitySizingRatio); } boost::optional AirConditionerVariableRefrigerantFlow::autosizedRatedTotalCoolingCapacity() const { + DEPRECATED_AT_MSG(2, 9, 0, "Use autosizedGrossRatedTotalCoolingCapacity instead."); return getImpl()->autosizedGrossRatedTotalCoolingCapacity(); } boost::optional AirConditionerVariableRefrigerantFlow::autosizedRatedTotalHeatingCapacity() const { + DEPRECATED_AT_MSG(2, 9, 0, "Use autosizedGrossRatedHeatingCapacity instead."); return getImpl()->autosizedGrossRatedHeatingCapacity(); } diff --git a/src/model/AirTerminalSingleDuctVAVReheat.cpp b/src/model/AirTerminalSingleDuctVAVReheat.cpp index 97552375ac..2c78fe8f59 100644 --- a/src/model/AirTerminalSingleDuctVAVReheat.cpp +++ b/src/model/AirTerminalSingleDuctVAVReheat.cpp @@ -53,6 +53,7 @@ #include "../utilities/core/Compare.hpp" #include "../utilities/core/Assert.hpp" #include "../utilities/data/DataEnums.hpp" +#include "../utilities/core/DeprecatedHelpers.hpp" namespace openstudio { @@ -825,7 +826,7 @@ namespace model { } std::string AirTerminalSingleDuctVAVReheat::zoneMinimumAirFlowMethod() { - LOG(Warn, "zoneMinimumAirFlowMethod is deprecated, please use zoneMinimumAirFlowInputMethod"); + DEPRECATED_AT_MSG(3, 0, 1, "Use zoneMinimumAirFlowInputMethod instead."); return zoneMinimumAirFlowInputMethod(); } @@ -834,7 +835,7 @@ namespace model { } bool AirTerminalSingleDuctVAVReheat::setZoneMinimumAirFlowMethod(const std::string& value) { - LOG(Warn, "setZoneMinimumAirFlowMethod is deprecated, please use setZoneMinimumAirFlowInputMethod"); + DEPRECATED_AT_MSG(3, 0, 1, "Use setZoneMinimumAirFlowInputMethod instead."); return setZoneMinimumAirFlowInputMethod(value); } diff --git a/src/model/CoilCoolingDXCurveFitSpeed.cpp b/src/model/CoilCoolingDXCurveFitSpeed.cpp index 3bc788f568..9eccc41ea0 100644 --- a/src/model/CoilCoolingDXCurveFitSpeed.cpp +++ b/src/model/CoilCoolingDXCurveFitSpeed.cpp @@ -46,6 +46,7 @@ #include #include "../utilities/units/Unit.hpp" #include "../utilities/core/Assert.hpp" +#include "../utilities/core/DeprecatedHelpers.hpp" namespace openstudio { namespace model { @@ -517,12 +518,6 @@ namespace model { return getImpl()->activeFractionofCoilFaceArea(); } - double CoilCoolingDXCurveFitSpeed::ratedEvaporatorFanPowerPerVolumeFlowRate() const { - LOG(Warn, "As of 3.5.0, ratedEvaporatorFanPowerPerVolumeFlowRate is deprecated. Use ratedEvaporatorFanPowerPerVolumeFlowRate2017 instead. It " - "will be removed within three releases."); - return getImpl()->ratedEvaporatorFanPowerPerVolumeFlowRate2017(); - } - double CoilCoolingDXCurveFitSpeed::ratedEvaporatorFanPowerPerVolumeFlowRate2017() const { return getImpl()->ratedEvaporatorFanPowerPerVolumeFlowRate2017(); } @@ -607,13 +602,6 @@ namespace model { return getImpl()->setActiveFractionofCoilFaceArea(activeFractionofCoilFaceArea); } - bool CoilCoolingDXCurveFitSpeed::setRatedEvaporatorFanPowerPerVolumeFlowRate(double ratedEvaporatorFanPowerPerVolumeFlowRate) { - LOG(Warn, "As of 3.5.0, setRatedEvaporatorFanPowerPerVolumeFlowRate is deprecated. Use setRatedEvaporatorFanPowerPerVolumeFlowRate2017 instead. " - "It will be removed within three releases."); - return getImpl()->setRatedEvaporatorFanPowerPerVolumeFlowRate2017( - ratedEvaporatorFanPowerPerVolumeFlowRate); - } - bool CoilCoolingDXCurveFitSpeed::setRatedEvaporatorFanPowerPerVolumeFlowRate2017(double ratedEvaporatorFanPowerPerVolumeFlowRate2017) { return getImpl()->setRatedEvaporatorFanPowerPerVolumeFlowRate2017( ratedEvaporatorFanPowerPerVolumeFlowRate2017); @@ -713,7 +701,21 @@ namespace model { } /// @cond - CoilCoolingDXCurveFitSpeed::CoilCoolingDXCurveFitSpeed(std::shared_ptr impl) : ResourceObject(impl) {} + CoilCoolingDXCurveFitSpeed::CoilCoolingDXCurveFitSpeed(std::shared_ptr impl) + : ResourceObject(std::move(impl)) {} + + // DEPRECATED + double CoilCoolingDXCurveFitSpeed::ratedEvaporatorFanPowerPerVolumeFlowRate() const { + DEPRECATED_AT_MSG(3, 5, 0, "Use ratedEvaporatorFanPowerPerVolumeFlowRate2017 instead."); + return getImpl()->ratedEvaporatorFanPowerPerVolumeFlowRate2017(); + } + + bool CoilCoolingDXCurveFitSpeed::setRatedEvaporatorFanPowerPerVolumeFlowRate(double ratedEvaporatorFanPowerPerVolumeFlowRate) { + DEPRECATED_AT_MSG(3, 5, 0, "Use setRatedEvaporatorFanPowerPerVolumeFlowRate2017 instead."); + return getImpl()->setRatedEvaporatorFanPowerPerVolumeFlowRate2017( + ratedEvaporatorFanPowerPerVolumeFlowRate); + } + /// @endcond } // namespace model diff --git a/src/model/CoilCoolingDXMultiSpeedStageData.cpp b/src/model/CoilCoolingDXMultiSpeedStageData.cpp index 49f242f6b9..14da66c8c9 100644 --- a/src/model/CoilCoolingDXMultiSpeedStageData.cpp +++ b/src/model/CoilCoolingDXMultiSpeedStageData.cpp @@ -43,6 +43,7 @@ #include #include "../utilities/units/Unit.hpp" #include "../utilities/core/Assert.hpp" + #include "../utilities/core/DeprecatedHelpers.hpp" namespace openstudio { @@ -973,12 +974,12 @@ namespace model { // DEPRECATED double CoilCoolingDXMultiSpeedStageData::ratedEvaporatorFanPowerPerVolumeFlowRate() const { - DEPRECATED_AT_MSG("3.5.0", "Use ratedEvaporatorFanPowerPerVolumeFlowRate2017 instead."); + DEPRECATED_AT_MSG(3, 5, 0, "Use ratedEvaporatorFanPowerPerVolumeFlowRate2017 instead."); return getImpl()->ratedEvaporatorFanPowerPerVolumeFlowRate2017(); } bool CoilCoolingDXMultiSpeedStageData::setRatedEvaporatorFanPowerPerVolumeFlowRate(double ratedEvaporatorFanPowerPerVolumeFlowRate) { - DEPRECATED_AT_MSG("3.5.0", "Use setRatedEvaporatorFanPowerPerVolumeFlowRate2017 instead."); + DEPRECATED_AT_MSG(3, 5, 0, "Use setRatedEvaporatorFanPowerPerVolumeFlowRate2017 instead."); return getImpl()->setRatedEvaporatorFanPowerPerVolumeFlowRate2017( ratedEvaporatorFanPowerPerVolumeFlowRate); } diff --git a/src/model/CoilCoolingDXSingleSpeed.cpp b/src/model/CoilCoolingDXSingleSpeed.cpp index fc5de6a050..fb4274f02d 100644 --- a/src/model/CoilCoolingDXSingleSpeed.cpp +++ b/src/model/CoilCoolingDXSingleSpeed.cpp @@ -59,6 +59,8 @@ #include "AirLoopHVACOutdoorAirSystem_Impl.hpp" #include "AirLoopHVACDedicatedOutdoorAirSystem.hpp" #include "AirLoopHVACDedicatedOutdoorAirSystem_Impl.hpp" +#include "AirflowNetworkEquivalentDuct.hpp" +#include "AirflowNetworkEquivalentDuct_Impl.hpp" #include "Model.hpp" #include @@ -67,8 +69,8 @@ #include "../utilities/core/Compare.hpp" #include "../utilities/core/Assert.hpp" #include "../utilities/data/DataEnums.hpp" -#include "AirflowNetworkEquivalentDuct.hpp" -#include "AirflowNetworkEquivalentDuct_Impl.hpp" + +#include "../utilities/core/DeprecatedHelpers.hpp" namespace openstudio { namespace model { @@ -1010,8 +1012,6 @@ namespace model { setBasinHeaterSetpointTemperature(2.0); } - CoilCoolingDXSingleSpeed::CoilCoolingDXSingleSpeed(std::shared_ptr p) : StraightComponent(std::move(p)) {} - Schedule CoilCoolingDXSingleSpeed::availabilitySchedule() const { return getImpl()->availabilitySchedule(); } @@ -1032,12 +1032,6 @@ namespace model { return getImpl()->setRatedCOP(value); } - double CoilCoolingDXSingleSpeed::ratedEvaporatorFanPowerPerVolumeFlowRate() const { - LOG(Warn, "As of 3.5.0, ratedEvaporatorFanPowerPerVolumeFlowRate is deprecated. Use ratedSupplyFanPowerPerVolumeFlowRate2017 instead. It will be " - "removed within three releases."); - return getImpl()->ratedEvaporatorFanPowerPerVolumeFlowRate2017(); - } - double CoilCoolingDXSingleSpeed::ratedEvaporatorFanPowerPerVolumeFlowRate2017() const { return getImpl()->ratedEvaporatorFanPowerPerVolumeFlowRate2017(); } @@ -1046,18 +1040,6 @@ namespace model { return getImpl()->ratedEvaporatorFanPowerPerVolumeFlowRate2023(); } - bool CoilCoolingDXSingleSpeed::setRatedEvaporatorFanPowerPerVolumeFlowRate(boost::optional value) { - LOG(Warn, "As of 3.5.0, setRatedEvaporatorFanPowerPerVolumeFlowRate is deprecated. Use setRatedEvaporatorFanPowerPerVolumeFlowRate2017 instead. " - "It will be removed within three releases."); - return getImpl()->setRatedEvaporatorFanPowerPerVolumeFlowRate2017(value); - } - - bool CoilCoolingDXSingleSpeed::setRatedEvaporatorFanPowerPerVolumeFlowRate(double value) { - LOG(Warn, "As of 3.5.0, setRatedEvaporatorFanPowerPerVolumeFlowRate is deprecated. Use setRatedEvaporatorFanPowerPerVolumeFlowRate2017 instead. " - "It will be removed within three releases."); - return getImpl()->setRatedEvaporatorFanPowerPerVolumeFlowRate2017(value); - } - bool CoilCoolingDXSingleSpeed::setRatedEvaporatorFanPowerPerVolumeFlowRate2017(boost::optional value) { return getImpl()->setRatedEvaporatorFanPowerPerVolumeFlowRate2017(value); } @@ -1392,5 +1374,26 @@ namespace model { return getImpl()->autosizedEvaporativeCondenserPumpRatedPowerConsumption(); } + /// @cond + + CoilCoolingDXSingleSpeed::CoilCoolingDXSingleSpeed(std::shared_ptr impl) : StraightComponent(std::move(p)) {} + + // DEPRECATED + double CoilCoolingDXSingleSpeed::ratedEvaporatorFanPowerPerVolumeFlowRate() const { + DEPRECATED_AT_MSG(3, 5, 0, "Use ratedEvaporatorFanPowerPerVolumeFlowRate2017 instead."); + return getImpl()->ratedEvaporatorFanPowerPerVolumeFlowRate2017(); + } + + bool CoilCoolingDXSingleSpeed::setRatedEvaporatorFanPowerPerVolumeFlowRate(boost::optional value) { + DEPRECATED_AT_MSG(3, 5, 0, "Use setRatedEvaporatorFanPowerPerVolumeFlowRate2017 instead."); + return getImpl()->setRatedEvaporatorFanPowerPerVolumeFlowRate2017(value); + } + + bool CoilCoolingDXSingleSpeed::setRatedEvaporatorFanPowerPerVolumeFlowRate(double value) { + DEPRECATED_AT_MSG(3, 5, 0, "Use setRatedEvaporatorFanPowerPerVolumeFlowRate2017 instead."); + return getImpl()->setRatedEvaporatorFanPowerPerVolumeFlowRate2017(value); + } + /// @endcond + } // namespace model } // namespace openstudio diff --git a/src/model/CoilCoolingDXSingleSpeed.hpp b/src/model/CoilCoolingDXSingleSpeed.hpp index 5b5546e898..11c4a7cfee 100644 --- a/src/model/CoilCoolingDXSingleSpeed.hpp +++ b/src/model/CoilCoolingDXSingleSpeed.hpp @@ -87,7 +87,7 @@ namespace model { static IddObjectType iddObjectType(); - std::vector condenserTypeValues() const; + static std::vector condenserTypeValues() const; /** @name Getters */ //@{ diff --git a/src/model/CoilCoolingWaterToAirHeatPumpEquationFit.cpp b/src/model/CoilCoolingWaterToAirHeatPumpEquationFit.cpp index c5e21c588c..bdd36e2540 100644 --- a/src/model/CoilCoolingWaterToAirHeatPumpEquationFit.cpp +++ b/src/model/CoilCoolingWaterToAirHeatPumpEquationFit.cpp @@ -51,6 +51,8 @@ #include "../utilities/core/Assert.hpp" #include "../utilities/data/DataEnums.hpp" +#include "../utilities/core/DeprecatedHelpers.hpp" + namespace openstudio { namespace model { @@ -806,211 +808,198 @@ namespace model { // DEPRECATED double CoilCoolingWaterToAirHeatPumpEquationFit::totalCoolingCapacityCoefficient1() const { - LOG(Warn, "This method is deprecated. Use CoilCoolingWaterToAirHeatPumpEquationFit::totalCoolingCapacityCurve().coefficient1Constant() instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use CoilCoolingWaterToAirHeatPumpEquationFit::totalCoolingCapacityCurve().coefficient1Constant() instead."); CurveQuadLinear curve = getImpl()->totalCoolingCapacityCurve(); return curve.coefficient1Constant(); } bool CoilCoolingWaterToAirHeatPumpEquationFit::setTotalCoolingCapacityCoefficient1(double totalCoolingCapacityCoefficient1) { - LOG(Warn, "This method is deprecated. Use " - "CoilCoolingWaterToAirHeatPumpEquationFit::totalCoolingCapacityCurve().setCoefficient1Constant(double) instead.") + DEPRECATED_AT_MSG(3, 2, 0, + "Use " + "CoilCoolingWaterToAirHeatPumpEquationFit::totalCoolingCapacityCurve().setCoefficient1Constant(double) instead."); CurveQuadLinear curve = getImpl()->totalCoolingCapacityCurve(); return curve.setCoefficient1Constant(totalCoolingCapacityCoefficient1); } double CoilCoolingWaterToAirHeatPumpEquationFit::totalCoolingCapacityCoefficient2() const { - LOG(Warn, "This method is deprecated. Use CoilCoolingWaterToAirHeatPumpEquationFit::totalCoolingCapacityCurve().coefficient2w() instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use CoilCoolingWaterToAirHeatPumpEquationFit::totalCoolingCapacityCurve().coefficient2w() instead."); CurveQuadLinear curve = getImpl()->totalCoolingCapacityCurve(); return curve.coefficient2w(); } bool CoilCoolingWaterToAirHeatPumpEquationFit::setTotalCoolingCapacityCoefficient2(double totalCoolingCapacityCoefficient2) { - LOG(Warn, - "This method is deprecated. Use CoilCoolingWaterToAirHeatPumpEquationFit::totalCoolingCapacityCurve().setCoefficient2w(double) instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use CoilCoolingWaterToAirHeatPumpEquationFit::totalCoolingCapacityCurve().setCoefficient2w(double) instead."); CurveQuadLinear curve = getImpl()->totalCoolingCapacityCurve(); return curve.setCoefficient2w(totalCoolingCapacityCoefficient2); } double CoilCoolingWaterToAirHeatPumpEquationFit::totalCoolingCapacityCoefficient3() const { - LOG(Warn, "This method is deprecated. Use CoilCoolingWaterToAirHeatPumpEquationFit::totalCoolingCapacityCurve().coefficient3x() instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use CoilCoolingWaterToAirHeatPumpEquationFit::totalCoolingCapacityCurve().coefficient3x() instead."); CurveQuadLinear curve = getImpl()->totalCoolingCapacityCurve(); return curve.coefficient3x(); } bool CoilCoolingWaterToAirHeatPumpEquationFit::setTotalCoolingCapacityCoefficient3(double totalCoolingCapacityCoefficient3) { - LOG(Warn, - "This method is deprecated. Use CoilCoolingWaterToAirHeatPumpEquationFit::totalCoolingCapacityCurve().setCoefficient3x(double) instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use CoilCoolingWaterToAirHeatPumpEquationFit::totalCoolingCapacityCurve().setCoefficient3x(double) instead."); CurveQuadLinear curve = getImpl()->totalCoolingCapacityCurve(); return curve.setCoefficient3x(totalCoolingCapacityCoefficient3); } double CoilCoolingWaterToAirHeatPumpEquationFit::totalCoolingCapacityCoefficient4() const { - LOG(Warn, "This method is deprecated. Use CoilCoolingWaterToAirHeatPumpEquationFit::totalCoolingCapacityCurve().coefficient4y() instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use CoilCoolingWaterToAirHeatPumpEquationFit::totalCoolingCapacityCurve().coefficient4y() instead."); CurveQuadLinear curve = getImpl()->totalCoolingCapacityCurve(); return curve.coefficient4y(); } bool CoilCoolingWaterToAirHeatPumpEquationFit::setTotalCoolingCapacityCoefficient4(double totalCoolingCapacityCoefficient4) { - LOG(Warn, - "This method is deprecated. Use CoilCoolingWaterToAirHeatPumpEquationFit::totalCoolingCapacityCurve().setCoefficient4y(double) instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use CoilCoolingWaterToAirHeatPumpEquationFit::totalCoolingCapacityCurve().setCoefficient4y(double) instead."); CurveQuadLinear curve = getImpl()->totalCoolingCapacityCurve(); return curve.setCoefficient4y(totalCoolingCapacityCoefficient4); } double CoilCoolingWaterToAirHeatPumpEquationFit::totalCoolingCapacityCoefficient5() const { - LOG(Warn, "This method is deprecated. Use CoilCoolingWaterToAirHeatPumpEquationFit::totalCoolingCapacityCurve().coefficient5z() instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use CoilCoolingWaterToAirHeatPumpEquationFit::totalCoolingCapacityCurve().coefficient5z() instead."); CurveQuadLinear curve = getImpl()->totalCoolingCapacityCurve(); return curve.coefficient5z(); } bool CoilCoolingWaterToAirHeatPumpEquationFit::setTotalCoolingCapacityCoefficient5(double totalCoolingCapacityCoefficient5) { - LOG(Warn, - "This method is deprecated. Use CoilCoolingWaterToAirHeatPumpEquationFit::totalCoolingCapacityCurve().setCoefficient5z(double) instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use CoilCoolingWaterToAirHeatPumpEquationFit::totalCoolingCapacityCurve().setCoefficient5z(double) instead."); CurveQuadLinear curve = getImpl()->totalCoolingCapacityCurve(); return curve.setCoefficient5z(totalCoolingCapacityCoefficient5); } double CoilCoolingWaterToAirHeatPumpEquationFit::sensibleCoolingCapacityCoefficient1() const { - LOG(Warn, - "This method is deprecated. Use CoilCoolingWaterToAirHeatPumpEquationFit::sensibleCoolingCapacityCurve().coefficient1Constant() instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use CoilCoolingWaterToAirHeatPumpEquationFit::sensibleCoolingCapacityCurve().coefficient1Constant() instead."); CurveQuintLinear curve = getImpl()->sensibleCoolingCapacityCurve(); return curve.coefficient1Constant(); } bool CoilCoolingWaterToAirHeatPumpEquationFit::setSensibleCoolingCapacityCoefficient1(double sensibleCoolingCapacityCoefficient1) { - LOG(Warn, "This method is deprecated. Use " - "CoilCoolingWaterToAirHeatPumpEquationFit::sensibleCoolingCapacityCurve().setCoefficient1Constant(double) instead.") + DEPRECATED_AT_MSG(3, 2, 0, + "Use " + "CoilCoolingWaterToAirHeatPumpEquationFit::sensibleCoolingCapacityCurve().setCoefficient1Constant(double) instead."); CurveQuintLinear curve = getImpl()->sensibleCoolingCapacityCurve(); return curve.setCoefficient1Constant(sensibleCoolingCapacityCoefficient1); } double CoilCoolingWaterToAirHeatPumpEquationFit::sensibleCoolingCapacityCoefficient2() const { - LOG(Warn, "This method is deprecated. Use CoilCoolingWaterToAirHeatPumpEquationFit::sensibleCoolingCapacityCurve().coefficient2v() instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use CoilCoolingWaterToAirHeatPumpEquationFit::sensibleCoolingCapacityCurve().coefficient2v() instead."); CurveQuintLinear curve = getImpl()->sensibleCoolingCapacityCurve(); return curve.coefficient2v(); } bool CoilCoolingWaterToAirHeatPumpEquationFit::setSensibleCoolingCapacityCoefficient2(double sensibleCoolingCapacityCoefficient2) { - LOG(Warn, - "This method is deprecated. Use CoilCoolingWaterToAirHeatPumpEquationFit::sensibleCoolingCapacityCurve().setCoefficient2v(double) instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use CoilCoolingWaterToAirHeatPumpEquationFit::sensibleCoolingCapacityCurve().setCoefficient2v(double) instead."); CurveQuintLinear curve = getImpl()->sensibleCoolingCapacityCurve(); return curve.setCoefficient2v(sensibleCoolingCapacityCoefficient2); } double CoilCoolingWaterToAirHeatPumpEquationFit::sensibleCoolingCapacityCoefficient3() const { - LOG(Warn, "This method is deprecated. Use CoilCoolingWaterToAirHeatPumpEquationFit::sensibleCoolingCapacityCurve().coefficient3w() instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use CoilCoolingWaterToAirHeatPumpEquationFit::sensibleCoolingCapacityCurve().coefficient3w() instead."); CurveQuintLinear curve = getImpl()->sensibleCoolingCapacityCurve(); return curve.coefficient3w(); } bool CoilCoolingWaterToAirHeatPumpEquationFit::setSensibleCoolingCapacityCoefficient3(double sensibleCoolingCapacityCoefficient3) { - LOG(Warn, - "This method is deprecated. Use CoilCoolingWaterToAirHeatPumpEquationFit::sensibleCoolingCapacityCurve().setCoefficient3w(double) instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use CoilCoolingWaterToAirHeatPumpEquationFit::sensibleCoolingCapacityCurve().setCoefficient3w(double) instead."); CurveQuintLinear curve = getImpl()->sensibleCoolingCapacityCurve(); return curve.setCoefficient3w(sensibleCoolingCapacityCoefficient3); } double CoilCoolingWaterToAirHeatPumpEquationFit::sensibleCoolingCapacityCoefficient4() const { - LOG(Warn, "This method is deprecated. Use CoilCoolingWaterToAirHeatPumpEquationFit::sensibleCoolingCapacityCurve().coefficient4x() instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use CoilCoolingWaterToAirHeatPumpEquationFit::sensibleCoolingCapacityCurve().coefficient4x() instead."); CurveQuintLinear curve = getImpl()->sensibleCoolingCapacityCurve(); return curve.coefficient4x(); } bool CoilCoolingWaterToAirHeatPumpEquationFit::setSensibleCoolingCapacityCoefficient4(double sensibleCoolingCapacityCoefficient4) { - LOG(Warn, - "This method is deprecated. Use CoilCoolingWaterToAirHeatPumpEquationFit::sensibleCoolingCapacityCurve().setCoefficient4x(double) instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use CoilCoolingWaterToAirHeatPumpEquationFit::sensibleCoolingCapacityCurve().setCoefficient4x(double) instead."); CurveQuintLinear curve = getImpl()->sensibleCoolingCapacityCurve(); return curve.setCoefficient4x(sensibleCoolingCapacityCoefficient4); } double CoilCoolingWaterToAirHeatPumpEquationFit::sensibleCoolingCapacityCoefficient5() const { - LOG(Warn, "This method is deprecated. Use CoilCoolingWaterToAirHeatPumpEquationFit::sensibleCoolingCapacityCurve().coefficient5y() instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use CoilCoolingWaterToAirHeatPumpEquationFit::sensibleCoolingCapacityCurve().coefficient5y() instead."); CurveQuintLinear curve = getImpl()->sensibleCoolingCapacityCurve(); return curve.coefficient5y(); } bool CoilCoolingWaterToAirHeatPumpEquationFit::setSensibleCoolingCapacityCoefficient5(double sensibleCoolingCapacityCoefficient5) { - LOG(Warn, - "This method is deprecated. Use CoilCoolingWaterToAirHeatPumpEquationFit::sensibleCoolingCapacityCurve().setCoefficient5y(double) instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use CoilCoolingWaterToAirHeatPumpEquationFit::sensibleCoolingCapacityCurve().setCoefficient5y(double) instead."); CurveQuintLinear curve = getImpl()->sensibleCoolingCapacityCurve(); return curve.setCoefficient5y(sensibleCoolingCapacityCoefficient5); } double CoilCoolingWaterToAirHeatPumpEquationFit::sensibleCoolingCapacityCoefficient6() const { - LOG(Warn, "This method is deprecated. Use CoilCoolingWaterToAirHeatPumpEquationFit::sensibleCoolingCapacityCurve().coefficient6z() instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use CoilCoolingWaterToAirHeatPumpEquationFit::sensibleCoolingCapacityCurve().coefficient6z() instead."); CurveQuintLinear curve = getImpl()->sensibleCoolingCapacityCurve(); return curve.coefficient6z(); } bool CoilCoolingWaterToAirHeatPumpEquationFit::setSensibleCoolingCapacityCoefficient6(double sensibleCoolingCapacityCoefficient6) { - LOG(Warn, - "This method is deprecated. Use CoilCoolingWaterToAirHeatPumpEquationFit::sensibleCoolingCapacityCurve().setCoefficient6z(double) instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use CoilCoolingWaterToAirHeatPumpEquationFit::sensibleCoolingCapacityCurve().setCoefficient6z(double) instead."); CurveQuintLinear curve = getImpl()->sensibleCoolingCapacityCurve(); return curve.setCoefficient6z(sensibleCoolingCapacityCoefficient6); } double CoilCoolingWaterToAirHeatPumpEquationFit::coolingPowerConsumptionCoefficient1() const { - LOG(Warn, - "This method is deprecated. Use CoilCoolingWaterToAirHeatPumpEquationFit::coolingPowerConsumptionCurve().coefficient1Constant() instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use CoilCoolingWaterToAirHeatPumpEquationFit::coolingPowerConsumptionCurve().coefficient1Constant() instead."); CurveQuadLinear curve = getImpl()->coolingPowerConsumptionCurve(); return curve.coefficient1Constant(); } bool CoilCoolingWaterToAirHeatPumpEquationFit::setCoolingPowerConsumptionCoefficient1(double coolingPowerConsumptionCoefficient1) { - LOG(Warn, "This method is deprecated. Use " - "CoilCoolingWaterToAirHeatPumpEquationFit::coolingPowerConsumptionCurve().setCoefficient1Constant(double) instead.") + DEPRECATED_AT_MSG(3, 2, 0, + "Use CoilCoolingWaterToAirHeatPumpEquationFit::coolingPowerConsumptionCurve().setCoefficient1Constant(double) instead."); CurveQuadLinear curve = getImpl()->coolingPowerConsumptionCurve(); return curve.setCoefficient1Constant(coolingPowerConsumptionCoefficient1); } double CoilCoolingWaterToAirHeatPumpEquationFit::coolingPowerConsumptionCoefficient2() const { - LOG(Warn, "This method is deprecated. Use CoilCoolingWaterToAirHeatPumpEquationFit::coolingPowerConsumptionCurve().coefficient2w() instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use CoilCoolingWaterToAirHeatPumpEquationFit::coolingPowerConsumptionCurve().coefficient2w() instead."); CurveQuadLinear curve = getImpl()->coolingPowerConsumptionCurve(); return curve.coefficient2w(); } bool CoilCoolingWaterToAirHeatPumpEquationFit::setCoolingPowerConsumptionCoefficient2(double coolingPowerConsumptionCoefficient2) { - LOG(Warn, - "This method is deprecated. Use CoilCoolingWaterToAirHeatPumpEquationFit::coolingPowerConsumptionCurve().setCoefficient2w(double) instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use CoilCoolingWaterToAirHeatPumpEquationFit::coolingPowerConsumptionCurve().setCoefficient2w(double) instead."); CurveQuadLinear curve = getImpl()->coolingPowerConsumptionCurve(); return curve.setCoefficient2w(coolingPowerConsumptionCoefficient2); } double CoilCoolingWaterToAirHeatPumpEquationFit::coolingPowerConsumptionCoefficient3() const { - LOG(Warn, "This method is deprecated. Use CoilCoolingWaterToAirHeatPumpEquationFit::coolingPowerConsumptionCurve().coefficient3x() instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use CoilCoolingWaterToAirHeatPumpEquationFit::coolingPowerConsumptionCurve().coefficient3x() instead."); CurveQuadLinear curve = getImpl()->coolingPowerConsumptionCurve(); return curve.coefficient3x(); } bool CoilCoolingWaterToAirHeatPumpEquationFit::setCoolingPowerConsumptionCoefficient3(double coolingPowerConsumptionCoefficient3) { - LOG(Warn, - "This method is deprecated. Use CoilCoolingWaterToAirHeatPumpEquationFit::coolingPowerConsumptionCurve().setCoefficient3x(double) instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use CoilCoolingWaterToAirHeatPumpEquationFit::coolingPowerConsumptionCurve().setCoefficient3x(double) instead."); CurveQuadLinear curve = getImpl()->coolingPowerConsumptionCurve(); return curve.setCoefficient3x(coolingPowerConsumptionCoefficient3); } double CoilCoolingWaterToAirHeatPumpEquationFit::coolingPowerConsumptionCoefficient4() const { - LOG(Warn, "This method is deprecated. Use CoilCoolingWaterToAirHeatPumpEquationFit::coolingPowerConsumptionCurve().coefficient4y() instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use CoilCoolingWaterToAirHeatPumpEquationFit::coolingPowerConsumptionCurve().coefficient4y() instead."); CurveQuadLinear curve = getImpl()->coolingPowerConsumptionCurve(); return curve.coefficient4y(); } bool CoilCoolingWaterToAirHeatPumpEquationFit::setCoolingPowerConsumptionCoefficient4(double coolingPowerConsumptionCoefficient4) { - LOG(Warn, - "This method is deprecated. Use CoilCoolingWaterToAirHeatPumpEquationFit::coolingPowerConsumptionCurve().setCoefficient4y(double) instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use CoilCoolingWaterToAirHeatPumpEquationFit::coolingPowerConsumptionCurve().setCoefficient4y(double) instead."); CurveQuadLinear curve = getImpl()->coolingPowerConsumptionCurve(); return curve.setCoefficient4y(coolingPowerConsumptionCoefficient4); } double CoilCoolingWaterToAirHeatPumpEquationFit::coolingPowerConsumptionCoefficient5() const { - LOG(Warn, "This method is deprecated. Use CoilCoolingWaterToAirHeatPumpEquationFit::coolingPowerConsumptionCurve().coefficient5z() instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use CoilCoolingWaterToAirHeatPumpEquationFit::coolingPowerConsumptionCurve().coefficient5z() instead."); CurveQuadLinear curve = getImpl()->coolingPowerConsumptionCurve(); return curve.coefficient5z(); } bool CoilCoolingWaterToAirHeatPumpEquationFit::setCoolingPowerConsumptionCoefficient5(double coolingPowerConsumptionCoefficient5) { - LOG(Warn, - "This method is deprecated. Use CoilCoolingWaterToAirHeatPumpEquationFit::coolingPowerConsumptionCurve().setCoefficient5z(double) instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use CoilCoolingWaterToAirHeatPumpEquationFit::coolingPowerConsumptionCurve().setCoefficient5z(double) instead."); CurveQuadLinear curve = getImpl()->coolingPowerConsumptionCurve(); return curve.setCoefficient5z(coolingPowerConsumptionCoefficient5); } diff --git a/src/model/CoilHeatingDXMultiSpeedStageData.cpp b/src/model/CoilHeatingDXMultiSpeedStageData.cpp index 0d6def3111..06b82d3afe 100644 --- a/src/model/CoilHeatingDXMultiSpeedStageData.cpp +++ b/src/model/CoilHeatingDXMultiSpeedStageData.cpp @@ -43,6 +43,7 @@ #include #include "../utilities/units/Unit.hpp" #include "../utilities/core/Assert.hpp" +#include "../utilities/core/DeprecatedHelpers.hpp" namespace openstudio { namespace model { @@ -522,12 +523,6 @@ namespace model { return getImpl()->isRatedAirFlowRateAutosized(); } - double CoilHeatingDXMultiSpeedStageData::ratedSupplyAirFanPowerPerVolumeFlowRate() const { - LOG(Warn, "As of 3.5.0, ratedSupplyAirFanPowerPerVolumeFlowRate is deprecated. Use ratedSupplyAirFanPowerPerVolumeFlowRate2017 instead. It will " - "be removed within three releases.") - return getImpl()->ratedSupplyAirFanPowerPerVolumeFlowRate2017(); - } - double CoilHeatingDXMultiSpeedStageData::ratedSupplyAirFanPowerPerVolumeFlowRate2017() const { return getImpl()->ratedSupplyAirFanPowerPerVolumeFlowRate2017(); } @@ -584,13 +579,6 @@ namespace model { getImpl()->autosizeRatedAirFlowRate(); } - bool CoilHeatingDXMultiSpeedStageData::setRatedSupplyAirFanPowerPerVolumeFlowRate(double ratedSupplyAirFanPowerPerVolumeFlowRate) { - LOG(Warn, "As of 3.5.0, setRatedSupplyAirFanPowerPerVolumeFlowRate is deprecated. Use setRatedSupplyAirFanPowerPerVolumeFlowRate2017 instead. It " - "will be removed within three releases."); - return getImpl()->setRatedSupplyAirFanPowerPerVolumeFlowRate2017( - ratedSupplyAirFanPowerPerVolumeFlowRate); - } - bool CoilHeatingDXMultiSpeedStageData::setRatedSupplyAirFanPowerPerVolumeFlowRate2017(double ratedSupplyAirFanPowerPerVolumeFlowRate2017) { return getImpl()->setRatedSupplyAirFanPowerPerVolumeFlowRate2017( ratedSupplyAirFanPowerPerVolumeFlowRate2017); @@ -629,11 +617,6 @@ namespace model { return getImpl()->setWasteHeatFunctionofTemperatureCurve(curve); } - /// @cond - CoilHeatingDXMultiSpeedStageData::CoilHeatingDXMultiSpeedStageData(std::shared_ptr impl) - : ParentObject(std::move(impl)) {} - /// @endcond - boost::optional CoilHeatingDXMultiSpeedStageData::autosizedGrossRatedHeatingCapacity() const { return getImpl()->autosizedGrossRatedHeatingCapacity(); } @@ -658,5 +641,22 @@ namespace model { return getImpl()->stageIndexAndParentCoil(); } + /// @cond + CoilHeatingDXMultiSpeedStageData::CoilHeatingDXMultiSpeedStageData(std::shared_ptr impl) + : ParentObject(std::move(impl)) {} + + // DEPRECATED + double CoilHeatingDXMultiSpeedStageData::ratedSupplyAirFanPowerPerVolumeFlowRate() const { + DEPRECATED_AT_MSG(3, 5, 0, "Use ratedSupplyAirFanPowerPerVolumeFlowRate2017 instead."); + return getImpl()->ratedSupplyAirFanPowerPerVolumeFlowRate2017(); + } + + bool CoilHeatingDXMultiSpeedStageData::setRatedSupplyAirFanPowerPerVolumeFlowRate(double ratedSupplyAirFanPowerPerVolumeFlowRate) { + DEPRECATED_AT_MSG(3, 5, 0, "Use setRatedSupplyAirFanPowerPerVolumeFlowRate2017 instead."); + return getImpl()->setRatedSupplyAirFanPowerPerVolumeFlowRate2017( + ratedSupplyAirFanPowerPerVolumeFlowRate); + } + /// @endcond + } // namespace model } // namespace openstudio diff --git a/src/model/CoilHeatingDXSingleSpeed.cpp b/src/model/CoilHeatingDXSingleSpeed.cpp index 9a3b4e5edd..1f7dfe0ac4 100644 --- a/src/model/CoilHeatingDXSingleSpeed.cpp +++ b/src/model/CoilHeatingDXSingleSpeed.cpp @@ -1130,12 +1130,12 @@ namespace model { // DEPRECATED double CoilHeatingDXSingleSpeed::ratedSupplyFanPowerPerVolumeFlowRate() const { - DEPRECATED_AT_MSG("3.5.0", "Use ratedSupplyFanPowerPerVolumeFlowRate2017 instead."); + DEPRECATED_AT_MSG(3, 5, 0, "Use ratedSupplyFanPowerPerVolumeFlowRate2017 instead."); return getImpl()->ratedSupplyFanPowerPerVolumeFlowRate2017(); } bool CoilHeatingDXSingleSpeed::setRatedSupplyFanPowerPerVolumeFlowRate(double ratedSupplyFanPowerPerVolumeFlowRate) { - DEPRECATED_AT_MSG("3.5.0", "Use setRatedSupplyFanPowerPerVolumeFlowRate2017 instead."); + DEPRECATED_AT_MSG(3, 5, 0, "Use setRatedSupplyFanPowerPerVolumeFlowRate2017 instead."); return getImpl()->setRatedSupplyFanPowerPerVolumeFlowRate2017(ratedSupplyFanPowerPerVolumeFlowRate); } diff --git a/src/model/CoilHeatingWaterToAirHeatPumpEquationFit.cpp b/src/model/CoilHeatingWaterToAirHeatPumpEquationFit.cpp index 6edec72f14..784106364b 100644 --- a/src/model/CoilHeatingWaterToAirHeatPumpEquationFit.cpp +++ b/src/model/CoilHeatingWaterToAirHeatPumpEquationFit.cpp @@ -47,6 +47,8 @@ #include "../utilities/core/Assert.hpp" #include "../utilities/data/DataEnums.hpp" +#include "../utilities/core/DeprecatedHelpers.hpp" + namespace openstudio { namespace model { @@ -641,128 +643,123 @@ namespace model { // DEPRECATED double CoilHeatingWaterToAirHeatPumpEquationFit::heatingCapacityCoefficient1() const { - LOG(Warn, "This method is deprecated. Use CoilHeatingWaterToAirHeatPumpEquationFit::heatingCapacityCurve().coefficient1Constant() instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use CoilHeatingWaterToAirHeatPumpEquationFit::heatingCapacityCurve().coefficient1Constant() instead."); CurveQuadLinear curve = getImpl()->heatingCapacityCurve(); return curve.coefficient1Constant(); } bool CoilHeatingWaterToAirHeatPumpEquationFit::setHeatingCapacityCoefficient1(double heatingCapacityCoefficient1) { - LOG(Warn, - "This method is deprecated. Use CoilHeatingWaterToAirHeatPumpEquationFit::heatingCapacityCurve().setCoefficient1Constant(double) instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use CoilHeatingWaterToAirHeatPumpEquationFit::heatingCapacityCurve().setCoefficient1Constant(double) instead."); CurveQuadLinear curve = getImpl()->heatingCapacityCurve(); return curve.setCoefficient1Constant(heatingCapacityCoefficient1); } double CoilHeatingWaterToAirHeatPumpEquationFit::heatingCapacityCoefficient2() const { - LOG(Warn, "This method is deprecated. Use CoilHeatingWaterToAirHeatPumpEquationFit::heatingCapacityCurve().coefficient2w() instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use CoilHeatingWaterToAirHeatPumpEquationFit::heatingCapacityCurve().coefficient2w() instead."); CurveQuadLinear curve = getImpl()->heatingCapacityCurve(); return curve.coefficient2w(); } bool CoilHeatingWaterToAirHeatPumpEquationFit::setHeatingCapacityCoefficient2(double heatingCapacityCoefficient2) { - LOG(Warn, "This method is deprecated. Use CoilHeatingWaterToAirHeatPumpEquationFit::heatingCapacityCurve().setCoefficient2w(double) instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use CoilHeatingWaterToAirHeatPumpEquationFit::heatingCapacityCurve().setCoefficient2w(double) instead."); CurveQuadLinear curve = getImpl()->heatingCapacityCurve(); return curve.setCoefficient2w(heatingCapacityCoefficient2); } double CoilHeatingWaterToAirHeatPumpEquationFit::heatingCapacityCoefficient3() const { - LOG(Warn, "This method is deprecated. Use CoilHeatingWaterToAirHeatPumpEquationFit::heatingCapacityCurve().coefficient3x() instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use CoilHeatingWaterToAirHeatPumpEquationFit::heatingCapacityCurve().coefficient3x() instead."); CurveQuadLinear curve = getImpl()->heatingCapacityCurve(); return curve.coefficient3x(); } bool CoilHeatingWaterToAirHeatPumpEquationFit::setHeatingCapacityCoefficient3(double heatingCapacityCoefficient3) { - LOG(Warn, "This method is deprecated. Use CoilHeatingWaterToAirHeatPumpEquationFit::heatingCapacityCurve().setCoefficient3x(double) instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use CoilHeatingWaterToAirHeatPumpEquationFit::heatingCapacityCurve().setCoefficient3x(double) instead."); CurveQuadLinear curve = getImpl()->heatingCapacityCurve(); return curve.setCoefficient3x(heatingCapacityCoefficient3); } double CoilHeatingWaterToAirHeatPumpEquationFit::heatingCapacityCoefficient4() const { - LOG(Warn, "This method is deprecated. Use CoilHeatingWaterToAirHeatPumpEquationFit::heatingCapacityCurve().coefficient4y() instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use CoilHeatingWaterToAirHeatPumpEquationFit::heatingCapacityCurve().coefficient4y() instead."); CurveQuadLinear curve = getImpl()->heatingCapacityCurve(); return curve.coefficient4y(); } bool CoilHeatingWaterToAirHeatPumpEquationFit::setHeatingCapacityCoefficient4(double heatingCapacityCoefficient4) { - LOG(Warn, "This method is deprecated. Use CoilHeatingWaterToAirHeatPumpEquationFit::heatingCapacityCurve().setCoefficient4y(double) instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use CoilHeatingWaterToAirHeatPumpEquationFit::heatingCapacityCurve().setCoefficient4y(double) instead."); CurveQuadLinear curve = getImpl()->heatingCapacityCurve(); return curve.setCoefficient4y(heatingCapacityCoefficient4); } double CoilHeatingWaterToAirHeatPumpEquationFit::heatingCapacityCoefficient5() const { - LOG(Warn, "This method is deprecated. Use CoilHeatingWaterToAirHeatPumpEquationFit::heatingCapacityCurve().coefficient5z() instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use CoilHeatingWaterToAirHeatPumpEquationFit::heatingCapacityCurve().coefficient5z() instead."); CurveQuadLinear curve = getImpl()->heatingCapacityCurve(); return curve.coefficient5z(); } bool CoilHeatingWaterToAirHeatPumpEquationFit::setHeatingCapacityCoefficient5(double heatingCapacityCoefficient5) { - LOG(Warn, "This method is deprecated. Use CoilHeatingWaterToAirHeatPumpEquationFit::heatingCapacityCurve().setCoefficient5z(double) instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use CoilHeatingWaterToAirHeatPumpEquationFit::heatingCapacityCurve().setCoefficient5z(double) instead."); CurveQuadLinear curve = getImpl()->heatingCapacityCurve(); return curve.setCoefficient5z(heatingCapacityCoefficient5); } double CoilHeatingWaterToAirHeatPumpEquationFit::heatingPowerConsumptionCoefficient1() const { - LOG(Warn, - "This method is deprecated. Use CoilHeatingWaterToAirHeatPumpEquationFit::heatingPowerConsumptionCurve().coefficient1Constant() instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use CoilHeatingWaterToAirHeatPumpEquationFit::heatingPowerConsumptionCurve().coefficient1Constant() instead."); CurveQuadLinear curve = getImpl()->heatingPowerConsumptionCurve(); return curve.coefficient1Constant(); } bool CoilHeatingWaterToAirHeatPumpEquationFit::setHeatingPowerConsumptionCoefficient1(double heatingPowerConsumptionCoefficient1) { - LOG(Warn, "This method is deprecated. Use " - "CoilHeatingWaterToAirHeatPumpEquationFit::heatingPowerConsumptionCurve().setCoefficient1Constant(double) instead.") + DEPRECATED_AT_MSG(3, 2, 0, + "Use " + "CoilHeatingWaterToAirHeatPumpEquationFit::heatingPowerConsumptionCurve().setCoefficient1Constant(double) instead."); CurveQuadLinear curve = getImpl()->heatingPowerConsumptionCurve(); return curve.setCoefficient1Constant(heatingPowerConsumptionCoefficient1); } double CoilHeatingWaterToAirHeatPumpEquationFit::heatingPowerConsumptionCoefficient2() const { - LOG(Warn, "This method is deprecated. Use CoilHeatingWaterToAirHeatPumpEquationFit::heatingPowerConsumptionCurve().coefficient2w() instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use CoilHeatingWaterToAirHeatPumpEquationFit::heatingPowerConsumptionCurve().coefficient2w() instead."); CurveQuadLinear curve = getImpl()->heatingPowerConsumptionCurve(); return curve.coefficient2w(); } bool CoilHeatingWaterToAirHeatPumpEquationFit::setHeatingPowerConsumptionCoefficient2(double heatingPowerConsumptionCoefficient2) { - LOG(Warn, - "This method is deprecated. Use CoilHeatingWaterToAirHeatPumpEquationFit::heatingPowerConsumptionCurve().setCoefficient2w(double) instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use CoilHeatingWaterToAirHeatPumpEquationFit::heatingPowerConsumptionCurve().setCoefficient2w(double) instead."); CurveQuadLinear curve = getImpl()->heatingPowerConsumptionCurve(); return curve.setCoefficient2w(heatingPowerConsumptionCoefficient2); } double CoilHeatingWaterToAirHeatPumpEquationFit::heatingPowerConsumptionCoefficient3() const { - LOG(Warn, "This method is deprecated. Use CoilHeatingWaterToAirHeatPumpEquationFit::heatingPowerConsumptionCurve().coefficient3x() instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use CoilHeatingWaterToAirHeatPumpEquationFit::heatingPowerConsumptionCurve().coefficient3x() instead."); CurveQuadLinear curve = getImpl()->heatingPowerConsumptionCurve(); return curve.coefficient3x(); } bool CoilHeatingWaterToAirHeatPumpEquationFit::setHeatingPowerConsumptionCoefficient3(double heatingPowerConsumptionCoefficient3) { - LOG(Warn, - "This method is deprecated. Use CoilHeatingWaterToAirHeatPumpEquationFit::heatingPowerConsumptionCurve().setCoefficient3x(double) instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use CoilHeatingWaterToAirHeatPumpEquationFit::heatingPowerConsumptionCurve().setCoefficient3x(double) instead."); CurveQuadLinear curve = getImpl()->heatingPowerConsumptionCurve(); return curve.setCoefficient3x(heatingPowerConsumptionCoefficient3); } double CoilHeatingWaterToAirHeatPumpEquationFit::heatingPowerConsumptionCoefficient4() const { - LOG(Warn, "This method is deprecated. Use CoilHeatingWaterToAirHeatPumpEquationFit::heatingPowerConsumptionCurve().coefficient4y() instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use CoilHeatingWaterToAirHeatPumpEquationFit::heatingPowerConsumptionCurve().coefficient4y() instead."); CurveQuadLinear curve = getImpl()->heatingPowerConsumptionCurve(); return curve.coefficient4y(); } bool CoilHeatingWaterToAirHeatPumpEquationFit::setHeatingPowerConsumptionCoefficient4(double heatingPowerConsumptionCoefficient4) { - LOG(Warn, - "This method is deprecated. Use CoilHeatingWaterToAirHeatPumpEquationFit::heatingPowerConsumptionCurve().setCoefficient4y(double) instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use CoilHeatingWaterToAirHeatPumpEquationFit::heatingPowerConsumptionCurve().setCoefficient4y(double) instead."); CurveQuadLinear curve = getImpl()->heatingPowerConsumptionCurve(); return curve.setCoefficient4y(heatingPowerConsumptionCoefficient4); } double CoilHeatingWaterToAirHeatPumpEquationFit::heatingPowerConsumptionCoefficient5() const { - LOG(Warn, "This method is deprecated. Use CoilHeatingWaterToAirHeatPumpEquationFit::heatingPowerConsumptionCurve().coefficient5z() instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use CoilHeatingWaterToAirHeatPumpEquationFit::heatingPowerConsumptionCurve().coefficient5z() instead."); CurveQuadLinear curve = getImpl()->heatingPowerConsumptionCurve(); return curve.coefficient5z(); } bool CoilHeatingWaterToAirHeatPumpEquationFit::setHeatingPowerConsumptionCoefficient5(double heatingPowerConsumptionCoefficient5) { - LOG(Warn, - "This method is deprecated. Use CoilHeatingWaterToAirHeatPumpEquationFit::heatingPowerConsumptionCurve().setCoefficient5z(double) instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use CoilHeatingWaterToAirHeatPumpEquationFit::heatingPowerConsumptionCurve().setCoefficient5z(double) instead."); CurveQuadLinear curve = getImpl()->heatingPowerConsumptionCurve(); return curve.setCoefficient5z(heatingPowerConsumptionCoefficient5); } diff --git a/src/model/ConstructionAirBoundary.cpp b/src/model/ConstructionAirBoundary.cpp index 932013e6a8..676d508948 100644 --- a/src/model/ConstructionAirBoundary.cpp +++ b/src/model/ConstructionAirBoundary.cpp @@ -30,7 +30,6 @@ #include "ConstructionAirBoundary.hpp" #include "ConstructionAirBoundary_Impl.hpp" -// TODO: Check the following class names against object getters and setters. #include "Schedule.hpp" #include "Schedule_Impl.hpp" #include "ScheduleTypeLimits.hpp" @@ -40,10 +39,10 @@ #include #include -#include "../utilities/units/Unit.hpp" - #include "../utilities/core/Assert.hpp" +#include "../utilities/core/DeprecatedHelpers.hpp" + namespace openstudio { namespace model { @@ -174,13 +173,13 @@ namespace model { std::vector ConstructionAirBoundary::solarAndDaylightingMethodValues() { std::vector result; - LOG(Warn, "This method is deprecated. All air boundaries will be modeled using the former 'GroupedZones' option."); + DEPRECATED_AT_MSG(3, 2, 0, "All air boundaries will be modeled using the former 'GroupedZones' option."); return result; } std::vector ConstructionAirBoundary::radiantExchangeMethodValues() { std::vector result; - LOG(Warn, "This method is deprecated. All air boundaries will be modeled using the former 'GroupedZones' option."); + DEPRECATED_AT_MSG(3, 2, 0, "All air boundaries will be modeled using the former 'GroupedZones' option."); return result; } @@ -189,22 +188,22 @@ namespace model { } std::string ConstructionAirBoundary::solarAndDaylightingMethod() const { - LOG(Warn, "This method is deprecated. All air boundaries will be modeled using the former 'GroupedZones' option."); + DEPRECATED_AT_MSG(3, 2, 0, "All air boundaries will be modeled using the former 'GroupedZones' option."); return "GroupedZones"; } bool ConstructionAirBoundary::isSolarAndDaylightingMethodDefaulted() const { - LOG(Warn, "This method is deprecated. All air boundaries will be modeled using the former 'GroupedZones' option."); + DEPRECATED_AT_MSG(3, 2, 0, "All air boundaries will be modeled using the former 'GroupedZones' option."); return true; } std::string ConstructionAirBoundary::radiantExchangeMethod() const { - LOG(Warn, "This method is deprecated. All air boundaries will be modeled using the former 'GroupedZones' option."); + DEPRECATED_AT_MSG(3, 2, 0, "All air boundaries will be modeled using the former 'GroupedZones' option."); return "GroupedZones"; } bool ConstructionAirBoundary::isRadiantExchangeMethodDefaulted() const { - LOG(Warn, "This method is deprecated. All air boundaries will be modeled using the former 'GroupedZones' option."); + DEPRECATED_AT_MSG(3, 2, 0, "All air boundaries will be modeled using the former 'GroupedZones' option."); return true; } @@ -229,21 +228,21 @@ namespace model { } bool ConstructionAirBoundary::setSolarAndDaylightingMethod(const std::string& /*solarAndDaylightingMethod*/) { - LOG(Warn, "This method is deprecated. All air boundaries will be modeled using the former 'GroupedZones' option."); + DEPRECATED_AT_MSG(3, 2, 0, "All air boundaries will be modeled using the former 'GroupedZones' option."); return false; } void ConstructionAirBoundary::resetSolarAndDaylightingMethod() { - LOG(Warn, "This method is deprecated. All air boundaries will be modeled using the former 'GroupedZones' option."); + DEPRECATED_AT_MSG(3, 2, 0, "All air boundaries will be modeled using the former 'GroupedZones' option."); } bool ConstructionAirBoundary::setRadiantExchangeMethod(const std::string& /*radiantExchangeMethod*/) { - LOG(Warn, "This method is deprecated. All air boundaries will be modeled using the former 'GroupedZones' option."); + DEPRECATED_AT_MSG(3, 2, 0, "All air boundaries will be modeled using the former 'GroupedZones' option."); return false; } void ConstructionAirBoundary::resetRadiantExchangeMethod() { - LOG(Warn, "This method is deprecated. All air boundaries will be modeled using the former 'GroupedZones' option."); + DEPRECATED_AT_MSG(3, 2, 0, "All air boundaries will be modeled using the former 'GroupedZones' option."); } bool ConstructionAirBoundary::setAirExchangeMethod(const std::string& airExchangeMethod) { diff --git a/src/model/CurveDoubleExponentialDecay.cpp b/src/model/CurveDoubleExponentialDecay.cpp index 88eaf5f625..05e4029b3c 100644 --- a/src/model/CurveDoubleExponentialDecay.cpp +++ b/src/model/CurveDoubleExponentialDecay.cpp @@ -37,6 +37,8 @@ #include "../utilities/core/Assert.hpp" +#include "../utilities/core/DeprecatedHelpers.hpp" + #include using namespace std; @@ -317,7 +319,7 @@ namespace model { } double CurveDoubleExponentialDecay::coefficient3C4() const { - LOG(Warn, "This method is deprecated and will removed in a future release, please replace it with coefficient4C4."); + DEPRECATED_AT_MSG(3, 1, 0, "Use coefficient4C4 instead."); return getImpl()->coefficient4C4(); } @@ -326,7 +328,7 @@ namespace model { } double CurveDoubleExponentialDecay::coefficient3C5() const { - LOG(Warn, "This method is deprecated and will removed in a future release, please replace it with coefficient5C5."); + DEPRECATED_AT_MSG(3, 1, 0, "Use coefficient4C4 instead."); return getImpl()->coefficient5C5(); } @@ -379,7 +381,7 @@ namespace model { } bool CurveDoubleExponentialDecay::setCoefficient3C4(double coefficient4C4) { - LOG(Warn, "This method is deprecated and will removed in a future release, please replace it with setCoefficient4C4."); + DEPRECATED_AT_MSG(3, 1, 0, "Use setCoefficient4C4 instead."); return getImpl()->setCoefficient4C4(coefficient4C4); } @@ -388,7 +390,7 @@ namespace model { } bool CurveDoubleExponentialDecay::setCoefficient3C5(double coefficient5C5) { - LOG(Warn, "This method is deprecated and will removed in a future release, please replace it with setCoefficient5C5."); + DEPRECATED_AT_MSG(3, 1, 0, "Use setCoefficient5C5 instead."); return getImpl()->setCoefficient5C5(coefficient5C5); } diff --git a/src/model/DesignDay.cpp b/src/model/DesignDay.cpp index e2d898d474..6d9baede31 100644 --- a/src/model/DesignDay.cpp +++ b/src/model/DesignDay.cpp @@ -40,6 +40,8 @@ #include #include +#include "../utilities/core/DeprecatedHelpers.hpp" + namespace openstudio { namespace model { @@ -724,6 +726,7 @@ namespace model { // Deprecated std::vector DesignDay::validHumidityIndicatingTypeValues() { + DEPRECATED_AT_MSG(3, 3, 0, "Use validHumidityConditionTypeValues instead."); return getIddKeyNames(IddFactory::instance().getObject(iddObjectType()).get(), OS_SizingPeriod_DesignDayFields::HumidityConditionType); } @@ -761,6 +764,7 @@ namespace model { } double DesignDay::humidityIndicatingConditionsAtMaximumDryBulb() const { + DEPRECATED_AT_MSG(3, 3, 0, "Use wetBulbOrDewPointAtMaximumDryBulb, humidityRatioAtMaximumDryBulb, or enthalpyAtMaximumDryBulb instead."); boost::optional value = getString(OS_SizingPeriod_DesignDayFields::HumidityConditionType, true); OS_ASSERT(value); std::string humidityConditionType = value.get(); @@ -778,6 +782,9 @@ namespace model { } bool DesignDay::isHumidityIndicatingConditionsAtMaximumDryBulbDefaulted() const { + DEPRECATED_AT_MSG( + 3, 3, 0, + "Check that None of these have a value: wetBulbOrDewPointAtMaximumDryBulb,humidityRatioAtMaximumDryBulb, enthalpyAtMaximumDryBulb instead."); bool wetBulbOrDewPointAtMaximumDryBulb = isEmpty(OS_SizingPeriod_DesignDayFields::WetbulborDewPointatMaximumDryBulb); bool humidityRatioAtMaximumDryBulb = isEmpty(OS_SizingPeriod_DesignDayFields::HumidityRatioatMaximumDryBulb); bool enthalpyAtMaximumDryBulb = isEmpty(OS_SizingPeriod_DesignDayFields::EnthalpyatMaximumDryBulb); @@ -865,6 +872,7 @@ namespace model { } std::string DesignDay::humidityIndicatingType() const { + DEPRECATED_AT_MSG(3, 3, 0, "Use humidityConditionType instead."); return getImpl()->humidityConditionType(); } @@ -873,6 +881,7 @@ namespace model { } bool DesignDay::isHumidityIndicatingTypeDefaulted() const { + DEPRECATED_AT_MSG(3, 3, 0, "Use isHumidityConditionTypeDefaulted instead."); return getImpl()->isHumidityConditionTypeDefaulted(); } @@ -881,6 +890,7 @@ namespace model { } boost::optional DesignDay::humidityIndicatingDaySchedule() const { + DEPRECATED_AT_MSG(3, 3, 0, "Use humidityConditionDaySchedule instead."); return getImpl()->humidityConditionDaySchedule(); } @@ -909,6 +919,7 @@ namespace model { } boost::optional DesignDay::dryBulbTemperatureRangeModifierSchedule() const { + DEPRECATED_AT_MSG(3, 3, 0, "Use dryBulbTemperatureRangeModifierDaySchedule instead."); return getImpl()->dryBulbTemperatureRangeModifierDaySchedule(); } @@ -933,6 +944,7 @@ namespace model { } double DesignDay::ashraeTaub() const { + DEPRECATED_AT_MSG(3, 3, 0, "Use ashraeClearSkyOpticalDepthForBeamIrradiance instead."); return getImpl()->ashraeClearSkyOpticalDepthForBeamIrradiance(); } @@ -941,6 +953,7 @@ namespace model { } bool DesignDay::isAshraeTaubDefaulted() const { + DEPRECATED_AT_MSG(3, 3, 0, "Use isAshraeClearSkyOpticalDepthForBeamIrradianceDefaulted instead."); return getImpl()->isAshraeClearSkyOpticalDepthForBeamIrradianceDefaulted(); } @@ -949,6 +962,7 @@ namespace model { } double DesignDay::ashraeTaud() const { + DEPRECATED_AT_MSG(3, 3, 0, "Use ashraeClearSkyOpticalDepthForDiffuseIrradiance instead."); return getImpl()->ashraeClearSkyOpticalDepthForDiffuseIrradiance(); } @@ -957,6 +971,7 @@ namespace model { } bool DesignDay::isAshraeTaudDefaulted() const { + DEPRECATED_AT_MSG(3, 3, 0, "Use isAshraeClearSkyOpticalDepthForDiffuseIrradianceDefaulted instead."); return getImpl()->isAshraeClearSkyOpticalDepthForDiffuseIrradianceDefaulted(); } @@ -1077,6 +1092,7 @@ namespace model { } bool DesignDay::setHumidityIndicatingType(const std::string& humidityIndicatingType) { + DEPRECATED_AT_MSG(3, 3, 0, "Use setHumidityConditionType instead."); return getImpl()->setHumidityConditionType(humidityIndicatingType); } @@ -1085,6 +1101,7 @@ namespace model { } void DesignDay::resetHumidityIndicatingType() { + DEPRECATED_AT_MSG(3, 3, 0, "Use resetHumidityConditionType instead."); getImpl()->resetHumidityConditionType(); } @@ -1093,6 +1110,7 @@ namespace model { } bool DesignDay::setHumidityIndicatingDaySchedule(const ScheduleDay& schedule) { + DEPRECATED_AT_MSG(3, 3, 0, "Use setHumidityConditionDaySchedule instead."); return getImpl()->setHumidityConditionDaySchedule(schedule); } @@ -1101,6 +1119,7 @@ namespace model { } void DesignDay::resetHumidityIndicatingDaySchedule() { + DEPRECATED_AT_MSG(3, 3, 0, "Use resetHumidityConditionDaySchedule instead."); getImpl()->resetHumidityConditionDaySchedule(); } @@ -1109,6 +1128,7 @@ namespace model { } bool DesignDay::setHumidityIndicatingConditionsAtMaximumDryBulb(double humidityIndicatingConditionsAtMaximumDryBulb) { + DEPRECATED_AT_MSG(3, 3, 0, "Use setWetBulbOrDewPointAtMaximumDryBulb, setHumidityRatioAtMaximumDryBulb, or setEnthalpyAtMaximumDryBulb instead."); boost::optional value = getString(OS_SizingPeriod_DesignDayFields::HumidityConditionType, true); OS_ASSERT(value); std::string humidityConditionType = value.get(); @@ -1126,6 +1146,8 @@ namespace model { } void DesignDay::resetHumidityIndicatingConditionsAtMaximumDryBulb() { + DEPRECATED_AT_MSG(3, 3, 0, + "Use resetWetBulbOrDewPointAtMaximumDryBulb, resetHumidityRatioAtMaximumDryBulb, and resetEnthalpyAtMaximumDryBulb instead."); getImpl()->resetWetBulbOrDewPointAtMaximumDryBulb(); getImpl()->resetHumidityRatioAtMaximumDryBulb(); getImpl()->resetEnthalpyAtMaximumDryBulb(); @@ -1164,6 +1186,7 @@ namespace model { } bool DesignDay::setDryBulbTemperatureRangeModifierSchedule(const ScheduleDay& schedule) { + DEPRECATED_AT_MSG(3, 3, 0, "Use setDryBulbTemperatureRangeModifierDaySchedule instead."); return getImpl()->setDryBulbTemperatureRangeModifierDaySchedule(schedule); } @@ -1172,6 +1195,7 @@ namespace model { } void DesignDay::resetDryBulbTemperatureRangeModifierSchedule() { + DEPRECATED_AT_MSG(3, 3, 0, "Use resetDryBulbTemperatureRangeModifierDaySchedule instead."); getImpl()->resetDryBulbTemperatureRangeModifierDaySchedule(); } @@ -1204,6 +1228,7 @@ namespace model { } bool DesignDay::setAshraeTaub(double ashraeTaub) { + DEPRECATED_AT_MSG(3, 3, 0, "Use setAshraeClearSkyOpticalDepthForBeamIrradiance instead."); return getImpl()->setAshraeClearSkyOpticalDepthForBeamIrradiance(ashraeTaub); } @@ -1212,6 +1237,7 @@ namespace model { } void DesignDay::resetAshraeTaub() { + DEPRECATED_AT_MSG(3, 3, 0, "Use resetAshraeClearSkyOpticalDepthForBeamIrradiance instead."); getImpl()->resetAshraeClearSkyOpticalDepthForBeamIrradiance(); } @@ -1220,6 +1246,7 @@ namespace model { } bool DesignDay::setAshraeTaud(double ashraeTaud) { + DEPRECATED_AT_MSG(3, 3, 0, "Use setAshraeClearSkyOpticalDepthForDiffuseIrradiance instead."); return getImpl()->setAshraeClearSkyOpticalDepthForDiffuseIrradiance(ashraeTaud); } @@ -1228,6 +1255,7 @@ namespace model { } void DesignDay::resetAshraeTaud() { + DEPRECATED_AT_MSG(3, 3, 0, "Use resetAshraeClearSkyOpticalDepthForDiffuseIrradiance instead."); getImpl()->resetAshraeClearSkyOpticalDepthForDiffuseIrradiance(); } diff --git a/src/model/HeatPumpWaterToWaterEquationFitCooling.cpp b/src/model/HeatPumpWaterToWaterEquationFitCooling.cpp index 6d23c5f4e4..c00607d4e0 100644 --- a/src/model/HeatPumpWaterToWaterEquationFitCooling.cpp +++ b/src/model/HeatPumpWaterToWaterEquationFitCooling.cpp @@ -42,6 +42,8 @@ #include #include +#include "../utilities/core/DeprecatedHelpers.hpp" + namespace openstudio { namespace model { @@ -535,128 +537,122 @@ namespace model { // DEPRECATED double HeatPumpWaterToWaterEquationFitCooling::coolingCapacityCoefficient1() const { - LOG(Warn, "This method is deprecated. Use HeatPumpWaterToWaterEquationFitCooling::coolingCapacityCurve().coefficient1Constant() instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use HeatPumpWaterToWaterEquationFitCooling::coolingCapacityCurve().coefficient1Constant() instead."); CurveQuadLinear curve = getImpl()->coolingCapacityCurve(); return curve.coefficient1Constant(); } bool HeatPumpWaterToWaterEquationFitCooling::setCoolingCapacityCoefficient1(double coolingCapacityCoefficient1) { - LOG(Warn, - "This method is deprecated. Use HeatPumpWaterToWaterEquationFitCooling::coolingCapacityCurve().setCoefficient1Constant(double) instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use HeatPumpWaterToWaterEquationFitCooling::coolingCapacityCurve().setCoefficient1Constant(double) instead."); CurveQuadLinear curve = getImpl()->coolingCapacityCurve(); return curve.setCoefficient1Constant(coolingCapacityCoefficient1); } double HeatPumpWaterToWaterEquationFitCooling::coolingCapacityCoefficient2() const { - LOG(Warn, "This method is deprecated. Use HeatPumpWaterToWaterEquationFitCooling::coolingCapacityCurve().coefficient2w() instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use HeatPumpWaterToWaterEquationFitCooling::coolingCapacityCurve().coefficient2w() instead."); CurveQuadLinear curve = getImpl()->coolingCapacityCurve(); return curve.coefficient2w(); } bool HeatPumpWaterToWaterEquationFitCooling::setCoolingCapacityCoefficient2(double coolingCapacityCoefficient2) { - LOG(Warn, "This method is deprecated. Use HeatPumpWaterToWaterEquationFitCooling::coolingCapacityCurve().setCoefficient2w(double) instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use HeatPumpWaterToWaterEquationFitCooling::coolingCapacityCurve().setCoefficient2w(double) instead."); CurveQuadLinear curve = getImpl()->coolingCapacityCurve(); return curve.setCoefficient2w(coolingCapacityCoefficient2); } double HeatPumpWaterToWaterEquationFitCooling::coolingCapacityCoefficient3() const { - LOG(Warn, "This method is deprecated. Use HeatPumpWaterToWaterEquationFitCooling::coolingCapacityCurve().coefficient3x() instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use HeatPumpWaterToWaterEquationFitCooling::coolingCapacityCurve().coefficient3x() instead."); CurveQuadLinear curve = getImpl()->coolingCapacityCurve(); return curve.coefficient3x(); } bool HeatPumpWaterToWaterEquationFitCooling::setCoolingCapacityCoefficient3(double coolingCapacityCoefficient3) { - LOG(Warn, "This method is deprecated. Use HeatPumpWaterToWaterEquationFitCooling::coolingCapacityCurve().setCoefficient3x(double) instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use HeatPumpWaterToWaterEquationFitCooling::coolingCapacityCurve().setCoefficient3x(double) instead."); CurveQuadLinear curve = getImpl()->coolingCapacityCurve(); return curve.setCoefficient3x(coolingCapacityCoefficient3); } double HeatPumpWaterToWaterEquationFitCooling::coolingCapacityCoefficient4() const { - LOG(Warn, "This method is deprecated. Use HeatPumpWaterToWaterEquationFitCooling::coolingCapacityCurve().coefficient4y() instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use HeatPumpWaterToWaterEquationFitCooling::coolingCapacityCurve().coefficient4y() instead."); CurveQuadLinear curve = getImpl()->coolingCapacityCurve(); return curve.coefficient4y(); } bool HeatPumpWaterToWaterEquationFitCooling::setCoolingCapacityCoefficient4(double coolingCapacityCoefficient4) { - LOG(Warn, "This method is deprecated. Use HeatPumpWaterToWaterEquationFitCooling::coolingCapacityCurve().setCoefficient4y(double) instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use HeatPumpWaterToWaterEquationFitCooling::coolingCapacityCurve().setCoefficient4y(double) instead."); CurveQuadLinear curve = getImpl()->coolingCapacityCurve(); return curve.setCoefficient4y(coolingCapacityCoefficient4); } double HeatPumpWaterToWaterEquationFitCooling::coolingCapacityCoefficient5() const { - LOG(Warn, "This method is deprecated. Use HeatPumpWaterToWaterEquationFitCooling::coolingCapacityCurve().coefficient5z() instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use HeatPumpWaterToWaterEquationFitCooling::coolingCapacityCurve().coefficient5z() instead."); CurveQuadLinear curve = getImpl()->coolingCapacityCurve(); return curve.coefficient5z(); } bool HeatPumpWaterToWaterEquationFitCooling::setCoolingCapacityCoefficient5(double coolingCapacityCoefficient5) { - LOG(Warn, "This method is deprecated. Use HeatPumpWaterToWaterEquationFitCooling::coolingCapacityCurve().setCoefficient5z(double) instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use HeatPumpWaterToWaterEquationFitCooling::coolingCapacityCurve().setCoefficient5z(double) instead."); CurveQuadLinear curve = getImpl()->coolingCapacityCurve(); return curve.setCoefficient5z(coolingCapacityCoefficient5); } double HeatPumpWaterToWaterEquationFitCooling::coolingCompressorPowerCoefficient1() const { - LOG(Warn, "This method is deprecated. Use HeatPumpWaterToWaterEquationFitCooling::coolingCompressorPowerCurve().coefficient1Constant() instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use HeatPumpWaterToWaterEquationFitCooling::coolingCompressorPowerCurve().coefficient1Constant() instead."); CurveQuadLinear curve = getImpl()->coolingCompressorPowerCurve(); return curve.coefficient1Constant(); } bool HeatPumpWaterToWaterEquationFitCooling::setCoolingCompressorPowerCoefficient1(double coolingCompressorPowerCoefficient1) { - LOG( - Warn, - "This method is deprecated. Use HeatPumpWaterToWaterEquationFitCooling::coolingCompressorPowerCurve().setCoefficient1Constant(double) instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use HeatPumpWaterToWaterEquationFitCooling::coolingCompressorPowerCurve().setCoefficient1Constant(double) instead."); CurveQuadLinear curve = getImpl()->coolingCompressorPowerCurve(); return curve.setCoefficient1Constant(coolingCompressorPowerCoefficient1); } double HeatPumpWaterToWaterEquationFitCooling::coolingCompressorPowerCoefficient2() const { - LOG(Warn, "This method is deprecated. Use HeatPumpWaterToWaterEquationFitCooling::coolingCompressorPowerCurve().coefficient2w() instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use HeatPumpWaterToWaterEquationFitCooling::coolingCompressorPowerCurve().coefficient2w() instead."); CurveQuadLinear curve = getImpl()->coolingCompressorPowerCurve(); return curve.coefficient2w(); } bool HeatPumpWaterToWaterEquationFitCooling::setCoolingCompressorPowerCoefficient2(double coolingCompressorPowerCoefficient2) { - LOG(Warn, - "This method is deprecated. Use HeatPumpWaterToWaterEquationFitCooling::coolingCompressorPowerCurve().setCoefficient2w(double) instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use HeatPumpWaterToWaterEquationFitCooling::coolingCompressorPowerCurve().setCoefficient2w(double) instead."); CurveQuadLinear curve = getImpl()->coolingCompressorPowerCurve(); return curve.setCoefficient2w(coolingCompressorPowerCoefficient2); } double HeatPumpWaterToWaterEquationFitCooling::coolingCompressorPowerCoefficient3() const { - LOG(Warn, "This method is deprecated. Use HeatPumpWaterToWaterEquationFitCooling::coolingCompressorPowerCurve().coefficient3x() instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use HeatPumpWaterToWaterEquationFitCooling::coolingCompressorPowerCurve().coefficient3x() instead."); CurveQuadLinear curve = getImpl()->coolingCompressorPowerCurve(); return curve.coefficient3x(); } bool HeatPumpWaterToWaterEquationFitCooling::setCoolingCompressorPowerCoefficient3(double coolingCompressorPowerCoefficient3) { - LOG(Warn, - "This method is deprecated. Use HeatPumpWaterToWaterEquationFitCooling::coolingCompressorPowerCurve().setCoefficient3x(double) instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use HeatPumpWaterToWaterEquationFitCooling::coolingCompressorPowerCurve().setCoefficient3x(double) instead."); CurveQuadLinear curve = getImpl()->coolingCompressorPowerCurve(); return curve.setCoefficient3x(coolingCompressorPowerCoefficient3); } double HeatPumpWaterToWaterEquationFitCooling::coolingCompressorPowerCoefficient4() const { - LOG(Warn, "This method is deprecated. Use HeatPumpWaterToWaterEquationFitCooling::coolingCompressorPowerCurve().coefficient4y() instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use HeatPumpWaterToWaterEquationFitCooling::coolingCompressorPowerCurve().coefficient4y() instead."); CurveQuadLinear curve = getImpl()->coolingCompressorPowerCurve(); return curve.coefficient4y(); } bool HeatPumpWaterToWaterEquationFitCooling::setCoolingCompressorPowerCoefficient4(double coolingCompressorPowerCoefficient4) { LOG(Warn, - "This method is deprecated. Use HeatPumpWaterToWaterEquationFitCooling::coolingCompressorPowerCurve().setCoefficient4y(double) instead.") + "This method is deprecated. Use HeatPumpWaterToWaterEquationFitCooling::coolingCompressorPowerCurve().setCoefficient4y(double) instead."); CurveQuadLinear curve = getImpl()->coolingCompressorPowerCurve(); return curve.setCoefficient4y(coolingCompressorPowerCoefficient4); } double HeatPumpWaterToWaterEquationFitCooling::coolingCompressorPowerCoefficient5() const { - LOG(Warn, "This method is deprecated. Use HeatPumpWaterToWaterEquationFitCooling::coolingCompressorPowerCurve().coefficient5z() instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use HeatPumpWaterToWaterEquationFitCooling::coolingCompressorPowerCurve().coefficient5z() instead."); CurveQuadLinear curve = getImpl()->coolingCompressorPowerCurve(); return curve.coefficient5z(); } bool HeatPumpWaterToWaterEquationFitCooling::setCoolingCompressorPowerCoefficient5(double coolingCompressorPowerCoefficient5) { - LOG(Warn, - "This method is deprecated. Use HeatPumpWaterToWaterEquationFitCooling::coolingCompressorPowerCurve().setCoefficient5z(double) instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use HeatPumpWaterToWaterEquationFitCooling::coolingCompressorPowerCurve().setCoefficient5z(double) instead."); CurveQuadLinear curve = getImpl()->coolingCompressorPowerCurve(); return curve.setCoefficient5z(coolingCompressorPowerCoefficient5); } diff --git a/src/model/HeatPumpWaterToWaterEquationFitHeating.cpp b/src/model/HeatPumpWaterToWaterEquationFitHeating.cpp index 17e10e060a..979e984394 100644 --- a/src/model/HeatPumpWaterToWaterEquationFitHeating.cpp +++ b/src/model/HeatPumpWaterToWaterEquationFitHeating.cpp @@ -42,6 +42,8 @@ #include #include +#include "../utilities/core/DeprecatedHelpers.hpp" + namespace openstudio { namespace model { @@ -552,128 +554,121 @@ namespace model { // DEPRECATED double HeatPumpWaterToWaterEquationFitHeating::heatingCapacityCoefficient1() const { - LOG(Warn, "This method is deprecated. Use HeatPumpWaterToWaterEquationFitHeating::heatingCapacityCurve().coefficient1Constant() instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use HeatPumpWaterToWaterEquationFitHeating::heatingCapacityCurve().coefficient1Constant() instead."); CurveQuadLinear curve = getImpl()->heatingCapacityCurve(); return curve.coefficient1Constant(); } bool HeatPumpWaterToWaterEquationFitHeating::setHeatingCapacityCoefficient1(double heatingCapacityCoefficient1) { - LOG(Warn, - "This method is deprecated. Use HeatPumpWaterToWaterEquationFitHeating::heatingCapacityCurve().setCoefficient1Constant(double) instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use HeatPumpWaterToWaterEquationFitHeating::heatingCapacityCurve().setCoefficient1Constant(double) instead."); CurveQuadLinear curve = getImpl()->heatingCapacityCurve(); return curve.setCoefficient1Constant(heatingCapacityCoefficient1); } double HeatPumpWaterToWaterEquationFitHeating::heatingCapacityCoefficient2() const { - LOG(Warn, "This method is deprecated. Use HeatPumpWaterToWaterEquationFitHeating::heatingCapacityCurve().coefficient2w() instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use HeatPumpWaterToWaterEquationFitHeating::heatingCapacityCurve().coefficient2w() instead."); CurveQuadLinear curve = getImpl()->heatingCapacityCurve(); return curve.coefficient2w(); } bool HeatPumpWaterToWaterEquationFitHeating::setHeatingCapacityCoefficient2(double heatingCapacityCoefficient2) { - LOG(Warn, "This method is deprecated. Use HeatPumpWaterToWaterEquationFitHeating::heatingCapacityCurve().setCoefficient2w(double) instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use HeatPumpWaterToWaterEquationFitHeating::heatingCapacityCurve().setCoefficient2w(double) instead."); CurveQuadLinear curve = getImpl()->heatingCapacityCurve(); return curve.setCoefficient2w(heatingCapacityCoefficient2); } double HeatPumpWaterToWaterEquationFitHeating::heatingCapacityCoefficient3() const { - LOG(Warn, "This method is deprecated. Use HeatPumpWaterToWaterEquationFitHeating::heatingCapacityCurve().coefficient3x() instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use HeatPumpWaterToWaterEquationFitHeating::heatingCapacityCurve().coefficient3x() instead."); CurveQuadLinear curve = getImpl()->heatingCapacityCurve(); return curve.coefficient3x(); } bool HeatPumpWaterToWaterEquationFitHeating::setHeatingCapacityCoefficient3(double heatingCapacityCoefficient3) { - LOG(Warn, "This method is deprecated. Use HeatPumpWaterToWaterEquationFitHeating::heatingCapacityCurve().setCoefficient3x(double) instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use HeatPumpWaterToWaterEquationFitHeating::heatingCapacityCurve().setCoefficient3x(double) instead."); CurveQuadLinear curve = getImpl()->heatingCapacityCurve(); return curve.setCoefficient3x(heatingCapacityCoefficient3); } double HeatPumpWaterToWaterEquationFitHeating::heatingCapacityCoefficient4() const { - LOG(Warn, "This method is deprecated. Use HeatPumpWaterToWaterEquationFitHeating::heatingCapacityCurve().coefficient4y() instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use HeatPumpWaterToWaterEquationFitHeating::heatingCapacityCurve().coefficient4y() instead."); CurveQuadLinear curve = getImpl()->heatingCapacityCurve(); return curve.coefficient4y(); } bool HeatPumpWaterToWaterEquationFitHeating::setHeatingCapacityCoefficient4(double heatingCapacityCoefficient4) { - LOG(Warn, "This method is deprecated. Use HeatPumpWaterToWaterEquationFitHeating::heatingCapacityCurve().setCoefficient4y(double) instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use HeatPumpWaterToWaterEquationFitHeating::heatingCapacityCurve().setCoefficient4y(double) instead."); CurveQuadLinear curve = getImpl()->heatingCapacityCurve(); return curve.setCoefficient4y(heatingCapacityCoefficient4); } double HeatPumpWaterToWaterEquationFitHeating::heatingCapacityCoefficient5() const { - LOG(Warn, "This method is deprecated. Use HeatPumpWaterToWaterEquationFitHeating::heatingCapacityCurve().coefficient5z() instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use HeatPumpWaterToWaterEquationFitHeating::heatingCapacityCurve().coefficient5z() instead."); CurveQuadLinear curve = getImpl()->heatingCapacityCurve(); return curve.coefficient5z(); } bool HeatPumpWaterToWaterEquationFitHeating::setHeatingCapacityCoefficient5(double heatingCapacityCoefficient5) { - LOG(Warn, "This method is deprecated. Use HeatPumpWaterToWaterEquationFitHeating::heatingCapacityCurve().setCoefficient5z(double) instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use HeatPumpWaterToWaterEquationFitHeating::heatingCapacityCurve().setCoefficient5z(double) instead."); CurveQuadLinear curve = getImpl()->heatingCapacityCurve(); return curve.setCoefficient5z(heatingCapacityCoefficient5); } double HeatPumpWaterToWaterEquationFitHeating::heatingCompressorPowerCoefficient1() const { - LOG(Warn, "This method is deprecated. Use HeatPumpWaterToWaterEquationFitHeating::heatingCompressorPowerCurve().coefficient1Constant() instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use HeatPumpWaterToWaterEquationFitHeating::heatingCompressorPowerCurve().coefficient1Constant() instead."); CurveQuadLinear curve = getImpl()->heatingCompressorPowerCurve(); return curve.coefficient1Constant(); } bool HeatPumpWaterToWaterEquationFitHeating::setHeatingCompressorPowerCoefficient1(double heatingCompressorPowerCoefficient1) { - LOG( - Warn, - "This method is deprecated. Use HeatPumpWaterToWaterEquationFitHeating::heatingCompressorPowerCurve().setCoefficient1Constant(double) instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use HeatPumpWaterToWaterEquationFitHeating::heatingCompressorPowerCurve().setCoefficient1Constant(double) instead."); CurveQuadLinear curve = getImpl()->heatingCompressorPowerCurve(); return curve.setCoefficient1Constant(heatingCompressorPowerCoefficient1); } double HeatPumpWaterToWaterEquationFitHeating::heatingCompressorPowerCoefficient2() const { - LOG(Warn, "This method is deprecated. Use HeatPumpWaterToWaterEquationFitHeating::heatingCompressorPowerCurve().coefficient2w() instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use HeatPumpWaterToWaterEquationFitHeating::heatingCompressorPowerCurve().coefficient2w() instead."); CurveQuadLinear curve = getImpl()->heatingCompressorPowerCurve(); return curve.coefficient2w(); } bool HeatPumpWaterToWaterEquationFitHeating::setHeatingCompressorPowerCoefficient2(double heatingCompressorPowerCoefficient2) { - LOG(Warn, - "This method is deprecated. Use HeatPumpWaterToWaterEquationFitHeating::heatingCompressorPowerCurve().setCoefficient2w(double) instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use HeatPumpWaterToWaterEquationFitHeating::heatingCompressorPowerCurve().setCoefficient2w(double) instead."); CurveQuadLinear curve = getImpl()->heatingCompressorPowerCurve(); return curve.setCoefficient2w(heatingCompressorPowerCoefficient2); } double HeatPumpWaterToWaterEquationFitHeating::heatingCompressorPowerCoefficient3() const { - LOG(Warn, "This method is deprecated. Use HeatPumpWaterToWaterEquationFitHeating::heatingCompressorPowerCurve().coefficient3x() instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use HeatPumpWaterToWaterEquationFitHeating::heatingCompressorPowerCurve().coefficient3x() instead."); CurveQuadLinear curve = getImpl()->heatingCompressorPowerCurve(); return curve.coefficient3x(); } bool HeatPumpWaterToWaterEquationFitHeating::setHeatingCompressorPowerCoefficient3(double heatingCompressorPowerCoefficient3) { - LOG(Warn, - "This method is deprecated. Use HeatPumpWaterToWaterEquationFitHeating::heatingCompressorPowerCurve().setCoefficient3x(double) instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use HeatPumpWaterToWaterEquationFitHeating::heatingCompressorPowerCurve().setCoefficient3x(double) instead."); CurveQuadLinear curve = getImpl()->heatingCompressorPowerCurve(); return curve.setCoefficient3x(heatingCompressorPowerCoefficient3); } double HeatPumpWaterToWaterEquationFitHeating::heatingCompressorPowerCoefficient4() const { - LOG(Warn, "This method is deprecated. Use HeatPumpWaterToWaterEquationFitHeating::heatingCompressorPowerCurve().coefficient4y() instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use HeatPumpWaterToWaterEquationFitHeating::heatingCompressorPowerCurve().coefficient4y() instead."); CurveQuadLinear curve = getImpl()->heatingCompressorPowerCurve(); return curve.coefficient4y(); } bool HeatPumpWaterToWaterEquationFitHeating::setHeatingCompressorPowerCoefficient4(double heatingCompressorPowerCoefficient4) { - LOG(Warn, - "This method is deprecated. Use HeatPumpWaterToWaterEquationFitHeating::heatingCompressorPowerCurve().setCoefficient4y(double) instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use HeatPumpWaterToWaterEquationFitHeating::heatingCompressorPowerCurve().setCoefficient4y(double) instead."); CurveQuadLinear curve = getImpl()->heatingCompressorPowerCurve(); return curve.setCoefficient4y(heatingCompressorPowerCoefficient4); } double HeatPumpWaterToWaterEquationFitHeating::heatingCompressorPowerCoefficient5() const { - LOG(Warn, "This method is deprecated. Use HeatPumpWaterToWaterEquationFitHeating::heatingCompressorPowerCurve().coefficient5z() instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use HeatPumpWaterToWaterEquationFitHeating::heatingCompressorPowerCurve().coefficient5z() instead."); CurveQuadLinear curve = getImpl()->heatingCompressorPowerCurve(); return curve.coefficient5z(); } bool HeatPumpWaterToWaterEquationFitHeating::setHeatingCompressorPowerCoefficient5(double heatingCompressorPowerCoefficient5) { - LOG(Warn, - "This method is deprecated. Use HeatPumpWaterToWaterEquationFitHeating::heatingCompressorPowerCurve().setCoefficient5z(double) instead.") + DEPRECATED_AT_MSG(3, 2, 0, "Use HeatPumpWaterToWaterEquationFitHeating::heatingCompressorPowerCurve().setCoefficient5z(double) instead."); CurveQuadLinear curve = getImpl()->heatingCompressorPowerCurve(); return curve.setCoefficient5z(heatingCompressorPowerCoefficient5); } diff --git a/src/model/ScheduleFile.cpp b/src/model/ScheduleFile.cpp index a5c0b66cd2..5a508baf9f 100644 --- a/src/model/ScheduleFile.cpp +++ b/src/model/ScheduleFile.cpp @@ -46,6 +46,8 @@ #include "../utilities/core/Assert.hpp" #include "../utilities/filetypes/CSVFile.hpp" +#include "../utilities/core/DeprecatedHelpers.hpp" + #include namespace openstudio { @@ -548,8 +550,9 @@ unsigned ScheduleFile::addTimeSeries(const openstudio::TimeSeries& timeSeries) { } bool ScheduleFile::setMinutesperItem(const std::string& minutesperItem) { - LOG(Warn, "ScheduleFile::setMinutesperItem(const std::string&) is deprecated, use the ScheduleFile::setMinutesperItem(int) instead"); + DEPRECATED_AT_MSG(3, 2, 0, "Use the setMinutesperItem(int) instead"); try { + // TODO: remove the Impl too return getImpl()->setMinutesperItem(std::stoi(minutesperItem)); } catch (...) { return false; @@ -573,7 +576,7 @@ unsigned ScheduleFile::addTimeSeries(const openstudio::TimeSeries& timeSeries) { } /// @cond - ScheduleFile::ScheduleFile(std::shared_ptr impl) : ScheduleInterval(impl) {} + ScheduleFile::ScheduleFile(std::shared_ptr impl) : ScheduleInterval(std::move(impl)) {} /// @endcond } // namespace model diff --git a/src/model/SubSurface.cpp b/src/model/SubSurface.cpp index bf51a6d137..4e2ab8470e 100644 --- a/src/model/SubSurface.cpp +++ b/src/model/SubSurface.cpp @@ -91,6 +91,7 @@ #include "../utilities/geometry/Intersection.hpp" #include "../utilities/geometry/BoundingBox.hpp" #include "../utilities/core/Assert.hpp" +#include "../utilities/core/DeprecatedHelpers.hpp" using boost::to_upper_copy; @@ -1635,6 +1636,7 @@ namespace model { // DEPRECATED boost::optional SubSurface::shadingControl() const { + DEPRECATED_AT_MSG(3, 1, 0, "Use shadingControls() instead."); boost::optional result; auto scs = shadingControls(); if (!scs.empty()) { @@ -1648,12 +1650,14 @@ namespace model { // DEPRECATED bool SubSurface::setShadingControl(const ShadingControl& shadingControl) { + DEPRECATED_AT_MSG(3, 1, 0, "Use addShadingControl or addShadingControls instead."); removeAllShadingControls(); return addShadingControl(const_cast(shadingControl)); } // DEPRECATED void SubSurface::resetShadingControl() { + DEPRECATED_AT_MSG(3, 1, 0, "Use removeAllShadingControls instead."); removeAllShadingControls(); } diff --git a/src/model/ZoneAirMassFlowConservation.cpp b/src/model/ZoneAirMassFlowConservation.cpp index 8e72e2bb81..9088caec5a 100644 --- a/src/model/ZoneAirMassFlowConservation.cpp +++ b/src/model/ZoneAirMassFlowConservation.cpp @@ -35,6 +35,8 @@ #include "../utilities/core/Assert.hpp" +#include "../utilities/core/DeprecatedHelpers.hpp" + namespace openstudio { namespace model { @@ -206,8 +208,7 @@ namespace model { bool ZoneAirMassFlowConservation::adjustZoneMixingForZoneAirMassFlowBalance() const { // TODO: DEPRECATED std::string cur_choice = getImpl()->adjustZoneMixingandReturnForAirMassFlowBalance(); - LOG(Warn, "ZoneAirMassFlowConservation: This method is deprecated. " - "It captures two out of five possible choices, use adjustZoneMixingandReturnForAirMassFlowBalance instead."); + DEPRECATED_AT_MSG(3, 2, 0, "It captures two out of five possible choices, use adjustZoneMixingandReturnForAirMassFlowBalance instead."); if (openstudio::istringEqual("None", cur_choice)) { return false; } else if (openstudio::istringEqual("AdjustMixingOnly", cur_choice)) { @@ -221,14 +222,13 @@ namespace model { } bool ZoneAirMassFlowConservation::isAdjustZoneMixingForZoneAirMassFlowBalanceDefaulted() const { - LOG(Warn, "ZoneAirMassFlowConservation: This method is deprecated. " - "It captures two out of five possible choices, use isAdjustZoneMixingandReturnForAirMassFlowBalanceDefaulted instead."); + DEPRECATED_AT_MSG(3, 2, 0, + "It captures two out of five possible choices, use isAdjustZoneMixingandReturnForAirMassFlowBalanceDefaulted instead."); return getImpl()->isAdjustZoneMixingandReturnForAirMassFlowBalanceDefaulted(); } bool ZoneAirMassFlowConservation::setAdjustZoneMixingForZoneAirMassFlowBalance(bool adjustZoneMixingForZoneAirMassFlowBalance) { - LOG(Warn, "ZoneAirMassFlowConservation: This method is deprecated. " - "It captures two out of five possible choices, use setAdjustZoneMixingandReturnForAirMassFlowBalance instead."); + DEPRECATED_AT_MSG(3, 2, 0, "It captures two out of five possible choices, use setAdjustZoneMixingandReturnForAirMassFlowBalance instead."); if (adjustZoneMixingForZoneAirMassFlowBalance) { return getImpl()->setAdjustZoneMixingandReturnForAirMassFlowBalance("AdjustMixingOnly"); } else { @@ -237,8 +237,7 @@ namespace model { } void ZoneAirMassFlowConservation::resetAdjustZoneMixingForZoneAirMassFlowBalance() { - LOG(Warn, "ZoneAirMassFlowConservation: This method is deprecated. It captures two out of five possible choices, use " - "resetAdjustZoneMixingandReturnForAirMassFlowBalance instead."); + DEPRECATED_AT_MSG(3, 2, 0, "It captures two out of five possible choices, use resetAdjustZoneMixingandReturnForAirMassFlowBalance instead."); getImpl()->resetAdjustZoneMixingandReturnForAirMassFlowBalance(); } diff --git a/src/model/ZoneHVACLowTempRadiantConstFlow.cpp b/src/model/ZoneHVACLowTempRadiantConstFlow.cpp index 18e358982c..608126399b 100644 --- a/src/model/ZoneHVACLowTempRadiantConstFlow.cpp +++ b/src/model/ZoneHVACLowTempRadiantConstFlow.cpp @@ -59,6 +59,7 @@ #include "../utilities/core/Assert.hpp" #include "../utilities/data/DataEnums.hpp" +#include "../utilities/core/DeprecatedHelpers.hpp" namespace openstudio { namespace model { @@ -1079,16 +1080,18 @@ namespace model { /// @cond ZoneHVACLowTempRadiantConstFlow::ZoneHVACLowTempRadiantConstFlow(std::shared_ptr impl) : ZoneHVACComponent(std::move(impl)) {} - /// @endcond - // TODO: deprecated + // DEPRECATED void ZoneHVACLowTempRadiantConstFlow::resetHydronicTubingLength() { + DEPRECATED_AT_MSG(3, 0, 0, "Use autosizeHydronicTubingLength instead."); getImpl()->autosizeHydronicTubingLength(); } void ZoneHVACLowTempRadiantConstFlow::resetRatedFlowRate() { + DEPRECATED_AT_MSG(3, 0, 0, "Use autosizeRatedFlowRate instead."); getImpl()->autosizeRatedFlowRate(); } + /// @endcond } // namespace model } // namespace openstudio diff --git a/src/model/ZoneMixing.cpp b/src/model/ZoneMixing.cpp index 2644010e79..853963dc25 100644 --- a/src/model/ZoneMixing.cpp +++ b/src/model/ZoneMixing.cpp @@ -692,85 +692,79 @@ namespace model { // DEPRECATED void ZoneMixing::resetSourceZone() { - DEPRECATED_AT_MSG("3.5.0", "Use resetSourceZoneOrSpace instead."); + DEPRECATED_AT_MSG(3, 5, 0, "Use resetSourceZoneOrSpace instead."); getImpl()->resetSourceZoneOrSpace(); } boost::optional ZoneMixing::flowRateperZoneFloorArea() const { - DEPRECATED_AT_MSG("3.5.0", "Use flowRateperFloorArea instead."); + DEPRECATED_AT_MSG(3, 5, 0, "Use flowRateperFloorArea instead."); return getImpl()->flowRateperFloorArea(); } bool ZoneMixing::setFlowRateperZoneFloorArea(double flowRateperZoneFloorArea) { - DEPRECATED_AT_MSG("3.5.0", "Use setFlowRateperFloorArea instead."); + DEPRECATED_AT_MSG(3, 5, 0, "Use setFlowRateperFloorArea instead."); return getImpl()->setFlowRateperFloorArea(flowRateperZoneFloorArea); } // ReceivingTemperatureSchedule boost::optional ZoneMixing::minimumZoneTemperatureSchedule() const { - DEPRECATED_AT_MSG("3.5.0", "Use minimumReceivingTemperatureSchedule instead."); + DEPRECATED_AT_MSG(3, 5, 0, "Use minimumReceivingTemperatureSchedule instead."); return getImpl()->minimumReceivingTemperatureSchedule(); } bool ZoneMixing::setMinimumZoneTemperatureSchedule(Schedule& schedule) { - DEPRECATED_AT_MSG("3.5.0", "Use setMinimumReceivingTemperatureSchedule instead."); + DEPRECATED_AT_MSG(3, 5, 0, "Use setMinimumReceivingTemperatureSchedule instead."); return getImpl()->setMinimumReceivingTemperatureSchedule(schedule); } void ZoneMixing::resetMinimumZoneTemperatureSchedule() { - DEPRECATED_AT_MSG("3.5.0", "Use resetMinimumReceivingTemperatureSchedule instead."); + DEPRECATED_AT_MSG(3, 5, 0, "Use resetMinimumReceivingTemperatureSchedule instead."); getImpl()->resetMinimumReceivingTemperatureSchedule(); } boost::optional ZoneMixing::maximumZoneTemperatureSchedule() const { - DEPRECATED_AT_MSG("3.5.0", "Use maximumReceivingTemperatureSchedule instead."); + DEPRECATED_AT_MSG(3, 5, 0, "Use maximumReceivingTemperatureSchedule instead."); return getImpl()->maximumReceivingTemperatureSchedule(); } bool ZoneMixing::setMaximumZoneTemperatureSchedule(Schedule& schedule) { - DEPRECATED_AT_MSG("3.5.0", "Use setMaximumReceivingTemperatureSchedule instead."); + DEPRECATED_AT_MSG(3, 5, 0, "Use setMaximumReceivingTemperatureSchedule instead."); return getImpl()->setMaximumReceivingTemperatureSchedule(schedule); } void ZoneMixing::resetMaximumZoneTemperatureSchedule() { - DEPRECATED_AT_MSG("3.5.0", "Use resetMaximumReceivingTemperatureSchedule instead."); + DEPRECATED_AT_MSG(3, 5, 0, "Use resetMaximumReceivingTemperatureSchedule instead."); getImpl()->resetMaximumReceivingTemperatureSchedule(); } // SourceTemperatureSchedule boost::optional ZoneMixing::minimumSourceZoneTemperatureSchedule() const { - LOG(Warn, "As of 3.5.0, minimumSourceZoneTemperatureSchedule is deprecated. Use minimumSourceTemperatureSchedule instead. It will be " - "removed within three releases."); + DEPRECATED_AT_MSG(3, 5, 0, "Use minimumSourceTemperatureSchedule instead."); return getImpl()->minimumSourceTemperatureSchedule(); } bool ZoneMixing::setMinimumSourceZoneTemperatureSchedule(Schedule& schedule) { - LOG(Warn, "As of 3.5.0, setMinimumSourceZoneTemperatureSchedule is deprecated. Use setMinimumSourceTemperatureSchedule instead. It will be " - "removed within three releases."); + DEPRECATED_AT_MSG(3, 5, 0, "Use setMinimumSourceTemperatureSchedule instead."); return getImpl()->setMinimumSourceTemperatureSchedule(schedule); } void ZoneMixing::resetMinimumSourceZoneTemperatureSchedule() { - LOG(Warn, "As of 3.5.0, resetMinimumSourceZoneTemperatureSchedule is deprecated. Use resetMinimumSourceTemperatureSchedule instead. It will be " - "removed within three releases."); + DEPRECATED_AT_MSG(3, 5, 0, "Use resetMinimumSourceTemperatureSchedule instead."); getImpl()->resetMinimumSourceTemperatureSchedule(); } boost::optional ZoneMixing::maximumSourceZoneTemperatureSchedule() const { - LOG(Warn, "As of 3.5.0, maximumSourceZoneTemperatureSchedule is deprecated. Use maximumSourceTemperatureSchedule instead. It will be " - "removed within three releases."); + DEPRECATED_AT_MSG(3, 5, 0, "Use maximumSourceTemperatureSchedule instead."); return getImpl()->maximumSourceTemperatureSchedule(); } bool ZoneMixing::setMaximumSourceZoneTemperatureSchedule(Schedule& schedule) { - LOG(Warn, "As of 3.5.0, setMaximumSourceZoneTemperatureSchedule is deprecated. Use setMaximumSourceTemperatureSchedule instead. It will be " - "removed within three releases."); + DEPRECATED_AT_MSG(3, 5, 0, "Use setMaximumSourceTemperatureSchedule instead."); return getImpl()->setMaximumSourceTemperatureSchedule(schedule); } void ZoneMixing::resetMaximumSourceZoneTemperatureSchedule() { - LOG(Warn, "As of 3.5.0, resetMaximumSourceZoneTemperatureSchedule is deprecated. Use resetMaximumSourceTemperatureSchedule instead. It will be " - "removed within three releases."); + DEPRECATED_AT_MSG(3, 5, 0, "Use resetMaximumSourceTemperatureSchedule instead."); getImpl()->resetMaximumSourceTemperatureSchedule(); } diff --git a/src/utilities/bcl/RemoteBCL.cpp b/src/utilities/bcl/RemoteBCL.cpp index 08c93d05c4..aab3d23802 100644 --- a/src/utilities/bcl/RemoteBCL.cpp +++ b/src/utilities/bcl/RemoteBCL.cpp @@ -34,6 +34,7 @@ #include "../core/StringHelpers.hpp" #include "../core/System.hpp" #include "../core/UnzipFile.hpp" +#include "../core/DeprecatedHelpers.hpp" #include @@ -536,7 +537,7 @@ boost::optional RemoteBCL::waitForComponentDownload() const { } boost::optional RemoteBCL::waitForComponentDownload(int) const { - LOG(Warn, "waitForComponentDownload(int msec) is deprecated, the parameter is unused. Use waitForComponentDownload() instead"); + DEPRECATED_AT_MSG(3, 2, 1, "The int parameter is unused. Use waitForComponentDownload() instead"); return waitForComponentDownload(); } @@ -548,7 +549,7 @@ boost::optional RemoteBCL::waitForMeasureDownload() const { } boost::optional RemoteBCL::waitForMeasureDownload(int) const { - LOG(Warn, "waitForMeasureDownloadint is deprecated, the parameter is unused. Use waitForMeasureDownload() instead"); + DEPRECATED_AT_MSG(3, 2, 1, "The int parameter is unused. Use waitForMeasureDownload() instead"); return waitForMeasureDownload(); } @@ -560,7 +561,7 @@ boost::optional RemoteBCL::waitForMetaSearch() const { } boost::optional RemoteBCL::waitForMetaSearch(int) const { - LOG(Warn, "waitForMetaSearchint is deprecated, the parameter is unused. Use waitForMetaSearch() instead"); + DEPRECATED_AT_MSG(3, 2, 1, "The int parameter is unused. Use waitForMetaSearch() instead"); return waitForMetaSearch(); } @@ -572,7 +573,7 @@ std::vector RemoteBCL::waitForSearch() const { } std::vector RemoteBCL::waitForSearch(int) const { - LOG(Warn, "waitForSearchint is deprecated, the parameter is unused. Use waitForSearch() instead"); + DEPRECATED_AT_MSG(3, 2, 1, "The int parameter is unused. Use waitForSearch() instead"); return waitForSearch(); } diff --git a/src/utilities/core/DeprecatedHelpers.hpp b/src/utilities/core/DeprecatedHelpers.hpp index aa300edb8b..d9249238c4 100644 --- a/src/utilities/core/DeprecatedHelpers.hpp +++ b/src/utilities/core/DeprecatedHelpers.hpp @@ -38,16 +38,32 @@ #include #include +#include #include -#define DEPRECATED_AT(__deprecatedAt__) \ - openstudio::detail::log_deprecation_and_throw_if_time_to_remove(__deprecatedAt__, logChannel(), BOOST_CURRENT_FUNCTION) +namespace openstudio { -#define DEPRECATED_AT_MSG(__deprecatedAt__, __message__) \ - openstudio::detail::log_deprecation_and_throw_if_time_to_remove(__deprecatedAt__, logChannel(), BOOST_CURRENT_FUNCTION, __message__) +struct cx_VersionString +{ + constexpr cx_VersionString(int t_major, int t_minor, int t_patch) : major(t_major), minor(t_minor), patch(t_patch) {} -namespace openstudio { + constexpr cx_VersionString() = default; + + constexpr bool isGreaterThan(const cx_VersionString& other, int numMinors = 3) const { + return (major > other.major) || (minor >= other.minor + numMinors); + } + + std::string str() const { + return fmt::format("{}.{}.{}", major, minor, patch); + } + + int major = openstudio::detail::cx_openStudioVersionMajor(); + int minor = openstudio::detail::cx_openStudioVersionMinor(); + int patch = openstudio::detail::cx_openStudioVersionPatch(); +}; + +// static inline constexpr cx_VersionString cx_currentVersion{}; namespace detail { inline void log_deprecation_and_throw_if_time_to_remove(const std::string& deprecatedAt, const std::string& logChannel, @@ -57,16 +73,17 @@ namespace detail { } else { LOG_FREE(Warn, logChannel, "As of " << deprecatedAt << ", " << methodName << " is deprecated. " << extraMessage); } - - const VersionString currentVersion(openStudioVersion()); - const VersionString deprecatedAtVersion(deprecatedAt); - const bool isTimeToRemoveDeprecated = - ((currentVersion.major() == deprecatedAtVersion.major()) || (currentVersion.minor() >= deprecatedAtVersion.minor() + 3)); - if (isTimeToRemoveDeprecated) { - throw openstudio::Exception(fmt::format("Time to remove {} from the API", methodName)); - } } } // namespace detail } // namespace openstudio +#define DEPRECATED_AT(__deprecatedAtVersionMajor__, __deprecatedAtVersionMinor__, __deprecatedAtVersionPatch__) \ + DEPRECATED_AT_MSG(__deprecatedAtVersionMajor__, __deprecatedAtVersionMinor__, __deprecatedAtVersionPatch__, "") + +#define DEPRECATED_AT_MSG(__deprecatedAtVersionMajor__, __deprecatedAtVersionMinor__, __deprecatedAtVersionPatch__, __message__) \ + constexpr openstudio::cx_VersionString deprecatedAt(__deprecatedAtVersionMajor__, __deprecatedAtVersionMinor__, __deprecatedAtVersionPatch__); \ + static_assert(true || !openstudio::cx_VersionString{}.isGreaterThan(deprecatedAt), \ + "Time to remove, deprecated at " #__deprecatedAtVersionMajor__ "." #__deprecatedAtVersionMinor__ "." #__deprecatedAtVersionPatch__); \ + openstudio::detail::log_deprecation_and_throw_if_time_to_remove(deprecatedAt.str(), logChannel(), BOOST_CURRENT_FUNCTION, __message__) + #endif // UTILITIES_CORE_DEPRECATEDHELPERS_HPP From d85372796db8fbe531985f207fd641c562a2d2a1 Mon Sep 17 00:00:00 2001 From: Julien Marrec Date: Tue, 6 Jun 2023 23:08:42 +0200 Subject: [PATCH 4/5] Grab all the other deprecated methods (including recent / outside of model) cd developer/ruby && ruby DeprecatedMethods.rb --- developer/ruby/deprecated_methods.csv | 457 +++++++++--------- ...ranslatePlantEquipmentOperationSchemes.cpp | 7 +- ...rwardTranslateTableMultiVariableLookup.cpp | 3 +- src/model/CoilCoolingDXSingleSpeed.cpp | 5 +- src/model/CoilCoolingDXSingleSpeed.hpp | 2 +- src/model/EnergyManagementSystemActuator.cpp | 7 +- .../GroundHeatExchangerHorizontalTrench.cpp | 31 +- ...facePropertyExposedFoundationPerimeter.cpp | 4 +- src/utilities/filetypes/RunOptions.cpp | 13 +- 9 files changed, 272 insertions(+), 257 deletions(-) diff --git a/developer/ruby/deprecated_methods.csv b/developer/ruby/deprecated_methods.csv index b442499f1b..120d62efcf 100644 --- a/developer/ruby/deprecated_methods.csv +++ b/developer/ruby/deprecated_methods.csv @@ -1,219 +1,238 @@ -Namespace,Class Name,Method,Deprecated Since,Commit SHA,Replace With,Removed In, -measure,OSMeasure,registerWithSketchUp,,,None,, -measure,OSMeasure,registerWithApplication,,,None,, -model,AvailabilityManagerNightCycle,controlThermalZone,2.3.1,3578590b7e63a68bedb7e43bef21f50552e0c6b7,controlThermalZones,3.4.1, -model,AvailabilityManagerNightCycle,setControlThermalZone,2.3.1,3578590b7e63a68bedb7e43bef21f50552e0c6b8,setControlThermalZones,3.4.1, -model,AvailabilityManagerNightCycle,resetControlThermalZone,2.3.1,3578590b7e63a68bedb7e43bef21f50552e0c6b9,resetControlThermalZones,3.4.1, -model,AirLoopHVAC,availabilityManager,2.3.1,3578590b7e63a68bedb7e43bef21f50552e0c6b10,availabilityManagers,3.4.1, -model,AirLoopHVAC,setAvailabilityManager,2.3.1,3578590b7e63a68bedb7e43bef21f50552e0c6b11,"addAvailabilityManager, setAvailabilityManagers",3.4.1, -model,AirLoopHVAC,resetAvailabilityManager,2.3.1,3578590b7e63a68bedb7e43bef21f50552e0c6b12,resetAvailabilityManagers,3.4.1, -model,PlantLoop,availabilityManager,2.3.1,3578590b7e63a68bedb7e43bef21f50552e0c6b13,availabilityManagers,3.4.1, -model,PlantLoop,setAvailabilityManager,2.3.1,3578590b7e63a68bedb7e43bef21f50552e0c6b14,"addAvailabilityManager, setAvailabilityManagers",3.4.1, -model,PlantLoop,resetAvailabilityManager,2.3.1,3578590b7e63a68bedb7e43bef21f50552e0c6b15,resetAvailabilityManagers,3.4.1, -model,Node,addSetpointManager,1.13.0,40c19546076be456f110ca542cd70ce711541961,SetpointManagerXXX::addToNode,3.4.1, -model,Node,addSetpointManagerWarmest,1.13.0,40c19546076be456f110ca542cd70ce711541962,SetpointManagerWarmest::addToNode,3.4.1, -model,Node,getSetpointManagerSingleZoneReheat,1.13.0,40c19546076be456f110ca542cd70ce711541963,Node::setpointManagers,3.4.1, -model,Node,getSetpointManagerMixedAir,1.13.0,40c19546076be456f110ca542cd70ce711541964,Node::setpointManagers,3.4.1, -model,Node,setpointManagerScheduled,1.13.0,40c19546076be456f110ca542cd70ce711541965,Node::setpointManagers,3.4.1, -model,Node,setpointManagerFollowOutdoorAirTemperature,1.13.0,40c19546076be456f110ca542cd70ce711541966,Node::setpointManagers,3.4.1, -model,Node,setpointManagerOutdoorAirReset,1.13.0,40c19546076be456f110ca542cd70ce711541967,Node::setpointManagers,3.4.1, -model,Node,setpointManagerWarmest,1.13.0,40c19546076be456f110ca542cd70ce711541968,Node::setpointManagers,3.4.1, -model,Node,removeSetpointManagerSingleZoneReheat,1.13.0,40c19546076be456f110ca542cd70ce711541969,SetpointManagerSingleZoneReheat::remove,3.4.1, -model,Node,removeSetpointManagerWarmest,1.13.0,40c19546076be456f110ca542cd70ce711541970,SetpointManagerWarmest::remove,3.4.1, -model,Node,removeSetpointManagerOutdoorAirReset,1.13.0,40c19546076be456f110ca542cd70ce711541971,SetpointManagerOutdoorAirReset::remove,3.4.1, -model,Node,removeSetpointManagerFollowOutdoorAirTemperature,1.13.0,40c19546076be456f110ca542cd70ce711541972,SetpointManagerFollowOutdoorAirTemperature::remove,3.4.1, -model,Node,removeSetpointManagerScheduled,1.13.0,40c19546076be456f110ca542cd70ce711541973,SetpointManagerScheduled::remove,3.4.1, -model,Node,removeSetpointManagerMixedAir,1.13.0,40c19546076be456f110ca542cd70ce711541974,SetpointManagerMixedAir::remove,3.4.1, -model,ZoneVentilationDesignFlowRate,setDesignFlowRateCalculationMethod,2.3.1,9ee9be2d0da3ed954a1e98cc3ab39ec7debffa92,"Done when calling setDesignFlowRate, setFlowRateperZoneFloorArea, setAirChangesperHour",3.4.1, -model,SizingSystem,minimumSystemAirFlowRatio,2.6.2,0c2e8044feaea315dc4105b17ce747638be324f5,centralHeatingMaximumSystemAirFlowRatio,3.5.0, -model,SizingSystem,setMinimumSystemAirFlowRatio,2.6.2,0c2e8044feaea315dc4105b17ce747638be324f5,setCentralHeatingMaximumSystemAirFlowRatio,3.5.0, -model,AirWallMaterial,Entire Class,2.9.0,bf17b66549ddc5c7a5badb7f0a84d12b93b44e81,ConstructionAirBoundary,3.5.0, -utilities,RemoteBCL,waitForComponentDownload(int),3.2.1,12055f067989732fc7e00b7185ecd53abf5731da,waitForComponentDownload(),, -utilities,RemoteBCL,waitForMeasureDownload(int),3.2.1,12055f067989732fc7e00b7185ecd53abf5731da,waitForMeasureDownload,, -utilities,RemoteBCL,waitForMetaSearch(int),3.2.1,12055f067989732fc7e00b7185ecd53abf5731da,waitForMetaSearch,, -utilities,RemoteBCL,waitForSearch(int),3.2.1,12055f067989732fc7e00b7185ecd53abf5731da,waitForSearch,, -model,ZoneMixing,flowRateperZoneFloorArea,3.5.0,66456b023202578fb1849a6d4f78a2b9cd0a08b8,flowRateperFloorArea,, -model,ZoneMixing,minimumZoneTemperatureSchedule,3.5.0,66456b023202578fb1849a6d4f78a2b9cd0a08b8,minimumReceivingTemperatureSchedule,, -model,ZoneMixing,maximumZoneTemperatureSchedule,3.5.0,66456b023202578fb1849a6d4f78a2b9cd0a08b8,maximumReceivingTemperatureSchedule,, -model,ZoneMixing,minimumSourceZoneTemperatureSchedule,3.5.0,66456b023202578fb1849a6d4f78a2b9cd0a08b8,minimumSourceTemperatureSchedule,, -model,ZoneMixing,maximumSourceZoneTemperatureSchedule,3.5.0,66456b023202578fb1849a6d4f78a2b9cd0a08b8,maximumSourceTemperatureSchedule,, -model,ZoneMixing,setFlowRateperZoneFloorArea,3.5.0,66456b023202578fb1849a6d4f78a2b9cd0a08b8,setFlowRateperFloorArea,, -model,ZoneMixing,resetSourceZone,3.5.0,66456b023202578fb1849a6d4f78a2b9cd0a08b8,resetSourceZoneOrSpace,, -model,ZoneMixing,setMinimumZoneTemperatureSchedule,3.5.0,66456b023202578fb1849a6d4f78a2b9cd0a08b8,setMinimumReceivingTemperatureSchedule,, -model,ZoneMixing,resetMinimumZoneTemperatureSchedule,3.5.0,66456b023202578fb1849a6d4f78a2b9cd0a08b8,resetMinimumReceivingTemperatureSchedule,, -model,ZoneMixing,setMaximumZoneTemperatureSchedule,3.5.0,66456b023202578fb1849a6d4f78a2b9cd0a08b8,setMaximumReceivingTemperatureSchedule,, -model,ZoneMixing,resetMaximumZoneTemperatureSchedule,3.5.0,66456b023202578fb1849a6d4f78a2b9cd0a08b8,resetMaximumReceivingTemperatureSchedule,, -model,ZoneMixing,setMinimumSourceZoneTemperatureSchedule,3.5.0,66456b023202578fb1849a6d4f78a2b9cd0a08b8,setMinimumSourceTemperatureSchedule,, -model,ZoneMixing,resetMinimumSourceZoneTemperatureSchedule,3.5.0,66456b023202578fb1849a6d4f78a2b9cd0a08b8,resetMinimumSourceTemperatureSchedule,, -model,ZoneMixing,setMaximumSourceZoneTemperatureSchedule,3.5.0,66456b023202578fb1849a6d4f78a2b9cd0a08b8,setMaximumSourceTemperatureSchedule,, -model,ZoneMixing,resetMaximumSourceZoneTemperatureSchedule,3.5.0,66456b023202578fb1849a6d4f78a2b9cd0a08b8,resetMaximumSourceTemperatureSchedule,, -model,CoilCoolingDXMultiSpeedStageData,ratedEvaporatorFanPowerPerVolumeFlowRate,3.5.0,d4799760c23f8e2775ffd3fb83bffb692ac4be1e,ratedEvaporatorFanPowerPerVolumeFlowRate2017,, -model,CoilCoolingDXMultiSpeedStageData,setRatedEvaporatorFanPowerPerVolumeFlowRate,3.5.0,d4799760c23f8e2775ffd3fb83bffb692ac4be1e,setRatedEvaporatorFanPowerPerVolumeFlowRate2017,, -model,CoilCoolingDXCurveFitSpeed,ratedEvaporatorFanPowerPerVolumeFlowRate,3.5.0,d4799760c23f8e2775ffd3fb83bffb692ac4be1e,ratedEvaporatorFanPowerPerVolumeFlowRate2017,, -model,CoilCoolingDXCurveFitSpeed,setRatedEvaporatorFanPowerPerVolumeFlowRate,3.5.0,d4799760c23f8e2775ffd3fb83bffb692ac4be1e,setRatedEvaporatorFanPowerPerVolumeFlowRate2017,, -model,CoilCoolingDXSingleSpeed,ratedEvaporatorFanPowerPerVolumeFlowRate,3.5.0,d4799760c23f8e2775ffd3fb83bffb692ac4be1e,ratedEvaporatorFanPowerPerVolumeFlowRate2017,, -model,CoilCoolingDXSingleSpeed,setRatedEvaporatorFanPowerPerVolumeFlowRate,3.5.0,d4799760c23f8e2775ffd3fb83bffb692ac4be1e,setRatedEvaporatorFanPowerPerVolumeFlowRate2017,, -model,CoilHeatingDXSingleSpeed,ratedSupplyFanPowerPerVolumeFlowRate,3.5.0,d4799760c23f8e2775ffd3fb83bffb692ac4be1e,ratedSupplyFanPowerPerVolumeFlowRate2017,, -model,CoilHeatingDXSingleSpeed,setRatedSupplyFanPowerPerVolumeFlowRate,3.5.0,d4799760c23f8e2775ffd3fb83bffb692ac4be1e,setRatedSupplyFanPowerPerVolumeFlowRate2017,, -model,CoilHeatingDXMultiSpeedStageData,ratedSupplyAirFanPowerPerVolumeFlowRate,3.5.0,d4799760c23f8e2775ffd3fb83bffb692ac4be1e,ratedSupplyFanPowerPerVolumeFlowRate2017,, -model,CoilHeatingDXMultiSpeedStageData,setRatedSupplyAirFanPowerPerVolumeFlowRate,3.5.0,d4799760c23f8e2775ffd3fb83bffb692ac4be1e,setRatedSupplyFanPowerPerVolumeFlowRate2017,, -model,DesignDay,validHumidityIndicatingTypeValues,3.3.0,859e2a5aec84675af9b4ce3b62179c50240e7841,validHumidityConditionTypeValues,, -model,DesignDay,humidityIndicatingConditionsAtMaximumDryBulb,3.3.0,859e2a5aec84675af9b4ce3b62179c50240e7841,"wetBulbOrDewPointAtMaximumDryBulb,humidityRatioAtMaximumDryBulb, enthalpyAtMaximumDryBulb",, -model,DesignDay,isHumidityIndicatingConditionsAtMaximumDryBulbDefaulted,3.3.0,859e2a5aec84675af9b4ce3b62179c50240e7841,"None of these have a value: wetBulbOrDewPointAtMaximumDryBulb,humidityRatioAtMaximumDryBulb, enthalpyAtMaximumDryBulb",, -model,DesignDay,humidityIndicatingType,3.3.0,859e2a5aec84675af9b4ce3b62179c50240e7841,humidityConditionType,, -model,DesignDay,isHumidityIndicatingTypeDefaulted,3.3.0,859e2a5aec84675af9b4ce3b62179c50240e7841,isHumidityConditionTypeDefaulted,, -model,DesignDay,humidityIndicatingDaySchedule,3.3.0,859e2a5aec84675af9b4ce3b62179c50240e7841,humidityConditionDaySchedule,, -model,DesignDay,dryBulbTemperatureRangeModifierSchedule,3.3.0,859e2a5aec84675af9b4ce3b62179c50240e7841,dryBulbTemperatureRangeModifierDaySchedule,, -model,DesignDay,ashraeTaub,3.3.0,859e2a5aec84675af9b4ce3b62179c50240e7841,ashraeClearSkyOpticalDepthForBeamIrradiance,, -model,DesignDay,isAshraeTaubDefaulted,3.3.0,859e2a5aec84675af9b4ce3b62179c50240e7841,isAshraeClearSkyOpticalDepthForBeamIrradianceDefaulted,, -model,DesignDay,ashraeTaud,3.3.0,859e2a5aec84675af9b4ce3b62179c50240e7841,ashraeClearSkyOpticalDepthForDiffuseIrradiance,, -model,DesignDay,isAshraeTaudDefaulted,3.3.0,859e2a5aec84675af9b4ce3b62179c50240e7841,isAshraeClearSkyOpticalDepthForDiffuseIrradianceDefaulted,, -model,DesignDay,setHumidityIndicatingType,3.3.0,859e2a5aec84675af9b4ce3b62179c50240e7841,setHumidityConditionType,, -model,DesignDay,resetHumidityIndicatingType,3.3.0,859e2a5aec84675af9b4ce3b62179c50240e7841,resetHumidityConditionType,, -model,DesignDay,setHumidityIndicatingDaySchedule,3.3.0,859e2a5aec84675af9b4ce3b62179c50240e7841,setHumidityConditionDaySchedule,, -model,DesignDay,resetHumidityIndicatingDaySchedule,3.3.0,859e2a5aec84675af9b4ce3b62179c50240e7841,resetHumidityConditionDaySchedule,, -model,DesignDay,setHumidityIndicatingConditionsAtMaximumDryBulb,3.3.0,859e2a5aec84675af9b4ce3b62179c50240e7841,"setWetBulbOrDewPointAtMaximumDryBulb, setHumidityRatioAtMaximumDryBulb, setEnthalpyAtMaximumDryBulb",, -model,DesignDay,resetHumidityIndicatingConditionsAtMaximumDryBulb,3.3.0,859e2a5aec84675af9b4ce3b62179c50240e7841,"resetWetBulbOrDewPointAtMaximumDryBulb, resetHumidityRatioAtMaximumDryBulb, resetEnthalpyAtMaximumDryBulb",, -model,DesignDay,setDryBulbTemperatureRangeModifierSchedule,3.3.0,859e2a5aec84675af9b4ce3b62179c50240e7841,setDryBulbTemperatureRangeModifierDaySchedule,, -model,DesignDay,resetDryBulbTemperatureRangeModifierSchedule,3.3.0,859e2a5aec84675af9b4ce3b62179c50240e7841,resetDryBulbTemperatureRangeModifierDaySchedule,, -model,DesignDay,setAshraeTaub,3.3.0,859e2a5aec84675af9b4ce3b62179c50240e7841,setAshraeClearSkyOpticalDepthForBeamIrradiance,, -model,DesignDay,resetAshraeTaub,3.3.0,859e2a5aec84675af9b4ce3b62179c50240e7841,resetAshraeClearSkyOpticalDepthForBeamIrradiance,, -model,DesignDay,setAshraeTaud,3.3.0,859e2a5aec84675af9b4ce3b62179c50240e7841,setAshraeClearSkyOpticalDepthForDiffuseIrradiance,, -model,DesignDay,resetAshraeTaud,3.3.0,859e2a5aec84675af9b4ce3b62179c50240e7841,resetAshraeClearSkyOpticalDepthForDiffuseIrradiance,, -model,ZoneHVACEquipmentList,sequentialCoolingFraction,2.9.0,88a04d2e13e9a51d434a4e517909db2135401d06,sequentialCoolingFractionSchedule,, -model,ZoneHVACEquipmentList,sequentialHeatingFraction,2.9.0,88a04d2e13e9a51d434a4e517909db2135401d06,sequentialHeatingFractionSchedule,, -model,ZoneHVACEquipmentList,setSequentialCoolingFraction,2.9.0,88a04d2e13e9a51d434a4e517909db2135401d06,setSequentialCoolingFractionSchedule,, -model,ZoneHVACEquipmentList,setSequentialHeatingFraction,2.9.0,88a04d2e13e9a51d434a4e517909db2135401d06,setSequentialHeatingFractionSchedule,, -model,CoilCoolingWaterToAirHeatPumpEquationFit,totalCoolingCapacityCoefficient1,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,totalCoolingCapacityCurve,, -model,CoilCoolingWaterToAirHeatPumpEquationFit,totalCoolingCapacityCoefficient2,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,totalCoolingCapacityCurve,, -model,CoilCoolingWaterToAirHeatPumpEquationFit,totalCoolingCapacityCoefficient3,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,totalCoolingCapacityCurve,, -model,CoilCoolingWaterToAirHeatPumpEquationFit,totalCoolingCapacityCoefficient4,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,totalCoolingCapacityCurve,, -model,CoilCoolingWaterToAirHeatPumpEquationFit,totalCoolingCapacityCoefficient5,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,totalCoolingCapacityCurve,, -model,CoilCoolingWaterToAirHeatPumpEquationFit,sensibleCoolingCapacityCoefficient1,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,sensibleCoolingCapacityCurve,, -model,CoilCoolingWaterToAirHeatPumpEquationFit,sensibleCoolingCapacityCoefficient2,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,sensibleCoolingCapacityCurve,, -model,CoilCoolingWaterToAirHeatPumpEquationFit,sensibleCoolingCapacityCoefficient3,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,sensibleCoolingCapacityCurve,, -model,CoilCoolingWaterToAirHeatPumpEquationFit,sensibleCoolingCapacityCoefficient4,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,sensibleCoolingCapacityCurve,, -model,CoilCoolingWaterToAirHeatPumpEquationFit,sensibleCoolingCapacityCoefficient5,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,sensibleCoolingCapacityCurve,, -model,CoilCoolingWaterToAirHeatPumpEquationFit,sensibleCoolingCapacityCoefficient6,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,sensibleCoolingCapacityCurve,, -model,CoilCoolingWaterToAirHeatPumpEquationFit,coolingPowerConsumptionCoefficient1,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,coolingPowerConsumptionCurve,, -model,CoilCoolingWaterToAirHeatPumpEquationFit,coolingPowerConsumptionCoefficient2,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,coolingPowerConsumptionCurve,, -model,CoilCoolingWaterToAirHeatPumpEquationFit,coolingPowerConsumptionCoefficient3,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,coolingPowerConsumptionCurve,, -model,CoilCoolingWaterToAirHeatPumpEquationFit,coolingPowerConsumptionCoefficient4,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,coolingPowerConsumptionCurve,, -model,CoilCoolingWaterToAirHeatPumpEquationFit,coolingPowerConsumptionCoefficient5,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,coolingPowerConsumptionCurve,, -model,CoilCoolingWaterToAirHeatPumpEquationFit,setTotalCoolingCapacityCoefficient1,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setTotalCoolingCapacityCurve,, -model,CoilCoolingWaterToAirHeatPumpEquationFit,setTotalCoolingCapacityCoefficient2,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setTotalCoolingCapacityCurve,, -model,CoilCoolingWaterToAirHeatPumpEquationFit,setTotalCoolingCapacityCoefficient3,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setTotalCoolingCapacityCurve,, -model,CoilCoolingWaterToAirHeatPumpEquationFit,setTotalCoolingCapacityCoefficient4,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setTotalCoolingCapacityCurve,, -model,CoilCoolingWaterToAirHeatPumpEquationFit,setTotalCoolingCapacityCoefficient5,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setTotalCoolingCapacityCurve,, -model,CoilCoolingWaterToAirHeatPumpEquationFit,setSensibleCoolingCapacityCoefficient1,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setSensibleCoolingCapacityCurve,, -model,CoilCoolingWaterToAirHeatPumpEquationFit,setSensibleCoolingCapacityCoefficient2,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setSensibleCoolingCapacityCurve,, -model,CoilCoolingWaterToAirHeatPumpEquationFit,setSensibleCoolingCapacityCoefficient3,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setSensibleCoolingCapacityCurve,, -model,CoilCoolingWaterToAirHeatPumpEquationFit,setSensibleCoolingCapacityCoefficient4,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setSensibleCoolingCapacityCurve,, -model,CoilCoolingWaterToAirHeatPumpEquationFit,setSensibleCoolingCapacityCoefficient5,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setSensibleCoolingCapacityCurve,, -model,CoilCoolingWaterToAirHeatPumpEquationFit,setSensibleCoolingCapacityCoefficient6,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setSensibleCoolingCapacityCurve,, -model,CoilCoolingWaterToAirHeatPumpEquationFit,setCoolingPowerConsumptionCoefficient1,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setCoolingPowerConsumptionCurve,, -model,CoilCoolingWaterToAirHeatPumpEquationFit,setCoolingPowerConsumptionCoefficient2,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setCoolingPowerConsumptionCurve,, -model,CoilCoolingWaterToAirHeatPumpEquationFit,setCoolingPowerConsumptionCoefficient3,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setCoolingPowerConsumptionCurve,, -model,CoilCoolingWaterToAirHeatPumpEquationFit,setCoolingPowerConsumptionCoefficient4,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setCoolingPowerConsumptionCurve,, -model,CoilCoolingWaterToAirHeatPumpEquationFit,setCoolingPowerConsumptionCoefficient5,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setCoolingPowerConsumptionCurve,, -model,ConstructionAirBoundary,solarAndDaylightingMethodValues,3.2.0,0cd16efedbed7036a74c0e7beefb2f3cb79ee0b7,None,, -model,ConstructionAirBoundary,radiantExchangeMethodValues,3.2.0,0cd16efedbed7036a74c0e7beefb2f3cb79ee0b7,None,, -model,ConstructionAirBoundary,solarAndDaylightingMethod,3.2.0,0cd16efedbed7036a74c0e7beefb2f3cb79ee0b7,None,, -model,ConstructionAirBoundary,isSolarAndDaylightingMethodDefaulted,3.2.0,0cd16efedbed7036a74c0e7beefb2f3cb79ee0b7,None,, -model,ConstructionAirBoundary,radiantExchangeMethod,3.2.0,0cd16efedbed7036a74c0e7beefb2f3cb79ee0b7,None,, -model,ConstructionAirBoundary,isRadiantExchangeMethodDefaulted,3.2.0,0cd16efedbed7036a74c0e7beefb2f3cb79ee0b7,None,, -model,ConstructionAirBoundary,setSolarAndDaylightingMethod,3.2.0,0cd16efedbed7036a74c0e7beefb2f3cb79ee0b7,None,, -model,ConstructionAirBoundary,resetSolarAndDaylightingMethod,3.2.0,0cd16efedbed7036a74c0e7beefb2f3cb79ee0b7,None,, -model,ConstructionAirBoundary,setRadiantExchangeMethod,3.2.0,0cd16efedbed7036a74c0e7beefb2f3cb79ee0b7,None,, -model,ConstructionAirBoundary,resetRadiantExchangeMethod,3.2.0,0cd16efedbed7036a74c0e7beefb2f3cb79ee0b7,None,, -model,CurveDoubleExponentialDecay,coefficient3C4,3.1.0,e75a6741dece27ff1f9a6d3b4e118ff987787a54,coefficient4C4,, -model,CurveDoubleExponentialDecay,coefficient3C5,3.1.0,e75a6741dece27ff1f9a6d3b4e118ff987787a54,coefficient5C5,, -model,CurveDoubleExponentialDecay,setCoefficient3C4,3.1.0,e75a6741dece27ff1f9a6d3b4e118ff987787a54,setCoefficient4C4,, -model,CurveDoubleExponentialDecay,setCoefficient3C5,3.1.0,e75a6741dece27ff1f9a6d3b4e118ff987787a54,setCoefficient5C5,, -model,AirTerminalSingleDuctVAVReheat,zoneMinimumAirFlowMethod,3.0.1,de1a08cb2cf334c4ac162db0964de792127ec07a,zoneMinimumAirFlowInputMethod,, -model,AirTerminalSingleDuctVAVReheat,setZoneMinimumAirFlowMethod,3.0.1,de1a08cb2cf334c4ac162db0964de792127ec07a,setZoneMinimumAirFlowInputMethod,, -model,ZoneAirMassFlowConservation,adjustZoneMixingForZoneAirMassFlowBalance,3.2.0,5f1426de62e760197e4c9b7d076ec649b91b8480,adjustZoneMixingandReturnForAirMassFlowBalance,, -model,ZoneAirMassFlowConservation,isAdjustZoneMixingForZoneAirMassFlowBalanceDefaulted,3.2.0,5f1426de62e760197e4c9b7d076ec649b91b8480,isAdjustZoneMixingandReturnForAirMassFlowBalanceDefaulted,, -model,ZoneAirMassFlowConservation,setAdjustZoneMixingForZoneAirMassFlowBalance,3.2.0,5f1426de62e760197e4c9b7d076ec649b91b8480,setAdjustZoneMixingandReturnForAirMassFlowBalance,, -model,ZoneAirMassFlowConservation,resetAdjustZoneMixingForZoneAirMassFlowBalance,3.2.0,5f1426de62e760197e4c9b7d076ec649b91b8480,resetAdjustZoneMixingandReturnForAirMassFlowBalance,, -model,HeatPumpWaterToWaterEquationFitCooling,coolingCapacityCoefficient1,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,coolingCapacityCurve,, -model,HeatPumpWaterToWaterEquationFitCooling,coolingCapacityCoefficient2,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,coolingCapacityCurve,, -model,HeatPumpWaterToWaterEquationFitCooling,coolingCapacityCoefficient3,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,coolingCapacityCurve,, -model,HeatPumpWaterToWaterEquationFitCooling,coolingCapacityCoefficient4,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,coolingCapacityCurve,, -model,HeatPumpWaterToWaterEquationFitCooling,coolingCapacityCoefficient5,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,coolingCapacityCurve,, -model,HeatPumpWaterToWaterEquationFitCooling,coolingCompressorPowerCoefficient1,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,coolingCompressorPowerCurve,, -model,HeatPumpWaterToWaterEquationFitCooling,coolingCompressorPowerCoefficient2,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,coolingCompressorPowerCurve,, -model,HeatPumpWaterToWaterEquationFitCooling,coolingCompressorPowerCoefficient3,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,coolingCompressorPowerCurve,, -model,HeatPumpWaterToWaterEquationFitCooling,coolingCompressorPowerCoefficient4,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,coolingCompressorPowerCurve,, -model,HeatPumpWaterToWaterEquationFitCooling,coolingCompressorPowerCoefficient5,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,coolingCompressorPowerCurve,, -model,HeatPumpWaterToWaterEquationFitCooling,setCoolingCapacityCoefficient1,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setCoolingCapacityCurve,, -model,HeatPumpWaterToWaterEquationFitCooling,setCoolingCapacityCoefficient2,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setCoolingCapacityCurve,, -model,HeatPumpWaterToWaterEquationFitCooling,setCoolingCapacityCoefficient3,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setCoolingCapacityCurve,, -model,HeatPumpWaterToWaterEquationFitCooling,setCoolingCapacityCoefficient4,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setCoolingCapacityCurve,, -model,HeatPumpWaterToWaterEquationFitCooling,setCoolingCapacityCoefficient5,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setCoolingCapacityCurve,, -model,HeatPumpWaterToWaterEquationFitCooling,setCoolingCompressorPowerCoefficient1,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setCoolingCompressorPowerCurve,, -model,HeatPumpWaterToWaterEquationFitCooling,setCoolingCompressorPowerCoefficient2,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setCoolingCompressorPowerCurve,, -model,HeatPumpWaterToWaterEquationFitCooling,setCoolingCompressorPowerCoefficient3,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setCoolingCompressorPowerCurve,, -model,HeatPumpWaterToWaterEquationFitCooling,setCoolingCompressorPowerCoefficient4,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setCoolingCompressorPowerCurve,, -model,HeatPumpWaterToWaterEquationFitCooling,setCoolingCompressorPowerCoefficient5,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setCoolingCompressorPowerCurve,, -model,SubSurface,shadingControl,3.1.0,4c453f5a5384add48f619fd8fc9f0e1e991f663c,shadingControls,, -model,SubSurface,setShadingControl,3.1.0,4c453f5a5384add48f619fd8fc9f0e1e991f663c,"addShadingControl, addShadingControls",, -model,SubSurface,resetShadingControl,3.1.0,4c453f5a5384add48f619fd8fc9f0e1e991f663c,removeAllShadingControls,, -model,AirConditionerVariableRefrigerantFlow,ratedTotalCoolingCapacity,2.9.0,d292fea8a1ac5ea0e9ddb2360fe04528503d3b53,grossRatedTotalCoolingCapacity,, -model,AirConditionerVariableRefrigerantFlow,isRatedTotalCoolingCapacityAutosized,2.9.0,d292fea8a1ac5ea0e9ddb2360fe04528503d3b53,isGrossRatedTotalCoolingCapacityAutosized,, -model,AirConditionerVariableRefrigerantFlow,setRatedTotalCoolingCapacity,2.9.0,d292fea8a1ac5ea0e9ddb2360fe04528503d3b53,setGrossRatedTotalCoolingCapacity,, -model,AirConditionerVariableRefrigerantFlow,autosizeRatedTotalCoolingCapacity,2.9.0,d292fea8a1ac5ea0e9ddb2360fe04528503d3b53,autosizeGrossRatedTotalCoolingCapacity,, -model,AirConditionerVariableRefrigerantFlow,ratedCoolingCOP,2.9.0,d292fea8a1ac5ea0e9ddb2360fe04528503d3b53,grossRatedCoolingCOP,, -model,AirConditionerVariableRefrigerantFlow,setRatedCoolingCOP,2.9.0,d292fea8a1ac5ea0e9ddb2360fe04528503d3b53,setGrossRatedCoolingCOP,, -model,AirConditionerVariableRefrigerantFlow,ratedTotalHeatingCapacity,2.9.0,d292fea8a1ac5ea0e9ddb2360fe04528503d3b53,grossRatedHeatingCapacity,, -model,AirConditionerVariableRefrigerantFlow,isRatedTotalHeatingCapacityAutosized,2.9.0,d292fea8a1ac5ea0e9ddb2360fe04528503d3b53,isGrossRatedHeatingCapacityAutosized,, -model,AirConditionerVariableRefrigerantFlow,setRatedTotalHeatingCapacity,2.9.0,d292fea8a1ac5ea0e9ddb2360fe04528503d3b53,setGrossRatedHeatingCapacity,, -model,AirConditionerVariableRefrigerantFlow,autosizeRatedTotalHeatingCapacity,2.9.0,d292fea8a1ac5ea0e9ddb2360fe04528503d3b53,autosizeGrossRatedHeatingCapacity,, -model,AirConditionerVariableRefrigerantFlow,ratedTotalHeatingCapacitySizingRatio,2.9.0,d292fea8a1ac5ea0e9ddb2360fe04528503d3b53,ratedHeatingCapacitySizingRatio,, -model,AirConditionerVariableRefrigerantFlow,setRatedTotalHeatingCapacitySizingRatio,2.9.0,d292fea8a1ac5ea0e9ddb2360fe04528503d3b53,setRatedHeatingCapacitySizingRatio,, -model,AirConditionerVariableRefrigerantFlow,autosizedRatedTotalCoolingCapacity,2.9.0,d292fea8a1ac5ea0e9ddb2360fe04528503d3b53,autosizedGrossRatedTotalCoolingCapacity,, -model,AirConditionerVariableRefrigerantFlow,autosizedRatedTotalHeatingCapacity,2.9.0,d292fea8a1ac5ea0e9ddb2360fe04528503d3b53,autosizedGrossRatedHeatingCapacity,, -model,ZoneHVACLowTempRadiantConstFlow,resetHydronicTubingLength,3.0.0,cc981cc9b0330000b31a325c282fe3ee6a4345cb,autosizeHydronicTubingLength,, -model,ZoneHVACLowTempRadiantConstFlow,resetRatedFlowRate,3.0.0,cc981cc9b0330000b31a325c282fe3ee6a4345cb,autosizeRatedFlowRate,, -model,HeatPumpWaterToWaterEquationFitHeating,heatingCapacityCoefficient1,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,heatingCapacityCurve,, -model,HeatPumpWaterToWaterEquationFitHeating,heatingCapacityCoefficient2,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,heatingCapacityCurve,, -model,HeatPumpWaterToWaterEquationFitHeating,heatingCapacityCoefficient3,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,heatingCapacityCurve,, -model,HeatPumpWaterToWaterEquationFitHeating,heatingCapacityCoefficient4,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,heatingCapacityCurve,, -model,HeatPumpWaterToWaterEquationFitHeating,heatingCapacityCoefficient5,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,heatingCapacityCurve,, -model,HeatPumpWaterToWaterEquationFitHeating,heatingCompressorPowerCoefficient1,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,heatingCompressorPowerCurve,, -model,HeatPumpWaterToWaterEquationFitHeating,heatingCompressorPowerCoefficient2,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,heatingCompressorPowerCurve,, -model,HeatPumpWaterToWaterEquationFitHeating,heatingCompressorPowerCoefficient3,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,heatingCompressorPowerCurve,, -model,HeatPumpWaterToWaterEquationFitHeating,heatingCompressorPowerCoefficient4,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,heatingCompressorPowerCurve,, -model,HeatPumpWaterToWaterEquationFitHeating,heatingCompressorPowerCoefficient5,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,heatingCompressorPowerCurve,, -model,HeatPumpWaterToWaterEquationFitHeating,setHeatingCapacityCoefficient1,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setHeatingCapacityCurve,, -model,HeatPumpWaterToWaterEquationFitHeating,setHeatingCapacityCoefficient2,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setHeatingCapacityCurve,, -model,HeatPumpWaterToWaterEquationFitHeating,setHeatingCapacityCoefficient3,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setHeatingCapacityCurve,, -model,HeatPumpWaterToWaterEquationFitHeating,setHeatingCapacityCoefficient4,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setHeatingCapacityCurve,, -model,HeatPumpWaterToWaterEquationFitHeating,setHeatingCapacityCoefficient5,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setHeatingCapacityCurve,, -model,HeatPumpWaterToWaterEquationFitHeating,setHeatingCompressorPowerCoefficient1,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setHeatingCompressorPowerCurve,, -model,HeatPumpWaterToWaterEquationFitHeating,setHeatingCompressorPowerCoefficient2,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setHeatingCompressorPowerCurve,, -model,HeatPumpWaterToWaterEquationFitHeating,setHeatingCompressorPowerCoefficient3,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setHeatingCompressorPowerCurve,, -model,HeatPumpWaterToWaterEquationFitHeating,setHeatingCompressorPowerCoefficient4,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setHeatingCompressorPowerCurve,, -model,HeatPumpWaterToWaterEquationFitHeating,setHeatingCompressorPowerCoefficient5,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setHeatingCompressorPowerCurve,, -model,CoilHeatingWaterToAirHeatPumpEquationFit,heatingCapacityCoefficient1,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,heatingCapacityCurve,, -model,CoilHeatingWaterToAirHeatPumpEquationFit,heatingCapacityCoefficient2,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,heatingCapacityCurve,, -model,CoilHeatingWaterToAirHeatPumpEquationFit,heatingCapacityCoefficient3,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,heatingCapacityCurve,, -model,CoilHeatingWaterToAirHeatPumpEquationFit,heatingCapacityCoefficient4,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,heatingCapacityCurve,, -model,CoilHeatingWaterToAirHeatPumpEquationFit,heatingCapacityCoefficient5,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,heatingCapacityCurve,, -model,CoilHeatingWaterToAirHeatPumpEquationFit,heatingPowerConsumptionCoefficient1,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,heatingPowerConsumptionCurve,, -model,CoilHeatingWaterToAirHeatPumpEquationFit,heatingPowerConsumptionCoefficient2,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,heatingPowerConsumptionCurve,, -model,CoilHeatingWaterToAirHeatPumpEquationFit,heatingPowerConsumptionCoefficient3,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,heatingPowerConsumptionCurve,, -model,CoilHeatingWaterToAirHeatPumpEquationFit,heatingPowerConsumptionCoefficient4,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,heatingPowerConsumptionCurve,, -model,CoilHeatingWaterToAirHeatPumpEquationFit,heatingPowerConsumptionCoefficient5,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,heatingPowerConsumptionCurve,, -model,CoilHeatingWaterToAirHeatPumpEquationFit,setHeatingCapacityCoefficient1,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setHeatingCapacityCurve,, -model,CoilHeatingWaterToAirHeatPumpEquationFit,setHeatingCapacityCoefficient2,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setHeatingCapacityCurve,, -model,CoilHeatingWaterToAirHeatPumpEquationFit,setHeatingCapacityCoefficient3,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setHeatingCapacityCurve,, -model,CoilHeatingWaterToAirHeatPumpEquationFit,setHeatingCapacityCoefficient4,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setHeatingCapacityCurve,, -model,CoilHeatingWaterToAirHeatPumpEquationFit,setHeatingCapacityCoefficient5,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setHeatingCapacityCurve,, -model,CoilHeatingWaterToAirHeatPumpEquationFit,setHeatingPowerConsumptionCoefficient1,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setHeatingPowerConsumptionCurve,, -model,CoilHeatingWaterToAirHeatPumpEquationFit,setHeatingPowerConsumptionCoefficient2,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setHeatingPowerConsumptionCurve,, -model,CoilHeatingWaterToAirHeatPumpEquationFit,setHeatingPowerConsumptionCoefficient3,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setHeatingPowerConsumptionCurve,, -model,CoilHeatingWaterToAirHeatPumpEquationFit,setHeatingPowerConsumptionCoefficient4,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setHeatingPowerConsumptionCurve,, -model,CoilHeatingWaterToAirHeatPumpEquationFit,setHeatingPowerConsumptionCoefficient5,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setHeatingPowerConsumptionCurve,, -model,ScheduleFile,setMinutesperItem(std::string),3.2.0,b4a8acfffd3d73108e20c863920b4adbb9b3b727,setMinutesperItem(int),, -,,,,,,, \ No newline at end of file +Namespace,Class Name,Method,Deprecated Since,Commit SHA,Replace With,Removed In +measure,OSMeasure,registerWithSketchUp,,,None, +measure,OSMeasure,registerWithApplication,,,None, +model,AvailabilityManagerNightCycle,controlThermalZone,2.3.1,3578590b7e63a68bedb7e43bef21f50552e0c6b7,controlThermalZones,3.4.1 +model,AvailabilityManagerNightCycle,setControlThermalZone,2.3.1,3578590b7e63a68bedb7e43bef21f50552e0c6b8,setControlThermalZones,3.4.1 +model,AvailabilityManagerNightCycle,resetControlThermalZone,2.3.1,3578590b7e63a68bedb7e43bef21f50552e0c6b9,resetControlThermalZones,3.4.1 +model,AirLoopHVAC,availabilityManager,2.3.1,3578590b7e63a68bedb7e43bef21f50552e0c6b10,availabilityManagers,3.4.1 +model,AirLoopHVAC,setAvailabilityManager,2.3.1,3578590b7e63a68bedb7e43bef21f50552e0c6b11,"addAvailabilityManager, setAvailabilityManagers",3.4.1 +model,AirLoopHVAC,resetAvailabilityManager,2.3.1,3578590b7e63a68bedb7e43bef21f50552e0c6b12,resetAvailabilityManagers,3.4.1 +model,PlantLoop,availabilityManager,2.3.1,3578590b7e63a68bedb7e43bef21f50552e0c6b13,availabilityManagers,3.4.1 +model,PlantLoop,setAvailabilityManager,2.3.1,3578590b7e63a68bedb7e43bef21f50552e0c6b14,"addAvailabilityManager, setAvailabilityManagers",3.4.1 +model,PlantLoop,resetAvailabilityManager,2.3.1,3578590b7e63a68bedb7e43bef21f50552e0c6b15,resetAvailabilityManagers,3.4.1 +model,Node,addSetpointManager,1.13.0,40c19546076be456f110ca542cd70ce711541961,SetpointManagerXXX::addToNode,3.4.1 +model,Node,addSetpointManagerWarmest,1.13.0,40c19546076be456f110ca542cd70ce711541962,SetpointManagerWarmest::addToNode,3.4.1 +model,Node,getSetpointManagerSingleZoneReheat,1.13.0,40c19546076be456f110ca542cd70ce711541963,Node::setpointManagers,3.4.1 +model,Node,getSetpointManagerMixedAir,1.13.0,40c19546076be456f110ca542cd70ce711541964,Node::setpointManagers,3.4.1 +model,Node,setpointManagerScheduled,1.13.0,40c19546076be456f110ca542cd70ce711541965,Node::setpointManagers,3.4.1 +model,Node,setpointManagerFollowOutdoorAirTemperature,1.13.0,40c19546076be456f110ca542cd70ce711541966,Node::setpointManagers,3.4.1 +model,Node,setpointManagerOutdoorAirReset,1.13.0,40c19546076be456f110ca542cd70ce711541967,Node::setpointManagers,3.4.1 +model,Node,setpointManagerWarmest,1.13.0,40c19546076be456f110ca542cd70ce711541968,Node::setpointManagers,3.4.1 +model,Node,removeSetpointManagerSingleZoneReheat,1.13.0,40c19546076be456f110ca542cd70ce711541969,SetpointManagerSingleZoneReheat::remove,3.4.1 +model,Node,removeSetpointManagerWarmest,1.13.0,40c19546076be456f110ca542cd70ce711541970,SetpointManagerWarmest::remove,3.4.1 +model,Node,removeSetpointManagerOutdoorAirReset,1.13.0,40c19546076be456f110ca542cd70ce711541971,SetpointManagerOutdoorAirReset::remove,3.4.1 +model,Node,removeSetpointManagerFollowOutdoorAirTemperature,1.13.0,40c19546076be456f110ca542cd70ce711541972,SetpointManagerFollowOutdoorAirTemperature::remove,3.4.1 +model,Node,removeSetpointManagerScheduled,1.13.0,40c19546076be456f110ca542cd70ce711541973,SetpointManagerScheduled::remove,3.4.1 +model,Node,removeSetpointManagerMixedAir,1.13.0,40c19546076be456f110ca542cd70ce711541974,SetpointManagerMixedAir::remove,3.4.1 +model,ZoneVentilationDesignFlowRate,setDesignFlowRateCalculationMethod,2.3.1,9ee9be2d0da3ed954a1e98cc3ab39ec7debffa92,"Done when calling setDesignFlowRate, setFlowRateperZoneFloorArea, setAirChangesperHour",3.4.1 +model,SizingSystem,minimumSystemAirFlowRatio,2.6.2,0c2e8044feaea315dc4105b17ce747638be324f5,centralHeatingMaximumSystemAirFlowRatio,3.5.0 +model,SizingSystem,setMinimumSystemAirFlowRatio,2.6.2,0c2e8044feaea315dc4105b17ce747638be324f5,setCentralHeatingMaximumSystemAirFlowRatio,3.5.0 +model,AirWallMaterial,Entire Class,2.9.0,bf17b66549ddc5c7a5badb7f0a84d12b93b44e81,ConstructionAirBoundary,3.5.0 +utilities,RemoteBCL,waitForComponentDownload(int),3.2.1,12055f067989732fc7e00b7185ecd53abf5731da,waitForComponentDownload(), +utilities,RemoteBCL,waitForMeasureDownload(int),3.2.1,12055f067989732fc7e00b7185ecd53abf5731da,waitForMeasureDownload, +utilities,RemoteBCL,waitForMetaSearch(int),3.2.1,12055f067989732fc7e00b7185ecd53abf5731da,waitForMetaSearch, +utilities,RemoteBCL,waitForSearch(int),3.2.1,12055f067989732fc7e00b7185ecd53abf5731da,waitForSearch, +model,ZoneMixing,flowRateperZoneFloorArea,3.5.0,66456b023202578fb1849a6d4f78a2b9cd0a08b8,flowRateperFloorArea, +model,ZoneMixing,minimumZoneTemperatureSchedule,3.5.0,66456b023202578fb1849a6d4f78a2b9cd0a08b8,minimumReceivingTemperatureSchedule, +model,ZoneMixing,maximumZoneTemperatureSchedule,3.5.0,66456b023202578fb1849a6d4f78a2b9cd0a08b8,maximumReceivingTemperatureSchedule, +model,ZoneMixing,minimumSourceZoneTemperatureSchedule,3.5.0,66456b023202578fb1849a6d4f78a2b9cd0a08b8,minimumSourceTemperatureSchedule, +model,ZoneMixing,maximumSourceZoneTemperatureSchedule,3.5.0,66456b023202578fb1849a6d4f78a2b9cd0a08b8,maximumSourceTemperatureSchedule, +model,ZoneMixing,setFlowRateperZoneFloorArea,3.5.0,66456b023202578fb1849a6d4f78a2b9cd0a08b8,setFlowRateperFloorArea, +model,ZoneMixing,resetSourceZone,3.5.0,66456b023202578fb1849a6d4f78a2b9cd0a08b8,resetSourceZoneOrSpace, +model,ZoneMixing,setMinimumZoneTemperatureSchedule,3.5.0,66456b023202578fb1849a6d4f78a2b9cd0a08b8,setMinimumReceivingTemperatureSchedule, +model,ZoneMixing,resetMinimumZoneTemperatureSchedule,3.5.0,66456b023202578fb1849a6d4f78a2b9cd0a08b8,resetMinimumReceivingTemperatureSchedule, +model,ZoneMixing,setMaximumZoneTemperatureSchedule,3.5.0,66456b023202578fb1849a6d4f78a2b9cd0a08b8,setMaximumReceivingTemperatureSchedule, +model,ZoneMixing,resetMaximumZoneTemperatureSchedule,3.5.0,66456b023202578fb1849a6d4f78a2b9cd0a08b8,resetMaximumReceivingTemperatureSchedule, +model,ZoneMixing,setMinimumSourceZoneTemperatureSchedule,3.5.0,66456b023202578fb1849a6d4f78a2b9cd0a08b8,setMinimumSourceTemperatureSchedule, +model,ZoneMixing,resetMinimumSourceZoneTemperatureSchedule,3.5.0,66456b023202578fb1849a6d4f78a2b9cd0a08b8,resetMinimumSourceTemperatureSchedule, +model,ZoneMixing,setMaximumSourceZoneTemperatureSchedule,3.5.0,66456b023202578fb1849a6d4f78a2b9cd0a08b8,setMaximumSourceTemperatureSchedule, +model,ZoneMixing,resetMaximumSourceZoneTemperatureSchedule,3.5.0,66456b023202578fb1849a6d4f78a2b9cd0a08b8,resetMaximumSourceTemperatureSchedule, +model,CoilCoolingDXMultiSpeedStageData,ratedEvaporatorFanPowerPerVolumeFlowRate,3.5.0,d4799760c23f8e2775ffd3fb83bffb692ac4be1e,ratedEvaporatorFanPowerPerVolumeFlowRate2017, +model,CoilCoolingDXMultiSpeedStageData,setRatedEvaporatorFanPowerPerVolumeFlowRate,3.5.0,d4799760c23f8e2775ffd3fb83bffb692ac4be1e,setRatedEvaporatorFanPowerPerVolumeFlowRate2017, +model,CoilCoolingDXCurveFitSpeed,ratedEvaporatorFanPowerPerVolumeFlowRate,3.5.0,d4799760c23f8e2775ffd3fb83bffb692ac4be1e,ratedEvaporatorFanPowerPerVolumeFlowRate2017, +model,CoilCoolingDXCurveFitSpeed,setRatedEvaporatorFanPowerPerVolumeFlowRate,3.5.0,d4799760c23f8e2775ffd3fb83bffb692ac4be1e,setRatedEvaporatorFanPowerPerVolumeFlowRate2017, +model,CoilCoolingDXSingleSpeed,ratedEvaporatorFanPowerPerVolumeFlowRate,3.5.0,d4799760c23f8e2775ffd3fb83bffb692ac4be1e,ratedEvaporatorFanPowerPerVolumeFlowRate2017, +model,CoilCoolingDXSingleSpeed,setRatedEvaporatorFanPowerPerVolumeFlowRate,3.5.0,d4799760c23f8e2775ffd3fb83bffb692ac4be1e,setRatedEvaporatorFanPowerPerVolumeFlowRate2017, +model,CoilHeatingDXSingleSpeed,ratedSupplyFanPowerPerVolumeFlowRate,3.5.0,d4799760c23f8e2775ffd3fb83bffb692ac4be1e,ratedSupplyFanPowerPerVolumeFlowRate2017, +model,CoilHeatingDXSingleSpeed,setRatedSupplyFanPowerPerVolumeFlowRate,3.5.0,d4799760c23f8e2775ffd3fb83bffb692ac4be1e,setRatedSupplyFanPowerPerVolumeFlowRate2017, +model,CoilHeatingDXMultiSpeedStageData,ratedSupplyAirFanPowerPerVolumeFlowRate,3.5.0,d4799760c23f8e2775ffd3fb83bffb692ac4be1e,ratedSupplyFanPowerPerVolumeFlowRate2017, +model,CoilHeatingDXMultiSpeedStageData,setRatedSupplyAirFanPowerPerVolumeFlowRate,3.5.0,d4799760c23f8e2775ffd3fb83bffb692ac4be1e,setRatedSupplyFanPowerPerVolumeFlowRate2017, +model,DesignDay,validHumidityIndicatingTypeValues,3.3.0,859e2a5aec84675af9b4ce3b62179c50240e7841,validHumidityConditionTypeValues, +model,DesignDay,humidityIndicatingConditionsAtMaximumDryBulb,3.3.0,859e2a5aec84675af9b4ce3b62179c50240e7841,"wetBulbOrDewPointAtMaximumDryBulb,humidityRatioAtMaximumDryBulb, enthalpyAtMaximumDryBulb", +model,DesignDay,isHumidityIndicatingConditionsAtMaximumDryBulbDefaulted,3.3.0,859e2a5aec84675af9b4ce3b62179c50240e7841,"None of these have a value: wetBulbOrDewPointAtMaximumDryBulb,humidityRatioAtMaximumDryBulb, enthalpyAtMaximumDryBulb", +model,DesignDay,humidityIndicatingType,3.3.0,859e2a5aec84675af9b4ce3b62179c50240e7841,humidityConditionType, +model,DesignDay,isHumidityIndicatingTypeDefaulted,3.3.0,859e2a5aec84675af9b4ce3b62179c50240e7841,isHumidityConditionTypeDefaulted, +model,DesignDay,humidityIndicatingDaySchedule,3.3.0,859e2a5aec84675af9b4ce3b62179c50240e7841,humidityConditionDaySchedule, +model,DesignDay,dryBulbTemperatureRangeModifierSchedule,3.3.0,859e2a5aec84675af9b4ce3b62179c50240e7841,dryBulbTemperatureRangeModifierDaySchedule, +model,DesignDay,ashraeTaub,3.3.0,859e2a5aec84675af9b4ce3b62179c50240e7841,ashraeClearSkyOpticalDepthForBeamIrradiance, +model,DesignDay,isAshraeTaubDefaulted,3.3.0,859e2a5aec84675af9b4ce3b62179c50240e7841,isAshraeClearSkyOpticalDepthForBeamIrradianceDefaulted, +model,DesignDay,ashraeTaud,3.3.0,859e2a5aec84675af9b4ce3b62179c50240e7841,ashraeClearSkyOpticalDepthForDiffuseIrradiance, +model,DesignDay,isAshraeTaudDefaulted,3.3.0,859e2a5aec84675af9b4ce3b62179c50240e7841,isAshraeClearSkyOpticalDepthForDiffuseIrradianceDefaulted, +model,DesignDay,setHumidityIndicatingType,3.3.0,859e2a5aec84675af9b4ce3b62179c50240e7841,setHumidityConditionType, +model,DesignDay,resetHumidityIndicatingType,3.3.0,859e2a5aec84675af9b4ce3b62179c50240e7841,resetHumidityConditionType, +model,DesignDay,setHumidityIndicatingDaySchedule,3.3.0,859e2a5aec84675af9b4ce3b62179c50240e7841,setHumidityConditionDaySchedule, +model,DesignDay,resetHumidityIndicatingDaySchedule,3.3.0,859e2a5aec84675af9b4ce3b62179c50240e7841,resetHumidityConditionDaySchedule, +model,DesignDay,setHumidityIndicatingConditionsAtMaximumDryBulb,3.3.0,859e2a5aec84675af9b4ce3b62179c50240e7841,"setWetBulbOrDewPointAtMaximumDryBulb, setHumidityRatioAtMaximumDryBulb, setEnthalpyAtMaximumDryBulb", +model,DesignDay,resetHumidityIndicatingConditionsAtMaximumDryBulb,3.3.0,859e2a5aec84675af9b4ce3b62179c50240e7841,"resetWetBulbOrDewPointAtMaximumDryBulb, resetHumidityRatioAtMaximumDryBulb, resetEnthalpyAtMaximumDryBulb", +model,DesignDay,setDryBulbTemperatureRangeModifierSchedule,3.3.0,859e2a5aec84675af9b4ce3b62179c50240e7841,setDryBulbTemperatureRangeModifierDaySchedule, +model,DesignDay,resetDryBulbTemperatureRangeModifierSchedule,3.3.0,859e2a5aec84675af9b4ce3b62179c50240e7841,resetDryBulbTemperatureRangeModifierDaySchedule, +model,DesignDay,setAshraeTaub,3.3.0,859e2a5aec84675af9b4ce3b62179c50240e7841,setAshraeClearSkyOpticalDepthForBeamIrradiance, +model,DesignDay,resetAshraeTaub,3.3.0,859e2a5aec84675af9b4ce3b62179c50240e7841,resetAshraeClearSkyOpticalDepthForBeamIrradiance, +model,DesignDay,setAshraeTaud,3.3.0,859e2a5aec84675af9b4ce3b62179c50240e7841,setAshraeClearSkyOpticalDepthForDiffuseIrradiance, +model,DesignDay,resetAshraeTaud,3.3.0,859e2a5aec84675af9b4ce3b62179c50240e7841,resetAshraeClearSkyOpticalDepthForDiffuseIrradiance, +model,ZoneHVACEquipmentList,sequentialCoolingFraction,2.9.0,88a04d2e13e9a51d434a4e517909db2135401d06,sequentialCoolingFractionSchedule, +model,ZoneHVACEquipmentList,sequentialHeatingFraction,2.9.0,88a04d2e13e9a51d434a4e517909db2135401d06,sequentialHeatingFractionSchedule, +model,ZoneHVACEquipmentList,setSequentialCoolingFraction,2.9.0,88a04d2e13e9a51d434a4e517909db2135401d06,setSequentialCoolingFractionSchedule, +model,ZoneHVACEquipmentList,setSequentialHeatingFraction,2.9.0,88a04d2e13e9a51d434a4e517909db2135401d06,setSequentialHeatingFractionSchedule, +model,CoilCoolingWaterToAirHeatPumpEquationFit,totalCoolingCapacityCoefficient1,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,totalCoolingCapacityCurve, +model,CoilCoolingWaterToAirHeatPumpEquationFit,totalCoolingCapacityCoefficient2,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,totalCoolingCapacityCurve, +model,CoilCoolingWaterToAirHeatPumpEquationFit,totalCoolingCapacityCoefficient3,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,totalCoolingCapacityCurve, +model,CoilCoolingWaterToAirHeatPumpEquationFit,totalCoolingCapacityCoefficient4,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,totalCoolingCapacityCurve, +model,CoilCoolingWaterToAirHeatPumpEquationFit,totalCoolingCapacityCoefficient5,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,totalCoolingCapacityCurve, +model,CoilCoolingWaterToAirHeatPumpEquationFit,sensibleCoolingCapacityCoefficient1,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,sensibleCoolingCapacityCurve, +model,CoilCoolingWaterToAirHeatPumpEquationFit,sensibleCoolingCapacityCoefficient2,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,sensibleCoolingCapacityCurve, +model,CoilCoolingWaterToAirHeatPumpEquationFit,sensibleCoolingCapacityCoefficient3,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,sensibleCoolingCapacityCurve, +model,CoilCoolingWaterToAirHeatPumpEquationFit,sensibleCoolingCapacityCoefficient4,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,sensibleCoolingCapacityCurve, +model,CoilCoolingWaterToAirHeatPumpEquationFit,sensibleCoolingCapacityCoefficient5,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,sensibleCoolingCapacityCurve, +model,CoilCoolingWaterToAirHeatPumpEquationFit,sensibleCoolingCapacityCoefficient6,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,sensibleCoolingCapacityCurve, +model,CoilCoolingWaterToAirHeatPumpEquationFit,coolingPowerConsumptionCoefficient1,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,coolingPowerConsumptionCurve, +model,CoilCoolingWaterToAirHeatPumpEquationFit,coolingPowerConsumptionCoefficient2,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,coolingPowerConsumptionCurve, +model,CoilCoolingWaterToAirHeatPumpEquationFit,coolingPowerConsumptionCoefficient3,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,coolingPowerConsumptionCurve, +model,CoilCoolingWaterToAirHeatPumpEquationFit,coolingPowerConsumptionCoefficient4,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,coolingPowerConsumptionCurve, +model,CoilCoolingWaterToAirHeatPumpEquationFit,coolingPowerConsumptionCoefficient5,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,coolingPowerConsumptionCurve, +model,CoilCoolingWaterToAirHeatPumpEquationFit,setTotalCoolingCapacityCoefficient1,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setTotalCoolingCapacityCurve, +model,CoilCoolingWaterToAirHeatPumpEquationFit,setTotalCoolingCapacityCoefficient2,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setTotalCoolingCapacityCurve, +model,CoilCoolingWaterToAirHeatPumpEquationFit,setTotalCoolingCapacityCoefficient3,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setTotalCoolingCapacityCurve, +model,CoilCoolingWaterToAirHeatPumpEquationFit,setTotalCoolingCapacityCoefficient4,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setTotalCoolingCapacityCurve, +model,CoilCoolingWaterToAirHeatPumpEquationFit,setTotalCoolingCapacityCoefficient5,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setTotalCoolingCapacityCurve, +model,CoilCoolingWaterToAirHeatPumpEquationFit,setSensibleCoolingCapacityCoefficient1,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setSensibleCoolingCapacityCurve, +model,CoilCoolingWaterToAirHeatPumpEquationFit,setSensibleCoolingCapacityCoefficient2,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setSensibleCoolingCapacityCurve, +model,CoilCoolingWaterToAirHeatPumpEquationFit,setSensibleCoolingCapacityCoefficient3,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setSensibleCoolingCapacityCurve, +model,CoilCoolingWaterToAirHeatPumpEquationFit,setSensibleCoolingCapacityCoefficient4,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setSensibleCoolingCapacityCurve, +model,CoilCoolingWaterToAirHeatPumpEquationFit,setSensibleCoolingCapacityCoefficient5,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setSensibleCoolingCapacityCurve, +model,CoilCoolingWaterToAirHeatPumpEquationFit,setSensibleCoolingCapacityCoefficient6,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setSensibleCoolingCapacityCurve, +model,CoilCoolingWaterToAirHeatPumpEquationFit,setCoolingPowerConsumptionCoefficient1,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setCoolingPowerConsumptionCurve, +model,CoilCoolingWaterToAirHeatPumpEquationFit,setCoolingPowerConsumptionCoefficient2,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setCoolingPowerConsumptionCurve, +model,CoilCoolingWaterToAirHeatPumpEquationFit,setCoolingPowerConsumptionCoefficient3,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setCoolingPowerConsumptionCurve, +model,CoilCoolingWaterToAirHeatPumpEquationFit,setCoolingPowerConsumptionCoefficient4,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setCoolingPowerConsumptionCurve, +model,CoilCoolingWaterToAirHeatPumpEquationFit,setCoolingPowerConsumptionCoefficient5,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setCoolingPowerConsumptionCurve, +model,ConstructionAirBoundary,solarAndDaylightingMethodValues,3.2.0,0cd16efedbed7036a74c0e7beefb2f3cb79ee0b7,None, +model,ConstructionAirBoundary,radiantExchangeMethodValues,3.2.0,0cd16efedbed7036a74c0e7beefb2f3cb79ee0b7,None, +model,ConstructionAirBoundary,solarAndDaylightingMethod,3.2.0,0cd16efedbed7036a74c0e7beefb2f3cb79ee0b7,None, +model,ConstructionAirBoundary,isSolarAndDaylightingMethodDefaulted,3.2.0,0cd16efedbed7036a74c0e7beefb2f3cb79ee0b7,None, +model,ConstructionAirBoundary,radiantExchangeMethod,3.2.0,0cd16efedbed7036a74c0e7beefb2f3cb79ee0b7,None, +model,ConstructionAirBoundary,isRadiantExchangeMethodDefaulted,3.2.0,0cd16efedbed7036a74c0e7beefb2f3cb79ee0b7,None, +model,ConstructionAirBoundary,setSolarAndDaylightingMethod,3.2.0,0cd16efedbed7036a74c0e7beefb2f3cb79ee0b7,None, +model,ConstructionAirBoundary,resetSolarAndDaylightingMethod,3.2.0,0cd16efedbed7036a74c0e7beefb2f3cb79ee0b7,None, +model,ConstructionAirBoundary,setRadiantExchangeMethod,3.2.0,0cd16efedbed7036a74c0e7beefb2f3cb79ee0b7,None, +model,ConstructionAirBoundary,resetRadiantExchangeMethod,3.2.0,0cd16efedbed7036a74c0e7beefb2f3cb79ee0b7,None, +model,CurveDoubleExponentialDecay,coefficient3C4,3.1.0,e75a6741dece27ff1f9a6d3b4e118ff987787a54,coefficient4C4, +model,CurveDoubleExponentialDecay,coefficient3C5,3.1.0,e75a6741dece27ff1f9a6d3b4e118ff987787a54,coefficient5C5, +model,CurveDoubleExponentialDecay,setCoefficient3C4,3.1.0,e75a6741dece27ff1f9a6d3b4e118ff987787a54,setCoefficient4C4, +model,CurveDoubleExponentialDecay,setCoefficient3C5,3.1.0,e75a6741dece27ff1f9a6d3b4e118ff987787a54,setCoefficient5C5, +model,AirTerminalSingleDuctVAVReheat,zoneMinimumAirFlowMethod,3.0.1,de1a08cb2cf334c4ac162db0964de792127ec07a,zoneMinimumAirFlowInputMethod, +model,AirTerminalSingleDuctVAVReheat,setZoneMinimumAirFlowMethod,3.0.1,de1a08cb2cf334c4ac162db0964de792127ec07a,setZoneMinimumAirFlowInputMethod, +model,ZoneAirMassFlowConservation,adjustZoneMixingForZoneAirMassFlowBalance,3.2.0,5f1426de62e760197e4c9b7d076ec649b91b8480,adjustZoneMixingandReturnForAirMassFlowBalance, +model,ZoneAirMassFlowConservation,isAdjustZoneMixingForZoneAirMassFlowBalanceDefaulted,3.2.0,5f1426de62e760197e4c9b7d076ec649b91b8480,isAdjustZoneMixingandReturnForAirMassFlowBalanceDefaulted, +model,ZoneAirMassFlowConservation,setAdjustZoneMixingForZoneAirMassFlowBalance,3.2.0,5f1426de62e760197e4c9b7d076ec649b91b8480,setAdjustZoneMixingandReturnForAirMassFlowBalance, +model,ZoneAirMassFlowConservation,resetAdjustZoneMixingForZoneAirMassFlowBalance,3.2.0,5f1426de62e760197e4c9b7d076ec649b91b8480,resetAdjustZoneMixingandReturnForAirMassFlowBalance, +model,HeatPumpWaterToWaterEquationFitCooling,coolingCapacityCoefficient1,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,coolingCapacityCurve, +model,HeatPumpWaterToWaterEquationFitCooling,coolingCapacityCoefficient2,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,coolingCapacityCurve, +model,HeatPumpWaterToWaterEquationFitCooling,coolingCapacityCoefficient3,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,coolingCapacityCurve, +model,HeatPumpWaterToWaterEquationFitCooling,coolingCapacityCoefficient4,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,coolingCapacityCurve, +model,HeatPumpWaterToWaterEquationFitCooling,coolingCapacityCoefficient5,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,coolingCapacityCurve, +model,HeatPumpWaterToWaterEquationFitCooling,coolingCompressorPowerCoefficient1,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,coolingCompressorPowerCurve, +model,HeatPumpWaterToWaterEquationFitCooling,coolingCompressorPowerCoefficient2,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,coolingCompressorPowerCurve, +model,HeatPumpWaterToWaterEquationFitCooling,coolingCompressorPowerCoefficient3,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,coolingCompressorPowerCurve, +model,HeatPumpWaterToWaterEquationFitCooling,coolingCompressorPowerCoefficient4,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,coolingCompressorPowerCurve, +model,HeatPumpWaterToWaterEquationFitCooling,coolingCompressorPowerCoefficient5,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,coolingCompressorPowerCurve, +model,HeatPumpWaterToWaterEquationFitCooling,setCoolingCapacityCoefficient1,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setCoolingCapacityCurve, +model,HeatPumpWaterToWaterEquationFitCooling,setCoolingCapacityCoefficient2,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setCoolingCapacityCurve, +model,HeatPumpWaterToWaterEquationFitCooling,setCoolingCapacityCoefficient3,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setCoolingCapacityCurve, +model,HeatPumpWaterToWaterEquationFitCooling,setCoolingCapacityCoefficient4,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setCoolingCapacityCurve, +model,HeatPumpWaterToWaterEquationFitCooling,setCoolingCapacityCoefficient5,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setCoolingCapacityCurve, +model,HeatPumpWaterToWaterEquationFitCooling,setCoolingCompressorPowerCoefficient1,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setCoolingCompressorPowerCurve, +model,HeatPumpWaterToWaterEquationFitCooling,setCoolingCompressorPowerCoefficient2,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setCoolingCompressorPowerCurve, +model,HeatPumpWaterToWaterEquationFitCooling,setCoolingCompressorPowerCoefficient3,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setCoolingCompressorPowerCurve, +model,HeatPumpWaterToWaterEquationFitCooling,setCoolingCompressorPowerCoefficient4,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setCoolingCompressorPowerCurve, +model,HeatPumpWaterToWaterEquationFitCooling,setCoolingCompressorPowerCoefficient5,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setCoolingCompressorPowerCurve, +model,SubSurface,shadingControl,3.1.0,4c453f5a5384add48f619fd8fc9f0e1e991f663c,shadingControls, +model,SubSurface,setShadingControl,3.1.0,4c453f5a5384add48f619fd8fc9f0e1e991f663c,"addShadingControl, addShadingControls", +model,SubSurface,resetShadingControl,3.1.0,4c453f5a5384add48f619fd8fc9f0e1e991f663c,removeAllShadingControls, +model,AirConditionerVariableRefrigerantFlow,ratedTotalCoolingCapacity,2.9.0,d292fea8a1ac5ea0e9ddb2360fe04528503d3b53,grossRatedTotalCoolingCapacity, +model,AirConditionerVariableRefrigerantFlow,isRatedTotalCoolingCapacityAutosized,2.9.0,d292fea8a1ac5ea0e9ddb2360fe04528503d3b53,isGrossRatedTotalCoolingCapacityAutosized, +model,AirConditionerVariableRefrigerantFlow,setRatedTotalCoolingCapacity,2.9.0,d292fea8a1ac5ea0e9ddb2360fe04528503d3b53,setGrossRatedTotalCoolingCapacity, +model,AirConditionerVariableRefrigerantFlow,autosizeRatedTotalCoolingCapacity,2.9.0,d292fea8a1ac5ea0e9ddb2360fe04528503d3b53,autosizeGrossRatedTotalCoolingCapacity, +model,AirConditionerVariableRefrigerantFlow,ratedCoolingCOP,2.9.0,d292fea8a1ac5ea0e9ddb2360fe04528503d3b53,grossRatedCoolingCOP, +model,AirConditionerVariableRefrigerantFlow,setRatedCoolingCOP,2.9.0,d292fea8a1ac5ea0e9ddb2360fe04528503d3b53,setGrossRatedCoolingCOP, +model,AirConditionerVariableRefrigerantFlow,ratedTotalHeatingCapacity,2.9.0,d292fea8a1ac5ea0e9ddb2360fe04528503d3b53,grossRatedHeatingCapacity, +model,AirConditionerVariableRefrigerantFlow,isRatedTotalHeatingCapacityAutosized,2.9.0,d292fea8a1ac5ea0e9ddb2360fe04528503d3b53,isGrossRatedHeatingCapacityAutosized, +model,AirConditionerVariableRefrigerantFlow,setRatedTotalHeatingCapacity,2.9.0,d292fea8a1ac5ea0e9ddb2360fe04528503d3b53,setGrossRatedHeatingCapacity, +model,AirConditionerVariableRefrigerantFlow,autosizeRatedTotalHeatingCapacity,2.9.0,d292fea8a1ac5ea0e9ddb2360fe04528503d3b53,autosizeGrossRatedHeatingCapacity, +model,AirConditionerVariableRefrigerantFlow,ratedTotalHeatingCapacitySizingRatio,2.9.0,d292fea8a1ac5ea0e9ddb2360fe04528503d3b53,ratedHeatingCapacitySizingRatio, +model,AirConditionerVariableRefrigerantFlow,setRatedTotalHeatingCapacitySizingRatio,2.9.0,d292fea8a1ac5ea0e9ddb2360fe04528503d3b53,setRatedHeatingCapacitySizingRatio, +model,AirConditionerVariableRefrigerantFlow,autosizedRatedTotalCoolingCapacity,2.9.0,d292fea8a1ac5ea0e9ddb2360fe04528503d3b53,autosizedGrossRatedTotalCoolingCapacity, +model,AirConditionerVariableRefrigerantFlow,autosizedRatedTotalHeatingCapacity,2.9.0,d292fea8a1ac5ea0e9ddb2360fe04528503d3b53,autosizedGrossRatedHeatingCapacity, +model,ZoneHVACLowTempRadiantConstFlow,resetHydronicTubingLength,3.0.0,cc981cc9b0330000b31a325c282fe3ee6a4345cb,autosizeHydronicTubingLength, +model,ZoneHVACLowTempRadiantConstFlow,resetRatedFlowRate,3.0.0,cc981cc9b0330000b31a325c282fe3ee6a4345cb,autosizeRatedFlowRate, +model,HeatPumpWaterToWaterEquationFitHeating,heatingCapacityCoefficient1,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,heatingCapacityCurve, +model,HeatPumpWaterToWaterEquationFitHeating,heatingCapacityCoefficient2,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,heatingCapacityCurve, +model,HeatPumpWaterToWaterEquationFitHeating,heatingCapacityCoefficient3,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,heatingCapacityCurve, +model,HeatPumpWaterToWaterEquationFitHeating,heatingCapacityCoefficient4,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,heatingCapacityCurve, +model,HeatPumpWaterToWaterEquationFitHeating,heatingCapacityCoefficient5,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,heatingCapacityCurve, +model,HeatPumpWaterToWaterEquationFitHeating,heatingCompressorPowerCoefficient1,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,heatingCompressorPowerCurve, +model,HeatPumpWaterToWaterEquationFitHeating,heatingCompressorPowerCoefficient2,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,heatingCompressorPowerCurve, +model,HeatPumpWaterToWaterEquationFitHeating,heatingCompressorPowerCoefficient3,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,heatingCompressorPowerCurve, +model,HeatPumpWaterToWaterEquationFitHeating,heatingCompressorPowerCoefficient4,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,heatingCompressorPowerCurve, +model,HeatPumpWaterToWaterEquationFitHeating,heatingCompressorPowerCoefficient5,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,heatingCompressorPowerCurve, +model,HeatPumpWaterToWaterEquationFitHeating,setHeatingCapacityCoefficient1,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setHeatingCapacityCurve, +model,HeatPumpWaterToWaterEquationFitHeating,setHeatingCapacityCoefficient2,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setHeatingCapacityCurve, +model,HeatPumpWaterToWaterEquationFitHeating,setHeatingCapacityCoefficient3,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setHeatingCapacityCurve, +model,HeatPumpWaterToWaterEquationFitHeating,setHeatingCapacityCoefficient4,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setHeatingCapacityCurve, +model,HeatPumpWaterToWaterEquationFitHeating,setHeatingCapacityCoefficient5,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setHeatingCapacityCurve, +model,HeatPumpWaterToWaterEquationFitHeating,setHeatingCompressorPowerCoefficient1,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setHeatingCompressorPowerCurve, +model,HeatPumpWaterToWaterEquationFitHeating,setHeatingCompressorPowerCoefficient2,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setHeatingCompressorPowerCurve, +model,HeatPumpWaterToWaterEquationFitHeating,setHeatingCompressorPowerCoefficient3,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setHeatingCompressorPowerCurve, +model,HeatPumpWaterToWaterEquationFitHeating,setHeatingCompressorPowerCoefficient4,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setHeatingCompressorPowerCurve, +model,HeatPumpWaterToWaterEquationFitHeating,setHeatingCompressorPowerCoefficient5,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setHeatingCompressorPowerCurve, +model,CoilHeatingWaterToAirHeatPumpEquationFit,heatingCapacityCoefficient1,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,heatingCapacityCurve, +model,CoilHeatingWaterToAirHeatPumpEquationFit,heatingCapacityCoefficient2,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,heatingCapacityCurve, +model,CoilHeatingWaterToAirHeatPumpEquationFit,heatingCapacityCoefficient3,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,heatingCapacityCurve, +model,CoilHeatingWaterToAirHeatPumpEquationFit,heatingCapacityCoefficient4,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,heatingCapacityCurve, +model,CoilHeatingWaterToAirHeatPumpEquationFit,heatingCapacityCoefficient5,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,heatingCapacityCurve, +model,CoilHeatingWaterToAirHeatPumpEquationFit,heatingPowerConsumptionCoefficient1,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,heatingPowerConsumptionCurve, +model,CoilHeatingWaterToAirHeatPumpEquationFit,heatingPowerConsumptionCoefficient2,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,heatingPowerConsumptionCurve, +model,CoilHeatingWaterToAirHeatPumpEquationFit,heatingPowerConsumptionCoefficient3,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,heatingPowerConsumptionCurve, +model,CoilHeatingWaterToAirHeatPumpEquationFit,heatingPowerConsumptionCoefficient4,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,heatingPowerConsumptionCurve, +model,CoilHeatingWaterToAirHeatPumpEquationFit,heatingPowerConsumptionCoefficient5,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,heatingPowerConsumptionCurve, +model,CoilHeatingWaterToAirHeatPumpEquationFit,setHeatingCapacityCoefficient1,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setHeatingCapacityCurve, +model,CoilHeatingWaterToAirHeatPumpEquationFit,setHeatingCapacityCoefficient2,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setHeatingCapacityCurve, +model,CoilHeatingWaterToAirHeatPumpEquationFit,setHeatingCapacityCoefficient3,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setHeatingCapacityCurve, +model,CoilHeatingWaterToAirHeatPumpEquationFit,setHeatingCapacityCoefficient4,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setHeatingCapacityCurve, +model,CoilHeatingWaterToAirHeatPumpEquationFit,setHeatingCapacityCoefficient5,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setHeatingCapacityCurve, +model,CoilHeatingWaterToAirHeatPumpEquationFit,setHeatingPowerConsumptionCoefficient1,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setHeatingPowerConsumptionCurve, +model,CoilHeatingWaterToAirHeatPumpEquationFit,setHeatingPowerConsumptionCoefficient2,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setHeatingPowerConsumptionCurve, +model,CoilHeatingWaterToAirHeatPumpEquationFit,setHeatingPowerConsumptionCoefficient3,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setHeatingPowerConsumptionCurve, +model,CoilHeatingWaterToAirHeatPumpEquationFit,setHeatingPowerConsumptionCoefficient4,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setHeatingPowerConsumptionCurve, +model,CoilHeatingWaterToAirHeatPumpEquationFit,setHeatingPowerConsumptionCoefficient5,3.2.0,eaca57a480177d373f495a9b9d71989eafaf952d,setHeatingPowerConsumptionCurve, +model,ScheduleFile,setMinutesperItem(std::string),3.2.0,b4a8acfffd3d73108e20c863920b4adbb9b3b727,setMinutesperItem(int), +utilities,RunOptions,std::string forwardTranslateOptions,3.6.0,75aabb7ceaf8e853cd75bd0153c03241967170f5,ForwardTranslatorOptions forwardTranslatorOptions(), +utilities,RunOptions,setForwardTranslateOptions,3.6.0,75aabb7ceaf8e853cd75bd0153c03241967170f5,setForwardTranslatorOptions(ForwardTranslatorOptions), +utilities,RunOptions,resetForwardTranslateOptions,3.6.0,75aabb7ceaf8e853cd75bd0153c03241967170f5,resetForwardTranslatorOptions, +model,EnergyManagementSystemActuator,zoneName,3.6.0,d76d8c24dac0a9efa2b7a9497eaae84c1a6c8f1b,zoneOrSpace, +model,EnergyManagementSystemActuator,resetZoneName,3.6.0,d76d8c24dac0a9efa2b7a9497eaae84c1a6c8f1b,resetZoneOrSpace, +model,GroundHeatExchangerHorizontalTrench,groundTemperatureModelValues,3.6.0,44a2436cab528eaaf4da2806b990de5f67a984e9,undisturbedGroundTemperatureModel, +model,GroundHeatExchangerHorizontalTrench,groundTemperatureModel,3.6.0,44a2436cab528eaaf4da2806b990de5f67a984e9,undisturbedGroundTemperatureModel, +model,GroundHeatExchangerHorizontalTrench,isGroundTemperatureModelDefaulted,3.6.0,44a2436cab528eaaf4da2806b990de5f67a984e9,undisturbedGroundTemperatureModel, +model,GroundHeatExchangerHorizontalTrench,kusudaAchenbachAverageSurfaceTemperature,3.6.0,44a2436cab528eaaf4da2806b990de5f67a984e9,undisturbedGroundTemperatureModel, +model,GroundHeatExchangerHorizontalTrench,kusudaAchenbachAverageAmplitudeofSurfaceTemperature,3.6.0,44a2436cab528eaaf4da2806b990de5f67a984e9,undisturbedGroundTemperatureModel, +model,GroundHeatExchangerHorizontalTrench,kusudaAchenbachPhaseShiftofMinimumSurfaceTemperature,3.6.0,44a2436cab528eaaf4da2806b990de5f67a984e9,undisturbedGroundTemperatureModel, +model,GroundHeatExchangerHorizontalTrench,setGroundTemperatureModel,3.6.0,44a2436cab528eaaf4da2806b990de5f67a984e9,undisturbedGroundTemperatureModel, +model,GroundHeatExchangerHorizontalTrench,resetGroundTemperatureModel,3.6.0,44a2436cab528eaaf4da2806b990de5f67a984e9,undisturbedGroundTemperatureModel, +model,GroundHeatExchangerHorizontalTrench,setKusudaAchenbachAverageSurfaceTemperature,3.6.0,44a2436cab528eaaf4da2806b990de5f67a984e9,undisturbedGroundTemperatureModel, +model,GroundHeatExchangerHorizontalTrench,setKusudaAchenbachAverageAmplitudeofSurfaceTemperature,3.6.0,44a2436cab528eaaf4da2806b990de5f67a984e9,undisturbedGroundTemperatureModel, +model,GroundHeatExchangerHorizontalTrench,setKusudaAchenbachPhaseShiftofMinimumSurfaceTemperature,3.6.0,44a2436cab528eaaf4da2806b990de5f67a984e9,undisturbedGroundTemperatureModel, +model,SurfacePropertyExposedFoundationPerimeter,surfaceName,3.7.0,19bea0ce243d4f7484ff63dd084af4b75b21009d,surface().nameString(), +energyplus,ForwardTranslator,translateTableMultiVariableLookup,3.5.0,1c7521a7912473b3b8ba5c533fdf810936ff5c60,Remove TableMultiVariableLookup for TableLookup, +energyplus,ForwardTranslatePlantEquipmentOperationSchemes,componentType,3.6.0,1417dcb7f48c92629a1e5c43dd2b030c1711bf99,Model SDK: HVACComponent::componentType(), +energyplus,ForwardTranslatePlantEquipmentOperationSchemes,plantLoopType,3.6.0,1417dcb7f48c92629a1e5c43dd2b030c1711bf99,Model SDK: Loop::componentType(), \ No newline at end of file diff --git a/src/energyplus/ForwardTranslator/ForwardTranslatePlantEquipmentOperationSchemes.cpp b/src/energyplus/ForwardTranslator/ForwardTranslatePlantEquipmentOperationSchemes.cpp index 908d0e9b6a..9afed24a80 100644 --- a/src/energyplus/ForwardTranslator/ForwardTranslatePlantEquipmentOperationSchemes.cpp +++ b/src/energyplus/ForwardTranslator/ForwardTranslatePlantEquipmentOperationSchemes.cpp @@ -134,6 +134,7 @@ #include "../../model/GeneratorMicroTurbine.hpp" #include "../../model/GeneratorMicroTurbine_Impl.hpp" #include "../../utilities/data/DataEnums.hpp" +#include "../../utilities/core/DeprecatedHelpers.hpp" using namespace openstudio::model; using namespace openstudio::energyplus; @@ -176,12 +177,14 @@ namespace energyplus { } openstudio::energyplus::ComponentType plantLoopType(const PlantLoop& plantLoop) { - LOG_FREE(Warn, "openstudio.energyplus.plantLoopType", "Method is deprecated. Use Loop::componentType instead"); + auto logChannel = [] { return "openstudio::energyplus::plantLoopType"; }; + DEPRECATED_AT_MSG(3, 6, 0, "Use Loop::componentType instead"); return convertOSEnumToEnum(plantLoop.componentType()); } openstudio::energyplus::ComponentType componentType(const openstudio::model::HVACComponent& component) { - LOG_FREE(Warn, "openstudio.energyplus.componentType", "Method is deprecated. Use HVACComponent::componentType instead"); + auto logChannel = [] { return "openstudio::energyplus::componentType"; }; + DEPRECATED_AT_MSG(3, 6, 0, "Use HVACComponent::componentType instead"); return convertOSEnumToEnum(component.componentType()); } diff --git a/src/energyplus/ForwardTranslator/ForwardTranslateTableMultiVariableLookup.cpp b/src/energyplus/ForwardTranslator/ForwardTranslateTableMultiVariableLookup.cpp index f826b6c834..bb46320c32 100644 --- a/src/energyplus/ForwardTranslator/ForwardTranslateTableMultiVariableLookup.cpp +++ b/src/energyplus/ForwardTranslator/ForwardTranslateTableMultiVariableLookup.cpp @@ -40,7 +40,7 @@ #include #include -#include "../../utilities/core/Deprecated.hpp" +#include "../../utilities/core/DeprecatedHelpers.hpp" using namespace openstudio::model; @@ -57,6 +57,7 @@ namespace energyplus { #endif boost::optional ForwardTranslator::translateTableMultiVariableLookup(TableMultiVariableLookup& modelObject) { + DEPRECATED_AT_MSG(3, 5, 0, "The entire TableMultiVariableLookup will be removed."); OptionalString s; OptionalDouble d; OptionalModelObject temp; diff --git a/src/model/CoilCoolingDXSingleSpeed.cpp b/src/model/CoilCoolingDXSingleSpeed.cpp index fb4274f02d..bef6b32720 100644 --- a/src/model/CoilCoolingDXSingleSpeed.cpp +++ b/src/model/CoilCoolingDXSingleSpeed.cpp @@ -1282,7 +1282,7 @@ namespace model { return result; } - std::vector CoilCoolingDXSingleSpeed::condenserTypeValues() const { + std::vector CoilCoolingDXSingleSpeed::condenserTypeValues() { return getIddKeyNames(IddFactory::instance().getObject(iddObjectType()).get(), OS_Coil_Cooling_DX_SingleSpeedFields::CondenserType); } @@ -1376,7 +1376,8 @@ namespace model { /// @cond - CoilCoolingDXSingleSpeed::CoilCoolingDXSingleSpeed(std::shared_ptr impl) : StraightComponent(std::move(p)) {} + CoilCoolingDXSingleSpeed::CoilCoolingDXSingleSpeed(std::shared_ptr impl) + : StraightComponent(std::move(impl)) {} // DEPRECATED double CoilCoolingDXSingleSpeed::ratedEvaporatorFanPowerPerVolumeFlowRate() const { diff --git a/src/model/CoilCoolingDXSingleSpeed.hpp b/src/model/CoilCoolingDXSingleSpeed.hpp index 11c4a7cfee..c8d8dedf2d 100644 --- a/src/model/CoilCoolingDXSingleSpeed.hpp +++ b/src/model/CoilCoolingDXSingleSpeed.hpp @@ -87,7 +87,7 @@ namespace model { static IddObjectType iddObjectType(); - static std::vector condenserTypeValues() const; + static std::vector condenserTypeValues(); /** @name Getters */ //@{ diff --git a/src/model/EnergyManagementSystemActuator.cpp b/src/model/EnergyManagementSystemActuator.cpp index f5510fe88f..5080085de0 100644 --- a/src/model/EnergyManagementSystemActuator.cpp +++ b/src/model/EnergyManagementSystemActuator.cpp @@ -43,6 +43,7 @@ #include #include "../utilities/core/Assert.hpp" +#include "../utilities/core/DeprecatedHelpers.hpp" namespace openstudio { namespace model { @@ -341,14 +342,12 @@ namespace model { // DEPRECATED boost::optional EnergyManagementSystemActuator::zoneName() const { - LOG(Warn, "As of 3.6.0, EnergyManagementSystemActuator::zoneName is deprecated. Use zoneOrSpace instead. " - "It will be removed within three releases."); + DEPRECATED_AT_MSG(3, 6, 0, "Use zoneOrSpace instead."); return getImpl()->zoneOrSpace(); } void EnergyManagementSystemActuator::resetZoneName() { - LOG(Warn, "As of 3.6.0, EnergyManagementSystemActuator::resetZoneName is deprecated. Use resetZoneOrSpace instead. " - "It will be removed within three releases."); + DEPRECATED_AT_MSG(3, 6, 0, "Use resetZoneOrSpace instead."); getImpl()->resetZoneOrSpace(); } /// @endcond diff --git a/src/model/GroundHeatExchangerHorizontalTrench.cpp b/src/model/GroundHeatExchangerHorizontalTrench.cpp index 8b8bea87dd..b15a330d34 100644 --- a/src/model/GroundHeatExchangerHorizontalTrench.cpp +++ b/src/model/GroundHeatExchangerHorizontalTrench.cpp @@ -37,6 +37,7 @@ #include "SiteGroundTemperatureUndisturbedKusudaAchenbach_Impl.hpp" #include "../utilities/core/Assert.hpp" +#include "../utilities/core/DeprecatedHelpers.hpp" #include "../utilities/data/DataEnums.hpp" #include @@ -358,8 +359,7 @@ namespace model { } std::vector GroundHeatExchangerHorizontalTrench::groundTemperatureModelValues() { - LOG(Warn, "As of 3.6.0, groundTemperatureModelValues is deprecated. Use undisturbedGroundTemperatureModel instead. It will be removed within " - "three releases."); + DEPRECATED_AT_MSG(3, 6, 0, "Use undisturbedGroundTemperatureModel instead."); std::vector result{"KusudaAchenbach", "SiteGroundTemperature"}; return result; } @@ -436,14 +436,12 @@ namespace model { } bool GroundHeatExchangerHorizontalTrench::isGroundTemperatureModelDefaulted() const { - LOG(Warn, "As of 3.6.0, isGroundTemperatureModelDefaulted is deprecated. Use undisturbedGroundTemperatureModel instead. It will be removed " - "within three releases."); + DEPRECATED_AT_MSG(3, 6, 0, "Use undisturbedGroundTemperatureModel instead."); return false; } double GroundHeatExchangerHorizontalTrench::kusudaAchenbachAverageSurfaceTemperature() const { - LOG(Warn, "As of 3.6.0, kusudaAchenbachAverageSurfaceTemperature is deprecated. Use undisturbedGroundTemperatureModel instead. It will be " - "removed within three releases."); + DEPRECATED_AT_MSG(3, 6, 0, "Use undisturbedGroundTemperatureModel instead."); if (undisturbedGroundTemperatureModel().iddObjectType() != IddObjectType::OS_Site_GroundTemperature_Undisturbed_KusudaAchenbach) { LOG_AND_THROW("Undisturbed ground temperature model is not KusudaAchenbach."); } @@ -451,8 +449,7 @@ namespace model { } double GroundHeatExchangerHorizontalTrench::kusudaAchenbachAverageAmplitudeofSurfaceTemperature() const { - LOG(Warn, "As of 3.6.0, kusudaAchenbachAverageAmplitudeofSurfaceTemperature is deprecated. Use undisturbedGroundTemperatureModel instead. It " - "will be removed within three releases."); + DEPRECATED_AT_MSG(3, 6, 0, "Use undisturbedGroundTemperatureModel instead."); if (undisturbedGroundTemperatureModel().iddObjectType() != IddObjectType::OS_Site_GroundTemperature_Undisturbed_KusudaAchenbach) { LOG_AND_THROW("Undisturbed ground temperature model is not KusudaAchenbach."); } @@ -460,8 +457,7 @@ namespace model { } double GroundHeatExchangerHorizontalTrench::kusudaAchenbachPhaseShiftofMinimumSurfaceTemperature() const { - LOG(Warn, "As of 3.6.0, kusudaAchenbachPhaseShiftofMinimumSurfaceTemperature is deprecated. Use undisturbedGroundTemperatureModel instead. It " - "will be removed within three releases."); + DEPRECATED_AT_MSG(3, 6, 0, "Use undisturbedGroundTemperatureModel instead."); if (undisturbedGroundTemperatureModel().iddObjectType() != IddObjectType::OS_Site_GroundTemperature_Undisturbed_KusudaAchenbach) { LOG_AND_THROW("Undisturbed ground temperature model is not KusudaAchenbach."); } @@ -538,19 +534,16 @@ namespace model { } bool GroundHeatExchangerHorizontalTrench::setGroundTemperatureModel(const std::string& groundTemperatureModel) { - LOG(Warn, "As of 3.6.0, setGroundTemperatureModel is deprecated. Use undisturbedGroundTemperatureModel instead. It will be removed within three " - "releases."); + DEPRECATED_AT_MSG(3, 6, 0, "Use undisturbedGroundTemperatureModel instead."); return false; } void GroundHeatExchangerHorizontalTrench::resetGroundTemperatureModel() { - LOG(Warn, "As of 3.6.0, groundTemperatureModelValues is deprecated. Use undisturbedGroundTemperatureModel instead. It will be removed within " - "three releases."); + DEPRECATED_AT_MSG(3, 6, 0, "Use undisturbedGroundTemperatureModel instead."); } bool GroundHeatExchangerHorizontalTrench::setKusudaAchenbachAverageSurfaceTemperature(double kusudaAchenbachAverageSurfaceTemperature) { - LOG(Warn, "As of 3.6.0, setKusudaAchenbachAverageSurfaceTemperature is deprecated. Use undisturbedGroundTemperatureModel instead. It will be " - "removed within three releases."); + DEPRECATED_AT_MSG(3, 6, 0, "Use undisturbedGroundTemperatureModel instead."); if (undisturbedGroundTemperatureModel().iddObjectType() != IddObjectType::OS_Site_GroundTemperature_Undisturbed_KusudaAchenbach) { LOG_AND_THROW("Undisturbed ground temperature model is not KusudaAchenbach."); } @@ -560,8 +553,7 @@ namespace model { bool GroundHeatExchangerHorizontalTrench::setKusudaAchenbachAverageAmplitudeofSurfaceTemperature( double kusudaAchenbachAverageAmplitudeofSurfaceTemperature) { - LOG(Warn, "As of 3.6.0, setKusudaAchenbachAverageAmplitudeofSurfaceTemperature is deprecated. Use undisturbedGroundTemperatureModel instead. It " - "will be removed within three releases."); + DEPRECATED_AT_MSG(3, 6, 0, "Use undisturbedGroundTemperatureModel instead."); if (undisturbedGroundTemperatureModel().iddObjectType() != IddObjectType::OS_Site_GroundTemperature_Undisturbed_KusudaAchenbach) { LOG_AND_THROW("Undisturbed ground temperature model is not KusudaAchenbach."); } @@ -571,8 +563,7 @@ namespace model { bool GroundHeatExchangerHorizontalTrench::setKusudaAchenbachPhaseShiftofMinimumSurfaceTemperature( double kusudaAchenbachPhaseShiftofMinimumSurfaceTemperature) { - LOG(Warn, "As of 3.6.0, setKusudaAchenbachPhaseShiftofMinimumSurfaceTemperature is deprecated. Use undisturbedGroundTemperatureModel instead. It " - "will be removed within three releases."); + DEPRECATED_AT_MSG(3, 6, 0, "Use undisturbedGroundTemperatureModel instead."); if (undisturbedGroundTemperatureModel().iddObjectType() != IddObjectType::OS_Site_GroundTemperature_Undisturbed_KusudaAchenbach) { LOG_AND_THROW("Undisturbed ground temperature model is not KusudaAchenbach."); } diff --git a/src/model/SurfacePropertyExposedFoundationPerimeter.cpp b/src/model/SurfacePropertyExposedFoundationPerimeter.cpp index f3be24e884..0e3dc44645 100644 --- a/src/model/SurfacePropertyExposedFoundationPerimeter.cpp +++ b/src/model/SurfacePropertyExposedFoundationPerimeter.cpp @@ -40,6 +40,7 @@ #include #include "../utilities/core/Assert.hpp" +#include "../utilities/core/DeprecatedHelpers.hpp" namespace openstudio { namespace model { @@ -175,8 +176,7 @@ namespace model { } std::string SurfacePropertyExposedFoundationPerimeter::surfaceName() const { - LOG(Warn, "As of 3.7.0, surfaceName is deprecated. Use surface.nameString instead. It will be " - "removed within three releases."); + DEPRECATED_AT_MSG(3, 7, 0, "Use surface.nameString instead."); return getImpl()->surface().nameString(); } diff --git a/src/utilities/filetypes/RunOptions.cpp b/src/utilities/filetypes/RunOptions.cpp index bafe6855f7..2cf9ea1b48 100644 --- a/src/utilities/filetypes/RunOptions.cpp +++ b/src/utilities/filetypes/RunOptions.cpp @@ -32,6 +32,7 @@ #include "ForwardTranslatorOptions.hpp" #include "../core/Assert.hpp" +#include "../core/DeprecatedHelpers.hpp" #include @@ -441,14 +442,15 @@ void RunOptions::resetForwardTranslatorOptions() { // DEPRECATED std::string RunOptions::forwardTranslateOptions() const { - LOG(Warn, "As of 3.5.1, (std::string) forwardTranslateOptions is deprecated. Use (ForwardTranslatorOptions) forwardTranslatorOptions instead. " - "It will be removed within three releases."); + DEPRECATED_AT_MSG(3, 6, 0, "Use `ForwardTranslatorOptions RunOptions::forwardTranslatorOptions` instead."); return getImpl()->forwardTranslatorOptions().string(); } bool RunOptions::setForwardTranslateOptions(const std::string& options) { - LOG(Warn, "As of 3.5.1, setForwardTranslateOptions(std::string) is deprecated. Use setForwardTranslatorOptions(ForwardTranslatorOptions) instead. " - "It will be removed within three releases."); + DEPRECATED_AT_MSG( + 3, 6, 0, + "Use `ForwardTranslatorOptions RunOptions::setForwardTranslatorOptions(const ForwardTranslatorOptions& forwardTranslatorOptions)` instead."); + if (auto ftOptions_ = ForwardTranslatorOptions::fromString(options)) { return getImpl()->setForwardTranslatorOptions(ftOptions_.get()); } @@ -456,8 +458,7 @@ bool RunOptions::setForwardTranslateOptions(const std::string& options) { } void RunOptions::resetForwardTranslateOptions() { - LOG(Warn, "As of 3.5.1, resetForwardTranslateOptions is deprecated. Use resetForwardTranslateOptions instead. " - "It will be removed within three releases."); + DEPRECATED_AT_MSG(3, 6, 0, "Use resetForwardTranslateOptions instead."); getImpl()->resetForwardTranslatorOptions(); } From a1a3eefe327fe3ef5700166ea8300c7ee9df4fe1 Mon Sep 17 00:00:00 2001 From: Julien Marrec Date: Tue, 6 Jun 2023 23:38:50 +0200 Subject: [PATCH 5/5] Change OS_DEPRECATED to take version info at which it was deprecated for better message --- developer/ruby/deprecated_methods.csv | 5 +- src/energyplus/ForwardTranslator.hpp | 2 +- ...ranslatePlantEquipmentOperationSchemes.hpp | 4 +- src/measure/OSMeasure.hpp | 4 +- .../AirConditionerVariableRefrigerantFlow.hpp | 28 ++++---- src/model/AirTerminalSingleDuctVAVReheat.hpp | 4 +- src/model/CoilCoolingDXCurveFitSpeed.hpp | 4 +- .../CoilCoolingDXMultiSpeedStageData.hpp | 4 +- src/model/CoilCoolingDXSingleSpeed.hpp | 6 +- ...ilCoolingWaterToAirHeatPumpEquationFit.hpp | 64 +++++++++---------- .../CoilHeatingDXMultiSpeedStageData.hpp | 4 +- src/model/CoilHeatingDXSingleSpeed.hpp | 4 +- ...ilHeatingWaterToAirHeatPumpEquationFit.hpp | 40 ++++++------ src/model/ConstructionAirBoundary.hpp | 20 +++--- src/model/CurveDoubleExponentialDecay.hpp | 8 +-- src/model/DesignDay.hpp | 46 ++++++------- src/model/EnergyManagementSystemActuator.hpp | 4 +- .../GroundHeatExchangerHorizontalTrench.hpp | 22 +++---- ...HeatPumpWaterToWaterEquationFitCooling.hpp | 40 ++++++------ ...HeatPumpWaterToWaterEquationFitHeating.hpp | 40 ++++++------ src/model/ScheduleFile.hpp | 2 +- src/model/SubSurface.hpp | 6 +- ...facePropertyExposedFoundationPerimeter.hpp | 2 +- src/model/TableMultiVariableLookup.cpp | 3 +- src/model/TableMultiVariableLookup.hpp | 2 +- src/model/ZoneAirMassFlowConservation.hpp | 8 +-- src/model/ZoneHVACEquipmentList.hpp | 8 +-- src/model/ZoneHVACLowTempRadiantConstFlow.hpp | 4 +- src/model/ZoneMixing.hpp | 30 ++++----- src/utilities/bcl/RemoteBCL.hpp | 8 +-- src/utilities/core/Deprecated.hpp | 12 +--- src/utilities/filetypes/RunOptions.hpp | 6 +- 32 files changed, 220 insertions(+), 224 deletions(-) diff --git a/developer/ruby/deprecated_methods.csv b/developer/ruby/deprecated_methods.csv index 120d62efcf..bf8274a85e 100644 --- a/developer/ruby/deprecated_methods.csv +++ b/developer/ruby/deprecated_methods.csv @@ -1,6 +1,6 @@ Namespace,Class Name,Method,Deprecated Since,Commit SHA,Replace With,Removed In -measure,OSMeasure,registerWithSketchUp,,,None, -measure,OSMeasure,registerWithApplication,,,None, +measure,OSMeasure,registerWithSketchUp,1.13.0,9b792e5a8d247c5ba075752ea93c91708b0e1bc4,None, +measure,OSMeasure,registerWithApplication,1.13.0,9b792e5a8d247c5ba075752ea93c91708b0e1bc4,None, model,AvailabilityManagerNightCycle,controlThermalZone,2.3.1,3578590b7e63a68bedb7e43bef21f50552e0c6b7,controlThermalZones,3.4.1 model,AvailabilityManagerNightCycle,setControlThermalZone,2.3.1,3578590b7e63a68bedb7e43bef21f50552e0c6b8,setControlThermalZones,3.4.1 model,AvailabilityManagerNightCycle,resetControlThermalZone,2.3.1,3578590b7e63a68bedb7e43bef21f50552e0c6b9,resetControlThermalZones,3.4.1 @@ -233,6 +233,7 @@ model,GroundHeatExchangerHorizontalTrench,setKusudaAchenbachAverageSurfaceTemper model,GroundHeatExchangerHorizontalTrench,setKusudaAchenbachAverageAmplitudeofSurfaceTemperature,3.6.0,44a2436cab528eaaf4da2806b990de5f67a984e9,undisturbedGroundTemperatureModel, model,GroundHeatExchangerHorizontalTrench,setKusudaAchenbachPhaseShiftofMinimumSurfaceTemperature,3.6.0,44a2436cab528eaaf4da2806b990de5f67a984e9,undisturbedGroundTemperatureModel, model,SurfacePropertyExposedFoundationPerimeter,surfaceName,3.7.0,19bea0ce243d4f7484ff63dd084af4b75b21009d,surface().nameString(), +model,TableMultiVariableLookup,Entire Class,3.5.0,1c7521a7912473b3b8ba5c533fdf810936ff5c60,TableLookup, energyplus,ForwardTranslator,translateTableMultiVariableLookup,3.5.0,1c7521a7912473b3b8ba5c533fdf810936ff5c60,Remove TableMultiVariableLookup for TableLookup, energyplus,ForwardTranslatePlantEquipmentOperationSchemes,componentType,3.6.0,1417dcb7f48c92629a1e5c43dd2b030c1711bf99,Model SDK: HVACComponent::componentType(), energyplus,ForwardTranslatePlantEquipmentOperationSchemes,plantLoopType,3.6.0,1417dcb7f48c92629a1e5c43dd2b030c1711bf99,Model SDK: Loop::componentType(), \ No newline at end of file diff --git a/src/energyplus/ForwardTranslator.hpp b/src/energyplus/ForwardTranslator.hpp index b908ec567f..e44befb0c6 100644 --- a/src/energyplus/ForwardTranslator.hpp +++ b/src/energyplus/ForwardTranslator.hpp @@ -1491,7 +1491,7 @@ namespace energyplus { boost::optional translateSwimmingPoolIndoor(model::SwimmingPoolIndoor& modelObject); - OS_DEPRECATED boost::optional translateTableMultiVariableLookup(model::TableMultiVariableLookup& modelObject); + OS_DEPRECATED(3, 5, 0) boost::optional translateTableMultiVariableLookup(model::TableMultiVariableLookup& modelObject); boost::optional translateTableLookup(model::TableLookup& modelObject); diff --git a/src/energyplus/ForwardTranslator/ForwardTranslatePlantEquipmentOperationSchemes.hpp b/src/energyplus/ForwardTranslator/ForwardTranslatePlantEquipmentOperationSchemes.hpp index 4a765b750e..9e0fd1679f 100644 --- a/src/energyplus/ForwardTranslator/ForwardTranslatePlantEquipmentOperationSchemes.hpp +++ b/src/energyplus/ForwardTranslator/ForwardTranslatePlantEquipmentOperationSchemes.hpp @@ -58,7 +58,7 @@ namespace energyplus { NONE }; - OS_DEPRECATED ENERGYPLUS_API openstudio::energyplus::ComponentType componentType(const openstudio::model::HVACComponent& component); + OS_DEPRECATED(3, 6, 0) ENERGYPLUS_API openstudio::energyplus::ComponentType componentType(const openstudio::model::HVACComponent& component); bool _isSetpointComponent(const openstudio::model::PlantLoop& plantLoop, const openstudio::model::ModelObject& comp); @@ -78,7 +78,7 @@ namespace energyplus { * * If there is no cooling, no heating, no "both": None * * All other cases: "both" */ - OS_DEPRECATED ENERGYPLUS_API openstudio::energyplus::ComponentType plantLoopType(const openstudio::model::PlantLoop& plantLoop); + OS_DEPRECATED(3, 6, 0) ENERGYPLUS_API openstudio::energyplus::ComponentType plantLoopType(const openstudio::model::PlantLoop& plantLoop); /* Some plant components air in a containingHVACComponent() and it is that * container which needs to go on the plant operation scheme. Here is a filter to figure that out. diff --git a/src/measure/OSMeasure.hpp b/src/measure/OSMeasure.hpp index 9535956af1..9124df1792 100644 --- a/src/measure/OSMeasure.hpp +++ b/src/measure/OSMeasure.hpp @@ -74,11 +74,11 @@ namespace measure { /** Register this script with SketchUp. Deprecated in favor of registerWithApplication(). * Base class implementation does nothing and returns false. \deprecated */ - OS_DEPRECATED virtual bool registerWithSketchUp() const; + OS_DEPRECATED(1, 13, 0) virtual bool registerWithSketchUp() const; /** Register this script with an Application. Base class implementation does nothing and * returns false. \deprecated */ - OS_DEPRECATED virtual bool registerWithApplication() const; + OS_DEPRECATED(1, 13, 0) virtual bool registerWithApplication() const; protected: OSMeasure() = default; diff --git a/src/model/AirConditionerVariableRefrigerantFlow.hpp b/src/model/AirConditionerVariableRefrigerantFlow.hpp index 898471670d..89e4ee0b7a 100644 --- a/src/model/AirConditionerVariableRefrigerantFlow.hpp +++ b/src/model/AirConditionerVariableRefrigerantFlow.hpp @@ -87,12 +87,12 @@ namespace model { bool setGrossRatedCoolingCOP(double grossRatedCoolingCOP); // Deprecated - OS_DEPRECATED boost::optional ratedTotalCoolingCapacity() const; - OS_DEPRECATED bool isRatedTotalCoolingCapacityAutosized() const; - OS_DEPRECATED bool setRatedTotalCoolingCapacity(double ratedTotalCoolingCapacity); - OS_DEPRECATED void autosizeRatedTotalCoolingCapacity(); - OS_DEPRECATED double ratedCoolingCOP() const; - OS_DEPRECATED bool setRatedCoolingCOP(double ratedCoolingCOP); + OS_DEPRECATED(2, 9, 0) boost::optional ratedTotalCoolingCapacity() const; + OS_DEPRECATED(2, 9, 0) bool isRatedTotalCoolingCapacityAutosized() const; + OS_DEPRECATED(2, 9, 0) bool setRatedTotalCoolingCapacity(double ratedTotalCoolingCapacity); + OS_DEPRECATED(2, 9, 0) void autosizeRatedTotalCoolingCapacity(); + OS_DEPRECATED(2, 9, 0) double ratedCoolingCOP() const; + OS_DEPRECATED(2, 9, 0) bool setRatedCoolingCOP(double ratedCoolingCOP); /** In EnergyPlus 9.6.0 and above this property maps to the EnergyPlus field "Minimum Condenser Inlet Node Temperature in Cooling Mode" **/ double minimumOutdoorTemperatureinCoolingMode() const; @@ -172,12 +172,12 @@ namespace model { bool setRatedHeatingCapacitySizingRatio(double ratedHeatingCapacitySizingRatio); // Deprecated - OS_DEPRECATED boost::optional ratedTotalHeatingCapacity() const; - OS_DEPRECATED bool isRatedTotalHeatingCapacityAutosized() const; - OS_DEPRECATED bool setRatedTotalHeatingCapacity(double ratedTotalHeatingCapacity); - OS_DEPRECATED void autosizeRatedTotalHeatingCapacity(); - OS_DEPRECATED double ratedTotalHeatingCapacitySizingRatio() const; - OS_DEPRECATED bool setRatedTotalHeatingCapacitySizingRatio(double ratedTotalHeatingCapacitySizingRatio); + OS_DEPRECATED(2, 9, 0) boost::optional ratedTotalHeatingCapacity() const; + OS_DEPRECATED(2, 9, 0) bool isRatedTotalHeatingCapacityAutosized() const; + OS_DEPRECATED(2, 9, 0) bool setRatedTotalHeatingCapacity(double ratedTotalHeatingCapacity); + OS_DEPRECATED(2, 9, 0) void autosizeRatedTotalHeatingCapacity(); + OS_DEPRECATED(2, 9, 0) double ratedTotalHeatingCapacitySizingRatio() const; + OS_DEPRECATED(2, 9, 0) bool setRatedTotalHeatingCapacitySizingRatio(double ratedTotalHeatingCapacitySizingRatio); double ratedHeatingCOP() const; @@ -494,8 +494,8 @@ namespace model { boost::optional autosizedGrossRatedHeatingCapacity() const; // Deprecated - OS_DEPRECATED boost::optional autosizedRatedTotalCoolingCapacity() const; - OS_DEPRECATED boost::optional autosizedRatedTotalHeatingCapacity() const; + OS_DEPRECATED(2, 9, 0) boost::optional autosizedRatedTotalCoolingCapacity() const; + OS_DEPRECATED(2, 9, 0) boost::optional autosizedRatedTotalHeatingCapacity() const; boost::optional autosizedResistiveDefrostHeaterCapacity() const; diff --git a/src/model/AirTerminalSingleDuctVAVReheat.hpp b/src/model/AirTerminalSingleDuctVAVReheat.hpp index d32a9beea6..5930123ea0 100644 --- a/src/model/AirTerminalSingleDuctVAVReheat.hpp +++ b/src/model/AirTerminalSingleDuctVAVReheat.hpp @@ -90,14 +90,14 @@ namespace model { /** Returns the value of the MaximumAirFlowRate field. */ std::string zoneMinimumAirFlowInputMethod(); /** deprecated **/ - OS_DEPRECATED std::string zoneMinimumAirFlowMethod(); + OS_DEPRECATED(3, 0, 1) std::string zoneMinimumAirFlowMethod(); /** Sets the value of the MaximumAirFlowRate field. * Options are FixedFlowRate and Scheduled. */ bool setZoneMinimumAirFlowInputMethod(const std::string& value); /** deprecated **/ - OS_DEPRECATED bool setZoneMinimumAirFlowMethod(const std::string& value); + OS_DEPRECATED(3, 0, 1) bool setZoneMinimumAirFlowMethod(const std::string& value); /** Returns the value of the ConstantMinimumAirFlowFraction field. */ boost::optional constantMinimumAirFlowFraction() const; diff --git a/src/model/CoilCoolingDXCurveFitSpeed.hpp b/src/model/CoilCoolingDXCurveFitSpeed.hpp index 95b9d2072a..23b3bce6e0 100644 --- a/src/model/CoilCoolingDXCurveFitSpeed.hpp +++ b/src/model/CoilCoolingDXCurveFitSpeed.hpp @@ -84,7 +84,7 @@ namespace model { double activeFractionofCoilFaceArea() const; - OS_DEPRECATED double ratedEvaporatorFanPowerPerVolumeFlowRate() const; + OS_DEPRECATED(3, 5, 0) double ratedEvaporatorFanPowerPerVolumeFlowRate() const; double ratedEvaporatorFanPowerPerVolumeFlowRate2017() const; @@ -132,7 +132,7 @@ namespace model { bool setActiveFractionofCoilFaceArea(double activeFractionofCoilFaceArea); - OS_DEPRECATED bool setRatedEvaporatorFanPowerPerVolumeFlowRate(double ratedEvaporatorFanPowerPerVolumeFlowRate); + OS_DEPRECATED(3, 5, 0) bool setRatedEvaporatorFanPowerPerVolumeFlowRate(double ratedEvaporatorFanPowerPerVolumeFlowRate); bool setRatedEvaporatorFanPowerPerVolumeFlowRate2017(double ratedEvaporatorFanPowerPerVolumeFlowRate2017); diff --git a/src/model/CoilCoolingDXMultiSpeedStageData.hpp b/src/model/CoilCoolingDXMultiSpeedStageData.hpp index 69b5fa3f81..3325337c12 100644 --- a/src/model/CoilCoolingDXMultiSpeedStageData.hpp +++ b/src/model/CoilCoolingDXMultiSpeedStageData.hpp @@ -90,7 +90,7 @@ namespace model { bool isRatedAirFlowRateAutosized() const; - OS_DEPRECATED double ratedEvaporatorFanPowerPerVolumeFlowRate() const; + OS_DEPRECATED(3, 5, 0) double ratedEvaporatorFanPowerPerVolumeFlowRate() const; double ratedEvaporatorFanPowerPerVolumeFlowRate2017() const; @@ -146,7 +146,7 @@ namespace model { void autosizeRatedAirFlowRate(); - OS_DEPRECATED bool setRatedEvaporatorFanPowerPerVolumeFlowRate(double ratedEvaporatorFanPowerPerVolumeFlowRate); + OS_DEPRECATED(3, 5, 0) bool setRatedEvaporatorFanPowerPerVolumeFlowRate(double ratedEvaporatorFanPowerPerVolumeFlowRate); bool setRatedEvaporatorFanPowerPerVolumeFlowRate2017(double ratedEvaporatorFanPowerPerVolumeFlowRate2017); diff --git a/src/model/CoilCoolingDXSingleSpeed.hpp b/src/model/CoilCoolingDXSingleSpeed.hpp index c8d8dedf2d..f767e877ab 100644 --- a/src/model/CoilCoolingDXSingleSpeed.hpp +++ b/src/model/CoilCoolingDXSingleSpeed.hpp @@ -99,7 +99,7 @@ namespace model { double ratedCOP() const; /** Returns the value of the RatedEvaporatorFanPowerPerVolumeFlowRate field. **/ - OS_DEPRECATED double ratedEvaporatorFanPowerPerVolumeFlowRate() const; + OS_DEPRECATED(3, 5, 0) double ratedEvaporatorFanPowerPerVolumeFlowRate() const; /** Returns the value of the RatedEvaporatorFanPowerPerVolumeFlowRate2017 field. **/ double ratedEvaporatorFanPowerPerVolumeFlowRate2017() const; @@ -182,7 +182,7 @@ namespace model { bool setRatedCOP(double value); /** Sets the value of the RatedEvaporatorFanPowerPerVolumeFlowRate field. **/ - OS_DEPRECATED bool setRatedEvaporatorFanPowerPerVolumeFlowRate(boost::optional value); + OS_DEPRECATED(3, 5, 0) bool setRatedEvaporatorFanPowerPerVolumeFlowRate(boost::optional value); /** Sets the value of the RatedEvaporatorFanPowerPerVolumeFlowRate2017 field. **/ bool setRatedEvaporatorFanPowerPerVolumeFlowRate2017(boost::optional value); @@ -190,7 +190,7 @@ namespace model { /** Sets the value of the RatedEvaporatorFanPowerPerVolumeFlowRate2023 field. **/ bool setRatedEvaporatorFanPowerPerVolumeFlowRate2023(boost::optional value); - OS_DEPRECATED bool setRatedEvaporatorFanPowerPerVolumeFlowRate(double value); + OS_DEPRECATED(3, 5, 0) bool setRatedEvaporatorFanPowerPerVolumeFlowRate(double value); bool setRatedEvaporatorFanPowerPerVolumeFlowRate2017(double value); diff --git a/src/model/CoilCoolingWaterToAirHeatPumpEquationFit.hpp b/src/model/CoilCoolingWaterToAirHeatPumpEquationFit.hpp index 7620b849f8..81d24b8bf2 100644 --- a/src/model/CoilCoolingWaterToAirHeatPumpEquationFit.hpp +++ b/src/model/CoilCoolingWaterToAirHeatPumpEquationFit.hpp @@ -107,28 +107,28 @@ namespace model { CurveQuadLinear totalCoolingCapacityCurve() const; - OS_DEPRECATED double totalCoolingCapacityCoefficient1() const; - OS_DEPRECATED double totalCoolingCapacityCoefficient2() const; - OS_DEPRECATED double totalCoolingCapacityCoefficient3() const; - OS_DEPRECATED double totalCoolingCapacityCoefficient4() const; - OS_DEPRECATED double totalCoolingCapacityCoefficient5() const; + OS_DEPRECATED(3, 2, 0) double totalCoolingCapacityCoefficient1() const; + OS_DEPRECATED(3, 2, 0) double totalCoolingCapacityCoefficient2() const; + OS_DEPRECATED(3, 2, 0) double totalCoolingCapacityCoefficient3() const; + OS_DEPRECATED(3, 2, 0) double totalCoolingCapacityCoefficient4() const; + OS_DEPRECATED(3, 2, 0) double totalCoolingCapacityCoefficient5() const; CurveQuintLinear sensibleCoolingCapacityCurve() const; - OS_DEPRECATED double sensibleCoolingCapacityCoefficient1() const; - OS_DEPRECATED double sensibleCoolingCapacityCoefficient2() const; - OS_DEPRECATED double sensibleCoolingCapacityCoefficient3() const; - OS_DEPRECATED double sensibleCoolingCapacityCoefficient4() const; - OS_DEPRECATED double sensibleCoolingCapacityCoefficient5() const; - OS_DEPRECATED double sensibleCoolingCapacityCoefficient6() const; + OS_DEPRECATED(3, 2, 0) double sensibleCoolingCapacityCoefficient1() const; + OS_DEPRECATED(3, 2, 0) double sensibleCoolingCapacityCoefficient2() const; + OS_DEPRECATED(3, 2, 0) double sensibleCoolingCapacityCoefficient3() const; + OS_DEPRECATED(3, 2, 0) double sensibleCoolingCapacityCoefficient4() const; + OS_DEPRECATED(3, 2, 0) double sensibleCoolingCapacityCoefficient5() const; + OS_DEPRECATED(3, 2, 0) double sensibleCoolingCapacityCoefficient6() const; CurveQuadLinear coolingPowerConsumptionCurve() const; - OS_DEPRECATED double coolingPowerConsumptionCoefficient1() const; - OS_DEPRECATED double coolingPowerConsumptionCoefficient2() const; - OS_DEPRECATED double coolingPowerConsumptionCoefficient3() const; - OS_DEPRECATED double coolingPowerConsumptionCoefficient4() const; - OS_DEPRECATED double coolingPowerConsumptionCoefficient5() const; + OS_DEPRECATED(3, 2, 0) double coolingPowerConsumptionCoefficient1() const; + OS_DEPRECATED(3, 2, 0) double coolingPowerConsumptionCoefficient2() const; + OS_DEPRECATED(3, 2, 0) double coolingPowerConsumptionCoefficient3() const; + OS_DEPRECATED(3, 2, 0) double coolingPowerConsumptionCoefficient4() const; + OS_DEPRECATED(3, 2, 0) double coolingPowerConsumptionCoefficient5() const; double nominalTimeforCondensateRemovaltoBegin() const; @@ -174,28 +174,28 @@ namespace model { bool setTotalCoolingCapacityCurve(const CurveQuadLinear& totalCoolingCapacityCurve); - OS_DEPRECATED bool setTotalCoolingCapacityCoefficient1(double totalCoolingCapacityCoefficient1); - OS_DEPRECATED bool setTotalCoolingCapacityCoefficient2(double totalCoolingCapacityCoefficient2); - OS_DEPRECATED bool setTotalCoolingCapacityCoefficient3(double totalCoolingCapacityCoefficient3); - OS_DEPRECATED bool setTotalCoolingCapacityCoefficient4(double totalCoolingCapacityCoefficient4); - OS_DEPRECATED bool setTotalCoolingCapacityCoefficient5(double totalCoolingCapacityCoefficient5); + OS_DEPRECATED(3, 2, 0) bool setTotalCoolingCapacityCoefficient1(double totalCoolingCapacityCoefficient1); + OS_DEPRECATED(3, 2, 0) bool setTotalCoolingCapacityCoefficient2(double totalCoolingCapacityCoefficient2); + OS_DEPRECATED(3, 2, 0) bool setTotalCoolingCapacityCoefficient3(double totalCoolingCapacityCoefficient3); + OS_DEPRECATED(3, 2, 0) bool setTotalCoolingCapacityCoefficient4(double totalCoolingCapacityCoefficient4); + OS_DEPRECATED(3, 2, 0) bool setTotalCoolingCapacityCoefficient5(double totalCoolingCapacityCoefficient5); bool setSensibleCoolingCapacityCurve(const CurveQuintLinear& sensibleCoolingCapacityCurve); - OS_DEPRECATED bool setSensibleCoolingCapacityCoefficient1(double sensibleCoolingCapacityCoefficient1); - OS_DEPRECATED bool setSensibleCoolingCapacityCoefficient2(double sensibleCoolingCapacityCoefficient2); - OS_DEPRECATED bool setSensibleCoolingCapacityCoefficient3(double sensibleCoolingCapacityCoefficient3); - OS_DEPRECATED bool setSensibleCoolingCapacityCoefficient4(double sensibleCoolingCapacityCoefficient4); - OS_DEPRECATED bool setSensibleCoolingCapacityCoefficient5(double sensibleCoolingCapacityCoefficient5); - OS_DEPRECATED bool setSensibleCoolingCapacityCoefficient6(double sensibleCoolingCapacityCoefficient6); + OS_DEPRECATED(3, 2, 0) bool setSensibleCoolingCapacityCoefficient1(double sensibleCoolingCapacityCoefficient1); + OS_DEPRECATED(3, 2, 0) bool setSensibleCoolingCapacityCoefficient2(double sensibleCoolingCapacityCoefficient2); + OS_DEPRECATED(3, 2, 0) bool setSensibleCoolingCapacityCoefficient3(double sensibleCoolingCapacityCoefficient3); + OS_DEPRECATED(3, 2, 0) bool setSensibleCoolingCapacityCoefficient4(double sensibleCoolingCapacityCoefficient4); + OS_DEPRECATED(3, 2, 0) bool setSensibleCoolingCapacityCoefficient5(double sensibleCoolingCapacityCoefficient5); + OS_DEPRECATED(3, 2, 0) bool setSensibleCoolingCapacityCoefficient6(double sensibleCoolingCapacityCoefficient6); bool setCoolingPowerConsumptionCurve(const CurveQuadLinear& coolingPowerConsumptionCurve); - OS_DEPRECATED bool setCoolingPowerConsumptionCoefficient1(double coolingPowerConsumptionCoefficient1); - OS_DEPRECATED bool setCoolingPowerConsumptionCoefficient2(double coolingPowerConsumptionCoefficient2); - OS_DEPRECATED bool setCoolingPowerConsumptionCoefficient3(double coolingPowerConsumptionCoefficient3); - OS_DEPRECATED bool setCoolingPowerConsumptionCoefficient4(double coolingPowerConsumptionCoefficient4); - OS_DEPRECATED bool setCoolingPowerConsumptionCoefficient5(double coolingPowerConsumptionCoefficient5); + OS_DEPRECATED(3, 2, 0) bool setCoolingPowerConsumptionCoefficient1(double coolingPowerConsumptionCoefficient1); + OS_DEPRECATED(3, 2, 0) bool setCoolingPowerConsumptionCoefficient2(double coolingPowerConsumptionCoefficient2); + OS_DEPRECATED(3, 2, 0) bool setCoolingPowerConsumptionCoefficient3(double coolingPowerConsumptionCoefficient3); + OS_DEPRECATED(3, 2, 0) bool setCoolingPowerConsumptionCoefficient4(double coolingPowerConsumptionCoefficient4); + OS_DEPRECATED(3, 2, 0) bool setCoolingPowerConsumptionCoefficient5(double coolingPowerConsumptionCoefficient5); bool setNominalTimeforCondensateRemovaltoBegin(double nominalTimeforCondensateRemovaltoBegin); diff --git a/src/model/CoilHeatingDXMultiSpeedStageData.hpp b/src/model/CoilHeatingDXMultiSpeedStageData.hpp index eba9ea514c..ed6324e29f 100644 --- a/src/model/CoilHeatingDXMultiSpeedStageData.hpp +++ b/src/model/CoilHeatingDXMultiSpeedStageData.hpp @@ -85,7 +85,7 @@ namespace model { bool isRatedAirFlowRateAutosized() const; - OS_DEPRECATED double ratedSupplyAirFanPowerPerVolumeFlowRate() const; + OS_DEPRECATED(3, 5, 0) double ratedSupplyAirFanPowerPerVolumeFlowRate() const; double ratedSupplyAirFanPowerPerVolumeFlowRate2017() const; @@ -119,7 +119,7 @@ namespace model { void autosizeRatedAirFlowRate(); - OS_DEPRECATED bool setRatedSupplyAirFanPowerPerVolumeFlowRate(double ratedSupplyAirFanPowerPerVolumeFlowRate); + OS_DEPRECATED(3, 5, 0) bool setRatedSupplyAirFanPowerPerVolumeFlowRate(double ratedSupplyAirFanPowerPerVolumeFlowRate); bool setRatedSupplyAirFanPowerPerVolumeFlowRate2017(double ratedSupplyAirFanPowerPerVolumeFlowRate2017); diff --git a/src/model/CoilHeatingDXSingleSpeed.hpp b/src/model/CoilHeatingDXSingleSpeed.hpp index 1b7bcadde3..1139a063af 100644 --- a/src/model/CoilHeatingDXSingleSpeed.hpp +++ b/src/model/CoilHeatingDXSingleSpeed.hpp @@ -92,7 +92,7 @@ namespace model { bool isRatedAirFlowRateAutosized() const; - OS_DEPRECATED double ratedSupplyFanPowerPerVolumeFlowRate() const; + OS_DEPRECATED(3, 5, 0) double ratedSupplyFanPowerPerVolumeFlowRate() const; double ratedSupplyFanPowerPerVolumeFlowRate2017() const; @@ -148,7 +148,7 @@ namespace model { void autosizeRatedAirFlowRate(); - OS_DEPRECATED bool setRatedSupplyFanPowerPerVolumeFlowRate(double ratedSupplyFanPowerPerVolumeFlowRate); + OS_DEPRECATED(3, 5, 0) bool setRatedSupplyFanPowerPerVolumeFlowRate(double ratedSupplyFanPowerPerVolumeFlowRate); bool setRatedSupplyFanPowerPerVolumeFlowRate2017(double ratedSupplyFanPowerPerVolumeFlowRate2017); diff --git a/src/model/CoilHeatingWaterToAirHeatPumpEquationFit.hpp b/src/model/CoilHeatingWaterToAirHeatPumpEquationFit.hpp index bdd828089f..0e321a77f1 100644 --- a/src/model/CoilHeatingWaterToAirHeatPumpEquationFit.hpp +++ b/src/model/CoilHeatingWaterToAirHeatPumpEquationFit.hpp @@ -104,19 +104,19 @@ namespace model { CurveQuadLinear heatingCapacityCurve() const; - OS_DEPRECATED double heatingCapacityCoefficient1() const; - OS_DEPRECATED double heatingCapacityCoefficient2() const; - OS_DEPRECATED double heatingCapacityCoefficient3() const; - OS_DEPRECATED double heatingCapacityCoefficient4() const; - OS_DEPRECATED double heatingCapacityCoefficient5() const; + OS_DEPRECATED(3, 2, 0) double heatingCapacityCoefficient1() const; + OS_DEPRECATED(3, 2, 0) double heatingCapacityCoefficient2() const; + OS_DEPRECATED(3, 2, 0) double heatingCapacityCoefficient3() const; + OS_DEPRECATED(3, 2, 0) double heatingCapacityCoefficient4() const; + OS_DEPRECATED(3, 2, 0) double heatingCapacityCoefficient5() const; CurveQuadLinear heatingPowerConsumptionCurve() const; - OS_DEPRECATED double heatingPowerConsumptionCoefficient1() const; - OS_DEPRECATED double heatingPowerConsumptionCoefficient2() const; - OS_DEPRECATED double heatingPowerConsumptionCoefficient3() const; - OS_DEPRECATED double heatingPowerConsumptionCoefficient4() const; - OS_DEPRECATED double heatingPowerConsumptionCoefficient5() const; + OS_DEPRECATED(3, 2, 0) double heatingPowerConsumptionCoefficient1() const; + OS_DEPRECATED(3, 2, 0) double heatingPowerConsumptionCoefficient2() const; + OS_DEPRECATED(3, 2, 0) double heatingPowerConsumptionCoefficient3() const; + OS_DEPRECATED(3, 2, 0) double heatingPowerConsumptionCoefficient4() const; + OS_DEPRECATED(3, 2, 0) double heatingPowerConsumptionCoefficient5() const; //@} /** @name Setters */ @@ -158,19 +158,19 @@ namespace model { bool setHeatingCapacityCurve(const CurveQuadLinear& heatingCapacityCurve); - OS_DEPRECATED bool setHeatingCapacityCoefficient1(double heatingCapacityCoefficient1); - OS_DEPRECATED bool setHeatingCapacityCoefficient2(double heatingCapacityCoefficient2); - OS_DEPRECATED bool setHeatingCapacityCoefficient3(double heatingCapacityCoefficient3); - OS_DEPRECATED bool setHeatingCapacityCoefficient4(double heatingCapacityCoefficient4); - OS_DEPRECATED bool setHeatingCapacityCoefficient5(double heatingCapacityCoefficient5); + OS_DEPRECATED(3, 2, 0) bool setHeatingCapacityCoefficient1(double heatingCapacityCoefficient1); + OS_DEPRECATED(3, 2, 0) bool setHeatingCapacityCoefficient2(double heatingCapacityCoefficient2); + OS_DEPRECATED(3, 2, 0) bool setHeatingCapacityCoefficient3(double heatingCapacityCoefficient3); + OS_DEPRECATED(3, 2, 0) bool setHeatingCapacityCoefficient4(double heatingCapacityCoefficient4); + OS_DEPRECATED(3, 2, 0) bool setHeatingCapacityCoefficient5(double heatingCapacityCoefficient5); bool setHeatingPowerConsumptionCurve(const CurveQuadLinear& heatingPowerConsumptionCurve); - OS_DEPRECATED bool setHeatingPowerConsumptionCoefficient1(double heatingPowerConsumptionCoefficient1); - OS_DEPRECATED bool setHeatingPowerConsumptionCoefficient2(double heatingPowerConsumptionCoefficient2); - OS_DEPRECATED bool setHeatingPowerConsumptionCoefficient3(double heatingPowerConsumptionCoefficient3); - OS_DEPRECATED bool setHeatingPowerConsumptionCoefficient4(double heatingPowerConsumptionCoefficient4); - OS_DEPRECATED bool setHeatingPowerConsumptionCoefficient5(double heatingPowerConsumptionCoefficient5); + OS_DEPRECATED(3, 2, 0) bool setHeatingPowerConsumptionCoefficient1(double heatingPowerConsumptionCoefficient1); + OS_DEPRECATED(3, 2, 0) bool setHeatingPowerConsumptionCoefficient2(double heatingPowerConsumptionCoefficient2); + OS_DEPRECATED(3, 2, 0) bool setHeatingPowerConsumptionCoefficient3(double heatingPowerConsumptionCoefficient3); + OS_DEPRECATED(3, 2, 0) bool setHeatingPowerConsumptionCoefficient4(double heatingPowerConsumptionCoefficient4); + OS_DEPRECATED(3, 2, 0) bool setHeatingPowerConsumptionCoefficient5(double heatingPowerConsumptionCoefficient5); //@} /** @name Other */ diff --git a/src/model/ConstructionAirBoundary.hpp b/src/model/ConstructionAirBoundary.hpp index bb5747bd39..b5393f0945 100644 --- a/src/model/ConstructionAirBoundary.hpp +++ b/src/model/ConstructionAirBoundary.hpp @@ -67,9 +67,9 @@ namespace model { static IddObjectType iddObjectType(); - OS_DEPRECATED static std::vector solarAndDaylightingMethodValues(); + OS_DEPRECATED(3, 2, 0) static std::vector solarAndDaylightingMethodValues(); - OS_DEPRECATED static std::vector radiantExchangeMethodValues(); + OS_DEPRECATED(3, 2, 0) static std::vector radiantExchangeMethodValues(); static std::vector airExchangeMethodValues(); @@ -77,16 +77,16 @@ namespace model { //@{ // cppcheck-suppress functionStatic - OS_DEPRECATED std::string solarAndDaylightingMethod() const; + OS_DEPRECATED(3, 2, 0) std::string solarAndDaylightingMethod() const; // cppcheck-suppress functionStatic - OS_DEPRECATED bool isSolarAndDaylightingMethodDefaulted() const; + OS_DEPRECATED(3, 2, 0) bool isSolarAndDaylightingMethodDefaulted() const; // cppcheck-suppress functionStatic - OS_DEPRECATED std::string radiantExchangeMethod() const; + OS_DEPRECATED(3, 2, 0) std::string radiantExchangeMethod() const; // cppcheck-suppress functionStatic - OS_DEPRECATED bool isRadiantExchangeMethodDefaulted() const; + OS_DEPRECATED(3, 2, 0) bool isRadiantExchangeMethodDefaulted() const; std::string airExchangeMethod() const; @@ -103,16 +103,16 @@ namespace model { //@{ // cppcheck-suppress functionStatic - OS_DEPRECATED bool setSolarAndDaylightingMethod(const std::string& solarAndDaylightingMethod); + OS_DEPRECATED(3, 2, 0) bool setSolarAndDaylightingMethod(const std::string& solarAndDaylightingMethod); // cppcheck-suppress functionStatic - OS_DEPRECATED void resetSolarAndDaylightingMethod(); + OS_DEPRECATED(3, 2, 0) void resetSolarAndDaylightingMethod(); // cppcheck-suppress functionStatic - OS_DEPRECATED bool setRadiantExchangeMethod(const std::string& radiantExchangeMethod); + OS_DEPRECATED(3, 2, 0) bool setRadiantExchangeMethod(const std::string& radiantExchangeMethod); // cppcheck-suppress functionStatic - OS_DEPRECATED void resetRadiantExchangeMethod(); + OS_DEPRECATED(3, 2, 0) void resetRadiantExchangeMethod(); bool setAirExchangeMethod(const std::string& airExchangeMethod); diff --git a/src/model/CurveDoubleExponentialDecay.hpp b/src/model/CurveDoubleExponentialDecay.hpp index a59cc92022..17720b7b91 100644 --- a/src/model/CurveDoubleExponentialDecay.hpp +++ b/src/model/CurveDoubleExponentialDecay.hpp @@ -79,10 +79,10 @@ namespace model { double coefficient3C3() const; double coefficient4C4() const; - OS_DEPRECATED double coefficient3C4() const; // TODO: ill-named, should be coefficient4C4 + OS_DEPRECATED(3, 1, 0) double coefficient3C4() const; // TODO: ill-named, should be coefficient4C4 double coefficient5C5() const; - OS_DEPRECATED double coefficient3C5() const; // TODO: ill-named, should be coefficient5C5 + OS_DEPRECATED(3, 1, 0) double coefficient3C5() const; // TODO: ill-named, should be coefficient5C5 double minimumValueofx() const; @@ -111,10 +111,10 @@ namespace model { bool setCoefficient3C3(double coefficient3C3); bool setCoefficient4C4(double coefficient4C4); - OS_DEPRECATED bool setCoefficient3C4(double coefficient4C4); + OS_DEPRECATED(3, 1, 0) bool setCoefficient3C4(double coefficient4C4); bool setCoefficient5C5(double coefficient5C5); - OS_DEPRECATED bool setCoefficient3C5(double coefficient5C5); + OS_DEPRECATED(3, 1, 0) bool setCoefficient3C5(double coefficient5C5); bool setMinimumValueofx(double minimumValueofx); diff --git a/src/model/DesignDay.hpp b/src/model/DesignDay.hpp index de6a05c01a..aca0d176d2 100644 --- a/src/model/DesignDay.hpp +++ b/src/model/DesignDay.hpp @@ -56,7 +56,7 @@ namespace model { static std::vector validDayTypeValues(); - OS_DEPRECATED static std::vector validHumidityIndicatingTypeValues(); + OS_DEPRECATED(3, 3, 0) static std::vector validHumidityIndicatingTypeValues(); static std::vector validHumidityConditionTypeValues(); @@ -78,9 +78,9 @@ namespace model { bool isDailyDryBulbTemperatureRangeDefaulted() const; - OS_DEPRECATED double humidityIndicatingConditionsAtMaximumDryBulb() const; + OS_DEPRECATED(3, 3, 0) double humidityIndicatingConditionsAtMaximumDryBulb() const; - OS_DEPRECATED bool isHumidityIndicatingConditionsAtMaximumDryBulbDefaulted() const; + OS_DEPRECATED(3, 3, 0) bool isHumidityIndicatingConditionsAtMaximumDryBulbDefaulted() const; double barometricPressure() const; @@ -122,15 +122,15 @@ namespace model { bool isDaylightSavingTimeIndicatorDefaulted() const; - OS_DEPRECATED std::string humidityIndicatingType() const; + OS_DEPRECATED(3, 3, 0) std::string humidityIndicatingType() const; std::string humidityConditionType() const; - OS_DEPRECATED bool isHumidityIndicatingTypeDefaulted() const; + OS_DEPRECATED(3, 3, 0) bool isHumidityIndicatingTypeDefaulted() const; bool isHumidityConditionTypeDefaulted() const; - OS_DEPRECATED boost::optional humidityIndicatingDaySchedule() const; + OS_DEPRECATED(3, 3, 0) boost::optional humidityIndicatingDaySchedule() const; boost::optional humidityConditionDaySchedule() const; @@ -144,7 +144,7 @@ namespace model { bool isDryBulbTemperatureRangeModifierTypeDefaulted() const; - OS_DEPRECATED boost::optional dryBulbTemperatureRangeModifierSchedule() const; + OS_DEPRECATED(3, 3, 0) boost::optional dryBulbTemperatureRangeModifierSchedule() const; boost::optional dryBulbTemperatureRangeModifierDaySchedule() const; @@ -156,19 +156,19 @@ namespace model { boost::optional diffuseSolarDaySchedule() const; - OS_DEPRECATED double ashraeTaub() const; + OS_DEPRECATED(3, 3, 0) double ashraeTaub() const; double ashraeClearSkyOpticalDepthForBeamIrradiance() const; - OS_DEPRECATED bool isAshraeTaubDefaulted() const; + OS_DEPRECATED(3, 3, 0) bool isAshraeTaubDefaulted() const; bool isAshraeClearSkyOpticalDepthForBeamIrradianceDefaulted() const; - OS_DEPRECATED double ashraeTaud() const; + OS_DEPRECATED(3, 3, 0) double ashraeTaud() const; double ashraeClearSkyOpticalDepthForDiffuseIrradiance() const; - OS_DEPRECATED bool isAshraeTaudDefaulted() const; + OS_DEPRECATED(3, 3, 0) bool isAshraeTaudDefaulted() const; bool isAshraeClearSkyOpticalDepthForDiffuseIrradianceDefaulted() const; @@ -232,28 +232,28 @@ namespace model { void resetDaylightSavingTimeIndicator(); - OS_DEPRECATED bool setHumidityIndicatingType(const std::string& humidityIndicatingType); + OS_DEPRECATED(3, 3, 0) bool setHumidityIndicatingType(const std::string& humidityIndicatingType); bool setHumidityConditionType(const std::string& humidityConditionType); - OS_DEPRECATED void resetHumidityIndicatingType(); + OS_DEPRECATED(3, 3, 0) void resetHumidityIndicatingType(); void resetHumidityConditionType(); /** Sets the humidity indicating day schedule. The appropriate ScheduleTypeLimits varies * depending on the humidity indicating type. Please see the EnergyPlus input-output reference * for details before using this feature. */ - OS_DEPRECATED bool setHumidityIndicatingDaySchedule(const ScheduleDay& schedule); + OS_DEPRECATED(3, 3, 0) bool setHumidityIndicatingDaySchedule(const ScheduleDay& schedule); bool setHumidityConditionDaySchedule(const ScheduleDay& schedule); - OS_DEPRECATED void resetHumidityIndicatingDaySchedule(); + OS_DEPRECATED(3, 3, 0) void resetHumidityIndicatingDaySchedule(); void resetHumidityConditionDaySchedule(); - OS_DEPRECATED bool setHumidityIndicatingConditionsAtMaximumDryBulb(double humidityIndicatingConditionsAtMaximumDryBulb); + OS_DEPRECATED(3, 3, 0) bool setHumidityIndicatingConditionsAtMaximumDryBulb(double humidityIndicatingConditionsAtMaximumDryBulb); - OS_DEPRECATED void resetHumidityIndicatingConditionsAtMaximumDryBulb(); + OS_DEPRECATED(3, 3, 0) void resetHumidityIndicatingConditionsAtMaximumDryBulb(); bool setWetBulbOrDewPointAtMaximumDryBulb(double wetBulbOrDewPointAtMaximumDryBulb); @@ -274,11 +274,11 @@ namespace model { /** Sets the dry bulb temperature range modifier day schedule. The appropriate * ScheduleTypeLimits varies depending on the dry bulb temperature range modifier type. Please * see the EnergyPlus input-output reference for details before using this feature. */ - OS_DEPRECATED bool setDryBulbTemperatureRangeModifierSchedule(const ScheduleDay& schedule); + OS_DEPRECATED(3, 3, 0) bool setDryBulbTemperatureRangeModifierSchedule(const ScheduleDay& schedule); bool setDryBulbTemperatureRangeModifierDaySchedule(const ScheduleDay& schedule); - OS_DEPRECATED void resetDryBulbTemperatureRangeModifierSchedule(); + OS_DEPRECATED(3, 3, 0) void resetDryBulbTemperatureRangeModifierSchedule(); void resetDryBulbTemperatureRangeModifierDaySchedule(); @@ -294,19 +294,19 @@ namespace model { void resetDiffuseSolarDaySchedule(); - OS_DEPRECATED bool setAshraeTaub(double ashraeTaub); + OS_DEPRECATED(3, 3, 0) bool setAshraeTaub(double ashraeTaub); bool setAshraeClearSkyOpticalDepthForBeamIrradiance(double ashraeClearSkyOpticalDepthForBeamIrradiance); - OS_DEPRECATED void resetAshraeTaub(); + OS_DEPRECATED(3, 3, 0) void resetAshraeTaub(); void resetAshraeClearSkyOpticalDepthForBeamIrradiance(); - OS_DEPRECATED bool setAshraeTaud(double ashraeTaud); + OS_DEPRECATED(3, 3, 0) bool setAshraeTaud(double ashraeTaud); bool setAshraeClearSkyOpticalDepthForDiffuseIrradiance(double ashraeClearSkyOpticalDepthForDiffuseIrradiance); - OS_DEPRECATED void resetAshraeTaud(); + OS_DEPRECATED(3, 3, 0) void resetAshraeTaud(); void resetAshraeClearSkyOpticalDepthForDiffuseIrradiance(); diff --git a/src/model/EnergyManagementSystemActuator.hpp b/src/model/EnergyManagementSystemActuator.hpp index a78226b98a..89fb5214e1 100644 --- a/src/model/EnergyManagementSystemActuator.hpp +++ b/src/model/EnergyManagementSystemActuator.hpp @@ -100,7 +100,7 @@ namespace model { std::string actuatedComponentType() const; - OS_DEPRECATED boost::optional zoneName() const; + OS_DEPRECATED(3, 6, 0) boost::optional zoneName() const; boost::optional zoneOrSpace() const; boost::optional thermalZone() const; @@ -120,7 +120,7 @@ namespace model { //set the ZoneName field to the Space's ThermalZone's name bool setSpace(const Space& space); - OS_DEPRECATED void resetZoneName(); + OS_DEPRECATED(3, 6, 0) void resetZoneName(); void resetZoneOrSpace(); //@} diff --git a/src/model/GroundHeatExchangerHorizontalTrench.hpp b/src/model/GroundHeatExchangerHorizontalTrench.hpp index ee8eeb233e..ba4db82e88 100644 --- a/src/model/GroundHeatExchangerHorizontalTrench.hpp +++ b/src/model/GroundHeatExchangerHorizontalTrench.hpp @@ -66,7 +66,7 @@ namespace model { static IddObjectType iddObjectType(); - OS_DEPRECATED static std::vector groundTemperatureModelValues(); + OS_DEPRECATED(3, 6, 0) static std::vector groundTemperatureModelValues(); /** @name Getters */ //@{ @@ -101,16 +101,16 @@ namespace model { double soilMoistureContentPercentatSaturation() const; - OS_DEPRECATED std::string groundTemperatureModel() const; + OS_DEPRECATED(3, 6, 0) std::string groundTemperatureModel() const; // cppcheck-suppress functionStatic - OS_DEPRECATED bool isGroundTemperatureModelDefaulted() const; + OS_DEPRECATED(3, 6, 0) bool isGroundTemperatureModelDefaulted() const; - OS_DEPRECATED double kusudaAchenbachAverageSurfaceTemperature() const; + OS_DEPRECATED(3, 6, 0) double kusudaAchenbachAverageSurfaceTemperature() const; - OS_DEPRECATED double kusudaAchenbachAverageAmplitudeofSurfaceTemperature() const; + OS_DEPRECATED(3, 6, 0) double kusudaAchenbachAverageAmplitudeofSurfaceTemperature() const; - OS_DEPRECATED double kusudaAchenbachPhaseShiftofMinimumSurfaceTemperature() const; + OS_DEPRECATED(3, 6, 0) double kusudaAchenbachPhaseShiftofMinimumSurfaceTemperature() const; double evapotranspirationGroundCoverParameter() const; @@ -151,16 +151,16 @@ namespace model { bool setSoilMoistureContentPercentatSaturation(double soilMoistureContentPercentatSaturation); // cppcheck-suppress functionStatic - OS_DEPRECATED bool setGroundTemperatureModel(const std::string& groundTemperatureModel); + OS_DEPRECATED(3, 6, 0) bool setGroundTemperatureModel(const std::string& groundTemperatureModel); // cppcheck-suppress functionStatic - OS_DEPRECATED void resetGroundTemperatureModel(); + OS_DEPRECATED(3, 6, 0) void resetGroundTemperatureModel(); - OS_DEPRECATED bool setKusudaAchenbachAverageSurfaceTemperature(double kusudaAchenbachAverageSurfaceTemperature); + OS_DEPRECATED(3, 6, 0) bool setKusudaAchenbachAverageSurfaceTemperature(double kusudaAchenbachAverageSurfaceTemperature); - OS_DEPRECATED bool setKusudaAchenbachAverageAmplitudeofSurfaceTemperature(double kusudaAchenbachAverageAmplitudeofSurfaceTemperature); + OS_DEPRECATED(3, 6, 0) bool setKusudaAchenbachAverageAmplitudeofSurfaceTemperature(double kusudaAchenbachAverageAmplitudeofSurfaceTemperature); - OS_DEPRECATED bool setKusudaAchenbachPhaseShiftofMinimumSurfaceTemperature(double kusudaAchenbachPhaseShiftofMinimumSurfaceTemperature); + OS_DEPRECATED(3, 6, 0) bool setKusudaAchenbachPhaseShiftofMinimumSurfaceTemperature(double kusudaAchenbachPhaseShiftofMinimumSurfaceTemperature); bool setEvapotranspirationGroundCoverParameter(double evapotranspirationGroundCoverParameter); diff --git a/src/model/HeatPumpWaterToWaterEquationFitCooling.hpp b/src/model/HeatPumpWaterToWaterEquationFitCooling.hpp index ce05b30cb7..c363fdb7dd 100644 --- a/src/model/HeatPumpWaterToWaterEquationFitCooling.hpp +++ b/src/model/HeatPumpWaterToWaterEquationFitCooling.hpp @@ -99,18 +99,18 @@ namespace model { bool isRatedCoolingPowerConsumptionAutosized() const; CurveQuadLinear coolingCapacityCurve() const; - OS_DEPRECATED double coolingCapacityCoefficient1() const; - OS_DEPRECATED double coolingCapacityCoefficient2() const; - OS_DEPRECATED double coolingCapacityCoefficient3() const; - OS_DEPRECATED double coolingCapacityCoefficient4() const; - OS_DEPRECATED double coolingCapacityCoefficient5() const; + OS_DEPRECATED(3, 2, 0) double coolingCapacityCoefficient1() const; + OS_DEPRECATED(3, 2, 0) double coolingCapacityCoefficient2() const; + OS_DEPRECATED(3, 2, 0) double coolingCapacityCoefficient3() const; + OS_DEPRECATED(3, 2, 0) double coolingCapacityCoefficient4() const; + OS_DEPRECATED(3, 2, 0) double coolingCapacityCoefficient5() const; CurveQuadLinear coolingCompressorPowerCurve() const; - OS_DEPRECATED double coolingCompressorPowerCoefficient1() const; - OS_DEPRECATED double coolingCompressorPowerCoefficient2() const; - OS_DEPRECATED double coolingCompressorPowerCoefficient3() const; - OS_DEPRECATED double coolingCompressorPowerCoefficient4() const; - OS_DEPRECATED double coolingCompressorPowerCoefficient5() const; + OS_DEPRECATED(3, 2, 0) double coolingCompressorPowerCoefficient1() const; + OS_DEPRECATED(3, 2, 0) double coolingCompressorPowerCoefficient2() const; + OS_DEPRECATED(3, 2, 0) double coolingCompressorPowerCoefficient3() const; + OS_DEPRECATED(3, 2, 0) double coolingCompressorPowerCoefficient4() const; + OS_DEPRECATED(3, 2, 0) double coolingCompressorPowerCoefficient5() const; double referenceCoefficientofPerformance() const; @@ -148,19 +148,19 @@ namespace model { bool setCoolingCapacityCurve(const CurveQuadLinear& coolingCapacityCurve); - OS_DEPRECATED bool setCoolingCapacityCoefficient1(double coolingCapacityCoefficient1); - OS_DEPRECATED bool setCoolingCapacityCoefficient2(double coolingCapacityCoefficient2); - OS_DEPRECATED bool setCoolingCapacityCoefficient3(double coolingCapacityCoefficient3); - OS_DEPRECATED bool setCoolingCapacityCoefficient4(double coolingCapacityCoefficient4); - OS_DEPRECATED bool setCoolingCapacityCoefficient5(double coolingCapacityCoefficient5); + OS_DEPRECATED(3, 2, 0) bool setCoolingCapacityCoefficient1(double coolingCapacityCoefficient1); + OS_DEPRECATED(3, 2, 0) bool setCoolingCapacityCoefficient2(double coolingCapacityCoefficient2); + OS_DEPRECATED(3, 2, 0) bool setCoolingCapacityCoefficient3(double coolingCapacityCoefficient3); + OS_DEPRECATED(3, 2, 0) bool setCoolingCapacityCoefficient4(double coolingCapacityCoefficient4); + OS_DEPRECATED(3, 2, 0) bool setCoolingCapacityCoefficient5(double coolingCapacityCoefficient5); bool setCoolingCompressorPowerCurve(const CurveQuadLinear& coolingCompressorPowerCurve); - OS_DEPRECATED bool setCoolingCompressorPowerCoefficient1(double coolingCompressorPowerCoefficient1); - OS_DEPRECATED bool setCoolingCompressorPowerCoefficient2(double coolingCompressorPowerCoefficient2); - OS_DEPRECATED bool setCoolingCompressorPowerCoefficient3(double coolingCompressorPowerCoefficient3); - OS_DEPRECATED bool setCoolingCompressorPowerCoefficient4(double coolingCompressorPowerCoefficient4); - OS_DEPRECATED bool setCoolingCompressorPowerCoefficient5(double coolingCompressorPowerCoefficient5); + OS_DEPRECATED(3, 2, 0) bool setCoolingCompressorPowerCoefficient1(double coolingCompressorPowerCoefficient1); + OS_DEPRECATED(3, 2, 0) bool setCoolingCompressorPowerCoefficient2(double coolingCompressorPowerCoefficient2); + OS_DEPRECATED(3, 2, 0) bool setCoolingCompressorPowerCoefficient3(double coolingCompressorPowerCoefficient3); + OS_DEPRECATED(3, 2, 0) bool setCoolingCompressorPowerCoefficient4(double coolingCompressorPowerCoefficient4); + OS_DEPRECATED(3, 2, 0) bool setCoolingCompressorPowerCoefficient5(double coolingCompressorPowerCoefficient5); bool setReferenceCoefficientofPerformance(double referenceCoefficientofPerformance); diff --git a/src/model/HeatPumpWaterToWaterEquationFitHeating.hpp b/src/model/HeatPumpWaterToWaterEquationFitHeating.hpp index e30024b73b..7d938cf66c 100644 --- a/src/model/HeatPumpWaterToWaterEquationFitHeating.hpp +++ b/src/model/HeatPumpWaterToWaterEquationFitHeating.hpp @@ -96,18 +96,18 @@ namespace model { bool isRatedHeatingPowerConsumptionAutosized() const; CurveQuadLinear heatingCapacityCurve() const; - OS_DEPRECATED double heatingCapacityCoefficient1() const; - OS_DEPRECATED double heatingCapacityCoefficient2() const; - OS_DEPRECATED double heatingCapacityCoefficient3() const; - OS_DEPRECATED double heatingCapacityCoefficient4() const; - OS_DEPRECATED double heatingCapacityCoefficient5() const; + OS_DEPRECATED(3, 2, 0) double heatingCapacityCoefficient1() const; + OS_DEPRECATED(3, 2, 0) double heatingCapacityCoefficient2() const; + OS_DEPRECATED(3, 2, 0) double heatingCapacityCoefficient3() const; + OS_DEPRECATED(3, 2, 0) double heatingCapacityCoefficient4() const; + OS_DEPRECATED(3, 2, 0) double heatingCapacityCoefficient5() const; CurveQuadLinear heatingCompressorPowerCurve() const; - OS_DEPRECATED double heatingCompressorPowerCoefficient1() const; - OS_DEPRECATED double heatingCompressorPowerCoefficient2() const; - OS_DEPRECATED double heatingCompressorPowerCoefficient3() const; - OS_DEPRECATED double heatingCompressorPowerCoefficient4() const; - OS_DEPRECATED double heatingCompressorPowerCoefficient5() const; + OS_DEPRECATED(3, 2, 0) double heatingCompressorPowerCoefficient1() const; + OS_DEPRECATED(3, 2, 0) double heatingCompressorPowerCoefficient2() const; + OS_DEPRECATED(3, 2, 0) double heatingCompressorPowerCoefficient3() const; + OS_DEPRECATED(3, 2, 0) double heatingCompressorPowerCoefficient4() const; + OS_DEPRECATED(3, 2, 0) double heatingCompressorPowerCoefficient5() const; double referenceCoefficientofPerformance() const; @@ -145,19 +145,19 @@ namespace model { bool setHeatingCapacityCurve(const CurveQuadLinear& heatingCapacityCurve); - OS_DEPRECATED bool setHeatingCapacityCoefficient1(double heatingCapacityCoefficient1); - OS_DEPRECATED bool setHeatingCapacityCoefficient2(double heatingCapacityCoefficient2); - OS_DEPRECATED bool setHeatingCapacityCoefficient3(double heatingCapacityCoefficient3); - OS_DEPRECATED bool setHeatingCapacityCoefficient4(double heatingCapacityCoefficient4); - OS_DEPRECATED bool setHeatingCapacityCoefficient5(double heatingCapacityCoefficient5); + OS_DEPRECATED(3, 2, 0) bool setHeatingCapacityCoefficient1(double heatingCapacityCoefficient1); + OS_DEPRECATED(3, 2, 0) bool setHeatingCapacityCoefficient2(double heatingCapacityCoefficient2); + OS_DEPRECATED(3, 2, 0) bool setHeatingCapacityCoefficient3(double heatingCapacityCoefficient3); + OS_DEPRECATED(3, 2, 0) bool setHeatingCapacityCoefficient4(double heatingCapacityCoefficient4); + OS_DEPRECATED(3, 2, 0) bool setHeatingCapacityCoefficient5(double heatingCapacityCoefficient5); bool setHeatingCompressorPowerCurve(const CurveQuadLinear& heatingCompressorPowerCurve); - OS_DEPRECATED bool setHeatingCompressorPowerCoefficient1(double heatingCompressorPowerCoefficient1); - OS_DEPRECATED bool setHeatingCompressorPowerCoefficient2(double heatingCompressorPowerCoefficient2); - OS_DEPRECATED bool setHeatingCompressorPowerCoefficient3(double heatingCompressorPowerCoefficient3); - OS_DEPRECATED bool setHeatingCompressorPowerCoefficient4(double heatingCompressorPowerCoefficient4); - OS_DEPRECATED bool setHeatingCompressorPowerCoefficient5(double heatingCompressorPowerCoefficient5); + OS_DEPRECATED(3, 2, 0) bool setHeatingCompressorPowerCoefficient1(double heatingCompressorPowerCoefficient1); + OS_DEPRECATED(3, 2, 0) bool setHeatingCompressorPowerCoefficient2(double heatingCompressorPowerCoefficient2); + OS_DEPRECATED(3, 2, 0) bool setHeatingCompressorPowerCoefficient3(double heatingCompressorPowerCoefficient3); + OS_DEPRECATED(3, 2, 0) bool setHeatingCompressorPowerCoefficient4(double heatingCompressorPowerCoefficient4); + OS_DEPRECATED(3, 2, 0) bool setHeatingCompressorPowerCoefficient5(double heatingCompressorPowerCoefficient5); bool setReferenceCoefficientofPerformance(double referenceCoefficientofPerformance); diff --git a/src/model/ScheduleFile.hpp b/src/model/ScheduleFile.hpp index d1e85d7569..597da74d05 100644 --- a/src/model/ScheduleFile.hpp +++ b/src/model/ScheduleFile.hpp @@ -132,7 +132,7 @@ namespace model { void resetInterpolatetoTimestep(); - OS_DEPRECATED bool setMinutesperItem(const std::string& minutesperItem); + OS_DEPRECATED(3, 2, 0) bool setMinutesperItem(const std::string& minutesperItem); bool setMinutesperItem(int minutesperItem); diff --git a/src/model/SubSurface.hpp b/src/model/SubSurface.hpp index e429488d6d..6d6e007cb3 100644 --- a/src/model/SubSurface.hpp +++ b/src/model/SubSurface.hpp @@ -104,7 +104,7 @@ namespace model { bool allowShadingControl() const; - OS_DEPRECATED boost::optional shadingControl() const; + OS_DEPRECATED(3, 1, 0) boost::optional shadingControl() const; std::vector shadingControls() const; @@ -150,10 +150,10 @@ namespace model { // This will remove this SubSurface from any shading control(s) it is on (`removeAllShadingControls()`) then will call `addShadingControl(shadingControl)` // NOTE: for backward compatibility with C++ interfaces, the argument is kept as `const ShadingControl&`, // but internally this will do a const_cast since the ShadingControl will be mutated - OS_DEPRECATED bool setShadingControl(const ShadingControl& shadingControl); + OS_DEPRECATED(3, 1, 0) bool setShadingControl(const ShadingControl& shadingControl); // Replaced with removeAllShadingControls - OS_DEPRECATED void resetShadingControl(); + OS_DEPRECATED(3, 1, 0) void resetShadingControl(); bool addShadingControl(ShadingControl& shadingControl); diff --git a/src/model/SurfacePropertyExposedFoundationPerimeter.hpp b/src/model/SurfacePropertyExposedFoundationPerimeter.hpp index a6f1295a7d..507371dc66 100644 --- a/src/model/SurfacePropertyExposedFoundationPerimeter.hpp +++ b/src/model/SurfacePropertyExposedFoundationPerimeter.hpp @@ -69,7 +69,7 @@ namespace model { /** @name Getters */ //@{ - OS_DEPRECATED std::string surfaceName() const; + OS_DEPRECATED(3, 7, 0) std::string surfaceName() const; Surface surface() const; diff --git a/src/model/TableMultiVariableLookup.cpp b/src/model/TableMultiVariableLookup.cpp index db5062ff9f..3736196c30 100644 --- a/src/model/TableMultiVariableLookup.cpp +++ b/src/model/TableMultiVariableLookup.cpp @@ -49,6 +49,7 @@ #include "../utilities/math/FloatCompare.hpp" #include "../utilities/core/Assert.hpp" +#include "../utilities/core/DeprecatedHelpers.hpp" #include #include @@ -915,7 +916,7 @@ namespace model { : Curve(TableMultiVariableLookup::iddObjectType(), model) { OS_ASSERT(getImpl()); - LOG(Warn, "TableMultiVariableLookup is deprecated. Use TableLookup instead."); + DEPRECATED_AT_MSG(3, 5, 0, "TableMultiVariableLookup is deprecated. Use TableLookup instead."); // Check if numberofIndependentVariables between 1 and 5 included, otherwise THROW bool ok = getImpl()->setNumberofIndependentVariables(numberofIndependentVariables); diff --git a/src/model/TableMultiVariableLookup.hpp b/src/model/TableMultiVariableLookup.hpp index 12b73e2ce7..025c22d2fa 100644 --- a/src/model/TableMultiVariableLookup.hpp +++ b/src/model/TableMultiVariableLookup.hpp @@ -72,7 +72,7 @@ namespace model { MODEL_API std::ostream& operator<<(std::ostream& out, const openstudio::model::TableMultiVariableLookupPoint& point); /** TableMultiVariableLookup is a Curve that wraps the OpenStudio IDD object 'OS:Table:MultiVariableLookup'. */ - class OS_DEPRECATED MODEL_API TableMultiVariableLookup : public Curve + class OS_DEPRECATED(3, 5, 0) MODEL_API TableMultiVariableLookup : public Curve { public: /** @name Constructors and Destructors */ diff --git a/src/model/ZoneAirMassFlowConservation.hpp b/src/model/ZoneAirMassFlowConservation.hpp index 66e05a0700..fa6798a02b 100644 --- a/src/model/ZoneAirMassFlowConservation.hpp +++ b/src/model/ZoneAirMassFlowConservation.hpp @@ -73,10 +73,10 @@ namespace model { std::string adjustZoneMixingandReturnForAirMassFlowBalance() const; // TODO: makes little sense - OS_DEPRECATED bool adjustZoneMixingForZoneAirMassFlowBalance() const; + OS_DEPRECATED(3, 2, 0) bool adjustZoneMixingForZoneAirMassFlowBalance() const; bool isAdjustZoneMixingandReturnForAirMassFlowBalanceDefaulted() const; - OS_DEPRECATED bool isAdjustZoneMixingForZoneAirMassFlowBalanceDefaulted() const; + OS_DEPRECATED(3, 2, 0) bool isAdjustZoneMixingForZoneAirMassFlowBalanceDefaulted() const; std::string infiltrationBalancingMethod() const; @@ -92,10 +92,10 @@ namespace model { bool setAdjustZoneMixingandReturnForAirMassFlowBalance(const std::string& adjustZoneMixingandReturnForAirMassFlowBalance); // TODO: makes little sense too - OS_DEPRECATED bool setAdjustZoneMixingForZoneAirMassFlowBalance(bool adjustZoneMixingForZoneAirMassFlowBalance); + OS_DEPRECATED(3, 2, 0) bool setAdjustZoneMixingForZoneAirMassFlowBalance(bool adjustZoneMixingForZoneAirMassFlowBalance); void resetAdjustZoneMixingandReturnForAirMassFlowBalance(); - OS_DEPRECATED void resetAdjustZoneMixingForZoneAirMassFlowBalance(); + OS_DEPRECATED(3, 2, 0) void resetAdjustZoneMixingForZoneAirMassFlowBalance(); bool setInfiltrationBalancingMethod(const std::string& infiltrationBalancingMethod); diff --git a/src/model/ZoneHVACEquipmentList.hpp b/src/model/ZoneHVACEquipmentList.hpp index 404f221855..0fe31f81bb 100644 --- a/src/model/ZoneHVACEquipmentList.hpp +++ b/src/model/ZoneHVACEquipmentList.hpp @@ -118,7 +118,7 @@ namespace model { * Returns nothing if when equipment is not in the ZoneHVACEquipmentList, its heating priority is zero, * or the loadDistributionScheme isn't 'Sequential' */ - OS_DEPRECATED boost::optional sequentialCoolingFraction(const ModelObject& equipment) const; + OS_DEPRECATED(2, 9, 0) boost::optional sequentialCoolingFraction(const ModelObject& equipment) const; /** Return the Sequential Cooling Fraction Schedule of equipment. * Returns nothing if when equipment is not in the ZoneHVACEquipmentList, its heating priority is zero, @@ -130,7 +130,7 @@ namespace model { * Returns nothing if when equipment is not in the ZoneHVACEquipmentList, its cooling priority is zero, * or the loadDistributionScheme isn't 'Sequential' */ - OS_DEPRECATED boost::optional sequentialHeatingFraction(const ModelObject& equipment) const; + OS_DEPRECATED(2, 9, 0) boost::optional sequentialHeatingFraction(const ModelObject& equipment) const; /** Return the Sequential Heating Fraction Schedule of equipment. * Returns nothing if when equipment is not in the ZoneHVACEquipmentList, its cooling priority is zero, @@ -142,7 +142,7 @@ namespace model { * Returns false when equipment is not in the ZoneHVACEquipmentList, its cooling priority is zero, * or the loadDistributionScheme isn't 'Sequential' */ - OS_DEPRECATED bool setSequentialCoolingFraction(const ModelObject& equipment, double fraction); + OS_DEPRECATED(2, 9, 0) bool setSequentialCoolingFraction(const ModelObject& equipment, double fraction); /** Set the Sequential Cooling Fraction Schedule of equipment. * Returns false when equipement is not in the ZoneHVACEquipmentList, its cooling priority is zero, @@ -154,7 +154,7 @@ namespace model { * Returns false when equipment is not in the ZoneHVACEquipmentList, its heating priority is zero, * or the loadDistributionScheme isn't 'Sequential' */ - OS_DEPRECATED bool setSequentialHeatingFraction(const ModelObject& equipment, double fraction); + OS_DEPRECATED(2, 9, 0) bool setSequentialHeatingFraction(const ModelObject& equipment, double fraction); /** Set the Sequential Heating Fraction Schedule of equipment. * Returns false when equipment is not in the ZoneHVACEquipmentList, its heating priority is zero, diff --git a/src/model/ZoneHVACLowTempRadiantConstFlow.hpp b/src/model/ZoneHVACLowTempRadiantConstFlow.hpp index 34e5573d06..91cb60c1d8 100644 --- a/src/model/ZoneHVACLowTempRadiantConstFlow.hpp +++ b/src/model/ZoneHVACLowTempRadiantConstFlow.hpp @@ -169,7 +169,7 @@ namespace model { bool setHydronicTubingLength(double hydronicTubingLength); // Will forward to autosizeHydronicTubingLength() - OS_DEPRECATED void resetHydronicTubingLength(); // Shouldn't have existed to begin with. + OS_DEPRECATED(3, 0, 0) void resetHydronicTubingLength(); // Shouldn't have existed to begin with. void autosizeHydronicTubingLength(); @@ -192,7 +192,7 @@ namespace model { bool setRatedFlowRate(double ratedFlowRate); // Will forward to autosizeRatedFlowRate() - OS_DEPRECATED void resetRatedFlowRate(); + OS_DEPRECATED(3, 0, 0) void resetRatedFlowRate(); void autosizeRatedFlowRate(); diff --git a/src/model/ZoneMixing.hpp b/src/model/ZoneMixing.hpp index a9a0b7ee47..cfc64171ef 100644 --- a/src/model/ZoneMixing.hpp +++ b/src/model/ZoneMixing.hpp @@ -87,7 +87,7 @@ namespace model { boost::optional designFlowRate() const; - OS_DEPRECATED boost::optional flowRateperZoneFloorArea() const; + OS_DEPRECATED(3, 5, 0) boost::optional flowRateperZoneFloorArea() const; boost::optional flowRateperFloorArea() const; boost::optional flowRateperPerson() const; @@ -108,19 +108,19 @@ namespace model { /// Returns the temperature schedule containing the receiving zone or space dry-bulb temperature below which mixing is shutoff. boost::optional minimumReceivingTemperatureSchedule() const; - OS_DEPRECATED boost::optional minimumZoneTemperatureSchedule() const; + OS_DEPRECATED(3, 5, 0) boost::optional minimumZoneTemperatureSchedule() const; /// Returns the temperature schedule containing the receiving zone or space dry-bulb temperature above which mixing is shutoff. boost::optional maximumReceivingTemperatureSchedule() const; - OS_DEPRECATED boost::optional maximumZoneTemperatureSchedule() const; + OS_DEPRECATED(3, 5, 0) boost::optional maximumZoneTemperatureSchedule() const; /// Returns the temperature schedule containing the source zone or space dry-bulb temperature below which mixing is shutoff. boost::optional minimumSourceTemperatureSchedule() const; - OS_DEPRECATED boost::optional minimumSourceZoneTemperatureSchedule() const; + OS_DEPRECATED(3, 5, 0) boost::optional minimumSourceZoneTemperatureSchedule() const; /// Returns the temperature schedule containing the source zone or space dry-bulb temperature above which mixing is shutoff. boost::optional maximumSourceTemperatureSchedule() const; - OS_DEPRECATED boost::optional maximumSourceZoneTemperatureSchedule() const; + OS_DEPRECATED(3, 5, 0) boost::optional maximumSourceZoneTemperatureSchedule() const; /// Returns the temperature schedule containing the outdoor temperature below which mixing is shutoff. boost::optional minimumOutdoorTemperatureSchedule() const; @@ -138,7 +138,7 @@ namespace model { bool setDesignFlowRate(double designFlowRate); bool setFlowRateperFloorArea(double flowRateperFloorArea); - OS_DEPRECATED bool setFlowRateperZoneFloorArea(double flowRateperZoneFloorArea); + OS_DEPRECATED(3, 5, 0) bool setFlowRateperZoneFloorArea(double flowRateperZoneFloorArea); bool setFlowRateperPerson(double flowRateperPerson); @@ -146,7 +146,7 @@ namespace model { /// Sets the ThermalZone which supplies air to this mixing object. bool setSourceZone(const ThermalZone& zone); - OS_DEPRECATED void resetSourceZone(); + OS_DEPRECATED(3, 5, 0) void resetSourceZone(); bool setSourceSpace(const Space& space); void resetSourceZoneOrSpace(); @@ -165,29 +165,29 @@ namespace model { bool setMinimumReceivingTemperatureSchedule(Schedule& schedule); void resetMinimumReceivingTemperatureSchedule(); - OS_DEPRECATED bool setMinimumZoneTemperatureSchedule(Schedule& schedule); - OS_DEPRECATED void resetMinimumZoneTemperatureSchedule(); + OS_DEPRECATED(3, 5, 0) bool setMinimumZoneTemperatureSchedule(Schedule& schedule); + OS_DEPRECATED(3, 5, 0) void resetMinimumZoneTemperatureSchedule(); /// Sets the temperature schedule containing the receiving zone dry-bulb temperature above which mixing is shutoff. bool setMaximumReceivingTemperatureSchedule(Schedule& schedule); void resetMaximumReceivingTemperatureSchedule(); - OS_DEPRECATED bool setMaximumZoneTemperatureSchedule(Schedule& schedule); - OS_DEPRECATED void resetMaximumZoneTemperatureSchedule(); + OS_DEPRECATED(3, 5, 0) bool setMaximumZoneTemperatureSchedule(Schedule& schedule); + OS_DEPRECATED(3, 5, 0) void resetMaximumZoneTemperatureSchedule(); /// Sets the temperature schedule containing the source zone dry-bulb temperature below which mixing is shutoff. bool setMinimumSourceTemperatureSchedule(Schedule& schedule); void resetMinimumSourceTemperatureSchedule(); - OS_DEPRECATED bool setMinimumSourceZoneTemperatureSchedule(Schedule& schedule); - OS_DEPRECATED void resetMinimumSourceZoneTemperatureSchedule(); + OS_DEPRECATED(3, 5, 0) bool setMinimumSourceZoneTemperatureSchedule(Schedule& schedule); + OS_DEPRECATED(3, 5, 0) void resetMinimumSourceZoneTemperatureSchedule(); /// Sets the temperature schedule containing the source zone dry-bulb temperature above which mixing is shutoff. bool setMaximumSourceTemperatureSchedule(Schedule& schedule); void resetMaximumSourceTemperatureSchedule(); - OS_DEPRECATED bool setMaximumSourceZoneTemperatureSchedule(Schedule& schedule); - OS_DEPRECATED void resetMaximumSourceZoneTemperatureSchedule(); + OS_DEPRECATED(3, 5, 0) bool setMaximumSourceZoneTemperatureSchedule(Schedule& schedule); + OS_DEPRECATED(3, 5, 0) void resetMaximumSourceZoneTemperatureSchedule(); /// Returns the temperature schedule containing the outdoor temperature below which mixing is shutoff. bool setMinimumOutdoorTemperatureSchedule(Schedule& schedule); diff --git a/src/utilities/bcl/RemoteBCL.hpp b/src/utilities/bcl/RemoteBCL.hpp index c4ae356650..db1b910fa5 100644 --- a/src/utilities/bcl/RemoteBCL.hpp +++ b/src/utilities/bcl/RemoteBCL.hpp @@ -187,22 +187,22 @@ class UTILITIES_API RemoteBCL : public BCL /// Wait number of milliseconds for download to complete /// Returns the download if it completed in the allowable time boost::optional waitForComponentDownload() const; - OS_DEPRECATED boost::optional waitForComponentDownload(int) const; + OS_DEPRECATED(3, 2, 1) boost::optional waitForComponentDownload(int) const; /// Wait number of milliseconds for download to complete /// Returns the download if it completed in the allowable time boost::optional waitForMeasureDownload() const; - OS_DEPRECATED boost::optional waitForMeasureDownload(int) const; + OS_DEPRECATED(3, 2, 1) boost::optional waitForMeasureDownload(int) const; /// Wait number of milliseconds for download to complete /// Returns the download if it completed in the allowable time boost::optional waitForMetaSearch() const; - OS_DEPRECATED boost::optional waitForMetaSearch(int) const; + OS_DEPRECATED(3, 2, 1) boost::optional waitForMetaSearch(int) const; /// Wait number of milliseconds for download to complete /// Returns the download if it completed in the allowable time std::vector waitForSearch() const; - OS_DEPRECATED std::vector waitForSearch(int) const; + OS_DEPRECATED(3, 2, 1) std::vector waitForSearch(int) const; //@} /** @name Non-blocking class members */ diff --git a/src/utilities/core/Deprecated.hpp b/src/utilities/core/Deprecated.hpp index 513fcfa965..e6df9146e8 100644 --- a/src/utilities/core/Deprecated.hpp +++ b/src/utilities/core/Deprecated.hpp @@ -36,9 +36,9 @@ #include "../UtilitiesAPI.hpp" -#ifdef __GNUC__ -# define OS_DEPRECATED __attribute__((deprecated)) -#elif defined(_MSC_VER) +#define OS_DEPRECATED(__deprecatedAtVersionMajor__, __deprecatedAtVersionMinor__, __deprecatedAtVersionPatch__) \ + [[deprecated("Deprecated at " #__deprecatedAtVersionMajor__ "." #__deprecatedAtVersionMinor__ "." #__deprecatedAtVersionPatch__ \ + ". It will be removed after three releases.")]] /// In MSVC this will generate warning C4996 /// To intentionally disable this warning, e.g. in test code that still uses deprecated functionality /// place this around the code that uses the deprecated functionality @@ -51,10 +51,4 @@ /// #pragma warning( pop ) /// #endif -# define OS_DEPRECATED __declspec(deprecated) -#else -# pragma message("WARNING: You need to implement DEPRECATED for this compiler") -# define OS_DEPRECATED -#endif - #endif // UTILITIES_CORE_DEPRECATED_HPP diff --git a/src/utilities/filetypes/RunOptions.hpp b/src/utilities/filetypes/RunOptions.hpp index b872598d5a..3a1b964467 100644 --- a/src/utilities/filetypes/RunOptions.hpp +++ b/src/utilities/filetypes/RunOptions.hpp @@ -110,9 +110,9 @@ class UTILITIES_API RunOptions bool setCustomOutputAdapter(const CustomOutputAdapter& adapter); void resetCustomOutputAdapter(); - OS_DEPRECATED std::string forwardTranslateOptions() const; - OS_DEPRECATED bool setForwardTranslateOptions(const std::string& options); - OS_DEPRECATED void resetForwardTranslateOptions(); + OS_DEPRECATED(3, 6, 0) std::string forwardTranslateOptions() const; + OS_DEPRECATED(3, 6, 0) bool setForwardTranslateOptions(const std::string& options); + OS_DEPRECATED(3, 6, 0) void resetForwardTranslateOptions(); ForwardTranslatorOptions forwardTranslatorOptions() const; bool setForwardTranslatorOptions(const ForwardTranslatorOptions& forwardTranslatorOptions);