Skip to content

Commit

Permalink
Merge pull request #4123 from NREL/issue-4110
Browse files Browse the repository at this point in the history
Addresses #4110, align PTAC and PTHP coils with EnergyPlus
  • Loading branch information
kbenne authored Nov 5, 2020
2 parents 02711c2 + dbbcb3f commit 40de893
Show file tree
Hide file tree
Showing 9 changed files with 354 additions and 7 deletions.
2 changes: 2 additions & 0 deletions src/energyplus/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -675,6 +675,8 @@ set(${target_name}_test_src
Test/ZoneHVACLowTemperatureRadiantElectric_GTest.cpp
Test/ZoneHVACLowTempRadiantConstFlow_GTest.cpp
Test/ZoneHVACLowTempRadiantVarFlow_GTest.cpp
Test/ZoneHVACPackagedTerminalAirConditioner_GTest.cpp
Test/ZoneHVACPackagedTerminalHeatPump_GTest.cpp
Test/ZoneHVACTerminalUnitVariableRefrigerantFlow_GTest.cpp
Test/ZonePropertyUserViewFactorsBySurfaceName_GTest.cpp
Test/ZoneVentilationWindandStackOpenArea_GTest.cpp
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,12 @@
#include "../../model/ThermalZone_Impl.hpp"
#include "../../model/CoilCoolingDXSingleSpeed.hpp"
#include "../../model/CoilCoolingDXSingleSpeed_Impl.hpp"
#include "../../model/CoilCoolingDXVariableSpeed.hpp"
#include "../../model/CoilCoolingDXVariableSpeed_Impl.hpp"
#include "../../model/CoilSystemCoolingDXHeatExchangerAssisted.hpp"
#include "../../model/CoilSystemCoolingDXHeatExchangerAssisted_Impl.hpp"
#include "../../model/HeatExchangerAirToAirSensibleAndLatent.hpp"
#include "../../model/HeatExchangerAirToAirSensibleAndLatent_Impl.hpp"
#include <utilities/idd/ZoneHVAC_PackagedTerminalAirConditioner_FieldEnums.hxx>
#include <utilities/idd/Fan_ConstantVolume_FieldEnums.hxx>
#include <utilities/idd/Fan_OnOff_FieldEnums.hxx>
Expand All @@ -50,6 +56,8 @@
#include <utilities/idd/Coil_Heating_Electric_FieldEnums.hxx>
#include <utilities/idd/Coil_Heating_Water_FieldEnums.hxx>
#include <utilities/idd/Coil_Cooling_DX_SingleSpeed_FieldEnums.hxx>
#include <utilities/idd/Coil_Cooling_DX_VariableSpeed_FieldEnums.hxx>
#include <utilities/idd/HeatExchanger_AirToAir_SensibleAndLatent_FieldEnums.hxx>
#include <utilities/idd/OutdoorAir_Mixer_FieldEnums.hxx>
#include "../../utilities/idd/IddEnums.hpp"
#include "../../utilities/math/FloatCompare.hpp"
Expand Down Expand Up @@ -382,6 +390,21 @@ boost::optional<IdfObject> ForwardTranslator::translateZoneHVACPackagedTerminalA
_coolingCoil->setString(Coil_Cooling_DX_SingleSpeedFields::AirInletNodeName,coolingCoilInletNodeName);

_coolingCoil->setString(Coil_Cooling_DX_SingleSpeedFields::AirOutletNodeName,coolingCoilOutletNodeName);
} else if( _coolingCoil->iddObject().type() == IddObjectType::Coil_Cooling_DX_VariableSpeed )
{
_coolingCoil->setString(Coil_Cooling_DX_VariableSpeedFields::IndoorAirInletNodeName,coolingCoilInletNodeName);

_coolingCoil->setString(Coil_Cooling_DX_VariableSpeedFields::IndoorAirOutletNodeName,coolingCoilOutletNodeName);
} else if( _coolingCoil->iddObject().type() == IddObjectType::CoilSystem_Cooling_DX_HeatExchangerAssisted )
{
auto hx = coolingCoil.cast<CoilSystemCoolingDXHeatExchangerAssisted>().heatExchanger();
boost::optional<IdfObject> _heatExchanger = translateAndMapModelObject(hx);
if( _heatExchanger ) {
if( _heatExchanger->iddObject().type() == IddObjectType::HeatExchanger_AirToAir_SensibleAndLatent ) {
_heatExchanger->setString(HeatExchanger_AirToAir_SensibleAndLatentFields::SupplyAirInletNodeName,coolingCoilInletNodeName);
_heatExchanger->setString(HeatExchanger_AirToAir_SensibleAndLatentFields::ExhaustAirOutletNodeName,coolingCoilOutletNodeName);
}
}
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,19 +39,30 @@
#include "../../model/ThermalZone_Impl.hpp"
#include "../../model/CoilCoolingDXSingleSpeed.hpp"
#include "../../model/CoilCoolingDXSingleSpeed_Impl.hpp"
#include "../../model/CoilCoolingDXVariableSpeed.hpp"
#include "../../model/CoilCoolingDXVariableSpeed_Impl.hpp"
#include "../../model/CoilSystemCoolingDXHeatExchangerAssisted.hpp"
#include "../../model/CoilSystemCoolingDXHeatExchangerAssisted_Impl.hpp"
#include "../../model/HeatExchangerAirToAirSensibleAndLatent.hpp"
#include "../../model/HeatExchangerAirToAirSensibleAndLatent_Impl.hpp"
#include "../../model/CoilHeatingDXSingleSpeed.hpp"
#include "../../model/CoilHeatingDXSingleSpeed_Impl.hpp"
#include "../../model/CoilHeatingDXVariableSpeed.hpp"
#include "../../model/CoilHeatingDXVariableSpeed_Impl.hpp"
#include "../../model/AirLoopHVAC.hpp"
#include "../../model/AirLoopHVAC_Impl.hpp"
#include <utilities/idd/ZoneHVAC_PackagedTerminalHeatPump_FieldEnums.hxx>
#include <utilities/idd/Fan_ConstantVolume_FieldEnums.hxx>
#include <utilities/idd/Fan_OnOff_FieldEnums.hxx>
#include <utilities/idd/Fan_SystemModel_FieldEnums.hxx>
#include <utilities/idd/Coil_Heating_DX_SingleSpeed_FieldEnums.hxx>
#include <utilities/idd/Coil_Heating_DX_VariableSpeed_FieldEnums.hxx>
#include <utilities/idd/Coil_Heating_Fuel_FieldEnums.hxx>
#include <utilities/idd/Coil_Heating_Electric_FieldEnums.hxx>
#include <utilities/idd/Coil_Heating_Water_FieldEnums.hxx>
#include <utilities/idd/Coil_Cooling_DX_SingleSpeed_FieldEnums.hxx>
#include <utilities/idd/Coil_Cooling_DX_VariableSpeed_FieldEnums.hxx>
#include <utilities/idd/HeatExchanger_AirToAir_SensibleAndLatent_FieldEnums.hxx>
#include <utilities/idd/OutdoorAir_Mixer_FieldEnums.hxx>
#include "../../utilities/idd/IddEnums.hpp"
#include "../../utilities/math/FloatCompare.hpp"
Expand Down Expand Up @@ -316,6 +327,20 @@ boost::optional<IdfObject> ForwardTranslator::translateZoneHVACPackagedTerminalH
_heatingCoil->setString(Coil_Heating_DX_SingleSpeedFields::AirOutletNodeName,heatingCoilOutletNodeName);
}
}
} else if( boost::optional<CoilHeatingDXVariableSpeed> coilHeatingDXVariableSpeed = heatingCoil.optionalCast<CoilHeatingDXVariableSpeed>() )
{
if( boost::optional<IdfObject> _heatingCoil = translateCoilHeatingDXVariableSpeedWithoutUnitary(coilHeatingDXVariableSpeed.get()) )
{
idfObject.setString(ZoneHVAC_PackagedTerminalHeatPumpFields::HeatingCoilObjectType,_heatingCoil->iddObject().name() );

idfObject.setString(ZoneHVAC_PackagedTerminalHeatPumpFields::HeatingCoilName,_heatingCoil->name().get() );

if( _heatingCoil->iddObject().type() == IddObjectType::Coil_Heating_DX_VariableSpeed )
{
_heatingCoil->setString(Coil_Heating_DX_VariableSpeedFields::IndoorAirInletNodeName,coolingCoilOutletNodeName);
_heatingCoil->setString(Coil_Heating_DX_VariableSpeedFields::IndoorAirOutletNodeName,heatingCoilOutletNodeName);
}
}
}

