openstudio-workflow 0.1.1 → 0.2.0

data/lib/openstudio/workflow/jobs/run_openstudio/run_openstudio.rb

@@ -17,7 +17,6 @@
 #  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 ######################################################################
 
-# TODO: I hear that measures can step on each other if not run in their own directory
 class RunOpenstudio
   # Mixin the MeasureApplication module to apply measures
   include OpenStudio::Workflow::ApplyMeasures
@@ -25,8 +24,10 @@ class RunOpenstudio
   # Initialize
   # param directory: base directory where the simulation files are prepared
   # param logger: logger object in which to write log messages
-  def initialize(directory, logger, time_logger, adapter, options = {})
+  def initialize(directory, logger, time_logger, adapter, workflow_arguments, options = {})
     defaults = { format: 'hash', use_monthly_reports: false, analysis_root_path: '.' }
+    warn 'Option of use_monthly_reports is deprecated. Monthly reports are always generated.' if options[:use_monthly_reports]
+
     @options = defaults.merge(options)
     @directory = directory
     # TODO: there is a base number of arguments that each job will need including @run_directory. abstract it out.
@@ -35,6 +36,7 @@ class RunOpenstudio
     @results = {}
     @logger = logger
     @time_logger = time_logger
+    @workflow_arguments = workflow_arguments
     @logger.info "#{self.class} passed the following options #{@options}"
 
     # initialize instance variables that are needed in the perform section
@@ -63,12 +65,14 @@ class RunOpenstudio
       load_weather_file
 
       apply_measures(:openstudio_measure)
+      @logger.info('Finished applying OpenStudio measures.')
 
       @time_logger.start('Translating to EnergyPlus')
       translate_to_energyplus
       @time_logger.stop('Translating to EnergyPlus')
 
       apply_measures(:energyplus_measure)
+      @logger.info('Finished applying EnergyPlus measures.')
 
       # check if the weather file has changed. This is cheesy for now. Should have a default measure that
       # always sets the weather file so that it can be better controlled
@@ -106,15 +110,6 @@ class RunOpenstudio
     idf_filename = "#{@run_directory}/in.idf"
     File.open(idf_filename, 'w') { |f| f << @model_idf.to_s }
 
-    # TODO: convert this to an OpenStudio method instead of substituting the data as text
-    if @options[:use_monthly_reports]
-      @logger.info 'Adding monthly reports to EnergyPlus IDF'
-      to_append = File.read(File.join(File.dirname(__FILE__), 'monthly_report.idf'))
-      File.open(idf_filename, 'a') do |handle|
-        handle.puts to_append
-      end
-    end
-
     @results[:osm] = File.expand_path(osm_filename)
     @results[:idf] = File.expand_path(idf_filename)
   end

data/lib/openstudio/workflow/jobs/run_postprocess/run_postprocess.rb

@@ -27,7 +27,7 @@ class RunPostprocess
   # Mixin the MeasureApplication module to apply measures
   include OpenStudio::Workflow::ApplyMeasures
 
-  def initialize(directory, logger, time_logger, adapter, options = {})
+  def initialize(directory, logger, time_logger, adapter, workflow_arguments, options = {})
     defaults = {}
     @options = defaults.merge(options)
     @directory = directory
@@ -35,6 +35,7 @@ class RunPostprocess
     @adapter = adapter
     @logger = logger
     @time_logger = time_logger
+    @workflow_arguments = workflow_arguments
     @results = {}
     @output_attributes = {}
 
@@ -76,14 +77,14 @@ class RunPostprocess
       end
     end
 
-    # Also, find any "report.html" files
+    # Also, find any "report*.*" files
     Dir["#{@run_directory}/*/report*.*"].each do |report|
       # get the parent directory of the file and snake case it
       # do i need to force encoding on this as well?
-      measure_class_name = File.basename(File.dirname(report)).snake_case
+      measure_class_name = File.basename(File.dirname(report)).to_underscore
       file_ext = File.extname(report)
-      append_str = File.basename(report, '.*').gsub('report', '')
-      new_file_name = "#{@directory}/reports/#{measure_class_name}#{append_str}#{file_ext}"
+      append_str = File.basename(report, '.*')
+      new_file_name = "#{@directory}/reports/#{measure_class_name}_#{append_str}#{file_ext}"
       FileUtils.copy report, new_file_name
     end
 
