Skip to content

Commit

Permalink
Merge pull request #111 from NREL/mpsh-pan-heater-bugfix
Browse files Browse the repository at this point in the history 
Latest measures.
  • Loading branch information
@shorowit
shorowit committed Oct 20, 2017
2 parents 8b2a52a + f9f7893 commit ae29b71
Show file tree
Hide file tree
Showing 64 changed files with 1,868 additions and 881 deletions.
34 changes: 32 additions & 2 deletions measures/TimeseriesCSVExport/measure.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<schema_version>3.0</schema_version>
<name>timeseries_csv_export</name>
<uid>2a3442c1-944d-4e91-9e11-11e0cf368c64</uid>
<version_id>3f6e6464-3318-4f09-b2dc-d4c5999a4d4d</version_id>
<version_modified>20171018T041304Z</version_modified>
<version_id>b020ce9c-3783-49cc-b50f-12d52e9c66fc</version_id>
<version_modified>20171017T211650Z</version_modified>
<xml_checksum>15BF4E57</xml_checksum>
<class_name>TimeseriesCSVExport</class_name>
<display_name>Timeseries CSV Export</display_name>
Expand Down Expand Up @@ -76,6 +76,30 @@
</attribute>
</attributes>
<files>
<file>
<filename>SFD_Successful_EnergyPlus_Run_AMY.osm</filename>
<filetype>osm</filetype>
<usage_type>test</usage_type>
<checksum>9D71F795</checksum>
</file>
<file>
<filename>SFD_Successful_EnergyPlus_Run_TMY.osm</filename>
<filetype>osm</filetype>
<usage_type>test</usage_type>
<checksum>D9A8217C</checksum>
</file>
<file>
<filename>USA_CO_Denver_Intl_AP_725650_TMY3.epw</filename>
<filetype>epw</filetype>
<usage_type>test</usage_type>
<checksum>E23378AA</checksum>
</file>
<file>
<filename>DuPage_17043_725300_880860.epw</filename>
<filetype>epw</filetype>
<usage_type>test</usage_type>
<checksum>335AE046</checksum>
</file>
<file>
<filename>constants.rb</filename>
<filetype>rb</filetype>
Expand Down Expand Up @@ -106,6 +130,12 @@
<usage_type>resource</usage_type>
<checksum>03F09690</checksum>
</file>
<file>
<filename>timeseries_csv_export_test.rb</filename>
<filetype>rb</filetype>
<usage_type>test</usage_type>
<checksum>003DCA9B</checksum>
</file>
<file>
<version>
<software_program>OpenStudio</software_program>
Expand Down
46 changes: 38 additions & 8 deletions measures/UtilityBillCalculations/measure.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<schema_version>3.0</schema_version>
<name>utility_bill_calculations</name>
<uid>872cd20c-55df-459e-9ac9-f42c93ab665c</uid>
<version_id>f448c843-dac9-427d-ac6d-5266a7cb3640</version_id>
<version_modified>20171018T041305Z</version_modified>
<version_id>5f67dd1a-7fab-4b81-babe-0d987c40f6c3</version_id>
<version_modified>20171005T141219Z</version_modified>
<xml_checksum>6159342E</xml_checksum>
<class_name>UtilityBillCalculations</class_name>
<display_name>Utility Bill Calculations</display_name>
Expand Down Expand Up @@ -100,12 +100,30 @@
<usage_type>resource</usage_type>
<checksum>C9F510A2</checksum>
</file>
<file>
<filename>USA_CO_Denver_Intl_AP_725650_TMY3.epw</filename>
<filetype>epw</filetype>
<usage_type>test</usage_type>
<checksum>E23378AA</checksum>
</file>
<file>
<filename>sam-sdk-2017-1-17-r1.zip</filename>
<filetype>zip</filetype>
<usage_type>resource</usage_type>
<checksum>14339B8F</checksum>
</file>
<file>
<filename>utilities.csv</filename>
<filetype>csv</filetype>
<usage_type>resource</usage_type>
<checksum>49E7C310</checksum>
</file>
<file>
<filename>result.json</filename>
<filetype>json</filetype>
<usage_type>test</usage_type>
<checksum>EF682B2D</checksum>
</file>
<file>
<filename>by_nsrdb.csv</filename>
<filetype>csv</filetype>
Expand All @@ -118,6 +136,24 @@
<usage_type>resource</usage_type>
<checksum>3ADEAEFE</checksum>
</file>
<file>
<filename>SFD_2000sqft_2story_SL_UA_Denver.osm</filename>
<filetype>osm</filetype>
<usage_type>test</usage_type>
<checksum>15DB60CF</checksum>
</file>
<file>
<filename>enduse_timeseries.csv</filename>
<filetype>csv</filetype>
<usage_type>test</usage_type>
<checksum>86775404</checksum>
</file>
<file>
<filename>utility_bill_calculations_test.rb</filename>
<filetype>rb</filetype>
<usage_type>test</usage_type>
<checksum>DFC32020</checksum>
</file>
<file>
<version>
<software_program>OpenStudio</software_program>
Expand Down Expand Up @@ -147,11 +183,5 @@
<usage_type>resource</usage_type>
<checksum>D205D809</checksum>
</file>
<file>
<filename>sam-sdk-2017-1-17-r1.zip</filename>
<filetype>zip</filetype>
<usage_type>resource</usage_type>
<checksum>9E486EA4</checksum>
</file>
</files>
</measure>
2 changes: 1 addition & 1 deletion resources/measures/ResidentialAirflow/measure.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2567,7 +2567,7 @@ def _processDuctsForUnit(model, runner, ducts, building, unit)
ducts.has_ducts = false
end

