openstudio-ee 0.9.0 → 0.10.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +4 -0
- data/Gemfile +5 -2
- data/Jenkinsfile +1 -1
- data/README.md +1 -0
- data/lib/measures/nze_hvac/measure.rb +5 -5
- data/lib/measures/nze_hvac/measure.xml +6 -6
- data/lib/openstudio/ee_measures/version.rb +1 -1
- data/openstudio-ee.gemspec +10 -6
- metadata +69 -13
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 1762c53efb31bd7fa2e7ea01d6bf96edec4689f0d4a0a9812b9ff2d8069bf2c7
|
4
|
+
data.tar.gz: dc67ecd0554f7d7bf048de972f7feb1752824bf65c0e042f14f0a596ebbf880b
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 161170595a6ef5ee2b139f6519ffa98f3543e7260602f2d8994b96f6343a0385de9713c153c5d2854fd7444f18de0993a4bac8d157939d810ec1dbce7e9a6f8d
|
7
|
+
data.tar.gz: ad21cb5ae77488bcc44f94e685d88935d7738b647bbf4993e2d9e8d660f53bb4394d1f189f1cd457ed368f4047e4d37780f677c3d3a4ddded7f992b924ab51b2
|
data/CHANGELOG.md
CHANGED
@@ -1,5 +1,9 @@
|
|
1
1
|
# OpenStudio(R) EE Gem
|
2
2
|
|
3
|
+
## Version 0.10.0
|
4
|
+
* Support for OpenStudio 3.8 (upgrade to standards gem 0.6.0, extension gem 0.8.0)
|
5
|
+
* Support Ruby 3.2.2
|
6
|
+
|
3
7
|
## Version 0.9.0
|
4
8
|
* Support for OpenStudio 3.7 (upgrade to standards gem 0.5.0, extension gem 0.7.0)
|
5
9
|
* Fix fuel type for GLHEProExportLoadsforGroundHeatExchangerSizing
|
data/Gemfile
CHANGED
@@ -13,8 +13,11 @@ gemspec
|
|
13
13
|
allow_local = ENV['FAVOR_LOCAL_GEMS']
|
14
14
|
|
15
15
|
# Delete when these branchesa are merged and released
|
16
|
-
#gem 'openstudio-extension', github: 'NREL/OpenStudio-extension-gem', branch: '
|
17
|
-
#gem 'openstudio-standards',
|
16
|
+
#gem 'openstudio-extension', github: 'NREL/OpenStudio-extension-gem', branch: 'wenyi-fix-build-temp', ref: "34a39a24aee2259de"
|
17
|
+
#gem 'openstudio-standards', github: 'NREL/openstudio-standards', tag: 'v0.6.0.rc2', ref: "1c42110"
|
18
|
+
#gem 'openstudio_measure_tester', :git => 'https://github.com/NREL/OpenStudio-measure-tester-gem.git', :branch => 'wenyi-dependencies-update'
|
19
|
+
#gem 'openstudio-workflow', :git => 'https://github.com/NREL/OpenStudio-workflow-gem.git', :branch => 'develop', ref: "32126e9b9f6"
|
20
|
+
#gem 'bcl', :git => 'https://github.com/wenyikuang/bcl-gem.git', :branch => 'develop'
|
18
21
|
|
19
22
|
|
20
23
|
# uncomment when you want CI to use develop branch of extension gem
|
data/Jenkinsfile
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
//Jenkins pipelines are stored in shared libraries. Please see: https://github.com/NREL/cbci_jenkins_libs
|
2
2
|
|
3
|
-
@Library('cbci_shared_libs') _
|
3
|
+
@Library('cbci_shared_libs@developExtension') _
|
4
4
|
|
5
5
|
// Build for PR to develop branch only.
|
6
6
|
if ((env.CHANGE_ID) && (env.CHANGE_TARGET) ) { // check if set
|
data/README.md
CHANGED
@@ -345,8 +345,8 @@ class NzeHvac < OpenStudio::Measure::ModelMeasure
|
|
345
345
|
# exclude plenum zones, zones without thermostats, and zones with no floor area
|
346
346
|
conditioned_zones = []
|
347
347
|
model.getThermalZones.each do |zone|
|
348
|
-
next if
|
349
|
-
next if !
|
348
|
+
next if OpenstudioStandards::ThermalZone.thermal_zone_plenum?(zone)
|
349
|
+
next if !OpenstudioStandards::ThermalZone.thermal_zone_heated?(zone) && !OpenstudioStandards::ThermalZone.thermal_zone_cooled?(zone)
|
350
350
|
conditioned_zones << zone
|
351
351
|
end
|
352
352
|
|
@@ -356,7 +356,7 @@ class NzeHvac < OpenStudio::Measure::ModelMeasure
|
|
356
356
|
when 'Automatic Partition'
|
357
357
|
# group zones by occupancy type (residential/nonresidential)
|
358
358
|
# split non-dominant groups if their total area exceeds 20,000 ft2.
|
359
|
-
sys_groups =
|
359
|
+
sys_groups = OpenstudioStandards::Geometry.model_group_thermal_zones_by_occupancy_type(model, min_area_m2: OpenStudio.convert(20000, 'ft^2', 'm^2').get)
|
360
360
|
|
361
361
|
# assume secondary system type is PSZ-AC for VAV Reheat otherwise assume same hvac system type
|
362
362
|
sec_sys_type = hvac_system_type # same as primary system type
|
@@ -381,13 +381,13 @@ class NzeHvac < OpenStudio::Measure::ModelMeasure
|
|
381
381
|
add_system_to_zones(model, runner, hvac_system_type, conditioned_zones, std, doas_dcv: doas_dcv)
|
382
382
|
|
383
383
|
when 'One System Per Building Story'
|
384
|
-
story_groups =
|
384
|
+
story_groups = OpenstudioStandards::Geometry.model_group_thermal_zones_by_building_story(model, conditioned_zones)
|
385
385
|
story_groups.each do |story_zones|
|
386
386
|
add_system_to_zones(model, runner, hvac_system_type, story_zones, std, doas_dcv: doas_dcv)
|
387
387
|
end
|
388
388
|
|
389
389
|
when 'One System Per Building Type'
|
390
|
-
system_groups =
|
390
|
+
system_groups = OpenstudioStandards::Geometry.model_group_thermal_zones_by_building_type(model, min_area_m2: 0.0)
|
391
391
|
system_groups.each do |system_group|
|
392
392
|
add_system_to_zones(model, runner, hvac_system_type, system_group['zones'], std, doas_dcv: doas_dcv)
|
393
393
|
end
|
@@ -3,8 +3,8 @@
|
|
3
3
|
<schema_version>3.1</schema_version>
|
4
4
|
<name>nze_hvac</name>
|
5
5
|
<uid>f060dff2-b28d-4194-a6af-e66d88ddb33c</uid>
|
6
|
-
<version_id>
|
7
|
-
<version_modified>
|
6
|
+
<version_id>b44fd444-f022-4409-af31-2b29e9603e31</version_id>
|
7
|
+
<version_modified>2024-05-09T20:11:49Z</version_modified>
|
8
8
|
<xml_checksum>0E5E4776</xml_checksum>
|
9
9
|
<class_name>NzeHvac</class_name>
|
10
10
|
<display_name>NZEHVAC</display_name>
|
@@ -252,19 +252,19 @@
|
|
252
252
|
<file>
|
253
253
|
<version>
|
254
254
|
<software_program>OpenStudio</software_program>
|
255
|
-
<identifier>
|
256
|
-
<min_compatible>3.
|
255
|
+
<identifier>3.8.0</identifier>
|
256
|
+
<min_compatible>3.8.0</min_compatible>
|
257
257
|
</version>
|
258
258
|
<filename>measure.rb</filename>
|
259
259
|
<filetype>rb</filetype>
|
260
260
|
<usage_type>script</usage_type>
|
261
|
-
<checksum>
|
261
|
+
<checksum>7EAD5ED0</checksum>
|
262
262
|
</file>
|
263
263
|
<file>
|
264
264
|
<filename>NZEHVAC_Test.rb</filename>
|
265
265
|
<filetype>rb</filetype>
|
266
266
|
<usage_type>test</usage_type>
|
267
|
-
<checksum>
|
267
|
+
<checksum>90B2A846</checksum>
|
268
268
|
</file>
|
269
269
|
<file>
|
270
270
|
<filename>USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw</filename>
|
data/openstudio-ee.gemspec
CHANGED
@@ -21,16 +21,20 @@ Gem::Specification.new do |spec|
|
|
21
21
|
spec.files = `git ls-files -z`.split("\x0").reject do |f|
|
22
22
|
f.match(%r{^(test|lib.measures.*tests|spec|features)/})
|
23
23
|
end
|
24
|
-
spec.bindir
|
25
|
-
spec.executables
|
24
|
+
spec.bindir = 'exe'
|
25
|
+
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
|
26
26
|
spec.require_paths = ['lib']
|
27
27
|
|
28
|
-
spec.required_ruby_version = '~> 2.
|
28
|
+
spec.required_ruby_version = '~> 3.2.2'
|
29
29
|
|
30
|
-
spec.add_dependency 'bundler', '~> 2.
|
31
|
-
spec.add_dependency 'openstudio-extension', '~> 0.
|
32
|
-
spec.add_dependency 'openstudio-standards', '
|
30
|
+
spec.add_dependency 'bundler', '~> 2.4.10'
|
31
|
+
spec.add_dependency 'openstudio-extension', '~> 0.8.0'
|
32
|
+
spec.add_dependency 'openstudio-standards', '0.6.1'
|
33
|
+
spec.add_dependency 'multipart-post', '2.4.0'
|
34
|
+
spec.add_dependency 'regexp_parser', '2.9.0'
|
35
|
+
spec.add_dependency 'addressable', '2.8.1'
|
33
36
|
|
34
37
|
spec.add_development_dependency 'rake', '~> 13.0'
|
35
38
|
spec.add_development_dependency 'rspec', '~> 3.9'
|
39
|
+
spec.add_development_dependency 'octokit', '4.18.0' # for change logs
|
36
40
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: openstudio-ee
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.10.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- David Goldwasser
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: exe
|
11
11
|
cert_chain: []
|
12
|
-
date:
|
12
|
+
date: 2024-07-12 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: bundler
|
@@ -17,42 +17,84 @@ dependencies:
|
|
17
17
|
requirements:
|
18
18
|
- - "~>"
|
19
19
|
- !ruby/object:Gem::Version
|
20
|
-
version:
|
20
|
+
version: 2.4.10
|
21
21
|
type: :runtime
|
22
22
|
prerelease: false
|
23
23
|
version_requirements: !ruby/object:Gem::Requirement
|
24
24
|
requirements:
|
25
25
|
- - "~>"
|
26
26
|
- !ruby/object:Gem::Version
|
27
|
-
version:
|
27
|
+
version: 2.4.10
|
28
28
|
- !ruby/object:Gem::Dependency
|
29
29
|
name: openstudio-extension
|
30
30
|
requirement: !ruby/object:Gem::Requirement
|
31
31
|
requirements:
|
32
32
|
- - "~>"
|
33
33
|
- !ruby/object:Gem::Version
|
34
|
-
version: 0.
|
34
|
+
version: 0.8.0
|
35
35
|
type: :runtime
|
36
36
|
prerelease: false
|
37
37
|
version_requirements: !ruby/object:Gem::Requirement
|
38
38
|
requirements:
|
39
39
|
- - "~>"
|
40
40
|
- !ruby/object:Gem::Version
|
41
|
-
version: 0.
|
41
|
+
version: 0.8.0
|
42
42
|
- !ruby/object:Gem::Dependency
|
43
43
|
name: openstudio-standards
|
44
44
|
requirement: !ruby/object:Gem::Requirement
|
45
45
|
requirements:
|
46
|
-
- -
|
46
|
+
- - '='
|
47
47
|
- !ruby/object:Gem::Version
|
48
|
-
version: 0.
|
48
|
+
version: 0.6.1
|
49
49
|
type: :runtime
|
50
50
|
prerelease: false
|
51
51
|
version_requirements: !ruby/object:Gem::Requirement
|
52
52
|
requirements:
|
53
|
-
- -
|
53
|
+
- - '='
|
54
|
+
- !ruby/object:Gem::Version
|
55
|
+
version: 0.6.1
|
56
|
+
- !ruby/object:Gem::Dependency
|
57
|
+
name: multipart-post
|
58
|
+
requirement: !ruby/object:Gem::Requirement
|
59
|
+
requirements:
|
60
|
+
- - '='
|
61
|
+
- !ruby/object:Gem::Version
|
62
|
+
version: 2.4.0
|
63
|
+
type: :runtime
|
64
|
+
prerelease: false
|
65
|
+
version_requirements: !ruby/object:Gem::Requirement
|
66
|
+
requirements:
|
67
|
+
- - '='
|
68
|
+
- !ruby/object:Gem::Version
|
69
|
+
version: 2.4.0
|
70
|
+
- !ruby/object:Gem::Dependency
|
71
|
+
name: regexp_parser
|
72
|
+
requirement: !ruby/object:Gem::Requirement
|
73
|
+
requirements:
|
74
|
+
- - '='
|
75
|
+
- !ruby/object:Gem::Version
|
76
|
+
version: 2.9.0
|
77
|
+
type: :runtime
|
78
|
+
prerelease: false
|
79
|
+
version_requirements: !ruby/object:Gem::Requirement
|
80
|
+
requirements:
|
81
|
+
- - '='
|
82
|
+
- !ruby/object:Gem::Version
|
83
|
+
version: 2.9.0
|
84
|
+
- !ruby/object:Gem::Dependency
|
85
|
+
name: addressable
|
86
|
+
requirement: !ruby/object:Gem::Requirement
|
87
|
+
requirements:
|
88
|
+
- - '='
|
89
|
+
- !ruby/object:Gem::Version
|
90
|
+
version: 2.8.1
|
91
|
+
type: :runtime
|
92
|
+
prerelease: false
|
93
|
+
version_requirements: !ruby/object:Gem::Requirement
|
94
|
+
requirements:
|
95
|
+
- - '='
|
54
96
|
- !ruby/object:Gem::Version
|
55
|
-
version:
|
97
|
+
version: 2.8.1
|
56
98
|
- !ruby/object:Gem::Dependency
|
57
99
|
name: rake
|
58
100
|
requirement: !ruby/object:Gem::Requirement
|
@@ -81,6 +123,20 @@ dependencies:
|
|
81
123
|
- - "~>"
|
82
124
|
- !ruby/object:Gem::Version
|
83
125
|
version: '3.9'
|
126
|
+
- !ruby/object:Gem::Dependency
|
127
|
+
name: octokit
|
128
|
+
requirement: !ruby/object:Gem::Requirement
|
129
|
+
requirements:
|
130
|
+
- - '='
|
131
|
+
- !ruby/object:Gem::Version
|
132
|
+
version: 4.18.0
|
133
|
+
type: :development
|
134
|
+
prerelease: false
|
135
|
+
version_requirements: !ruby/object:Gem::Requirement
|
136
|
+
requirements:
|
137
|
+
- - '='
|
138
|
+
- !ruby/object:Gem::Version
|
139
|
+
version: 4.18.0
|
84
140
|
description: Library and measures for OpenStudio for energy efficiency use cases
|
85
141
|
email:
|
86
142
|
- david.goldwasser@nrel.gov
|
@@ -249,7 +305,7 @@ licenses: []
|
|
249
305
|
metadata:
|
250
306
|
bug_tracker_uri: https://github.com/NREL/openstudio-ee-gem/issues
|
251
307
|
changelog_uri: https://github.com/NREL/openstudio-ee-gem/blob/develop/CHANGELOG.md
|
252
|
-
source_code_uri: https://github.com/NREL/openstudio-ee-gem/tree/v0.
|
308
|
+
source_code_uri: https://github.com/NREL/openstudio-ee-gem/tree/v0.10.0
|
253
309
|
post_install_message:
|
254
310
|
rdoc_options: []
|
255
311
|
require_paths:
|
@@ -258,14 +314,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
258
314
|
requirements:
|
259
315
|
- - "~>"
|
260
316
|
- !ruby/object:Gem::Version
|
261
|
-
version: 2.
|
317
|
+
version: 3.2.2
|
262
318
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
263
319
|
requirements:
|
264
320
|
- - ">="
|
265
321
|
- !ruby/object:Gem::Version
|
266
322
|
version: '0'
|
267
323
|
requirements: []
|
268
|
-
rubygems_version: 3.
|
324
|
+
rubygems_version: 3.4.10
|
269
325
|
signing_key:
|
270
326
|
specification_version: 4
|
271
327
|
summary: Library and measures for OpenStudio for energy efficiency use cases
|