@@ -98,7 +99,7 @@ class RunPostprocess
     # paths_to_rm << Pathname.glob("#{@run_directory}/*.idf") # keep the idfs
     # paths_to_rm << Pathname.glob("*.audit")
     # paths_to_rm << Pathname.glob("*.bnd")
-    paths_to_rm << Pathname.glob("#{@run_directory}/*.eso")
+    # paths_to_rm << Pathname.glob("#{@run_directory}/*.eso")
     paths_to_rm << Pathname.glob("#{@run_directory}/*.mtr")
     paths_to_rm << Pathname.glob("#{@run_directory}/*.epw")
     paths_to_rm << Pathname.glob("#{@run_directory}/*.mtd")

data/lib/openstudio/workflow/jobs/run_preflight/run_preflight.rb

@@ -19,13 +19,14 @@
 
 # Run Prelight job to prepare the directory for simulations.
 class RunPreflight
-  def initialize(directory, logger, time_logger, adapter, options = {})
+  def initialize(directory, logger, time_logger, adapter, workflow_arguments, options = {})
     defaults = {}
     @options = defaults.merge(options)
     @directory = directory
     @adapter = adapter
     @logger = logger
     @time_logger = time_logger
+    @workflow_arguments = workflow_arguments
     @results = {}
   end
 

data/lib/openstudio/workflow/jobs/run_reporting_measures/run_reporting_measures.rb

@@ -25,7 +25,7 @@ class RunReportingMeasures
   # Mixin the MeasureApplication module to apply measures
   include OpenStudio::Workflow::ApplyMeasures
 
-  def initialize(directory, logger, time_logger, adapter, options = {})
+  def initialize(directory, logger, time_logger, adapter, workflow_arguments, options = {})
     defaults = {}
     @options = defaults.merge(options)
     @directory = directory
@@ -33,6 +33,7 @@ class RunReportingMeasures
     @adapter = adapter
     @logger = logger
     @time_logger = time_logger
+    @workflow_arguments = workflow_arguments
     @results = {}
     @output_attributes = {}
 
@@ -43,6 +44,7 @@ class RunReportingMeasures
     @logger.info "#{self.class} passed the following options #{@options}"
 
     @model = load_model @options[:run_openstudio][:osm]
+    @model_idf = load_idf @options[:run_openstudio][:idf]
 
     # TODO: should read the name of the sql output file via the :run_openstudio options hash
     # I want to reiterate that this is cheezy!
@@ -61,11 +63,7 @@ class RunReportingMeasures
       @analysis_json = @adapter.get_problem(@directory, @options)
 
       @time_logger.start('Running standard post process')
-      if @options[:use_monthly_reports]
-        run_monthly_postprocess
-      else
-        run_standard_postprocess
-      end
+      run_monthly_postprocess
       @time_logger.stop('Running standard post process')
 
       translate_csv_to_json
@@ -193,7 +191,7 @@ class RunReportingMeasures
 
   private
 
-  # Load in the OpenStudio model. It is required for postprocessing
+  # Load in the OpenStudio model. It is required for post processing
   def load_model(filename)
     model = nil
     @logger.info 'Loading model'
@@ -213,18 +211,34 @@ class RunReportingMeasures
     model
   end
 
-  # Run the prepackaged measures in the Gem.
+  # Load in the IDF model. It is required for post processing
+  def load_idf(filename)
+    fail "IDF file does not exist: #{filename}" unless File.exist? filename
+    OpenStudio::Workspace.load(filename, 'EnergyPlus'.to_IddFileType).get
+  end
+
+  # Run the prepackaged measures in OpenStudio. Currently this runs the standard reports and the calibration measure
+  # TODO: add a flag on which packaged reporting measures to run
   def run_packaged_measures
     # configure the workflow item json to pass
     workflow_item = {
       display_name: 'Standard Reports',
-      measure_definition_directory: File.expand_path(File.join(File.dirname(__FILE__), 'packaged_measures', 'StandardReports', 'measure.rb')),
-      measure_definition_class_name: 'StandardReports',
+      measure_definition_directory: File.expand_path(File.join(OpenStudio::BCLMeasure.standardReportMeasure.directory.to_s, 'measure.rb')),
+      measure_definition_class_name: 'OpenStudioResults',
       measure_type: 'ReportingMeasure',
       name: 'standard_reports'
     }
