openstudio-workflow 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89e53c78fca885e3dfa70230cfcb844f46df7511
-  data.tar.gz: 84085fc7b3e3c8353e4854c81e981d0906b2c033
+  metadata.gz: 57a7d04300d875244f8d1120a856da6b943188e1
+  data.tar.gz: 22c3421d2b8b1bca3769588f8b1187fb35661f78
 SHA512:
-  metadata.gz: 235db73cd5e588fb0c9ee452b2a404cc40a9a42f472363f73b899afc5962c039b25e5f5d7325b0b24de13be6cc11f29da572090f319165dda03688206a13b519
-  data.tar.gz: 743d79020fd58e99ea602778575fa91abec7e443b25175ad7b7acfed8af3dcb54f6c4ed5b7717bd8d8562012f9879711e682bc3eb2f24326313d108937760cef
+  metadata.gz: 605e3afc830f36366203aa261c37f24025a624afa16cf873c2637830c50890be01c24e951a16de1e7a57101e1fc8b25cc8e4344979aba139ff132d307f0ad02f
+  data.tar.gz: 973a86b651deb00b688613d5726e80ac45f6e3af4f4e0f1d2e2bcd4127bd32f94743389b5057f2acb43c7888404cafc07d3bf57aaf8db422d6bfdaa684b61fb3

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

@@ -54,7 +54,7 @@ class RunReportingMeasures < OpenStudio::Workflow::Job
     if @registry[:model_idf].nil?
       idf_path = File.absolute_path(File.join(@registry[:run_dir], 'in.idf'))
       @logger.debug "Attempting to load #{idf_path}"
-      @registry.register(:model_idf) { load_idf('.', idf_path) }
+      @registry.register(:model_idf) { load_idf(idf_path, @logger) }
       raise "Unable to load #{idf_path}" unless @registry[:model_idf]
       @logger.debug "Successfully loaded #{idf_path}"
     end

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

@@ -28,7 +28,9 @@ module OpenStudio
           fail "The 'steps' array of the OSW is required." unless workflow_steps
           
           logger.debug "Finding measures of type #{measure_type.valueName}"
-          workflow_steps.each do |step|
+          workflow_steps.each_index do |step_index|
+            
+            step = workflow_steps[step_index]
 
             if @registry[:openstudio_2]
               if !step.to_MeasureStep.empty?
@@ -55,6 +57,11 @@ module OpenStudio
               else
                 logger.info "Found measure #{class_name} of type #{measure_type.valueName}. Applying now."
                 
+                # fast forward current step index to this index, skips any previous steps
+                while workflow_json.currentStepIndex < step_index
+                  workflow_json.incrementStep
+                end
+                
                 # DLM: why is output_adapter in options instead of registry?
                 options[:output_adapter].communicate_transition("Applying #{class_name}", :measure) if options[:output_adapter]
                 apply_measure(registry, step, options)

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

@@ -43,7 +43,7 @@ module OpenStudio
           # Load the IDF into a workspace object and return it
           logger.info "Reading in IDF model #{idf_path}"
 
-          idf = OpenStudio::Workspace.load(idf_path).get
+          idf = OpenStudio::Workspace.load(idf_path)
           raise "Failed to load IDF file #{idf_path}" if idf.empty?
           idf.get
         end

data/lib/openstudio/workflow/version.rb

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

metadata

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