unless HVAC.has_mini_split_heat_pump(model, runner, unit.living_zone, false).nil?
unless HVAC.has_mini_split_heat_pump(model, runner, unit.living_zone, unit, false).nil?
ducts.duct_location_zone = unit.living_zone
ducts.duct_location_name = unit.living_zone.name.to_s
ducts.has_ducts = false
Expand Down
38 changes: 19 additions & 19 deletions resources/measures/ResidentialAirflow/measure.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<schema_version>3.0</schema_version>
<name>residential_airflow</name>
<uid>7d2adf5c-9995-49be-b662-a23d2452bb36</uid>
<version_id>f71dec46-1058-415c-ad6d-177e7c48e932</version_id>
<version_modified>20171011T185047Z</version_modified>
<version_id>63c62150-718b-49a9-92a7-3bf60b95bf2d</version_id>
<version_modified>20171020T202717Z</version_modified>
<xml_checksum>19EEDBBB</xml_checksum>
<class_name>ResidentialAirflow</class_name>
<display_name>Set Residential Airflow</display_name>
Expand Down Expand Up @@ -689,12 +689,6 @@
<usage_type>resource</usage_type>
<checksum>1FFCC8C3</checksum>
</file>
<file>
<filename>hvac.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>F5B2C721</checksum>
</file>
<file>
<filename>SFD_2000sqft_2story_SL_UA_3Beds_2Baths_Denver.osm</filename>
<filetype>osm</filetype>
Expand Down Expand Up @@ -785,17 +779,6 @@
<usage_type>test</usage_type>
<checksum>2C665EA0</checksum>
</file>
<file>
<version>
<software_program>OpenStudio</software_program>
<identifier>1.13.1</identifier>
<min_compatible>2.0.4</min_compatible>
</version>
<filename>measure.rb</filename>
<filetype>rb</filetype>
<usage_type>script</usage_type>
<checksum>F9977BB0</checksum>
</file>
<file>
<filename>geometry.rb</filename>
<filetype>rb</filetype>
Expand All @@ -814,5 +797,22 @@
<usage_type>resource</usage_type>
<checksum>03F09690</checksum>
</file>
<file>
<filename>hvac.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>C9C319CF</checksum>
</file>
<file>
<version>
<software_program>OpenStudio</software_program>
<identifier>1.13.1</identifier>
<min_compatible>2.0.4</min_compatible>
</version>
<filename>measure.rb</filename>
<filetype>rb</filetype>
<usage_type>script</usage_type>
<checksum>335D652B</checksum>
</file>
</files>
</measure>
64 changes: 54 additions & 10 deletions resources/measures/ResidentialAirflow/resources/hvac.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -703,14 +703,58 @@ def self.has_air_source_heat_pump(model, runner, thermal_zone, remove=false)
return nil
end

def self.has_mini_split_heat_pump(model, runner, thermal_zone, remove=false)
def self.has_mini_split_heat_pump(model, runner, thermal_zone, unit, remove=false)
model.getAirConditionerVariableRefrigerantFlows.each do |vrf|
vrf.terminals.each do |terminal|
next unless thermal_zone.handle.to_s == terminal.thermalZone.get.handle.to_s
if remove
runner.registerInfo("Removed '#{terminal.name}' from #{thermal_zone.name}.")
terminal.remove
vrf.remove

obj_name = Constants.ObjectNameMiniSplitHeatPump(unit.name.to_s)