-    @logger.info 'Running packaged reporting measures'
+    @logger.info 'Running packaged Standard Reports measures'
+    apply_measure(workflow_item)
 
+    workflow_item = {
+      display_name: 'Calibration Reports',
+      measure_definition_directory: File.expand_path(File.join(OpenStudio::BCLMeasure.calibrationReportMeasure.directory.to_s, 'measure.rb')),
+      measure_definition_class_name: 'CalibrationReports',
+      measure_type: 'CalibrationReports',
+      name: 'calibration_reports'
+    }
+    @logger.info 'Running packaged Calibration Reports measures'
     apply_measure(workflow_item)
 
     @logger.info 'Finished Running Packaged Measures'
@@ -237,8 +251,8 @@ class RunReportingMeasures
       csv = CSV.read("#{@run_directory}/eplustbl.csv")
       csv.transpose.each do |k, v|
         longname = k.gsub(/\(.*\)/, '').strip
-        short_name = longname.downcase.gsub(' ', '_')
-        units = k.match(/\(.*\)/)[0].gsub('(', '').gsub(')', '')
+        short_name = longname.downcase.tr(' ', '_')
+        units = k.match(/\(.*\)/)[0].delete('(').delete(')')
         results[short_name.to_sym] = v.nil? ? nil : v.to_f
         results["#{short_name}_units".to_sym] = units
         results["#{short_name}_display_name".to_sym] = longname
@@ -294,33 +308,6 @@ class RunReportingMeasures
       val
     end
 
-    def add_element(hash, var_name, value, xpath = nil)
-      values_hash = {}
-      values_hash['name'] = var_name
-
-      # store correct datatype
-      store_val = nil
-      if value.nil?
-        store_val = nil
-      elsif value == 'true'
-        store_val = true
-      elsif value == 'false'
-        store_val = false
-      else
-        test = value.to_s
-        value = test.match('\.').nil? ? Integer(test) : Float(test) rescue test.to_s
-        if value.is_a?(Fixnum) || value.is_a?(Float)
-          store_val = value.to_f
-        else
-          store_val = value.to_s
-        end
-      end
-      values_hash['value'] = store_val
-      values_hash['xpath'] = xpath unless xpath.nil?
-
-      hash['data']['variables'] << values_hash
-    end
-
     # add results from sql method
     def add_data(sql, query, hdr, area, val)
       row = []
@@ -471,112 +458,4 @@ class RunReportingMeasures
       end
     end
   end
