Merge branch 'master' into slab-hvac-sizing

Author: shorowit

tasks.rb

@@ -5354,7 +5354,7 @@ def display_usage(command_list)
   if not ENV['CI']
     # Run ASHRAE 140 files
     puts 'Running ASHRAE 140 tests (this will take a minute)...'
-    command = 'openstudio workflow/tests/hpxml_translator_test.rb --name=test_ashrae_140 > log.txt'
+    command = "#{OpenStudio.getOpenStudioCLI} workflow/tests/hpxml_translator_test.rb --name=test_ashrae_140 > log.txt"
     system(command)
     results_csv_path = 'workflow/tests/results/results_ashrae_140.csv'
     if not File.exist? results_csv_path

workflow/tests/hpxml_translator_test.rb

@@ -21,13 +21,17 @@ class HPXMLTest < MiniTest::Test
   def before_setup
     @this_dir = File.dirname(__FILE__)
     @results_dir = File.join(@this_dir, 'results')
-    rm_path(@results_dir)
-    Dir.mkdir(@results_dir)
+    FileUtils.mkdir_p @results_dir
   end
 
   def test_simulations
     sample_files_dir = File.absolute_path(File.join(@this_dir, '..', 'sample_files'))
     autosize_dir = File.absolute_path(File.join(@this_dir, '..', 'sample_files', 'hvac_autosizing'))
+    
+    results_out = File.join(@results_dir, 'results.csv')
+    File.delete(results_out) if File.exist? results_out
+    sizing_out = File.join(@results_dir, 'results_hvac_sizing.csv')
+    File.delete(sizing_out) if File.exist? sizing_out
 
     test_dirs = [sample_files_dir,
                  autosize_dir]
@@ -47,15 +51,18 @@ def test_simulations
       all_results[xml], all_sizing_results[xml] = _run_xml(xml)
     end
 
-    _write_summary_results(all_results)
-    _write_hvac_sizing_results(all_sizing_results)
+    _write_summary_results(all_results, results_out)
+    _write_hvac_sizing_results(all_sizing_results, sizing_out)
   end
 
   def test_ashrae_140
-    ashrae_140_dir = File.absolute_path(File.join(@this_dir, 'ASHRAE_Standard_140'))
+    ashrae140_dir = File.absolute_path(File.join(@this_dir, 'ASHRAE_Standard_140'))
+    
+    ashrae140_out = File.join(@results_dir, 'results_ashrae_140.csv')
+    File.delete(ashrae140_out) if File.exist? ashrae140_out
 
     xmls = []
-    Dir["#{ashrae_140_dir}/*.xml"].sort.each do |xml|
+    Dir["#{ashrae140_dir}/*.xml"].sort.each do |xml|
       xmls << File.absolute_path(xml)
     end
 
@@ -67,7 +74,7 @@ def test_ashrae_140
       all_results[xml], all_sizing_results[xml] = _run_xml(xml)
     end
 
-    _write_ashrae_140_results(all_results, ashrae_140_dir)
+    _write_ashrae_140_results(all_results, ashrae140_dir)
   end
 
   def test_run_simulation_rb
@@ -269,15 +276,15 @@ def test_invalid
   def test_release_zips
     # Check release zips successfully created
     top_dir = File.join(@this_dir, '..', '..')
-    command = "openstudio #{File.join(top_dir, 'tasks.rb')} create_release_zips"
+    command = "#{OpenStudio.getOpenStudioCLI} #{File.join(top_dir, 'tasks.rb')} create_release_zips"
     system(command)
     assert_equal(2, Dir["#{top_dir}/*.zip"].size)
 
     # Check successful running of simulation from release zips
     Dir["#{top_dir}/OpenStudio-HPXML*.zip"].each do |zip|
       unzip_file = OpenStudio::UnzipFile.new(zip)
       unzip_file.extractAllFiles(OpenStudio::toPath(top_dir))
-      command = 'openstudio OpenStudio-HPXML/workflow/run_simulation.rb -x OpenStudio-HPXML/workflow/sample_files/base.xml'
+      command = "#{OpenStudio.getOpenStudioCLI} OpenStudio-HPXML/workflow/run_simulation.rb -x OpenStudio-HPXML/workflow/sample_files/base.xml"
       system(command)
       assert(File.exist? 'OpenStudio-HPXML/workflow/sample_files/run/results_annual.csv')
       File.delete(zip)
@@ -1339,9 +1346,8 @@ def _verify_outputs(runner, rundir, hpxml_path, results)
     sqlFile.close
   end
 
-  def _write_summary_results(results)
+  def _write_summary_results(results, csv_out)
     require 'csv'
-    csv_out = File.join(@results_dir, 'results.csv')
 
     output_keys = []
     results.each do |xml, xml_results|
@@ -1372,9 +1378,8 @@ def _write_summary_results(results)
     puts "Wrote summary results to #{csv_out}."
   end
 
-  def _write_hvac_sizing_results(all_sizing_results)
+  def _write_hvac_sizing_results(all_sizing_results, csv_out)
     require 'csv'
-    csv_out = File.join(@results_dir, 'results_hvac_sizing.csv')
 
     output_keys = nil
     all_sizing_results.each do |xml, xml_results|
@@ -1397,16 +1402,15 @@ def _write_hvac_sizing_results(all_sizing_results)
     puts "Wrote HVAC sizing results to #{csv_out}."
   end
 
-  def _write_ashrae_140_results(all_results, ashrae_140_dir)
+  def _write_ashrae_140_results(all_results, ashrae140_dir, csv_out)
     require 'csv'
-    csv_out = File.join(@results_dir, 'results_ashrae_140.csv')
 
     htg_loads = {}
     clg_loads = {}
     CSV.open(csv_out, 'w') do |csv|
       csv << ['Test Case', 'Annual Heating Load [MMBtu]', 'Annual Cooling Load [MMBtu]']
       all_results.sort.each do |xml, xml_results|
-        next unless xml.include? ashrae_140_dir
+        next unless xml.include? ashrae140_dir
         next unless xml.include? 'C.xml'
 
         htg_load = xml_results['Load: Heating (MBtu)'].round(2)
@@ -1415,7 +1419,7 @@ def _write_ashrae_140_results(all_results, ashrae_140_dir)
         htg_loads[test_name] = htg_load
       end
       all_results.sort.each do |xml, xml_results|
-        next unless xml.include? ashrae_140_dir
+        next unless xml.include? ashrae140_dir
         next unless xml.include? 'L.xml'
 
         clg_load = xml_results['Load: Cooling (MBtu)'].round(2)