diff --git a/src/openstudio_app/Resources/default/hvac_library.osm b/src/openstudio_app/Resources/default/hvac_library.osm index 6cfc0ecf9..5a1207bf5 100644 --- a/src/openstudio_app/Resources/default/hvac_library.osm +++ b/src/openstudio_app/Resources/default/hvac_library.osm @@ -13068,7 +13068,7 @@ OS:Fan:ConstantVolume, OS:Coil:Heating:Gas:MultiStage, {3b1fedfa-eb94-4c41-9ff0-eb695f74535d}, !- Handle Multi Speed HP Gas Htg Coil, !- Name - {1540674d-a780-43fe-a8dd-b0b23e85b39e}, !- Availability Schedule + {9f54092d-a4a8-41b8-a381-c4c332ecb843}, !- Availability Schedule , !- Air Inlet Node , !- Air Outlet Node , !- Part Load Fraction Correlation Curve @@ -13317,7 +13317,7 @@ OS:AirLoopHVAC:UnitaryHeatPump:AirToAir:MultiSpeed, , !- Controlling Zone or Thermostat Location {0f1dd656-a681-48a5-839e-80d7417180c6}, !- Supply Air Fan DrawThrough, !- Supply Air Fan Placement - {1540674d-a780-43fe-a8dd-b0b23e85b39e}, !- Supply Air Fan Operating Mode Schedule + {9f54092d-a4a8-41b8-a381-c4c332ecb843}, !- Supply Air Fan Operating Mode Schedule {3b1fedfa-eb94-4c41-9ff0-eb695f74535d}, !- Heating Coil -8, !- Minimum Outdoor Dry-Bulb Temperature for Compressor Operation {C} {a76a42fb-2594-4514-afb9-fd45a05494fc}, !- Cooling Coil @@ -13342,20 +13342,6 @@ OS:AirLoopHVAC:UnitaryHeatPump:AirToAir:MultiSpeed, autosize, !- Speed 3 Supply Air Flow Rate During Cooling Operation {m3/s} autosize; !- Speed 4 Supply Air Flow Rate During Cooling Operation {m3/s} -OS:Schedule:Constant, - {1540674d-a780-43fe-a8dd-b0b23e85b39e}, !- Handle - Always On Discrete, !- Name - {0dd600d4-b8cb-4c84-8eb6-780de152cd00}, !- Schedule Type Limits Name - 1; !- Value - -OS:ScheduleTypeLimits, - {0dd600d4-b8cb-4c84-8eb6-780de152cd00}, !- Handle - OnOff 1, !- Name - 0, !- Lower Limit Value - 1, !- Upper Limit Value - Discrete, !- Numeric Type - Availability; !- Unit Type - OS:Coil:Cooling:DX:VariableSpeed, {3ef4dbff-bbcf-4645-93ab-fcd09507f984}, !- Handle Coil Cooling DX Variable Speed - Two Speeds, !- Name @@ -13607,3 +13593,65 @@ OS:Schedule:Day, 0, !- Minute 1 27; !- Value Until Time 1 +OS:ZoneHVAC:EvaporativeCoolerUnit, + {d2f28626-5582-4e24-82ed-dfab77b63326}, !- Handle + Zone HVAC Evaporative Cooler Unit, !- Name + {9f54092d-a4a8-41b8-a381-c4c332ecb843}, !- Availability Schedule Name + , !- Availability Manager List Name + , !- Outdoor Air Inlet Node Name + , !- Cooler Outlet Node Name + , !- Zone Relief Air Node Name + {3247e7b6-3164-4d86-8f4e-a8238615ac29}, !- Supply Air Fan Name + autosize, !- Design Supply Air Flow Rate {m3/s} + BlowThrough, !- Fan Placement + ZoneTemperatureDeadbandOnOffCycling, !- Cooler Unit Control Method + 1, !- Throttling Range Temperature Difference {deltaC} + 100, !- Cooling Load Control Threshold Heat Transfer Rate {W} + {5e5b2500-4e30-4444-914c-39676a69a23b}, !- First Evaporative Cooler + , !- Second Evaporative Cooler + , !- Design Specification ZoneHVAC Sizing + 100; !- Shut Off Relative Humidity {percent} + +OS:Fan:SystemModel, + {3247e7b6-3164-4d86-8f4e-a8238615ac29}, !- Handle + Zone HVAC Evaporative Cooler Unit FanSystemModel, !- Name + {9f54092d-a4a8-41b8-a381-c4c332ecb843}, !- Availability Schedule Name + , !- Air Inlet Node Name + , !- Air Outlet Node Name + autosize, !- Design Maximum Air Flow Rate {m3/s} + Discrete, !- Speed Control Method + 0.2, !- Electric Power Minimum Flow Rate Fraction + 500, !- Design Pressure Rise {Pa} + 0.9, !- Motor Efficiency + 1, !- Motor In Air Stream Fraction + autosize, !- Design Electric Power Consumption {W} + PowerPerFlowPerPressure, !- Design Power Sizing Method + 840, !- Electric Power Per Unit Flow Rate {W/(m3/s)} + 1.66667, !- Electric Power Per Unit Flow Rate Per Unit Pressure {W-s/m3-Pa} + 0.7, !- Fan Total Efficiency + , !- Electric Power Function of Flow Fraction Curve Name + , !- Night Ventilation Mode Pressure Rise {Pa} + , !- Night Ventilation Mode Flow Fraction + , !- Motor Loss Zone Name + 0, !- Motor Loss Radiative Fraction + General; !- End-Use Subcategory + +OS:EvaporativeCooler:Direct:ResearchSpecial, + {5e5b2500-4e30-4444-914c-39676a69a23b}, !- Handle + Zone HVAC Evaporative Cooler Unit First Evap Cooler, !- Name + {9f54092d-a4a8-41b8-a381-c4c332ecb843}, !- Availability Schedule Name + 1, !- Cooler Design Effectiveness + 0, !- Recirculating Water Pump Power Consumption {W} + , !- Primary Air Design Flow Rate {m3/s} + , !- Air Inlet Node Name + , !- Air Outlet Node Name + , !- Sensor Node Name + 0, !- Drift Loss Fraction + 0, !- Blowdown Concentration Ratio + , !- Effectiveness Flow Ratio Modifier Curve Name + 0.1, !- Water Pump Power Sizing Factor {W/(m3/s)} + , !- Water Pump Power Modifier Curve Name + 16, !- Evaporative Operation Minimum Drybulb Temperature + 24, !- Evaporative Operation Maximum Limit Wetbulb Temperature + 28; !- Evaporative Operation Maximum Limit Drybulb Temperature + diff --git a/src/openstudio_lib/IconLibrary.cpp b/src/openstudio_lib/IconLibrary.cpp index d1969eb21..59664f894 100644 --- a/src/openstudio_lib/IconLibrary.cpp +++ b/src/openstudio_lib/IconLibrary.cpp @@ -230,6 +230,8 @@ IconLibrary::IconLibrary() { m_icons[openstudio::IddObjectType(openstudio::IddObjectType::OS_ZoneHVAC_Dehumidifier_DX).value()] = new QPixmap(":/images/dehumidifier_dx.png"); m_icons[openstudio::IddObjectType(openstudio::IddObjectType::OS_ZoneHVAC_EnergyRecoveryVentilator).value()] = new QPixmap(":/images/energy_recov_vent.png"); + m_icons[openstudio::IddObjectType(openstudio::IddObjectType::OS_ZoneHVAC_EvaporativeCoolerUnit).value()] = + new QPixmap(":/images/zonehvac_evaporativecoolerunit.png"); m_icons[openstudio::IddObjectType(openstudio::IddObjectType::OS_Coil_Heating_Water_Baseboard).value()] = new QPixmap(":/images/coilheatingwater_baseboard.png"); m_icons[openstudio::IddObjectType(openstudio::IddObjectType::OS_Coil_Heating_Water_Baseboard_Radiant).value()] = @@ -701,6 +703,8 @@ IconLibrary::IconLibrary() { new QPixmap(":/images/mini_icons/coilheatingwater_baseboard_mini.png"); m_miniIcons[openstudio::IddObjectType(openstudio::IddObjectType::OS_Coil_Heating_Water_Baseboard_Radiant).value()] = new QPixmap(":/images/mini_icons/Coil_Heating_Water_Baseboard_Radiant.png"); + m_miniIcons[openstudio::IddObjectType(openstudio::IddObjectType::OS_ZoneHVAC_EvaporativeCoolerUnit).value()] = + new QPixmap(":/images/mini_icons/zonehvac_evaporativecoolerunit.png"); m_miniIcons[openstudio::IddObjectType(openstudio::IddObjectType::OS_ZoneHVAC_FourPipeFanCoil).value()] = new QPixmap(":/images/mini_single_ducts_constant_vol_4pipe.png"); m_miniIcons[openstudio::IddObjectType(openstudio::IddObjectType::OS_ZoneHVAC_HighTemperatureRadiant).value()] = diff --git a/src/openstudio_lib/MainRightColumnController.cpp b/src/openstudio_lib/MainRightColumnController.cpp index 5a91d635b..cffb0f17b 100644 --- a/src/openstudio_lib/MainRightColumnController.cpp +++ b/src/openstudio_lib/MainRightColumnController.cpp @@ -729,15 +729,6 @@ void MainRightColumnController::configureForFacilitySubTab(int subTabID) { myLibraryList->setItemsRemoveable(false); myLibraryList->setItemsType(OSItemType::LibraryItem); - myLibraryList->addModelObjectType(IddObjectType::OS_Fan_ZoneExhaust, "Fan Zone Exhaust"); - myLibraryList->addModelObjectType(IddObjectType::OS_ZoneHVAC_PackagedTerminalHeatPump, "PTHP"); - myLibraryList->addModelObjectType(IddObjectType::OS_ZoneHVAC_PackagedTerminalAirConditioner, "PTAC"); - myLibraryList->addModelObjectType(IddObjectType::OS_ZoneHVAC_WaterToAirHeatPump, "Water To Air HP"); - myLibraryList->addModelObjectType(IddObjectType::OS_ZoneHVAC_LowTemperatureRadiant_ConstantFlow, "Low Temp Radiant Constant Flow"); - myLibraryList->addModelObjectType(IddObjectType::OS_ZoneHVAC_LowTemperatureRadiant_VariableFlow, "Low Temp Radiant Variable Flow"); - myLibraryList->addModelObjectType(IddObjectType::OS_ZoneHVAC_LowTemperatureRadiant_Electric, "Low Temp Radiant Electric"); - myLibraryList->addModelObjectType(IddObjectType::OS_ZoneHVAC_HighTemperatureRadiant, "High Temp Radiant"); - myLibraryList->addModelObjectCategoryPlaceholder("Zone HVAC"); myLibraryList->addModelObjectType(IddObjectType::OS_Construction_WindowDataFile, "Window Data File Constructions"); myLibraryList->addModelObjectType(IddObjectType::OS_Construction_FfactorGroundFloor, "F-factor Ground Floor Constructions"); myLibraryList->addModelObjectType(IddObjectType::OS_Construction_CfactorUndergroundWall, "C-factor Underground Wall Constructions"); @@ -856,15 +847,6 @@ void MainRightColumnController::configureForSpacesSubTab(int subTabID) { myLibraryList->addModelObjectType(IddObjectType::OS_WindowProperty_FrameAndDivider, "Frame And Divider Window Property"); myLibraryList->addModelObjectType(IddObjectType::OS_DaylightingDevice_Shelf, "DaylightingDevice Shelf"); myLibraryList->addModelObjectCategoryPlaceholder("Daylighting"); - myLibraryList->addModelObjectType(IddObjectType::OS_Fan_ZoneExhaust, "Fan Zone Exhaust"); - myLibraryList->addModelObjectType(IddObjectType::OS_ZoneHVAC_PackagedTerminalHeatPump, "PTHP"); - myLibraryList->addModelObjectType(IddObjectType::OS_ZoneHVAC_PackagedTerminalAirConditioner, "PTAC"); - myLibraryList->addModelObjectType(IddObjectType::OS_ZoneHVAC_WaterToAirHeatPump, "Water To Air HP"); - myLibraryList->addModelObjectType(IddObjectType::OS_ZoneHVAC_LowTemperatureRadiant_ConstantFlow, "Low Temp Radiant Constant Flow"); - myLibraryList->addModelObjectType(IddObjectType::OS_ZoneHVAC_LowTemperatureRadiant_VariableFlow, "Low Temp Radiant Variable Flow"); - myLibraryList->addModelObjectType(IddObjectType::OS_ZoneHVAC_LowTemperatureRadiant_Electric, "Low Temp Radiant Electric"); - myLibraryList->addModelObjectType(IddObjectType::OS_ZoneHVAC_HighTemperatureRadiant, "High Temp Radiant"); - myLibraryList->addModelObjectCategoryPlaceholder("Zone HVAC"); myLibraryList->addModelObjectType(IddObjectType::OS_Construction_WindowDataFile, "Window Data File Constructions"); myLibraryList->addModelObjectType(IddObjectType::OS_Construction_FfactorGroundFloor, "F-factor Ground Floor Constructions"); myLibraryList->addModelObjectType(IddObjectType::OS_Construction_CfactorUndergroundWall, "C-factor Underground Wall Constructions"); @@ -949,6 +931,7 @@ void MainRightColumnController::configureForThermalZonesSubTab(int subTabID) { libraryWidget->addModelObjectCategoryPlaceholder("Water Heaters"); libraryWidget->addModelObjectType(IddObjectType::OS_AirLoopHVAC_UnitarySystem, "Unitary System"); libraryWidget->addModelObjectCategoryPlaceholder("Unitary Systems"); + libraryWidget->addModelObjectType(IddObjectType::OS_ZoneHVAC_EvaporativeCoolerUnit, "Evaporative Cooler Unit"); libraryWidget->addModelObjectType(IddObjectType::OS_ZoneHVAC_CoolingPanel_RadiantConvective_Water, "Cooling Panel Radiant Convective Water"); libraryWidget->addModelObjectType(IddObjectType::OS_ZoneHVAC_Baseboard_Convective_Electric, "Baseboard Convective Electric"); libraryWidget->addModelObjectType(IddObjectType::OS_ZoneHVAC_Baseboard_Convective_Water, "Baseboard Convective Water"); diff --git a/src/openstudio_lib/images/mini_icons/zonehvac_evaporativecoolerunit.png b/src/openstudio_lib/images/mini_icons/zonehvac_evaporativecoolerunit.png new file mode 100644 index 000000000..523f20cc7 Binary files /dev/null and b/src/openstudio_lib/images/mini_icons/zonehvac_evaporativecoolerunit.png differ diff --git a/src/openstudio_lib/images/mini_icons/zonehvac_evaporativecoolerunit@2x.png b/src/openstudio_lib/images/mini_icons/zonehvac_evaporativecoolerunit@2x.png new file mode 100644 index 000000000..692da3d2c Binary files /dev/null and b/src/openstudio_lib/images/mini_icons/zonehvac_evaporativecoolerunit@2x.png differ diff --git a/src/openstudio_lib/images/zonehvac_evaporativecoolerunit.png b/src/openstudio_lib/images/zonehvac_evaporativecoolerunit.png new file mode 100644 index 000000000..9bf7182f3 Binary files /dev/null and b/src/openstudio_lib/images/zonehvac_evaporativecoolerunit.png differ diff --git a/src/openstudio_lib/images/zonehvac_evaporativecoolerunit@2x.png b/src/openstudio_lib/images/zonehvac_evaporativecoolerunit@2x.png new file mode 100644 index 000000000..a881738df Binary files /dev/null and b/src/openstudio_lib/images/zonehvac_evaporativecoolerunit@2x.png differ diff --git a/src/openstudio_lib/library/OpenStudioPolicy.xml b/src/openstudio_lib/library/OpenStudioPolicy.xml index 13804b279..15143aa1a 100644 --- a/src/openstudio_lib/library/OpenStudioPolicy.xml +++ b/src/openstudio_lib/library/OpenStudioPolicy.xml @@ -153,6 +153,13 @@ + + + + + + + diff --git a/src/openstudio_lib/openstudio.qrc b/src/openstudio_lib/openstudio.qrc index c254c7fb1..2a984c23c 100644 --- a/src/openstudio_lib/openstudio.qrc +++ b/src/openstudio_lib/openstudio.qrc @@ -655,6 +655,8 @@ images/zone_icon_off@2x.png images/zone_icon_pressed.png images/zone_icon_pressed@2x.png + images/zonehvac_evaporativecoolerunit.png + images/zonehvac_evaporativecoolerunit@2x.png images/zonehvac_low_temperature_radiant_electric.png images/zonehvac_low_temperature_radiant_electric@2x.png images/zonehvac_coolingpanel_radiantconvective_water.png @@ -1122,6 +1124,8 @@ images/mini_icons/window_material_gasmixture@2x.png images/mini_icons/window_material_glazing.png images/mini_icons/window_material_glazing@2x.png + images/mini_icons/zonehvac_evaporativecoolerunit.png + images/mini_icons/zonehvac_evaporativecoolerunit@2x.png images/mini_icons/zonehvac_low_temperature_radiant_electric.png images/mini_icons/zonehvac_low_temperature_radiant_electric@2x.png images/mini_icons/zonehvac_coolingpanel_radiantconvective_water.png diff --git a/src/openstudio_lib/test/IconLibrary_GTest.cpp b/src/openstudio_lib/test/IconLibrary_GTest.cpp index ada2d8f5a..6ab0e5592 100644 --- a/src/openstudio_lib/test/IconLibrary_GTest.cpp +++ b/src/openstudio_lib/test/IconLibrary_GTest.cpp @@ -99,6 +99,7 @@ TEST_F(OpenStudioLibFixture, IconLibrary_Icon) { //iddObjectTypes.push_back(IddObjectType::OS_WindowMaterial_Screen); //iddObjectTypes.push_back(IddObjectType::OS_WindowMaterial_Shade); //iddObjectTypes.push_back(IddObjectType::OS_WindowMaterial_SimpleGlazingSystem); + iddObjectTypes.push_back(IddObjectType::OS_ZoneHVAC_EvaporativeCoolerUnit); iddObjectTypes.push_back(IddObjectType::OS_ZoneHVAC_CoolingPanel_RadiantConvective_Water); iddObjectTypes.push_back(IddObjectType::OS_ZoneHVAC_PackagedTerminalAirConditioner); iddObjectTypes.push_back(IddObjectType::OS_ZoneHVAC_PackagedTerminalHeatPump); @@ -198,6 +199,7 @@ TEST_F(OpenStudioLibFixture, IconLibrary_MiniIcon) { iddObjectTypes.push_back(IddObjectType::OS_WindowMaterial_Screen); iddObjectTypes.push_back(IddObjectType::OS_WindowMaterial_Shade); iddObjectTypes.push_back(IddObjectType::OS_WindowMaterial_SimpleGlazingSystem); + iddObjectTypes.push_back(IddObjectType::OS_ZoneHVAC_EvaporativeCoolerUnit); iddObjectTypes.push_back(IddObjectType::OS_ZoneHVAC_CoolingPanel_RadiantConvective_Water); iddObjectTypes.push_back(IddObjectType::OS_ZoneHVAC_PackagedTerminalAirConditioner); iddObjectTypes.push_back(IddObjectType::OS_ZoneHVAC_PackagedTerminalHeatPump);