-
-  # TODO: This is ugly.  Move this out of here entirely and into a reporting measure if we need it at all
-  def run_standard_postprocess
-    def sql_query(sql, report_name, query)
-      val = nil
-      result = sql.execAndReturnFirstDouble("SELECT Value FROM TabularDataWithStrings WHERE ReportName='#{report_name}' AND #{query}")
-      if result.empty?
-        @logger.warn "Query for run_standard_postprocess failed for #{query}"
-      else
-        begin
-          val = result.get
-        rescue => e
-          @logger.info "#{__FILE__} failed with #{e.message}, #{e.backtrace.join("\n")}"
-          val = nil
-        end
-      end
-
-      val
-    end
-
-    def add_element(hash, var_name, value, xpath = nil)
-      values_hash = {}
-      values_hash['name'] = var_name
-
-      # store correct datatype
-      store_val = nil
-      if value.nil?
-        store_val = nil
-      elsif value == 'true'
-        store_val = true
-      elsif value == 'false'
-        store_val = false
-      else
-        test = value.to_s
-        value = test.match('\.').nil? ? Integer(test) : Float(test) rescue test.to_s
-        if value.is_a?(Fixnum) || value.is_a?(Float)
-          store_val = value.to_f
-        else
-          store_val = value.to_s
-        end
-      end
-      values_hash['value'] = store_val
-      values_hash['xpath'] = xpath unless xpath.nil?
-
-      hash['data']['variables'] << values_hash
-    end
-
-    # add results from sql method
-    def add_data(sql, query, hdr, area, val)
-      row = []
-      val = sql_query(sql, 'AnnualBuildingUtilityPerformanceSummary', query) if val.nil?
-      row << hdr
-      if area.nil?
-        row << val
-      else
-        row << (val * 1000) / area
-      end
-      row
-    end
-
-    # open sql file
-    sql_file = OpenStudio::SqlFile.new(@sql_filename)
-
-    # get building area
-    bldg_area = sql_query(sql_file, 'AnnualBuildingUtilityPerformanceSummary', "TableName='Building Area' AND RowName='Net Conditioned Building Area' AND ColumnName='Area'")
-    # populate data array
-
-    tbl_data = []
-    tbl_data << add_data(sql_file, "TableName='Site and Source Energy' AND RowName='Total Site Energy' AND ColumnName='Energy Per Conditioned Building Area'", 'Total Energy (MJ/m2)', nil, nil)
-    tbl_data << add_data(sql_file, "TableName='Site and Source Energy' AND RowName='Total Source Energy' AND ColumnName='Energy Per Conditioned Building Area'", 'Total Source Energy (MJ/m2)', nil, nil)
-    tbl_data << add_data(sql_file, "TableName='End Uses' AND RowName='Total End Uses' AND ColumnName='Electricity'", 'Total Electricity (MJ/m2)', bldg_area, nil)
-    tbl_data << add_data(sql_file, "TableName='End Uses' AND RowName='Total End Uses' AND ColumnName='Natural Gas'", 'Total Natural Gas (MJ/m2)', bldg_area, nil)
-    tbl_data << add_data(sql_file, "TableName='End Uses' AND RowName='Heating' AND ColumnName='Electricity'", 'Heating Electricity (MJ/m2)', bldg_area, nil)
-    tbl_data << add_data(sql_file, "TableName='End Uses' AND RowName='Heating' AND ColumnName='Natural Gas'", 'Heating Natural Gas (MJ/m2)', bldg_area, nil)
-    tbl_data << add_data(sql_file, "TableName='End Uses' AND RowName='Cooling' AND ColumnName='Electricity'", 'Cooling Electricity (MJ/m2)', bldg_area, nil)
-    tbl_data << add_data(sql_file, "TableName='End Uses' AND RowName='Interior Lighting' AND ColumnName='Electricity'", 'Interior Lighting Electricity (MJ/m2)', bldg_area, nil)
-    tbl_data << add_data(sql_file, "TableName='End Uses' AND RowName='Exterior Lighting' AND ColumnName='Electricity'", 'Exterior Lighting Electricity (MJ/m2)', bldg_area, nil)
-    tbl_data << add_data(sql_file, "TableName='End Uses' AND RowName='Interior Equipment' AND ColumnName='Electricity'", 'Interior Equipment Electricity (MJ/m2)', bldg_area, nil)
-    tbl_data << add_data(sql_file, "TableName='End Uses' AND RowName='Interior Equipment' AND ColumnName='Natural Gas'", 'Interior Equipment Natural Gas (MJ/m2)', bldg_area, nil)
-    tbl_data << add_data(sql_file, "TableName='End Uses' AND RowName='Exterior Equipment' AND ColumnName='Electricity'", 'Exterior Equipment Electricity (MJ/m2)', bldg_area, nil)
-    tbl_data << add_data(sql_file, "TableName='End Uses' AND RowName='Fans' AND ColumnName='Electricity'", 'Fans Electricity (MJ/m2)', bldg_area, nil)
-    tbl_data << add_data(sql_file, "TableName='End Uses' AND RowName='Pumps' AND ColumnName='Electricity'", 'Pumps Electricity (MJ/m2)', bldg_area, nil)
-    tbl_data << add_data(sql_file, "TableName='End Uses' AND RowName='Heat Rejection' AND ColumnName='Electricity'", 'Heat Rejection Electricity (MJ/m2)', bldg_area, nil)
-    tbl_data << add_data(sql_file, "TableName='End Uses' AND RowName='Humidification' AND ColumnName='Electricity'", 'Humidification Electricity (MJ/m2)', bldg_area, nil)
-    tbl_data << add_data(sql_file, "TableName='End Uses' AND RowName='Water Systems' AND ColumnName='Electricity'", 'Water Systems Electricity (MJ/m2)', bldg_area, nil)
-    tbl_data << add_data(sql_file, "TableName='End Uses' AND RowName='Water Systems' AND ColumnName='Natural Gas'", 'Water Systems Natural Gas (MJ/m2)', bldg_area, nil)
-    tbl_data << add_data(sql_file, "TableName='End Uses' AND RowName='Refrigeration' AND ColumnName='Electricity'", 'Refrigeration Electricity (MJ/m2)', bldg_area, nil)
-    htg_hrs = sql_query(sql_file, 'AnnualBuildingUtilityPerformanceSummary', "TableName='Comfort and Setpoint Not Met Summary' AND RowName='Time Setpoint Not Met During Occupied Heating' AND ColumnName='Facility'")
-    clg_hrs = sql_query(sql_file, 'AnnualBuildingUtilityPerformanceSummary', "TableName='Comfort and Setpoint Not Met Summary' AND RowName='Time Setpoint Not Met During Occupied Cooling' AND ColumnName='Facility'")
-    tot_hrs = clg_hrs && htg_hrs ? htg_hrs + clg_hrs : nil
-    tbl_data << add_data(sql_file, nil, 'Heating Hours Unmet (hr)', nil, htg_hrs)
-    tbl_data << add_data(sql_file, nil, 'Cooling Hours Unmet (hr)', nil, clg_hrs)
-    tbl_data << add_data(sql_file, nil, 'Total Hours Unmet (hr)', nil, tot_hrs)
-    total_cost = sql_query(sql_file, 'Life-Cycle Cost Report', "TableName='Present Value by Category' AND RowName='Grand Total' AND ColumnName='Present Value'")
-    tbl_data << add_data(sql_file, nil, 'Total Life Cycle Cost ($)', nil, total_cost)
-    # close SQL file
-    sql_file.close
-    # transpose data
-    tbl_rows = tbl_data.transpose
-
-    @logger.info tbl_rows
-    # write electricity data to CSV
-    CSV.open("#{@run_directory}/eplustbl.csv", 'wb') do |csv|
-      tbl_rows.each do |row|
-        csv << row
-      end
-    end
-  end
 end

