openstudio-workflow 1.1.2 → 1.1.3
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 89e53c78fca885e3dfa70230cfcb844f46df7511
|
4
|
+
data.tar.gz: 84085fc7b3e3c8353e4854c81e981d0906b2c033
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 235db73cd5e588fb0c9ee452b2a404cc40a9a42f472363f73b899afc5962c039b25e5f5d7325b0b24de13be6cc11f29da572090f319165dda03688206a13b519
|
7
|
+
data.tar.gz: 743d79020fd58e99ea602778575fa91abec7e443b25175ad7b7acfed8af3dcb54f6c4ed5b7717bd8d8562012f9879711e682bc3eb2f24326313d108937760cef
|
@@ -96,6 +96,21 @@ class RunInitialization < OpenStudio::Workflow::Job
|
|
96
96
|
end
|
97
97
|
else
|
98
98
|
@registry.register(:model) { OpenStudio::Model::Model.new }
|
99
|
+
|
100
|
+
# add default objects to the model
|
101
|
+
begin
|
102
|
+
OpenStudio::Model::initializeModelObjects(@registry[:model])
|
103
|
+
rescue NameError
|
104
|
+
@registry[:model].getBuilding
|
105
|
+
@registry[:model].getFacility
|
106
|
+
@registry[:model].getSimulationControl
|
107
|
+
@registry[:model].getSizingParameters
|
108
|
+
@registry[:model].getTimestep
|
109
|
+
@registry[:model].getShadowCalculation
|
110
|
+
@registry[:model].getHeatBalanceAlgorithm
|
111
|
+
@registry[:model].getRunPeriod
|
112
|
+
@registry[:model].getLifeCycleCostParameters
|
113
|
+
end
|
99
114
|
end
|
100
115
|
|
101
116
|
if @registry[:openstudio_2]
|
@@ -35,7 +35,7 @@ class RunPostprocess < OpenStudio::Workflow::Job
|
|
35
35
|
@logger.debug "Calling #{__method__} in the #{self.class} class"
|
36
36
|
|
37
37
|
@logger.info 'Gathering reports'
|
38
|
-
gather_reports(@registry[:run_dir], @registry[:root_dir], @logger)
|
38
|
+
gather_reports(@registry[:run_dir], @registry[:root_dir], @registry[:workflow_json], @logger)
|
39
39
|
@logger.info 'Finished gathering reports'
|
40
40
|
|
41
41
|
if @options[:cleanup]
|
@@ -118,7 +118,7 @@ module OpenStudio
|
|
118
118
|
# @param [String] directory
|
119
119
|
# @param [String] logger
|
120
120
|
#
|
121
|
-
def gather_reports(run_dir, directory, logger)
|
121
|
+
def gather_reports(run_dir, directory, workflow_json, logger)
|
122
122
|
logger.info run_dir
|
123
123
|
logger.info directory
|
124
124
|
|
@@ -136,13 +136,17 @@ module OpenStudio
|
|
136
136
|
|
137
137
|
# Also, find any "report*.*" files
|
138
138
|
Dir["#{run_dir}/*/report*.*"].each do |report|
|
139
|
-
#
|
140
|
-
measure_dir_name = File.dirname(report).split(
|
139
|
+
# HRH: This is a temporary work-around to support PAT 2.1 pretty names AND the CLI while we roll a WorkflowJSON solution
|
140
|
+
measure_dir_name = File.dirname(report).split(File::SEPARATOR).last.gsub(/[0-9][0-9][0-9]_/, '')
|
141
141
|
measure_xml_path = File.absolute_path(File.join(File.dirname(report), '../../..', 'measures',
|
142
142
|
measure_dir_name, 'measure.xml'))
|
143
143
|
logger.info "measure_xml_path: #{measure_xml_path}"
|
144
|
-
|
145
|
-
|
144
|
+
if File.exists? measure_xml_path
|
145
|
+
measure_xml = REXML::Document.new File.read(measure_xml_path)
|
146
|
+
measure_class_name = OpenStudio.toUnderscoreCase(measure_xml.root.elements['class_name'].text)
|
147
|
+
else
|
148
|
+
measure_class_name = OpenStudio.toUnderscoreCase(measure_dir_name)
|
149
|
+
end
|
146
150
|
file_ext = File.extname(report)
|
147
151
|
append_str = File.basename(report, '.*')
|
148
152
|
new_file_name = "#{directory}/reports/#{measure_class_name}_#{append_str}#{file_ext}"
|
@@ -173,8 +177,8 @@ module OpenStudio
|
|
173
177
|
# paths_to_rm << Pathname.glob("#{run_dir}/*.eso")
|
174
178
|
paths_to_rm << Pathname.glob("#{run_dir}/*.mtr")
|
175
179
|
paths_to_rm << Pathname.glob("#{run_dir}/*.epw")
|
176
|
-
paths_to_rm << Pathname.glob("#{run_dir}/*.mtd")
|
177
|
-
paths_to_rm << Pathname.glob("#{run_dir}/*.rdd")
|
180
|
+
#paths_to_rm << Pathname.glob("#{run_dir}/*.mtd")
|
181
|
+
#paths_to_rm << Pathname.glob("#{run_dir}/*.rdd")
|
178
182
|
paths_to_rm.each { |p| FileUtils.rm_rf(p) }
|
179
183
|
end
|
180
184
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: openstudio-workflow
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.1.
|
4
|
+
version: 1.1.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Nicholas Long
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2017-03-
|
12
|
+
date: 2017-03-09 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: bundler
|