model.getOutputVariables.each do |output_var|
next unless output_var.name.to_s == Constants.ObjectNameMiniSplitHeatPump + " vrf heat energy output var"
output_var.remove
end
model.getOutputVariables.each do |output_var|
next unless output_var.name.to_s == Constants.ObjectNameMiniSplitHeatPump + " zone outdoor air drybulb temp output var"
output_var.remove
end

model.getEnergyManagementSystemSensors.each do |sensor|
next unless sensor.name.to_s == "#{obj_name} vrf energy sensor".gsub(" ","_").gsub("|","_")
sensor.remove
end
model.getEnergyManagementSystemSensors.each do |sensor|
next unless sensor.name.to_s == "#{obj_name} vrf fbsmt energy sensor".gsub(" ","_").gsub("|","_")
sensor.remove
end
model.getEnergyManagementSystemSensors.each do |sensor|
next unless sensor.name.to_s == "#{obj_name} tout sensor".gsub(" ","_").gsub("|","_")
sensor.remove
end
model.getEnergyManagementSystemActuators.each do |actuator|
next unless actuator.name.to_s == "#{obj_name} pan heater actuator".gsub(" ","_").gsub("|","_")
actuator.remove
end
model.getEnergyManagementSystemPrograms.each do |program|
next unless program.name.to_s == "#{obj_name} pan heater program".gsub(" ","_")
program.remove
end
model.getEnergyManagementSystemProgramCallingManagers.each do |program_calling_manager|
next unless program_calling_manager.name.to_s == obj_name + " pan heater program calling manager"
program_calling_manager.remove
end

thermal_zone.spaces.each do |space|
space.electricEquipment.each do |equip|
next unless equip.name.to_s == obj_name + " pan heater equip"
equip.electricEquipmentDefinition.remove
end
end

end
return true
end
Expand Down Expand Up @@ -783,13 +827,13 @@ def self.prioritize_zone_hvac(model, runner, zone)
return zone_hvac_list
end

