diff --git a/HPXMLtoOpenStudio/measure.rb b/HPXMLtoOpenStudio/measure.rb
index 6aa1e921de..2bb7311bd5 100644
--- a/HPXMLtoOpenStudio/measure.rb
+++ b/HPXMLtoOpenStudio/measure.rb
@@ -401,9 +401,6 @@ def self.set_defaults_and_globals(runner)
if @hpxml.building_construction.use_only_ideal_air_system.nil?
@hpxml.building_construction.use_only_ideal_air_system = false
end
- if @apply_ashrae140_assumptions
- @hpxml.building_construction.use_only_ideal_air_system = true
- end
# Initialize
@remaining_heat_load_frac = 1.0
@@ -2241,8 +2238,6 @@ def self.is_central_air_conditioner_and_furnace(heating_system, cooling_system)
end
def self.add_cooling_system(runner, model)
- return if @hpxml.building_construction.use_only_ideal_air_system
-
@hpxml.cooling_systems.each do |cooling_system|
check_distribution_system(cooling_system.distribution_system, cooling_system.cooling_system_type)
@@ -2279,8 +2274,6 @@ def self.add_cooling_system(runner, model)
end
def self.add_heating_system(runner, model)
- return if @hpxml.building_construction.use_only_ideal_air_system
-
@hpxml.heating_systems.each do |heating_system|
check_distribution_system(heating_system.distribution_system, heating_system.heating_system_type)
@@ -2320,8 +2313,6 @@ def self.add_heating_system(runner, model)
end
def self.add_heat_pump(runner, model, weather)
- return if @hpxml.building_construction.use_only_ideal_air_system
-
@hpxml.heat_pumps.each do |heat_pump|
if not heat_pump.heating_capacity_17F.nil?
if heat_pump.heating_capacity.nil?
diff --git a/HPXMLtoOpenStudio/measure.xml b/HPXMLtoOpenStudio/measure.xml
index d7369f002a..714d408973 100644
--- a/HPXMLtoOpenStudio/measure.xml
+++ b/HPXMLtoOpenStudio/measure.xml
@@ -3,8 +3,8 @@
3.0
hpxm_lto_openstudio
b1543b30-9465-45ff-ba04-1d1f85e763bc
- a5ce68fd-ea64-4797-ae10-a9451c617fcc
- 20200608T160112Z
+ bb6df16a-af59-4f99-902b-c60425767e97
+ 20200608T224540Z
D8922A73
HPXMLtoOpenStudio
HPXML to OpenStudio Translator
@@ -519,7 +519,7 @@
measure.rb
rb
script
- 31C27844
+ C4596E58
diff --git a/tasks.rb b/tasks.rb
index d2e69ee3d2..92c3fd1880 100644
--- a/tasks.rb
+++ b/tasks.rb
@@ -487,6 +487,7 @@ def set_hpxml_building_construction(hpxml_file, hpxml)
hpxml.building_construction.conditioned_floor_area = 1539
hpxml.building_construction.conditioned_building_volume = 12312
hpxml.building_construction.residential_facility_type = HPXML::ResidentialTypeSFD
+ hpxml.building_construction.use_only_ideal_air_system = true
elsif ['ASHRAE_Standard_140/L322XC.xml'].include? hpxml_file
hpxml.building_construction.number_of_conditioned_floors = 2
hpxml.building_construction.conditioned_floor_area = 3078
diff --git a/workflow/tests/ASHRAE_Standard_140/L100AC.xml b/workflow/tests/ASHRAE_Standard_140/L100AC.xml
index 0b7f871148..1073642d04 100644
--- a/workflow/tests/ASHRAE_Standard_140/L100AC.xml
+++ b/workflow/tests/ASHRAE_Standard_140/L100AC.xml
@@ -28,6 +28,9 @@
3
1539.0
12312.0
+
+ true
+
diff --git a/workflow/tests/ASHRAE_Standard_140/L100AL.xml b/workflow/tests/ASHRAE_Standard_140/L100AL.xml
index 331245255f..56ee29f097 100644
--- a/workflow/tests/ASHRAE_Standard_140/L100AL.xml
+++ b/workflow/tests/ASHRAE_Standard_140/L100AL.xml
@@ -28,6 +28,9 @@
3
1539.0
12312.0
+
+ true
+
diff --git a/workflow/tests/ASHRAE_Standard_140/L110AC.xml b/workflow/tests/ASHRAE_Standard_140/L110AC.xml
index aae86c4e32..34ff1358f3 100644
--- a/workflow/tests/ASHRAE_Standard_140/L110AC.xml
+++ b/workflow/tests/ASHRAE_Standard_140/L110AC.xml
@@ -28,6 +28,9 @@
3
1539.0
12312.0
+
+ true
+
diff --git a/workflow/tests/ASHRAE_Standard_140/L110AL.xml b/workflow/tests/ASHRAE_Standard_140/L110AL.xml
index 14c8dfedee..fdd0ccf8ec 100644
--- a/workflow/tests/ASHRAE_Standard_140/L110AL.xml
+++ b/workflow/tests/ASHRAE_Standard_140/L110AL.xml
@@ -28,6 +28,9 @@
3
1539.0
12312.0
+
+ true
+
diff --git a/workflow/tests/ASHRAE_Standard_140/L120AC.xml b/workflow/tests/ASHRAE_Standard_140/L120AC.xml
index bba581ca0c..7799c5e2f6 100644
--- a/workflow/tests/ASHRAE_Standard_140/L120AC.xml
+++ b/workflow/tests/ASHRAE_Standard_140/L120AC.xml
@@ -28,6 +28,9 @@
3
1539.0
12312.0
+
+ true
+
diff --git a/workflow/tests/ASHRAE_Standard_140/L120AL.xml b/workflow/tests/ASHRAE_Standard_140/L120AL.xml
index a9ffe84922..ec96db94c6 100644
--- a/workflow/tests/ASHRAE_Standard_140/L120AL.xml
+++ b/workflow/tests/ASHRAE_Standard_140/L120AL.xml
@@ -28,6 +28,9 @@
3
1539.0
12312.0
+
+ true
+
diff --git a/workflow/tests/ASHRAE_Standard_140/L130AC.xml b/workflow/tests/ASHRAE_Standard_140/L130AC.xml
index 8131e15462..8ade6933ec 100644
--- a/workflow/tests/ASHRAE_Standard_140/L130AC.xml
+++ b/workflow/tests/ASHRAE_Standard_140/L130AC.xml
@@ -28,6 +28,9 @@
3
1539.0
12312.0
+
+ true
+
diff --git a/workflow/tests/ASHRAE_Standard_140/L130AL.xml b/workflow/tests/ASHRAE_Standard_140/L130AL.xml
index 1f8ad44ffb..9de41586f9 100644
--- a/workflow/tests/ASHRAE_Standard_140/L130AL.xml
+++ b/workflow/tests/ASHRAE_Standard_140/L130AL.xml
@@ -28,6 +28,9 @@
3
1539.0
12312.0
+
+ true
+
diff --git a/workflow/tests/ASHRAE_Standard_140/L140AC.xml b/workflow/tests/ASHRAE_Standard_140/L140AC.xml
index b54f9615cf..f433226f27 100644
--- a/workflow/tests/ASHRAE_Standard_140/L140AC.xml
+++ b/workflow/tests/ASHRAE_Standard_140/L140AC.xml
@@ -28,6 +28,9 @@
3
1539.0
12312.0
+
+ true
+
diff --git a/workflow/tests/ASHRAE_Standard_140/L140AL.xml b/workflow/tests/ASHRAE_Standard_140/L140AL.xml
index 2017383689..496c7b9526 100644
--- a/workflow/tests/ASHRAE_Standard_140/L140AL.xml
+++ b/workflow/tests/ASHRAE_Standard_140/L140AL.xml
@@ -28,6 +28,9 @@
3
1539.0
12312.0
+
+ true
+
diff --git a/workflow/tests/ASHRAE_Standard_140/L150AC.xml b/workflow/tests/ASHRAE_Standard_140/L150AC.xml
index 0a8710f4a3..4cbd5b3222 100644
--- a/workflow/tests/ASHRAE_Standard_140/L150AC.xml
+++ b/workflow/tests/ASHRAE_Standard_140/L150AC.xml
@@ -28,6 +28,9 @@
3
1539.0
12312.0
+
+ true
+
diff --git a/workflow/tests/ASHRAE_Standard_140/L150AL.xml b/workflow/tests/ASHRAE_Standard_140/L150AL.xml
index 56ae8109dd..e2eccb5457 100644
--- a/workflow/tests/ASHRAE_Standard_140/L150AL.xml
+++ b/workflow/tests/ASHRAE_Standard_140/L150AL.xml
@@ -28,6 +28,9 @@
3
1539.0
12312.0
+
+ true
+
diff --git a/workflow/tests/ASHRAE_Standard_140/L155AC.xml b/workflow/tests/ASHRAE_Standard_140/L155AC.xml
index 803d28d78f..38622a34d6 100644
--- a/workflow/tests/ASHRAE_Standard_140/L155AC.xml
+++ b/workflow/tests/ASHRAE_Standard_140/L155AC.xml
@@ -28,6 +28,9 @@
3
1539.0
12312.0
+
+ true
+
diff --git a/workflow/tests/ASHRAE_Standard_140/L155AL.xml b/workflow/tests/ASHRAE_Standard_140/L155AL.xml
index 3fadb65678..71d7306504 100644
--- a/workflow/tests/ASHRAE_Standard_140/L155AL.xml
+++ b/workflow/tests/ASHRAE_Standard_140/L155AL.xml
@@ -28,6 +28,9 @@
3
1539.0
12312.0
+
+ true
+
diff --git a/workflow/tests/ASHRAE_Standard_140/L160AC.xml b/workflow/tests/ASHRAE_Standard_140/L160AC.xml
index 2b53292892..01cc2d8c1a 100644
--- a/workflow/tests/ASHRAE_Standard_140/L160AC.xml
+++ b/workflow/tests/ASHRAE_Standard_140/L160AC.xml
@@ -28,6 +28,9 @@
3
1539.0
12312.0
+
+ true
+
diff --git a/workflow/tests/ASHRAE_Standard_140/L160AL.xml b/workflow/tests/ASHRAE_Standard_140/L160AL.xml
index d84b73135f..1dfc15bfb7 100644
--- a/workflow/tests/ASHRAE_Standard_140/L160AL.xml
+++ b/workflow/tests/ASHRAE_Standard_140/L160AL.xml
@@ -28,6 +28,9 @@
3
1539.0
12312.0
+
+ true
+
diff --git a/workflow/tests/ASHRAE_Standard_140/L170AC.xml b/workflow/tests/ASHRAE_Standard_140/L170AC.xml
index 0d3b9397cd..0dbc136bba 100644
--- a/workflow/tests/ASHRAE_Standard_140/L170AC.xml
+++ b/workflow/tests/ASHRAE_Standard_140/L170AC.xml
@@ -28,6 +28,9 @@
3
1539.0
12312.0
+
+ true
+
diff --git a/workflow/tests/ASHRAE_Standard_140/L170AL.xml b/workflow/tests/ASHRAE_Standard_140/L170AL.xml
index 6388e5c7d9..d5065187c3 100644
--- a/workflow/tests/ASHRAE_Standard_140/L170AL.xml
+++ b/workflow/tests/ASHRAE_Standard_140/L170AL.xml
@@ -28,6 +28,9 @@
3
1539.0
12312.0
+
+ true
+
diff --git a/workflow/tests/ASHRAE_Standard_140/L200AC.xml b/workflow/tests/ASHRAE_Standard_140/L200AC.xml
index 4f130ae74e..fbdfc12e61 100644
--- a/workflow/tests/ASHRAE_Standard_140/L200AC.xml
+++ b/workflow/tests/ASHRAE_Standard_140/L200AC.xml
@@ -28,6 +28,9 @@
3
1539.0
12312.0
+
+ true
+
diff --git a/workflow/tests/ASHRAE_Standard_140/L200AL.xml b/workflow/tests/ASHRAE_Standard_140/L200AL.xml
index 80cc3e22b4..9e1cb3615c 100644
--- a/workflow/tests/ASHRAE_Standard_140/L200AL.xml
+++ b/workflow/tests/ASHRAE_Standard_140/L200AL.xml
@@ -28,6 +28,9 @@
3
1539.0
12312.0
+
+ true
+
diff --git a/workflow/tests/ASHRAE_Standard_140/L202AC.xml b/workflow/tests/ASHRAE_Standard_140/L202AC.xml
index acb5dd1df2..cac0d47416 100644
--- a/workflow/tests/ASHRAE_Standard_140/L202AC.xml
+++ b/workflow/tests/ASHRAE_Standard_140/L202AC.xml
@@ -28,6 +28,9 @@
3
1539.0
12312.0
+
+ true
+
diff --git a/workflow/tests/ASHRAE_Standard_140/L202AL.xml b/workflow/tests/ASHRAE_Standard_140/L202AL.xml
index 4fddea8d7b..b8fb4c3a47 100644
--- a/workflow/tests/ASHRAE_Standard_140/L202AL.xml
+++ b/workflow/tests/ASHRAE_Standard_140/L202AL.xml
@@ -28,6 +28,9 @@
3
1539.0
12312.0
+
+ true
+
diff --git a/workflow/tests/ASHRAE_Standard_140/L302XC.xml b/workflow/tests/ASHRAE_Standard_140/L302XC.xml
index f2d9247119..7090efabca 100644
--- a/workflow/tests/ASHRAE_Standard_140/L302XC.xml
+++ b/workflow/tests/ASHRAE_Standard_140/L302XC.xml
@@ -28,6 +28,9 @@
3
1539.0
12312.0
+
+ true
+
diff --git a/workflow/tests/ASHRAE_Standard_140/L304XC.xml b/workflow/tests/ASHRAE_Standard_140/L304XC.xml
index 11be1ef6a1..13211aca87 100644
--- a/workflow/tests/ASHRAE_Standard_140/L304XC.xml
+++ b/workflow/tests/ASHRAE_Standard_140/L304XC.xml
@@ -28,6 +28,9 @@
3
1539.0
12312.0
+
+ true
+
diff --git a/workflow/tests/ASHRAE_Standard_140/L322XC.xml b/workflow/tests/ASHRAE_Standard_140/L322XC.xml
index 00516789d7..24c86afa05 100644
--- a/workflow/tests/ASHRAE_Standard_140/L322XC.xml
+++ b/workflow/tests/ASHRAE_Standard_140/L322XC.xml
@@ -28,6 +28,9 @@
3
3078.0
24624.0
+
+ true
+
diff --git a/workflow/tests/ASHRAE_Standard_140/L324XC.xml b/workflow/tests/ASHRAE_Standard_140/L324XC.xml
index 6b61720967..6e99fcacc0 100644
--- a/workflow/tests/ASHRAE_Standard_140/L324XC.xml
+++ b/workflow/tests/ASHRAE_Standard_140/L324XC.xml
@@ -28,6 +28,9 @@
3
3078.0
24624.0
+
+ true
+