honeybee-openstudio 2.16.6 → 2.17.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/ci.yaml +2 -2
- data/Gemfile +1 -1
- data/honeybee-openstudio.gemspec +5 -5
- data/lib/files/urbanopt_Gemfile +13 -5
- data/lib/from_openstudio/geometry/face.rb +2 -2
- data/lib/from_openstudio/model.rb +9 -1
- data/lib/measures/from_honeybee_model_to_gbxml/measure.rb +7 -0
- data/lib/to_openstudio/construction/air.rb +0 -2
- data/lib/to_openstudio/schedule/fixed_interval.rb +1 -1
- metadata +95 -11
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 1186d2bbbf3f03e945a82ae14f61b1529715930086e4e33a196650b9e3c0cf7b
|
4
|
+
data.tar.gz: f68521a43fa529cf678eb8acb14895558244d896b09f1349bb033fab3cf91d2b
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: f344d6880203249bffdb96dd677db64a64b1f9dd025bdf1992bab9b04c09449e2d3e63cbf8ddb3e12b4df89b975da693a021fb91dd130bee2225d7f61e638e8e
|
7
|
+
data.tar.gz: 14d6d0470bf0323c7d37753d8f53f6314ad928618deac469d0515b9ba6311f25c1129f4b71d6f5ba3b4565536fbaaa3ea43ae0d7f699079c67469781bc8c2b1c
|
data/.github/workflows/ci.yaml
CHANGED
@@ -15,8 +15,8 @@ jobs:
|
|
15
15
|
run: |
|
16
16
|
echo $(pwd)
|
17
17
|
echo $(ls)
|
18
|
-
docker pull nrel/openstudio:3.
|
19
|
-
docker run --name test --rm -d -t -v $(pwd):/work -w /work nrel/openstudio:3.
|
18
|
+
docker pull nrel/openstudio:3.2.0
|
19
|
+
docker run --name test --rm -d -t -v $(pwd):/work -w /work nrel/openstudio:3.2.0
|
20
20
|
docker exec -t test pwd
|
21
21
|
docker exec -t test ls
|
22
22
|
docker exec -t test bundle update
|
data/Gemfile
CHANGED
@@ -7,7 +7,7 @@ gemspec
|
|
7
7
|
if File.exist?('../OpenStudio-extension-gem') # local development copy
|
8
8
|
gem 'openstudio-extension', path: '../OpenStudio-extension-gem'
|
9
9
|
else # get it from rubygems.org
|
10
|
-
gem 'openstudio-extension', '0.
|
10
|
+
gem 'openstudio-extension', '0.4.2'
|
11
11
|
end
|
12
12
|
|
13
13
|
# coveralls gem is used to generate coverage reports through CI
|
data/honeybee-openstudio.gemspec
CHANGED
@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
|
|
4
4
|
|
5
5
|
Gem::Specification.new do |spec|
|
6
6
|
spec.name = 'honeybee-openstudio'
|
7
|
-
spec.version = '2.
|
7
|
+
spec.version = '2.17.4'
|
8
8
|
spec.authors = ['Tanushree Charan', 'Dan Macumber', 'Chris Mackey', 'Mostapha Sadeghipour Roudsari']
|
9
9
|
spec.email = ['tanushree.charan@nrel.gov', 'chris@ladybug.tools']
|
10
10
|
|
@@ -21,8 +21,8 @@ Gem::Specification.new do |spec|
|
|
21
21
|
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
|
22
22
|
spec.require_paths = ['lib']
|
23
23
|
|
24
|
-
if /^2.
|
25
|
-
spec.required_ruby_version = "~> 2.
|
24
|
+
if /^2.7/.match(RUBY_VERSION)
|
25
|
+
spec.required_ruby_version = "~> 2.7.0"
|
26
26
|
|
27
27
|
spec.add_development_dependency "bundler", "~> 2.1"
|
28
28
|
spec.add_development_dependency "public_suffix", "~> 3.1.1"
|
@@ -33,6 +33,6 @@ Gem::Specification.new do |spec|
|
|
33
33
|
end
|
34
34
|
|
35
35
|
spec.add_dependency 'json_pure'
|
36
|
-
spec.add_dependency 'openstudio-extension', '0.
|
37
|
-
spec.add_dependency 'openstudio-standards', '~> 0.2.
|
36
|
+
spec.add_dependency 'openstudio-extension', '0.4.2'
|
37
|
+
spec.add_dependency 'openstudio-standards', '~> 0.2.13'
|
38
38
|
end
|
data/lib/files/urbanopt_Gemfile
CHANGED
@@ -1,15 +1,23 @@
|
|
1
1
|
source 'http://rubygems.org'
|
2
2
|
|
3
|
-
ruby '~> 2.
|
3
|
+
ruby '~> 2.7.0'
|
4
4
|
|
5
5
|
allow_local = ENV['FAVOR_LOCAL_GEMS']
|
6
6
|
|
7
|
+
if allow_local && File.exist?('../openstudio-common-measures-gem')
|
8
|
+
gem 'openstudio-common-measures', path: '../openstudio-common-measures-gem'
|
9
|
+
elsif allow_local
|
10
|
+
gem 'openstudio-common-measures', github: 'NREL/openstudio-common-measures-gem', branch: 'develop'
|
11
|
+
else
|
12
|
+
gem 'openstudio-common-measures', '~> 0.4.0'
|
13
|
+
end
|
14
|
+
|
7
15
|
if allow_local && File.exist?('../openstudio-model-articulation-gem')
|
8
16
|
gem 'openstudio-model-articulation', path: '../openstudio-model-articulation-gem'
|
9
17
|
elsif allow_local
|
10
18
|
gem 'openstudio-model-articulation', github: 'NREL/openstudio-model-articulation-gem', branch: 'develop'
|
11
19
|
else
|
12
|
-
gem 'openstudio-model-articulation', '0.
|
20
|
+
gem 'openstudio-model-articulation', '0.4.0'
|
13
21
|
end
|
14
22
|
|
15
23
|
if allow_local && File.exist?('../urbanopt-geojson-gem')
|
@@ -17,7 +25,7 @@ if allow_local && File.exist?('../urbanopt-geojson-gem')
|
|
17
25
|
elsif allow_local
|
18
26
|
gem 'urbanopt-geojson', github: 'URBANopt/urbanopt-geojson-gem', branch: 'develop'
|
19
27
|
else
|
20
|
-
gem 'urbanopt-geojson', '~> 0.
|
28
|
+
gem 'urbanopt-geojson', '~> 0.6.1'
|
21
29
|
end
|
22
30
|
|
23
31
|
if allow_local && File.exist?('../urbanopt-reporting-gem')
|
@@ -25,8 +33,8 @@ if allow_local && File.exist?('../urbanopt-reporting-gem')
|
|
25
33
|
elsif allow_local
|
26
34
|
gem 'urbanopt-reporting', github: 'URBANopt/urbanopt-reporting-gem', branch: 'develop'
|
27
35
|
else
|
28
|
-
gem 'urbanopt-reporting', '~> 0.
|
36
|
+
gem 'urbanopt-reporting', '~> 0.4.0'
|
29
37
|
end
|
30
38
|
|
31
39
|
# include the honeybee-openstudio-gem
|
32
|
-
gem 'honeybee-openstudio', '2.
|
40
|
+
gem 'honeybee-openstudio', '2.17.0'
|
@@ -108,7 +108,7 @@ module Honeybee
|
|
108
108
|
|
109
109
|
def self.boundary_condition_from_surface(surface)
|
110
110
|
result = {}
|
111
|
-
|
111
|
+
surface_bc = surface.outsideBoundaryCondition
|
112
112
|
adjacent_surface = surface.adjacentSurface
|
113
113
|
if !adjacent_surface.empty?
|
114
114
|
adjacent_space = clean_identifier(adjacent_surface.get.space.get.nameString)
|
@@ -116,7 +116,7 @@ module Honeybee
|
|
116
116
|
result = {type: 'Surface', boundary_condition_objects: [adjacent_surface, adjacent_space]}
|
117
117
|
elsif surface.isGroundSurface
|
118
118
|
result = {type: 'Ground'}
|
119
|
-
elsif
|
119
|
+
elsif surface_bc == 'Adiabatic'
|
120
120
|
result = {type: 'Adiabatic'}
|
121
121
|
else
|
122
122
|
sun_exposure = (surface.sunExposure == 'SunExposed')
|
@@ -81,7 +81,15 @@ module Honeybee
|
|
81
81
|
translator = OpenStudio::GbXML::GbXMLReverseTranslator.new
|
82
82
|
openstudio_model = translator.loadModel(file)
|
83
83
|
raise "Cannot load gbXML file at '#{}'" if openstudio_model.empty?
|
84
|
-
|
84
|
+
# remove any shade groups that were translated as spaces
|
85
|
+
os_model = openstudio_model.get
|
86
|
+
spaces = os_model.getSpaces()
|
87
|
+
spaces.each do |space|
|
88
|
+
if space.surfaces.length() == 0
|
89
|
+
space.remove()
|
90
|
+
end
|
91
|
+
end
|
92
|
+
self.translate_from_openstudio(os_model)
|
85
93
|
end
|
86
94
|
|
87
95
|
# Create Ladybug Energy Model JSON from IDF file
|
@@ -90,6 +90,13 @@ class FromHoneybeeModelToGbxml < OpenStudio::Measure::ModelMeasure
|
|
90
90
|
os_model = honeybee_model.to_openstudio_model(model)
|
91
91
|
STDOUT.flush
|
92
92
|
|
93
|
+
# make sure the zone name is different from the space name to comply with gbXML
|
94
|
+
zones = os_model.getThermalZones()
|
95
|
+
zones.each do |zone|
|
96
|
+
zone_name = zone.name.to_s + '_Zone'
|
97
|
+
zone.setName(zone_name)
|
98
|
+
end
|
99
|
+
|
93
100
|
# convert the OpenStudio model into a gbXML Model
|
94
101
|
output_file_path = runner.getStringArgumentValue('output_file_path', user_arguments)
|
95
102
|
if output_file_path && !output_file_path.empty?
|
@@ -45,8 +45,6 @@ module Honeybee
|
|
45
45
|
def to_openstudio(openstudio_model)
|
46
46
|
os_construction = OpenStudio::Model::ConstructionAirBoundary.new(openstudio_model)
|
47
47
|
os_construction.setName(@hash[:identifier])
|
48
|
-
os_construction.setSolarAndDaylightingMethod('GroupedZones')
|
49
|
-
os_construction.setRadiantExchangeMethod('GroupedZones')
|
50
48
|
os_construction.setAirExchangeMethod('None')
|
51
49
|
|
52
50
|
os_construction
|
@@ -203,7 +203,7 @@ module Honeybee
|
|
203
203
|
os_schedule_file = OpenStudio::Model::ScheduleFile.new(os_external_file, column, rowsToSkip)
|
204
204
|
os_schedule_file.setName(@hash[:identifier])
|
205
205
|
os_schedule_file.setInterpolatetoTimestep(interpolate)
|
206
|
-
os_schedule_file.setMinutesperItem(interval_length
|
206
|
+
os_schedule_file.setMinutesperItem(interval_length)
|
207
207
|
|
208
208
|
# assign the schedule type limit
|
209
209
|
if @hash[:schedule_type_limit]
|
metadata
CHANGED
@@ -1,18 +1,102 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: honeybee-openstudio
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.
|
4
|
+
version: 2.17.4
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Tanushree Charan
|
8
8
|
- Dan Macumber
|
9
9
|
- Chris Mackey
|
10
10
|
- Mostapha Sadeghipour Roudsari
|
11
|
-
autorequire:
|
11
|
+
autorequire:
|
12
12
|
bindir: exe
|
13
13
|
cert_chain: []
|
14
|
-
date: 2021-05-
|
14
|
+
date: 2021-05-21 00:00:00.000000000 Z
|
15
15
|
dependencies:
|
16
|
+
- !ruby/object:Gem::Dependency
|
17
|
+
name: bundler
|
18
|
+
requirement: !ruby/object:Gem::Requirement
|
19
|
+
requirements:
|
20
|
+
- - "~>"
|
21
|
+
- !ruby/object:Gem::Version
|
22
|
+
version: '2.1'
|
23
|
+
type: :development
|
24
|
+
prerelease: false
|
25
|
+
version_requirements: !ruby/object:Gem::Requirement
|
26
|
+
requirements:
|
27
|
+
- - "~>"
|
28
|
+
- !ruby/object:Gem::Version
|
29
|
+
version: '2.1'
|
30
|
+
- !ruby/object:Gem::Dependency
|
31
|
+
name: public_suffix
|
32
|
+
requirement: !ruby/object:Gem::Requirement
|
33
|
+
requirements:
|
34
|
+
- - "~>"
|
35
|
+
- !ruby/object:Gem::Version
|
36
|
+
version: 3.1.1
|
37
|
+
type: :development
|
38
|
+
prerelease: false
|
39
|
+
version_requirements: !ruby/object:Gem::Requirement
|
40
|
+
requirements:
|
41
|
+
- - "~>"
|
42
|
+
- !ruby/object:Gem::Version
|
43
|
+
version: 3.1.1
|
44
|
+
- !ruby/object:Gem::Dependency
|
45
|
+
name: json-schema
|
46
|
+
requirement: !ruby/object:Gem::Requirement
|
47
|
+
requirements:
|
48
|
+
- - "~>"
|
49
|
+
- !ruby/object:Gem::Version
|
50
|
+
version: 2.8.1
|
51
|
+
type: :development
|
52
|
+
prerelease: false
|
53
|
+
version_requirements: !ruby/object:Gem::Requirement
|
54
|
+
requirements:
|
55
|
+
- - "~>"
|
56
|
+
- !ruby/object:Gem::Version
|
57
|
+
version: 2.8.1
|
58
|
+
- !ruby/object:Gem::Dependency
|
59
|
+
name: rake
|
60
|
+
requirement: !ruby/object:Gem::Requirement
|
61
|
+
requirements:
|
62
|
+
- - "~>"
|
63
|
+
- !ruby/object:Gem::Version
|
64
|
+
version: '13.0'
|
65
|
+
type: :development
|
66
|
+
prerelease: false
|
67
|
+
version_requirements: !ruby/object:Gem::Requirement
|
68
|
+
requirements:
|
69
|
+
- - "~>"
|
70
|
+
- !ruby/object:Gem::Version
|
71
|
+
version: '13.0'
|
72
|
+
- !ruby/object:Gem::Dependency
|
73
|
+
name: rspec
|
74
|
+
requirement: !ruby/object:Gem::Requirement
|
75
|
+
requirements:
|
76
|
+
- - "~>"
|
77
|
+
- !ruby/object:Gem::Version
|
78
|
+
version: '3.9'
|
79
|
+
type: :development
|
80
|
+
prerelease: false
|
81
|
+
version_requirements: !ruby/object:Gem::Requirement
|
82
|
+
requirements:
|
83
|
+
- - "~>"
|
84
|
+
- !ruby/object:Gem::Version
|
85
|
+
version: '3.9'
|
86
|
+
- !ruby/object:Gem::Dependency
|
87
|
+
name: rubocop
|
88
|
+
requirement: !ruby/object:Gem::Requirement
|
89
|
+
requirements:
|
90
|
+
- - "~>"
|
91
|
+
- !ruby/object:Gem::Version
|
92
|
+
version: 0.54.0
|
93
|
+
type: :development
|
94
|
+
prerelease: false
|
95
|
+
version_requirements: !ruby/object:Gem::Requirement
|
96
|
+
requirements:
|
97
|
+
- - "~>"
|
98
|
+
- !ruby/object:Gem::Version
|
99
|
+
version: 0.54.0
|
16
100
|
- !ruby/object:Gem::Dependency
|
17
101
|
name: json_pure
|
18
102
|
requirement: !ruby/object:Gem::Requirement
|
@@ -33,28 +117,28 @@ dependencies:
|
|
33
117
|
requirements:
|
34
118
|
- - '='
|
35
119
|
- !ruby/object:Gem::Version
|
36
|
-
version: 0.
|
120
|
+
version: 0.4.2
|
37
121
|
type: :runtime
|
38
122
|
prerelease: false
|
39
123
|
version_requirements: !ruby/object:Gem::Requirement
|
40
124
|
requirements:
|
41
125
|
- - '='
|
42
126
|
- !ruby/object:Gem::Version
|
43
|
-
version: 0.
|
127
|
+
version: 0.4.2
|
44
128
|
- !ruby/object:Gem::Dependency
|
45
129
|
name: openstudio-standards
|
46
130
|
requirement: !ruby/object:Gem::Requirement
|
47
131
|
requirements:
|
48
132
|
- - "~>"
|
49
133
|
- !ruby/object:Gem::Version
|
50
|
-
version: 0.2.
|
134
|
+
version: 0.2.13
|
51
135
|
type: :runtime
|
52
136
|
prerelease: false
|
53
137
|
version_requirements: !ruby/object:Gem::Requirement
|
54
138
|
requirements:
|
55
139
|
- - "~>"
|
56
140
|
- !ruby/object:Gem::Version
|
57
|
-
version: 0.2.
|
141
|
+
version: 0.2.13
|
58
142
|
description: Library and measures for translating between Honeybee JSON schema and
|
59
143
|
OpenStudio Model schema (OSM).
|
60
144
|
email:
|
@@ -230,15 +314,15 @@ files:
|
|
230
314
|
homepage: https://github.com/ladybug-tools/honeybee-openstudio-gem
|
231
315
|
licenses: []
|
232
316
|
metadata: {}
|
233
|
-
post_install_message:
|
317
|
+
post_install_message:
|
234
318
|
rdoc_options: []
|
235
319
|
require_paths:
|
236
320
|
- lib
|
237
321
|
required_ruby_version: !ruby/object:Gem::Requirement
|
238
322
|
requirements:
|
239
|
-
- - "
|
323
|
+
- - "~>"
|
240
324
|
- !ruby/object:Gem::Version
|
241
|
-
version:
|
325
|
+
version: 2.7.0
|
242
326
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
243
327
|
requirements:
|
244
328
|
- - ">="
|
@@ -246,7 +330,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
246
330
|
version: '0'
|
247
331
|
requirements: []
|
248
332
|
rubygems_version: 3.1.2
|
249
|
-
signing_key:
|
333
|
+
signing_key:
|
250
334
|
specification_version: 4
|
251
335
|
summary: Gem for translating between Honeybee JSON and OpenStudio Model.
|
252
336
|
test_files: []
|