def self.remove_existing_hvac_equipment(model, runner, new_equip, thermal_zone, clone_perf=false)
def self.remove_existing_hvac_equipment(model, runner, new_equip, thermal_zone, clone_perf=false, unit=nil)
counterpart_equip = nil
perf = nil
case new_equip
when Constants.ObjectNameCentralAirConditioner
removed_ashp = self.has_air_source_heat_pump(model, runner, thermal_zone, true)
removed_mshp = self.has_mini_split_heat_pump(model, runner, thermal_zone, true)
removed_mshp = self.has_mini_split_heat_pump(model, runner, thermal_zone, unit, true)
counterpart_equip = self.has_furnace(model, runner, thermal_zone)
removed_ac = self.has_central_air_conditioner(model, runner, thermal_zone, true)
removed_room_ac = self.has_room_air_conditioner(model, runner, thermal_zone, true)
Expand All @@ -805,7 +849,7 @@ def self.remove_existing_hvac_equipment(model, runner, new_equip, thermal_zone,
end
when Constants.ObjectNameRoomAirConditioner
removed_ashp = self.has_air_source_heat_pump(model, runner, thermal_zone, true)
removed_mshp = self.has_mini_split_heat_pump(model, runner, thermal_zone, true)
removed_mshp = self.has_mini_split_heat_pump(model, runner, thermal_zone, unit, true)
removed_room_ac = self.has_room_air_conditioner(model, runner, thermal_zone, true)
removed_ac = self.has_central_air_conditioner(model, runner, thermal_zone, true)
removed_gshp_vert_bore = self.has_gshp_vert_bore(model, runner, thermal_zone, true)
Expand All @@ -820,7 +864,7 @@ def self.remove_existing_hvac_equipment(model, runner, new_equip, thermal_zone,
end
when Constants.ObjectNameFurnace
removed_ashp = self.has_air_source_heat_pump(model, runner, thermal_zone, true)
removed_mshp = self.has_mini_split_heat_pump(model, runner, thermal_zone, true)
removed_mshp = self.has_mini_split_heat_pump(model, runner, thermal_zone, unit, true)
counterpart_equip = self.has_central_air_conditioner(model, runner, thermal_zone)
removed_furnace = self.has_furnace(model, runner, thermal_zone, true)
removed_boiler = self.has_boiler(model, runner, thermal_zone, true)
Expand All @@ -837,7 +881,7 @@ def self.remove_existing_hvac_equipment(model, runner, new_equip, thermal_zone,
removed_furnace = self.has_furnace(model, runner, thermal_zone, true)
removed_elec_baseboard = self.has_electric_baseboard(model, runner, thermal_zone, true)
removed_ashp = self.has_air_source_heat_pump(model, runner, thermal_zone, true)
removed_mshp = self.has_mini_split_heat_pump(model, runner, thermal_zone, true)
removed_mshp = self.has_mini_split_heat_pump(model, runner, thermal_zone, unit, true)
removed_gshp_vert_bore = self.has_gshp_vert_bore(model, runner, thermal_zone, true)
if removed_furnace or removed_ashp or removed_mshp or removed_gshp_vert_bore
self.has_air_loop(model, runner, thermal_zone, true)
Expand All @@ -847,14 +891,14 @@ def self.remove_existing_hvac_equipment(model, runner, new_equip, thermal_zone,
removed_furnace = self.has_furnace(model, runner, thermal_zone, true)
removed_boiler = self.has_boiler(model, runner, thermal_zone, true)
removed_ashp = self.has_air_source_heat_pump(model, runner, thermal_zone, true)
removed_mshp = self.has_mini_split_heat_pump(model, runner, thermal_zone, true)
removed_mshp = self.has_mini_split_heat_pump(model, runner, thermal_zone, unit, true)
removed_gshp_vert_bore = self.has_gshp_vert_bore(model, runner, thermal_zone, true)
if removed_furnace or removed_ashp or removed_gshp_vert_bore
self.has_air_loop(model, runner, thermal_zone, true)
end
when Constants.ObjectNameAirSourceHeatPump
removed_ashp = self.has_air_source_heat_pump(model, runner, thermal_zone, true)
removed_mshp = self.has_mini_split_heat_pump(model, runner, thermal_zone, true)
removed_mshp = self.has_mini_split_heat_pump(model, runner, thermal_zone, unit, true)
removed_ac = self.has_central_air_conditioner(model, runner, thermal_zone, true)
removed_room_ac = self.has_room_air_conditioner(model, runner, thermal_zone, true)
removed_furnace = self.has_furnace(model, runner, thermal_zone, true)
Expand All @@ -865,7 +909,7 @@ def self.remove_existing_hvac_equipment(model, runner, new_equip, thermal_zone,
self.has_air_loop(model, runner, thermal_zone, true)
end
when Constants.ObjectNameMiniSplitHeatPump
removed_mshp = self.has_mini_split_heat_pump(model, runner, thermal_zone, true)
removed_mshp = self.has_mini_split_heat_pump(model, runner, thermal_zone, unit, true)
removed_ashp = self.has_air_source_heat_pump(model, runner, thermal_zone, true)
removed_ac = self.has_central_air_conditioner(model, runner, thermal_zone, true)
removed_room_ac = self.has_room_air_conditioner(model, runner, thermal_zone, true)
Expand All @@ -878,7 +922,7 @@ def self.remove_existing_hvac_equipment(model, runner, new_equip, thermal_zone,
end
when Constants.ObjectNameGroundSourceHeatPumpVerticalBore
removed_ashp = self.has_air_source_heat_pump(model, runner, thermal_zone, true)
removed_mshp = self.has_mini_split_heat_pump(model, runner, thermal_zone, true)
removed_mshp = self.has_mini_split_heat_pump(model, runner, thermal_zone, unit, true)
removed_ac = self.has_central_air_conditioner(model, runner, thermal_zone, true)
removed_room_ac = self.has_room_air_conditioner(model, runner, thermal_zone, true)
removed_furnace = self.has_furnace(model, runner, thermal_zone, true)
Expand Down
16 changes: 8 additions & 8 deletions resources/measures/ResidentialConstructionsWindows/measure.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<schema_version>3.0</schema_version>
<name>process_constructions_windows</name>
<uid>648dc42f-f079-4d97-913e-6dc3e19560b1</uid>
<version_id>aee81c0d-82d1-4424-9f6b-572e5a757a91</version_id>
<version_modified>20171011T185048Z</version_modified>
<version_id>062f9609-0e55-4e08-847d-462902f35b89</version_id>
<version_modified>20171020T202718Z</version_modified>
<xml_checksum>6FAFA9DE</xml_checksum>
<class_name>ProcessConstructionsWindows</class_name>
<display_name>Set Residential Window Construction</display_name>
Expand Down Expand Up @@ -150,12 +150,6 @@
<usage_type>resource</usage_type>
<checksum>B34275B6</checksum>
</file>
<file>
<filename>hvac.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>F5B2C721</checksum>
</file>
<file>
<filename>SFD_2000sqft_2story_SL_UA_Denver_Windows.osm</filename>
<filetype>osm</filetype>
Expand Down Expand Up @@ -192,5 +186,11 @@
<usage_type>resource</usage_type>
<checksum>03F09690</checksum>
</file>
<file>
<filename>hvac.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>C9C319CF</checksum>
</file>
</files>
</measure>

0 comments on commit ae29b71

Please sign in to comment.