openstudio-workflow 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 626a53f7a44fd8b5203559f9101767698477acbb
-  data.tar.gz: ae410305611dfe81e607f90e09fb4aab37d05e54
+  metadata.gz: 89e53c78fca885e3dfa70230cfcb844f46df7511
+  data.tar.gz: 84085fc7b3e3c8353e4854c81e981d0906b2c033
 SHA512:
-  metadata.gz: 94d0f57c7490ae80cdb5f97942d3045309784478f0f97850d5ef7b04b1853c0dc19131e82a81bc8d1025010d655ceaaa2bcdf99fa2d6d9d261f1747c98825ce2
-  data.tar.gz: 44f91112022af27f4eadfc1319d88b74f73bbffc4ca70f2532774c6411ea6b4b01a7e7b73e4604a4c158fef9231b53f49d790f62092bb7b73af3f8d57df5dbf3
+  metadata.gz: 235db73cd5e588fb0c9ee452b2a404cc40a9a42f472363f73b899afc5962c039b25e5f5d7325b0b24de13be6cc11f29da572090f319165dda03688206a13b519
+  data.tar.gz: 743d79020fd58e99ea602778575fa91abec7e443b25175ad7b7acfed8af3dcb54f6c4ed5b7717bd8d8562012f9879711e682bc3eb2f24326313d108937760cef

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

@@ -96,6 +96,21 @@ class RunInitialization < OpenStudio::Workflow::Job
       end
     else
       @registry.register(:model) { OpenStudio::Model::Model.new }
+      
+      # add default objects to the model
+      begin
+        OpenStudio::Model::initializeModelObjects(@registry[:model])
+      rescue NameError
+        @registry[:model].getBuilding
+        @registry[:model].getFacility
+        @registry[:model].getSimulationControl
+        @registry[:model].getSizingParameters
+        @registry[:model].getTimestep
+        @registry[:model].getShadowCalculation
+        @registry[:model].getHeatBalanceAlgorithm
+        @registry[:model].getRunPeriod
+        @registry[:model].getLifeCycleCostParameters
+      end
     end
 
     if @registry[:openstudio_2]

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

@@ -35,7 +35,7 @@ class RunPostprocess < OpenStudio::Workflow::Job
     @logger.debug "Calling #{__method__} in the #{self.class} class"
 
     @logger.info 'Gathering reports'
-    gather_reports(@registry[:run_dir], @registry[:root_dir], @logger)
+    gather_reports(@registry[:run_dir], @registry[:root_dir], @registry[:workflow_json], @logger)
     @logger.info 'Finished gathering reports'
 
     if @options[:cleanup]

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

@@ -118,7 +118,7 @@ module OpenStudio
         # @param [String] directory
         # @param [String] logger
         #
-        def gather_reports(run_dir, directory, logger)
+        def gather_reports(run_dir, directory, workflow_json, logger)
           logger.info run_dir
           logger.info directory
 
@@ -136,13 +136,17 @@ module OpenStudio
 
           # Also, find any "report*.*" files
           Dir["#{run_dir}/*/report*.*"].each do |report|
-            # get the parent directory of the file and snake case it
-            measure_dir_name = File.dirname(report).split('/').last.gsub(/[0-9][0-9][0-9]_/, '')
+            # HRH: This is a temporary work-around to support PAT 2.1 pretty names AND the CLI while we roll a WorkflowJSON solution
+            measure_dir_name = File.dirname(report).split(File::SEPARATOR).last.gsub(/[0-9][0-9][0-9]_/, '')
             measure_xml_path = File.absolute_path(File.join(File.dirname(report), '../../..', 'measures',
                                                             measure_dir_name, 'measure.xml'))
             logger.info "measure_xml_path: #{measure_xml_path}"
-            measure_xml = REXML::Document.new File.read(measure_xml_path)
-            measure_class_name = OpenStudio.toUnderscoreCase(measure_xml.root.elements['class_name'].text)
+            if File.exists? measure_xml_path
+              measure_xml = REXML::Document.new File.read(measure_xml_path)
+              measure_class_name = OpenStudio.toUnderscoreCase(measure_xml.root.elements['class_name'].text)
+            else
+              measure_class_name = OpenStudio.toUnderscoreCase(measure_dir_name)
+            end
             file_ext = File.extname(report)
             append_str = File.basename(report, '.*')
             new_file_name = "#{directory}/reports/#{measure_class_name}_#{append_str}#{file_ext}"
@@ -173,8 +177,8 @@ module OpenStudio
           # paths_to_rm << Pathname.glob("#{run_dir}/*.eso")
           paths_to_rm << Pathname.glob("#{run_dir}/*.mtr")
           paths_to_rm << Pathname.glob("#{run_dir}/*.epw")
-          paths_to_rm << Pathname.glob("#{run_dir}/*.mtd")
-          paths_to_rm << Pathname.glob("#{run_dir}/*.rdd")
+          #paths_to_rm << Pathname.glob("#{run_dir}/*.mtd")
+          #paths_to_rm << Pathname.glob("#{run_dir}/*.rdd")
           paths_to_rm.each { |p| FileUtils.rm_rf(p) }
         end
       end

data/lib/openstudio/workflow/version.rb

@@ -19,6 +19,6 @@
 
 module OpenStudio
   module Workflow
-    VERSION = '1.1.2'.freeze # Suffixes must have periods (not dashes)
+    VERSION = '1.1.3'.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.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Nicholas Long
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-02 00:00:00.000000000 Z
+date: 2017-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler