From 15ab7368056dca891e8c3fb7cbc7d73cd7b01338 Mon Sep 17 00:00:00 2001 From: Scott Horowitz Date: Mon, 20 May 2019 15:27:02 -0600 Subject: [PATCH] Fix base-hvac-dse.xml. --- measure.rb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/measure.rb b/measure.rb index ba80e11e7f..c32e8b8b72 100644 --- a/measure.rb +++ b/measure.rb @@ -2333,10 +2333,8 @@ def self.add_heating_system(runner, model, building) htg_type = heating_system_values[:heating_system_type] - dse_heat, dse_cool, has_dse = get_dse(building, heating_system_values) - attached_clg_system = get_attached_system(heating_system_values, building, - "CoolingSystem", has_dse) + "CoolingSystem") if only_furnaces_attached_to_cooling next unless htg_type == "Furnace" and not attached_clg_system.nil? @@ -2355,6 +2353,8 @@ def self.add_heating_system(runner, model, building) sequential_load_frac = load_frac / @total_frac_remaining_heat_load_served # Fraction of remaining load served by this system @total_frac_remaining_heat_load_served -= load_frac + dse_heat, dse_cool, has_dse = get_dse(building, heating_system_values) + sys_id = heating_system_values[:id] @hvac_map[sys_id] = [] @@ -3728,9 +3728,8 @@ def self.check_surface_assembly_rvalue(surface, film_r, assembly_r) end end - def self.get_attached_system(system_values, building, system_to_search, has_dse) + def self.get_attached_system(system_values, building, system_to_search) return nil if system_values[:distribution_system_idref].nil? - return nil if has_dse # Finds the OpenStudio object of the heating (or cooling) system attached (i.e., on the same # distribution system) to the current cooling (or heating) system.