honeybee-openstudio 2.16.5 → 2.16.6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/honeybee-openstudio.gemspec +1 -1
  3. data/lib/honeybee/_defaults/energy_default.json +13 -13
  4. data/lib/honeybee/_defaults/model.json +10 -36
  5. data/lib/to_openstudio/construction/opaque.rb +6 -2
  6. data/lib/to_openstudio/construction/window.rb +6 -2
  7. data/lib/to_openstudio/construction/windowshade.rb +6 -2
  8. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: ad15296fe9faed5252b04ed33eea5397f9a19e4df371f4dacceb1bd867c2e084
4
- data.tar.gz: 043fbb6ed6cf93b6698d7a89b61c58bbca196737c6d1342c5a7acb9c136ae4e8
3
+ metadata.gz: 6e3cdabf5a90b2968eb99672ade4990f7d05410c0c9516015b566960a5a4501b
4
+ data.tar.gz: 4214ee645a6e4cd5c1d348f0769f89139d315ed465f63ea65019baed71b45eb7
5
5
  SHA512:
6
- metadata.gz: d8856ffa8b761800cf65f8a7c670890636340f6423e0df5d98f940f5f5bb9d9818deb0c304e847293db6f1de3fba8635da03ae8e638d043ad62888d9d18159a6
7
- data.tar.gz: 4849870e2c3857a8be2b6e5fc5564ac099ad9c74839b5d6653bb62ddbd30e86b127a14b1ef35d9db476f814af98fa0f7879c758e960efcfa0912e7171c218535
6
+ metadata.gz: 7f7c50b6b37447a1df820e36bbc5b8a58fdefa65aa9c15746b915b70071e68c70510402acb621c2d07386e5d05cfd2d7d564997d14167e18b49fa2faadf6e18c
7
+ data.tar.gz: bef2f198926f6524fa833a94c24bbf340aeee11c168596effee7b901fa771698f00108eef0c9815ac4c3ac99915b93b2c5b9e5e83102d858e613dc6c168cc3d0
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.16.5'
7
+ spec.version = '2.16.6'
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
 
