openstudio-workflow 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c672be50cec3b97e0768c9b4b935283c281a42a8668d172777d77fc11f7bb636
-  data.tar.gz: 110cd910db5fd25e70c641dbbe905ee18b065dcfdf0447c50847867a5bd8a9db
+  metadata.gz: c632f0a2834a490fbd25b21ef3f17ff07d77e08bdf76db7d1737a2843665d2b6
+  data.tar.gz: 6ac3e3165ddac8de85d5a364878e4ae18089a9b7c2171b9bf2341cd1c4c9438e
 SHA512:
-  metadata.gz: 37cef44df01e125a9c6e0cb496c3d68accdca96dc97106d23fac41b8e63551efdc2b9deb57cb9ffa78a9ba246bf1e0837b1a897bbf08102d95d2329c078638fa
-  data.tar.gz: 31cd4fc83927dbef85d38ff169578888e23b928f0ab54039ac1b4cf04e2d8058849a23afa91b76443080ad98cf80c9675007a1ccb627cc69110d0e598fca3fc1
+  metadata.gz: e274ab7d2787530a70ea4b5f17859640597044b72ec0c62a5b1c35dd459b7e013fe248e8454526998ed66ec22750a4fc02831a30314cf50639717f608b11fa8f
+  data.tar.gz: 830be90f370e3f1290c3dddeeaa63c6e1b7d7f9b4bb7e64747ac04fbf44bd3e89b2f07d11683249aa19600dd331095a87694c55f1bc9fa9102d93bd65bb05071

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 OpenStudio::Workflow Change Log
 ==================================
 
+Version 2.1.1
+-------------
+* Add support for URBANopt Workflow
+* Update reporting measure in tests
+
 Version 2.1.0
 -------------
 * Support for EnergyPlus 9.4. This version will not work with prior versions of EnergyPlus.

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

@@ -62,9 +62,23 @@ class RunReportingMeasures < OpenStudio::Workflow::Job
 
     # Ensure output_attributes is initialized in the registry
     @registry.register(:output_attributes) { {} } unless @registry[:output_attributes]
+    
+    #get OSA[:urbanopt]  #BLB should prob be sent in as cli arg and used in options but for now just do this
+    @registry.register(:urbanopt) { false }
+    if @registry[:osw_path]
+      workflow = nil
+      if File.exist? @registry[:osw_path]
+        workflow = ::JSON.parse(File.read(@registry[:osw_path]), symbolize_names: true)
+        if !workflow.nil?
+          if !workflow[:urbanopt].nil?
+            @registry.register(:urbanopt) { workflow[:urbanopt] }
+          end
+        end
+      end    
+    end
 
     # Load simulation files as required
-    unless @registry[:runner].halted
+    unless @registry[:runner].halted || @registry[:urbanopt]
       if @registry[:model].nil?
         osm_path = File.absolute_path(File.join(@registry[:run_dir], 'in.osm'))
         @logger.debug "Attempting to load #{osm_path}"

data/lib/openstudio/workflow/version.rb

@@ -37,6 +37,6 @@
 
 module OpenStudio
   module Workflow
-    VERSION = '2.1.0' # Suffixes must have periods (not dashes)
+    VERSION = '2.1.1' # 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: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Nicholas Long
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-25 00:00:00.000000000 Z
+date: 2020-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -95,6 +95,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.8.0
+- !ruby/object:Gem::Dependency
+  name: openstudio-standards
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.12
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.12
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement