openstudio-workflow 1.1.5 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3000cc72f835a7919035780c7788c7a263919b7b
-  data.tar.gz: c55fbbe9a6acd529c8b983fefc560e2ab875a1e1
+  metadata.gz: e9b4f0394bca6c06758fcaa8151bc70d06166656
+  data.tar.gz: 9052de122a97f74fd6d4aa573f31d14ee921709d
 SHA512:
-  metadata.gz: 78cb0f8ab01d6a35d3b9a3a3b37fb71cbd7b2a38c3789d7d679fa8e0d9254041e7246cabb4bf02815594b3a38cb766cc7de9a72b55454168dee094509e0058ff
-  data.tar.gz: cfdb31fc4014bee9d2899df351f5b09090c1ea926b8cc829681b64c9b9204bd94c357a55f38809ea4f638be19689c4998f30e816499da3d3dac1ec59defd9990
+  metadata.gz: 6d946e5188f54cedf4e8d1dd8bf9f1bfc93a3443fd34623dd51abedf432162e036e9bcf86fc2f79a9cddd0a2d94d88c91e6f6ce8f5edc5afad31345dc8fac0e1
+  data.tar.gz: d42e9fafcbf20d01b4d74281861678593993263fe72f626681993e0a03ff2bca9106d26dca24ffc34cb8b5d7940c52e60c0b06ac75b5a6c68f24b50310c299a5

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

@@ -41,6 +41,7 @@ class RunInitialization < OpenStudio::Workflow::Job
     @output_adapter.communicate_started
 
     # Load various files and set basic directories for the registry
+    # DLM: this key is the raw JSON object, it is deprecated and should not be used, use :workflow_json instead
     @registry.register(:workflow) { @input_adapter.workflow }
     raise 'Specified workflow was nil' unless @registry[:workflow]
     @logger.debug 'Retrieved the workflow from the adapter'
@@ -65,6 +66,12 @@ class RunInitialization < OpenStudio::Workflow::Job
 
     @registry.register(:root_dir) { workflow_json.absoluteRootDir }
     @logger.debug "The root_dir for the datapoint is #{@registry[:root_dir]}"
+    
+    reports_dir = "#{@registry[:root_dir]}/reports"
+    if File.exist?(reports_dir)
+      @logger.debug "Removing existing reports directory: #{reports_dir}"
+      FileUtils.rm_rf(reports_dir)
+    end
 
     # create the runner with our WorkflowJSON
     @registry.register(:runner) { WorkflowRunner.new(@registry[:logger], @registry[:workflow_json], @registry[:openstudio_2]) }

data/lib/openstudio/workflow/util/measure.rb

@@ -181,7 +181,28 @@ module OpenStudio
             logger.warn "Value for argument '#{argument_name}' not set in argument list therefore will use default"
           end
         end
-
+        
+        # Method to add measure info to WorkflowStepResult
+        #
+        # @param [Object] result Current WorkflowStepResult
+        # @param [Object] measure Current BCLMeasure
+        def add_result_measure_info(result, measure)
+          begin
+            result.setMeasureType(measure.measureType)
+            result.setMeasureName(measure.name)
+            result.setMeasureId(measure.uid)
+            result.setMeasureVersionId(measure.versionId)
+            version_modified = measure.versionModified
+            if !version_modified.empty?
+              result.setMeasureVersionModified(version_modified.get)
+            end
+            result.setMeasureXmlChecksum(measure.xmlChecksum)
+            result.setMeasureClassName(measure.className)
+            result.setMeasureDisplayName(measure.displayName)
+          rescue NameError
+          end
+        end
+        
         # Method to allow for a single measure of any type to be run
         #
         # @param [String] directory Location of the datapoint directory to run. This is needed
@@ -394,6 +415,7 @@ module OpenStudio
                 
                 current_result = runner.result
                 runner.incrementStep
+                add_result_measure_info(current_result, measure)
                 current_result.setStepResult('Skip'.to_StepResult)
               end
             else
@@ -431,6 +453,8 @@ module OpenStudio
                 if !energyplus_output_requests
                   # incrementStep must be called after run
                   runner.incrementStep
+                  
+                  add_result_measure_info(result, measure)
                 end
                 
                 options[:output_adapter].communicate_measure_result(result) if options[:output_adapter]
@@ -452,6 +476,8 @@ module OpenStudio
                 # incrementStep must be called after run
                 runner.incrementStep
                 
+                add_result_measure_info(result, measure)
+                
                 options[:output_adapter].communicate_measure_result(result) if options[:output_adapter]
 
                 errors = result.stepErrors

data/lib/openstudio/workflow/version.rb

@@ -19,6 +19,6 @@
 
 module OpenStudio
   module Workflow
-    VERSION = '1.1.5'.freeze # Suffixes must have periods (not dashes)
+    VERSION = '1.2.0'.freeze # Suffixes must have periods (not dashes)
   end
 end

data/lib/openstudio/workflow_runner.rb

@@ -140,10 +140,12 @@ class WorkflowRunner < OpenStudio::Ruleset::OSRunner
 
       unless os_result.initialCondition.empty?
         current_step.step[:result][:initial_condition] = os_result.initialCondition.get.logMessage
+        current_step.step[:result][:step_initial_condition] = os_result.initialCondition.get.logMessage
       end
 
       unless os_result.finalCondition.empty?
         current_step.step[:result][:final_condition] = os_result.finalCondition.get.logMessage
+        current_step.step[:result][:step_final_condition] = os_result.finalCondition.get.logMessage
       end
 
       current_step.step[:result][:step_values] = []

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-workflow
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.2.0
 platform: ruby
 authors:
 - Nicholas Long
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-16 00:00:00.000000000 Z
+date: 2017-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler