Merge pull request #1127 from NREL/dep-updates

Less stringent run_analysis.rb dependencies
NREL · Aug 29, 2023 · 1348def · 1348def
2 parents 45178e1 + b02f292
commit 1348def
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/resources/buildstock.rb b/resources/buildstock.rb
@@ -1,17 +1,9 @@
 # frozen_string_literal: true
 
-require 'openstudio'
-if File.exist? File.absolute_path(File.join(File.dirname(__FILE__), '../lib/resources/hpxml-measures/HPXMLtoOpenStudio/resources')) # Hack to run ResStock on AWS
-  resources_path = File.absolute_path(File.join(File.dirname(__FILE__), '../lib/resources/hpxml-measures/HPXMLtoOpenStudio/resources'))
-elsif File.exist? File.absolute_path(File.join(File.dirname(__FILE__), 'hpxml-measures/HPXMLtoOpenStudio/resources')) # Hack to run ResStock unit tests locally
-  resources_path = File.absolute_path(File.join(File.dirname(__FILE__), 'hpxml-measures/HPXMLtoOpenStudio/resources'))
-elsif File.exist? File.join(OpenStudio::BCLMeasure::userMeasuresDir.to_s, 'HPXMLtoOpenStudio/resources') # Hack to run measures in the OS App since applied measures are copied off into a temporary directory
-  resources_path = File.join(OpenStudio::BCLMeasure::userMeasuresDir.to_s, 'HPXMLtoOpenStudio/resources')
-end
-require File.join(resources_path, 'meta_measure')
-
 require 'csv'
 
+require_relative '../resources/hpxml-measures/HPXMLtoOpenStudio/resources/meta_measure'
+
 class TsvFile
   def initialize(full_path, runner)
     @full_path = full_path
@@ -452,6 +444,7 @@ def get_data_for_sample(buildstock_csv_path, building_id, runner)
 end
 
 class RunOSWs
+  require 'openstudio'
   require 'csv'
   require 'json'
 

diff --git a/workflow/run_analysis.rb b/workflow/run_analysis.rb
@@ -3,6 +3,9 @@
 require 'parallel'
 require 'json'
 require 'yaml'
+require 'optparse'
+require 'pathname'
+require 'time'
 
 require_relative '../resources/buildstock'
 require_relative '../resources/run_sampling_lib'