data/lib/honeybee/_defaults/energy_default.json CHANGED
@@ -45,14 +45,14 @@
45
45
  {
46
46
  "type": "OpaqueConstructionAbridged",
47
47
  "identifier": "Generic Interior Door",
48
- "layers": [
48
+ "materials": [
49
49
  "Generic 25mm Wood"
50
50
  ]
51
51
  },
52
52
  {
53
53
  "type": "WindowConstructionAbridged",
54
54
  "identifier": "Generic Single Pane",
55
- "layers": [
55
+ "materials": [
56
56
  "Generic Clear Glass"
57
57
  ]
58
58
  },
@@ -73,7 +73,7 @@
73
73
  {
74
74
  "type": "OpaqueConstructionAbridged",
75
75
  "identifier": "Generic Interior Ceiling",
76
- "layers": [
76
+ "materials": [
77
77
  "Generic LW Concrete",
78
78
  "Generic Ceiling Air Gap",
79
79
  "Generic Acoustic Tile"
@@ -82,7 +82,7 @@
82
82
  {
83
83
  "type": "OpaqueConstructionAbridged",
84
84
  "identifier": "Generic Interior Wall",
85
- "layers": [
85
+ "materials": [
86
86
  "Generic Gypsum Board",
87
87
  "Generic Wall Air Gap",
88
88
  "Generic Gypsum Board"
@@ -91,7 +91,7 @@
91
91
  {
92
92
  "type": "OpaqueConstructionAbridged",
93
93
  "identifier": "Generic Exposed Floor",
94
- "layers": [
94
+ "materials": [
95
95
  "Generic Painted Metal",
96
96
  "Generic Ceiling Air Gap",
97
97
  "Generic 50mm Insulation",
@@ -101,7 +101,7 @@
101
101
  {
102
102
  "type": "OpaqueConstructionAbridged",
103
103
  "identifier": "Generic Interior Floor",
104
- "layers": [
104
+ "materials": [
105
105
  "Generic Acoustic Tile",
106
106
  "Generic Ceiling Air Gap",
107
107
  "Generic LW Concrete"
@@ -110,7 +110,7 @@
110
110
  {
111
111
  "type": "OpaqueConstructionAbridged",
112
112
  "identifier": "Generic Ground Slab",
113
- "layers": [
113
+ "materials": [
114
114
  "Generic 50mm Insulation",
115
115
  "Generic HW Concrete"
116
116
  ]
@@ -118,7 +118,7 @@
118
118
  {
119
119
  "type": "OpaqueConstructionAbridged",
120
120
  "identifier": "Generic Roof",
121
- "layers": [
121
+ "materials": [
122
122
  "Generic Roof Membrane",
123
123
  "Generic 50mm Insulation",
124
124
  "Generic LW Concrete",
@@ -129,7 +129,7 @@
129
129
  {
130
130
  "type": "OpaqueConstructionAbridged",
131
131
  "identifier": "Generic Exterior Wall",
132
- "layers": [
132
+ "materials": [
133
133
  "Generic Brick",
134
134
  "Generic LW Concrete",
135
135
  "Generic 50mm Insulation",
@@ -140,7 +140,7 @@
140
140
  {
141
141
  "type": "OpaqueConstructionAbridged",
142
142
  "identifier": "Generic Underground Wall",
143
- "layers": [
143
+ "materials": [
144
144
  "Generic 50mm Insulation",
145
145
  "Generic HW Concrete",
146
146
  "Generic Wall Air Gap",
@@ -156,7 +156,7 @@
156
156
  {
157
157
  "type": "OpaqueConstructionAbridged",
158
158
  "identifier": "Generic Underground Roof",
159
- "layers": [
159
+ "materials": [
160
160
  "Generic 50mm Insulation",
161
161
  "Generic HW Concrete",
162
162
  "Generic Ceiling Air Gap",
@@ -166,7 +166,7 @@
166
166
  {
167
167
  "type": "WindowConstructionAbridged",
168
168
  "identifier": "Generic Double Pane",
169
- "layers": [
169
+ "materials": [
170
170
  "Generic Low-e Glass",
171
171
  "Generic Window Air Gap",
172
172
  "Generic Clear Glass"
@@ -175,7 +175,7 @@
175
175
  {
176
176
  "type": "OpaqueConstructionAbridged",
177
177
  "identifier": "Generic Exterior Door",
178
- "layers": [
178
+ "materials": [
179
179
  "Generic Painted Metal",
180
180
  "Generic 25mm Insulation",
181
181
  "Generic Painted Metal"
data/lib/honeybee/_defaults/model.json CHANGED
@@ -3,7 +3,7 @@
3
3
  "servers": [],
4
4
  "info": {
5
5
  "description": "Honeybee model schema.",
6
- "version": "1.43.0",
6
+ "version": "1.43.1",
7
7
  "title": "Honeybee Model Schema",
8
8
  "contact": {
9
9
  "name": "Ladybug Tools",
@@ -3699,21 +3699,9 @@
3699
3699
  "minLength": 1,
3700
3700
  "type": "string"
3701
3701
  },
3702
- "layers": {
3703
- "title": "Layers",
3704
- "description": "List of strings for opaque material identifiers. The order of the materials is from exterior to interior.",
3705
- "minItems": 1,
3706
- "maxItems": 10,
3707
- "type": "array",
3708
- "items": {
3709
- "type": "string",
3710
- "minLength": 1,
3711
- "maxLength": 100
3712
- }
3713
- },
3714
3702
  "materials": {
3715
3703
  "title": "Materials",
3716
- "description": "List of opaque material definitions that are referenced in the layers. Note that the order of materials does not matter and there is no need to specify duplicated materials in this list.",
3704
+ "description": "List of opaque material definitions. The order of the materials is from exterior to interior.",
3717
3705
  "minItems": 1,
3718
3706
  "maxItems": 10,
3719
3707
  "type": "array",
@@ -3743,7 +3731,6 @@
3743
3731
  },
3744
3732
  "required": [
3745
3733
  "identifier",
3746
- "layers",
3747
3734
  "materials"
3748
3735
  ],
3749
3736
  "additionalProperties": false
@@ -4316,21 +4303,9 @@
4316
4303
  "minLength": 1,
4317
4304
  "type": "string"
4318
4305
  },
4319
- "layers": {
4320
- "title": "Layers",
4321
- "description": "List of strings for glazing or gas material identifiers. The order of the materials is from exterior to interior. If a SimpleGlazSys material is used, it must be the only material in the construction. For multi-layered constructions, adjacent glass layers must be separated by one and only one gas layer.",
4322
- "minItems": 1,
4323
- "maxItems": 8,
4324
- "type": "array",
4325
- "items": {
4326
- "type": "string",
4327
- "minLength": 1,
4328
- "maxLength": 100
4329
- }
4330
- },
4331
4306
  "materials": {
4332
4307
  "title": "Materials",
4333
- "description": "List of glazing and gas material definitions that are referenced in the layers. Note that the order of materials does not matter and there is no need to specify duplicated materials in this list.",
4308
+ "description": "List of glazing and gas material definitions. The order of the materials is from exterior to interior. If a SimpleGlazSys material is used, it must be the only material in the construction. For multi-layered constructions, adjacent glass layers must be separated by one and only one gas layer.",
4334
4309
  "minItems": 1,
4335
4310
  "maxItems": 8,
4336
4311
  "type": "array",
@@ -4369,7 +4344,6 @@
4369
4344
  },
4370
4345
  "required": [
4371
4346
  "identifier",
4372
- "layers",
4373
4347
  "materials"
4374
4348
  ],
4375
4349
  "additionalProperties": false
@@ -5150,8 +5124,8 @@
5150
5124
  "minLength": 1,
5151
5125
  "type": "string"
5152
5126
  },
5153
- "layers": {
5154
- "title": "Layers",
5127
+ "materials": {
5128
+ "title": "Materials",
5155
5129
  "description": "List of strings for opaque material identifiers. The order of the materials is from exterior to interior.",
5156
5130
  "minItems": 1,
5157
5131
  "maxItems": 10,
@@ -5177,7 +5151,7 @@
5177
5151
  },
5178
5152
  "required": [
5179
5153
  "identifier",
5180
- "layers"
5154
+ "materials"
5181
5155
  ],
5182
5156
  "additionalProperties": false
5183
5157
  },
@@ -5193,8 +5167,8 @@
5193
5167
  "minLength": 1,
5194
5168
  "type": "string"
5195
5169
  },
5196
- "layers": {
5197
- "title": "Layers",
5170
+ "materials": {
5171
+ "title": "Materials",
5198
5172
  "description": "List of strings for glazing or gas material identifiers. The order of the materials is from exterior to interior. If a SimpleGlazSys material is used, it must be the only material in the construction. For multi-layered constructions, adjacent glass layers must be separated by one and only one gas layer.",
5199
5173
  "minItems": 1,
5200
5174
  "maxItems": 8,
@@ -5220,7 +5194,7 @@
5220
5194
  },
5221
5195
  "required": [
5222
5196
  "identifier",
5223
- "layers"
5197
+ "materials"
5224
5198
  ],
5225
5199
  "additionalProperties": false
5226
5200
  },
@@ -11365,7 +11339,7 @@
11365
11339
  "version": {
11366
11340
  "title": "Version",
11367
11341
  "description": "Text string for the current version of the schema.",
11368
- "default": "1.43.0",
11342
+ "default": "1.43.1",
11369
11343
  "pattern": "([0-9]+)\\.([0-9]+)\\.([0-9]+)",
11370
11344
  "type": "string",
11371
11345
  "readOnly": true
data/lib/to_openstudio/construction/opaque.rb CHANGED
@@ -50,8 +50,12 @@ module Honeybee
50
50
  # create material vector
51
51
  os_materials = OpenStudio::Model::MaterialVector.new
52
52
  # loop through each layer and add to material vector
53
- @hash[:layers].each do |layer|
54
- material_identifier = layer
53
+ if @hash.key?(:layers)
54
+ mat_key = :layers
55
+ else
56
+ mat_key = :materials
57
+ end
58
+ @hash[mat_key].each do |material_identifier|
55
59
  material = openstudio_model.getMaterialByName(material_identifier)
56
60
  unless material.empty?
57
61
  os_material = material.get
data/lib/to_openstudio/construction/window.rb CHANGED
@@ -50,8 +50,12 @@ module Honeybee
50
50
  # create material vector
51
51
  os_materials = OpenStudio::Model::MaterialVector.new
52
52
  # loop through each layer and add to material vector
53
- @hash[:layers].each do |layer|
54
- material_identifier = layer
53
+ if @hash.key?(:layers)
54
+ mat_key = :layers
55
+ else
56
+ mat_key = :materials
57
+ end
58
+ @hash[mat_key].each do |material_identifier|
55
59
  material = openstudio_model.getMaterialByName(material_identifier)
56
60
  unless material.empty?
57
61
  os_material = material.get
data/lib/to_openstudio/construction/windowshade.rb CHANGED
@@ -62,8 +62,12 @@ module Honeybee
62
62
 
63
63
  # create the layers of the unshaded construction into which we will insert the shade
64
64
  os_materials = []
65
- @hash[:window_construction][:layers].each do |layer|
66
- material_identifier = layer
65
+ if @hash.key?(:layers)
66
+ mat_key = :layers
67
+ else
68
+ mat_key = :materials
69
+ end
70
+ @hash[:window_construction][mat_key].each do |material_identifier|
67
71
  material = openstudio_model.getMaterialByName(material_identifier)
68
72
  unless material.empty?
69
73
  os_material = material.get
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: honeybee-openstudio
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.16.5
4
+ version: 2.16.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Tanushree Charan
@@ -11,7 +11,7 @@ authors:
11
11
  autorequire:
12
12
  bindir: exe
13
13
  cert_chain: []
14
- date: 2021-05-06 00:00:00.000000000 Z
14
+ date: 2021-05-08 00:00:00.000000000 Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: json_pure