data/lib/openstudio/workflow/jobs/run_runmanager/run_runmanager.rb

@@ -27,14 +27,10 @@ class RunRunmanager
   # Initialize
   # param directory: base directory where the simulation files are prepared
   # param logger: logger object in which to write log messages
-  def initialize(directory, logger, time_logger, adapter, options = {})
-    energyplus_path = nil
-    if /cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM
-      energyplus_path = 'C:/EnergyPlus-8-2-0'
-    else
-      energyplus_path = '/usr/local/EnergyPlus-8-2-0'
-    end
+  def initialize(directory, logger, time_logger, adapter, workflow_arguments, options = {})
+    @logger = logger
 
+    energyplus_path = find_energyplus
     defaults = {
       analysis_root_path: '.',
       energyplus_path: energyplus_path
@@ -47,9 +43,9 @@ class RunRunmanager
     @run_directory = @directory / OpenStudio::Path.new('run')
     @adapter = adapter
     @results = {}
-    @logger = logger
     @logger.info "#{self.class} passed the following options #{@options}"
     @time_logger = time_logger
+    @workflow_arguments = workflow_arguments
 
     # initialize instance variables that are needed in the perform section
     @model = nil
@@ -200,8 +196,6 @@ class RunRunmanager
         @logger.info 'Updating OpenStudio DataPoint object'
         analysis.problem.updateDataPoint(data_point, job)
 
-        @logger.info data_point
-
         @results = { pat_data_point: ::MultiJson.load(data_point.toJSON, symbolize_names: true) }
 
         # Savet this to the directory for debugging purposes
@@ -222,4 +216,31 @@ class RunRunmanager
 
     @results
   end
+
+  private
+
+  # Look for the location of EnergyPlus
+  def find_energyplus
+    if ENV['ENERGYPLUSDIR']
+      return ENV['ENERGYPLUSDIR']
+      # TODO: check if method exists! first
+    elsif OpenStudio.respond_to? :getEnergyPlusDirectory
+      return OpenStudio.getEnergyPlusDirectory.to_s
+    elsif ENV['RUBYLIB'] =~ /OpenStudio/
+      warn 'Finding EnergyPlus by RUBYLIB parsing will not be supported in the near future. Use either ENERGYPLUSDIR'\
+           'env variable or a newer OpenStudio version that has the getEnergyPlusDirectory method'
+      path = ENV['RUBYLIB'].split(':')
+      path = File.dirname(path.find { |p| p =~ /OpenStudio/ })
+      # Grab the version out of the openstudio path
+      path += '/sharedresources/EnergyPlus-8-3-0'
+
+      return path
+    else
+      if /cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM
+        return 'C:/EnergyPlus-8-3-0'
+      else
+        return '/usr/local/EnergyPlus-8-3-0'
+      end
+    end
+  end
 end

data/lib/openstudio/workflow/jobs/run_xml/run_xml.rb

@@ -22,8 +22,8 @@ require 'libxml'
 # This actually belongs as another class that gets added as a state dynamically
 class RunXml
   # RunXml
-  def initialize(directory, logger, time_logger, adapter, options = {})
-    defaults = { use_monthly_reports: false, analysis_root_path: '.', xml_library_file: 'xml_runner.rb' }
+  def initialize(directory, logger, time_logger, adapter, workflow_arguments, options = {})
+    defaults = { analysis_root_path: '.', xml_library_file: 'xml_runner.rb' }
     @options = defaults.merge(options)
     @directory = directory
     # TODO: there is a base number of arguments that each job will need including @run_directory. abstract it out.
@@ -32,6 +32,7 @@ class RunXml
     @results = {}
     @logger = logger
     @time_logger = time_logger
+    @workflow_arguments = workflow_arguments
     @logger.info "#{self.class} passed the following options #{@options}"
 
     # initialize instance variables that are needed in the perform section
@@ -239,7 +240,7 @@ class RunXml
                       @logger.info "Setting variable '#{variable_name}' to '#{@datapoint_json[:data_point][:set_variable_values][variable_uuid]}'"
 
                       args[wf_var[:argument][:name].to_sym] = @datapoint_json[:data_point][:set_variable_values][variable_uuid]
-                      args["#{wf_var[:argument][:name]}_machine_name".to_sym] = wf_var[:argument][:display_name].snake_case
+                      args["#{wf_var[:argument][:name]}_machine_name".to_sym] = wf_var[:argument][:display_name].to_underscore
                       args["#{wf_var[:argument][:name]}_type".to_sym] = wf_var[:value_type] if wf_var[:value_type]
                       @logger.info "Setting the machine name for argument '#{wf_var[:argument][:name]}' to '#{args["#{wf_var[:argument][:name]}_machine_name".to_sym]}'"
 

data/lib/openstudio/workflow/run.rb

@@ -22,6 +22,7 @@ module OpenStudio
   module Workflow
     class Run
       attr_accessor :logger
+      attr_accessor :workflow_arguments
 
       attr_reader :options
       attr_reader :adapter
@@ -46,7 +47,6 @@ module OpenStudio
       # The default states for the workflow.  Note that the states of :queued of :finished need
       # to exist for all cases.
       def self.default_states
-        warn "[Deprecation Warning] explicitly specifying states will no longer be required in 0.3.0. Method #{__method__}"
         [
           { state: :queued, options: { initial: true } },
           { state: :preflight, options: { after_enter: :run_preflight } },
@@ -71,7 +71,6 @@ module OpenStudio
 
       # states for pat job
       def self.pat_states
-        warn "[Deprecation Warning] explicitly specifying states will no longer be required in 0.3.0. Method #{__method__}"
         [
           { state: :queued, options: { initial: true } },
           { state: :preflight, options: { after_enter: :run_preflight } },
@@ -95,6 +94,7 @@ module OpenStudio
         @transitions = {}
         @directory = directory
         @time_logger = TimeLogger.new
+        @workflow_arguments = {}
         # TODO: run directory is a convention right now. Move to a configuration item
         @run_directory = "#{@directory}/run"
 
@@ -131,7 +131,6 @@ module OpenStudio
         end
 
         @logger.info "Initializing directory #{@directory} for simulation with options #{@options}"
-        @logger.info "OpenStudio loaded: '#{$openstudio_gem}'"
 
         # load the state machine
         machine
@@ -156,7 +155,7 @@ module OpenStudio
             @logger.info 'Sending the run_runmananger results back to the adapter'
             @adapter.communicate_results @directory, @job_results[:run_runmanager]
           elsif @job_results[:run_reporting_measures]
-            @logger.info 'Sending the reporting measuers results back to the adapter'
+            @logger.info 'Sending the reporting measures results back to the adapter'
             @time_logger.save(File.join(@directory, 'profile.json'))
             @adapter.communicate_results @directory, @job_results[:run_reporting_measures]
           end
@@ -311,7 +310,7 @@ module OpenStudio
         require_relative "jobs/#{from_method}/#{from_method}"
         klass_name = from_method.to_s.split('_').map(&:capitalize) * ''
         @logger.info "Getting method for state transition '#{from_method}'"
-        klass = Object.const_get(klass_name).new(@directory, @logger, @time_logger, @adapter, get_job_options)
+        klass = Object.const_get(klass_name).new(@directory, @logger, @time_logger, @adapter, @workflow_arguments, get_job_options)
         klass
       end
     end

data/lib/openstudio/workflow/version.rb

@@ -19,6 +19,6 @@
 
 module OpenStudio
   module Workflow
-    VERSION = '0.1.1'
+    VERSION = '0.2.0'
   end
 end

data/lib/openstudio-workflow.rb

@@ -25,7 +25,6 @@ require 'fileutils'
 require 'securerandom' # uuids
 require 'json' # needed for a single pretty generate call
 require 'pathname'
-require 'mkmf' # for finding files
 
 begin
   require 'facter'
@@ -39,21 +38,18 @@ require 'openstudio/workflow/run'
 require 'openstudio/workflow/jobs/lib/apply_measures'
 require 'openstudio/workflow/time_logger'
 
-begin
-  require 'openstudio'
-  $openstudio_gem = true
-rescue LoadError => e
-  $openstudio_gem = false
-  puts 'OpenStudio did not load, but most functionality is still available. Will try to continue...'.red
-end
+require 'openstudio'
+require 'openstudio/extended_runner'
+
+ENV['OPENSTUDIO_WORKFLOW'] = 'true'
 
 # some core extensions
 class String
-  def snake_case
+  def to_underscore
     gsub(/::/, '/')
       .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
       .gsub(/([a-z\d])([A-Z])/, '\1_\2')
-      .tr(' -', '__')
+      .tr('-', '_')
       .downcase
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-workflow
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Nicholas Long
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-03 00:00:00.000000000 Z
+date: 2015-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -115,23 +115,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- CHANGELOG.md
-- README.md
-- Rakefile
-- lib/openstudio-workflow.rb
+- lib/openstudio/extended_runner.rb
 - lib/openstudio/workflow/adapter.rb
 - lib/openstudio/workflow/adapters/local.rb
 - lib/openstudio/workflow/adapters/mongo.rb
 - lib/openstudio/workflow/jobs/lib/apply_measures.rb
+- lib/openstudio/workflow/jobs/run_energyplus/monthly_report.idf
 - lib/openstudio/workflow/jobs/run_energyplus/run_energyplus.rb
-- lib/openstudio/workflow/jobs/run_openstudio/monthly_report.idf
 - lib/openstudio/workflow/jobs/run_openstudio/run_openstudio.rb
 - lib/openstudio/workflow/jobs/run_postprocess/run_postprocess.rb
 - lib/openstudio/workflow/jobs/run_preflight/run_preflight.rb
-- lib/openstudio/workflow/jobs/run_reporting_measures/packaged_measures/README.md
-- lib/openstudio/workflow/jobs/run_reporting_measures/packaged_measures/StandardReports/measure.rb
-- lib/openstudio/workflow/jobs/run_reporting_measures/packaged_measures/StandardReports/measure.xml
-- lib/openstudio/workflow/jobs/run_reporting_measures/packaged_measures/StandardReports/resources/report.html.erb
 - lib/openstudio/workflow/jobs/run_reporting_measures/run_reporting_measures.rb
 - lib/openstudio/workflow/jobs/run_runmanager/run_runmanager.rb
 - lib/openstudio/workflow/jobs/run_xml/run_xml.rb
@@ -139,6 +132,10 @@ files:
 - lib/openstudio/workflow/run.rb
 - lib/openstudio/workflow/time_logger.rb
 - lib/openstudio/workflow/version.rb
+- lib/openstudio-workflow.rb
+- README.md
+- CHANGELOG.md
+- Rakefile
 homepage: https://github.com/NREL/OpenStudio-workflow-gem
 licenses:
 - LGPL
@@ -159,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Workflow Manager

data/lib/openstudio/workflow/jobs/run_reporting_measures/packaged_measures/README.md

@@ -1,5 +0,0 @@
-# Packaged Measure Folder
-
-This folder is used to ship packaged measures with the AMIs.
-
-Current the only packaged measure is the StandardReports because it is run every simulation.  This folder will be copied into each data_point folder for now, but will eventually be part of the standard upload of the project and live in the scripts