// HeatingConvergenceTolerance
Expand All @@ -335,6 +360,11 @@ boost::optional<IdfObject> ForwardTranslator::translateZoneHVACPackagedTerminalH
{
_coolingCoil = translateCoilCoolingDXSingleSpeedWithoutUnitary(dxCoil.get());

m_map.insert(std::make_pair(coolingCoil.handle(),_coolingCoil.get()));
} else if( boost::optional<CoilCoolingDXVariableSpeed> dxCoil = coolingCoil.optionalCast<CoilCoolingDXVariableSpeed>() )
{
_coolingCoil = translateCoilCoolingDXVariableSpeedWithoutUnitary(dxCoil.get());

m_map.insert(std::make_pair(coolingCoil.handle(),_coolingCoil.get()));
}
else
Expand Down Expand Up @@ -365,6 +395,21 @@ boost::optional<IdfObject> ForwardTranslator::translateZoneHVACPackagedTerminalH
_coolingCoil->setString(Coil_Cooling_DX_SingleSpeedFields::AirInletNodeName,coolingCoilInletNodeName);

_coolingCoil->setString(Coil_Cooling_DX_SingleSpeedFields::AirOutletNodeName,coolingCoilOutletNodeName);
} else if( _coolingCoil->iddObject().type() == IddObjectType::Coil_Cooling_DX_VariableSpeed )
{
_coolingCoil->setString(Coil_Cooling_DX_VariableSpeedFields::IndoorAirInletNodeName,coolingCoilInletNodeName);

_coolingCoil->setString(Coil_Cooling_DX_VariableSpeedFields::IndoorAirOutletNodeName,coolingCoilOutletNodeName);
} else if( _coolingCoil->iddObject().type() == IddObjectType::CoilSystem_Cooling_DX_HeatExchangerAssisted )
{
auto hx = coolingCoil.cast<CoilSystemCoolingDXHeatExchangerAssisted>().heatExchanger();
boost::optional<IdfObject> _heatExchanger = translateAndMapModelObject(hx);
if( _heatExchanger ) {
if( _heatExchanger->iddObject().type() == IddObjectType::HeatExchanger_AirToAir_SensibleAndLatent ) {
_heatExchanger->setString(HeatExchanger_AirToAir_SensibleAndLatentFields::SupplyAirInletNodeName,coolingCoilInletNodeName);
_heatExchanger->setString(HeatExchanger_AirToAir_SensibleAndLatentFields::ExhaustAirOutletNodeName,coolingCoilOutletNodeName);
}
}
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@
#include "../../model/ThermalZone.hpp"
#include "../../model/CoilWaterHeatingDesuperheater.hpp"
#include "../../model/CoilCoolingDXSingleSpeed.hpp"
#include "../../model/CoilCoolingDXVariableSpeed.hpp"
#include "../../model/CoilSystemCoolingDXHeatExchangerAssisted.hpp"
#include "../../model/CoilHeatingElectric.hpp"
#include "../../model/FanConstantVolume.hpp"

Expand Down Expand Up @@ -77,3 +79,64 @@ TEST_F(EnergyPlusFixture, ForwardTranslator_ZoneHVACPackagedTerminalAirCondition
EXPECT_EQ(0u, workspace.getObjectsByType(IddObjectType::CoilSystem_Cooling_DX).size());

}

TEST_F(EnergyPlusFixture, ForwardTranslator_ZoneHVACPackagedTerminalAirConditioner_CoilCoolingDXVariableSpeed) {

Model m;

Schedule sch = m.alwaysOnDiscreteSchedule();
FanConstantVolume fan(m);
CoilCoolingDXVariableSpeed cc(m);
CoilHeatingElectric hc(m);

ZoneHVACPackagedTerminalAirConditioner ptac(m, sch, fan, hc, cc);

// Need to be in a thermal zone to be translated
ThermalZone z(m);
ptac.addToThermalZone(z);

ForwardTranslator forwardTranslator;
Workspace workspace = forwardTranslator.translateModel(m);

WorkspaceObjectVector idfObjs(workspace.getObjectsByType(IddObjectType::ZoneHVAC_PackagedTerminalAirConditioner));
ASSERT_EQ(1u, idfObjs.size());
WorkspaceObject idf_ptac(idfObjs[0]);

// Check that the DX coil ends up directly onto the object, and NOT a CoilSystem:Cooling:DX wrapper
EXPECT_EQ("Coil:Cooling:DX:VariableSpeed", idf_ptac.getString(ZoneHVAC_PackagedTerminalAirConditionerFields::CoolingCoilObjectType).get());
EXPECT_EQ(cc.nameString(), idf_ptac.getString(ZoneHVAC_PackagedTerminalAirConditionerFields::CoolingCoilName).get());

EXPECT_EQ(0u, workspace.getObjectsByType(IddObjectType::CoilSystem_Cooling_DX).size());

}

TEST_F(EnergyPlusFixture, ForwardTranslator_ZoneHVACPackagedTerminalAirConditioner_CoilSystemCoolingDXHeatExchangerAssisted) {

Model m;

Schedule sch = m.alwaysOnDiscreteSchedule();
FanConstantVolume fan(m);
CoilSystemCoolingDXHeatExchangerAssisted cc(m);
CoilHeatingElectric hc(m);

ZoneHVACPackagedTerminalAirConditioner ptac(m, sch, fan, hc, cc);

// Need to be in a thermal zone to be translated
ThermalZone z(m);
ptac.addToThermalZone(z);

ForwardTranslator forwardTranslator;
Workspace workspace = forwardTranslator.translateModel(m);

WorkspaceObjectVector idfObjs(workspace.getObjectsByType(IddObjectType::ZoneHVAC_PackagedTerminalAirConditioner));
ASSERT_EQ(1u, idfObjs.size());
WorkspaceObject idf_ptac(idfObjs[0]);

// Check that the DX coil ends up directly onto the object, and NOT a CoilSystem:Cooling:DX wrapper|
EXPECT_EQ("CoilSystem:Cooling:DX:HeatExchangerAssisted", idf_ptac.getString(ZoneHVAC_PackagedTerminalAirConditionerFields::CoolingCoilObjectType).get());
EXPECT_EQ(cc.nameString(), idf_ptac.getString(ZoneHVAC_PackagedTerminalAirConditionerFields::CoolingCoilName).get());

EXPECT_EQ(0u, workspace.getObjectsByType(IddObjectType::CoilSystem_Cooling_DX).size());
EXPECT_EQ(1u, workspace.getObjectsByType(IddObjectType::CoilSystem_Cooling_DX_HeatExchangerAssisted).size());

}
155 changes: 155 additions & 0 deletions src/energyplus/Test/ZoneHVACPackagedTerminalHeatPump_GTest.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,155 @@
/***********************************************************************************************************************
* OpenStudio(R), Copyright (c) 2008-2020, 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.
***********************************************************************************************************************/

#include <gtest/gtest.h>
#include "EnergyPlusFixture.hpp"

#include "../ForwardTranslator.hpp"
#include "../../model/Model.hpp"
#include "../../model/ZoneHVACPackagedTerminalHeatPump.hpp"
#include "../../model/ThermalZone.hpp"
#include "../../model/CoilHeatingDXSingleSpeed.hpp"
#include "../../model/CoilHeatingDXVariableSpeed.hpp"
#include "../../model/CoilCoolingDXSingleSpeed.hpp"
#include "../../model/CoilCoolingDXVariableSpeed.hpp"
#include "../../model/CoilSystemCoolingDXHeatExchangerAssisted.hpp"
#include "../../model/CoilHeatingElectric.hpp"
#include "../../model/FanConstantVolume.hpp"

#include "../../model/ScheduleConstant.hpp"

#include <utilities/idd/ZoneHVAC_PackagedTerminalHeatPump_FieldEnums.hxx>
#include <utilities/idd/IddEnums.hxx>

using namespace openstudio::energyplus;
using namespace openstudio::model;
using namespace openstudio;

TEST_F(EnergyPlusFixture, ForwardTranslator_ZoneHVACPackagedTerminalHeatPump) {

Model m;

Schedule sch = m.alwaysOnDiscreteSchedule();
FanConstantVolume fan(m,sch);
CoilHeatingDXSingleSpeed hc(m);
CoilCoolingDXSingleSpeed cc(m);
CoilHeatingElectric shc(m);

ZoneHVACPackagedTerminalHeatPump pthp(m, sch, fan, hc, cc, shc);

// Need to be in a thermal zone to be translated
ThermalZone z(m);
pthp.addToThermalZone(z);

ForwardTranslator forwardTranslator;
Workspace workspace = forwardTranslator.translateModel(m);

WorkspaceObjectVector idfObjs(workspace.getObjectsByType(IddObjectType::ZoneHVAC_PackagedTerminalHeatPump));
ASSERT_EQ(1u, idfObjs.size());
WorkspaceObject idf_pthp(idfObjs[0]);

EXPECT_EQ("Coil:Heating:DX:SingleSpeed", idf_pthp.getString(ZoneHVAC_PackagedTerminalHeatPumpFields::HeatingCoilObjectType).get());
EXPECT_EQ(hc.nameString(), idf_pthp.getString(ZoneHVAC_PackagedTerminalHeatPumpFields::HeatingCoilName).get());

// Check that the DX coil ends up directly onto the object, and NOT a CoilSystem:Cooling:DX wrapper|
EXPECT_EQ("Coil:Cooling:DX:SingleSpeed", idf_pthp.getString(ZoneHVAC_PackagedTerminalHeatPumpFields::CoolingCoilObjectType).get());
EXPECT_EQ(cc.nameString(), idf_pthp.getString(ZoneHVAC_PackagedTerminalHeatPumpFields::CoolingCoilName).get());

EXPECT_EQ(0u, workspace.getObjectsByType(IddObjectType::CoilSystem_Cooling_DX).size());

}

TEST_F(EnergyPlusFixture, ForwardTranslator_ZoneHVACPackagedTerminalHeatPump_CoilDXVariableSpeed) {

Model m;

Schedule sch = m.alwaysOnDiscreteSchedule();
FanConstantVolume fan(m,sch);
CoilHeatingDXVariableSpeed hc(m);
CoilCoolingDXVariableSpeed cc(m);
CoilHeatingElectric shc(m);

ZoneHVACPackagedTerminalHeatPump pthp(m, sch, fan, hc, cc, shc);

// Need to be in a thermal zone to be translated
ThermalZone z(m);
pthp.addToThermalZone(z);

ForwardTranslator forwardTranslator;
Workspace workspace = forwardTranslator.translateModel(m);

WorkspaceObjectVector idfObjs(workspace.getObjectsByType(IddObjectType::ZoneHVAC_PackagedTerminalHeatPump));
ASSERT_EQ(1u, idfObjs.size());
WorkspaceObject idf_pthp(idfObjs[0]);

EXPECT_EQ("Coil:Heating:DX:VariableSpeed", idf_pthp.getString(ZoneHVAC_PackagedTerminalHeatPumpFields::HeatingCoilObjectType).get());
EXPECT_EQ(hc.nameString(), idf_pthp.getString(ZoneHVAC_PackagedTerminalHeatPumpFields::HeatingCoilName).get());

// Check that the DX coil ends up directly onto the object, and NOT a CoilSystem:Cooling:DX wrapper|
EXPECT_EQ("Coil:Cooling:DX:VariableSpeed", idf_pthp.getString(ZoneHVAC_PackagedTerminalHeatPumpFields::CoolingCoilObjectType).get());
EXPECT_EQ(cc.nameString(), idf_pthp.getString(ZoneHVAC_PackagedTerminalHeatPumpFields::CoolingCoilName).get());

EXPECT_EQ(0u, workspace.getObjectsByType(IddObjectType::CoilSystem_Cooling_DX).size());

}

TEST_F(EnergyPlusFixture, ForwardTranslator_ZoneHVACPackagedTerminalHeatPump_CoilSystemCoolingDXHeatExchangerAssisted) {

Model m;

Schedule sch = m.alwaysOnDiscreteSchedule();
FanConstantVolume fan(m,sch);
CoilHeatingDXVariableSpeed hc(m);
CoilSystemCoolingDXHeatExchangerAssisted cc(m);
CoilHeatingElectric shc(m);

ZoneHVACPackagedTerminalHeatPump pthp(m, sch, fan, hc, cc, shc);

// Need to be in a thermal zone to be translated
ThermalZone z(m);
pthp.addToThermalZone(z);

ForwardTranslator forwardTranslator;
Workspace workspace = forwardTranslator.translateModel(m);

WorkspaceObjectVector idfObjs(workspace.getObjectsByType(IddObjectType::ZoneHVAC_PackagedTerminalHeatPump));
ASSERT_EQ(1u, idfObjs.size());
WorkspaceObject idf_pthp(idfObjs[0]);

EXPECT_EQ("Coil:Heating:DX:VariableSpeed", idf_pthp.getString(ZoneHVAC_PackagedTerminalHeatPumpFields::HeatingCoilObjectType).get());
EXPECT_EQ(hc.nameString(), idf_pthp.getString(ZoneHVAC_PackagedTerminalHeatPumpFields::HeatingCoilName).get());

// Check that the DX coil ends up directly onto the object, and NOT a CoilSystem:Cooling:DX wrapper|
EXPECT_EQ("CoilSystem:Cooling:DX:HeatExchangerAssisted", idf_pthp.getString(ZoneHVAC_PackagedTerminalHeatPumpFields::CoolingCoilObjectType).get());
EXPECT_EQ(cc.nameString(), idf_pthp.getString(ZoneHVAC_PackagedTerminalHeatPumpFields::CoolingCoilName).get());

EXPECT_EQ(0u, workspace.getObjectsByType(IddObjectType::CoilSystem_Cooling_DX).size());
EXPECT_EQ(1u, workspace.getObjectsByType(IddObjectType::CoilSystem_Cooling_DX_HeatExchangerAssisted).size());

}
6 changes: 4 additions & 2 deletions src/model/ZoneHVACPackagedTerminalAirConditioner.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -500,15 +500,17 @@ namespace detail {
{
bool isAllowedType = false;

if( coolingCoil.iddObjectType() == IddObjectType::OS_Coil_Cooling_DX_SingleSpeed )
if( (coolingCoil.iddObjectType() == IddObjectType::OS_Coil_Cooling_DX_SingleSpeed) ||
(coolingCoil.iddObjectType() == IddObjectType::OS_Coil_Cooling_DX_VariableSpeed) ||
(coolingCoil.iddObjectType() == IddObjectType::OS_CoilSystem_Cooling_DX_HeatExchangerAssisted) )
{
isAllowedType = true;
}

if( isAllowedType ) {
return setPointer(OS_ZoneHVAC_PackagedTerminalAirConditionerFields::CoolingCoilName,coolingCoil.handle());
} else {
LOG(Warn, "Invalid Cooling Coil Type (expected CoilCoolingDXSingleSpeed, not '" << coolingCoil.iddObjectType().valueName()
LOG(Warn, "Invalid Cooling Coil Type (expected CoilCoolingDXSingleSpeed or CoilSystemCoolingDXHeatExchangerAssisted or CoilCoolingDXVariableSpeed, not '" << coolingCoil.iddObjectType().valueName()
<< "') for " << briefDescription());
return false;
}
Expand Down
Loading

0 comments on commit 40de893

Please # to comment.