honeybee-openstudio 2.31.10 → 2.31.13
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/honeybee-openstudio.gemspec +1 -1
- data/lib/from_openstudio/geometry/room.rb +2 -2
- data/lib/honeybee/model.rb +1 -0
- data/lib/measures/from_honeybee_model_to_gbxml/measure.rb +1 -0
- data/lib/to_openstudio/geometry/room.rb +6 -4
- data/lib/to_openstudio/model.rb +36 -15
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 0ddf0d339bd4d1157383d5d16269de92cdbcc9e9f4b2b18b766f07bef02f37cd
|
4
|
+
data.tar.gz: 401beed22c8c1097195c4e7312bd16eeb8e9e71233c4b4a13330c68670e64072
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 4660a81eeedc682ec9d04c2a29fb1ab38b68692c7dffb5133aeaed0464c9cf31f95de09b639b3f1eb9464972980215eae166e47dc806a2696d692d690e6c0675
|
7
|
+
data.tar.gz: 62284552e9a5e1d6c296e0ffab568511b308b91df53936315958665d093527345a312c880d688de23e8b3dc21fd133a999d0617b1864823d8b2655d053445a34
|
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.4.0
|
19
|
+
docker run --name test --rm -d -t -v $(pwd):/work -w /work nrel/openstudio:3.4.0
|
20
20
|
docker exec -t test pwd
|
21
21
|
docker exec -t test ls
|
22
22
|
docker exec -t test bundle update
|
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.31.
|
7
|
+
spec.version = '2.31.13'
|
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
|
|
@@ -53,8 +53,8 @@ module Honeybee
|
|
53
53
|
outdoor_shades = outdoor_shades_from_space(space)
|
54
54
|
hash[:outdoor_shades] = outdoor_shades if !outdoor_shades.empty?
|
55
55
|
|
56
|
-
|
57
|
-
hash[:
|
56
|
+
multiplier = multiplier_from_space(space)
|
57
|
+
hash[:multiplier] = multiplier if multiplier
|
58
58
|
|
59
59
|
exclude_floor_area = exclude_floor_area_from_space(space)
|
60
60
|
hash[:exclude_floor_area] = exclude_floor_area
|
data/lib/honeybee/model.rb
CHANGED
@@ -87,6 +87,7 @@ class FromHoneybeeModelToGbxml < OpenStudio::Measure::ModelMeasure
|
|
87
87
|
end
|
88
88
|
honeybee_model = Honeybee::Model.read_from_disk(model_json)
|
89
89
|
$simple_window_cons = true
|
90
|
+
$orphan_groups = false
|
90
91
|
STDOUT.flush
|
91
92
|
os_model = honeybee_model.to_openstudio_model(model)
|
92
93
|
STDOUT.flush
|
@@ -312,10 +312,12 @@ module Honeybee
|
|
312
312
|
|
313
313
|
# assign service hot water if it exists
|
314
314
|
if @hash[:properties][:energy][:service_hot_water]
|
315
|
-
|
316
|
-
|
317
|
-
|
318
|
-
|
315
|
+
if @hash[:properties][:energy][:service_hot_water][:flow_per_area].to_f != 0
|
316
|
+
shw_space = ServiceHotWaterAbridged.new(@hash[:properties][:energy][:service_hot_water])
|
317
|
+
os_shw_space = shw_space.to_openstudio(
|
318
|
+
openstudio_model, os_space, @hash[:properties][:energy][:shw])
|
319
|
+
$shw_for_plant = shw_space
|
320
|
+
end
|
319
321
|
end
|
320
322
|
|
321
323
|
# assign infiltration if it exists
|
data/lib/to_openstudio/model.rb
CHANGED
@@ -454,10 +454,12 @@ module Honeybee
|
|
454
454
|
program_type_id = room[:properties][:energy][:program_type]
|
455
455
|
shw_hash = $programtype_shw_hash[program_type_id]
|
456
456
|
unless shw_hash.nil?
|
457
|
-
|
458
|
-
|
459
|
-
|
460
|
-
|
457
|
+
if shw_hash[:flow_per_area].to_f != 0
|
458
|
+
shw_object = ServiceHotWaterAbridged.new(shw_hash)
|
459
|
+
openstudio_shw = shw_object.to_openstudio(
|
460
|
+
@openstudio_model, openstudio_room, room[:properties][:energy][:shw])
|
461
|
+
$shw_for_plant = shw_object
|
462
|
+
end
|
461
463
|
end
|
462
464
|
end
|
463
465
|
|
@@ -596,45 +598,64 @@ module Honeybee
|
|
596
598
|
|
597
599
|
def create_orphaned_shades
|
598
600
|
if @hash[:orphaned_shades]
|
599
|
-
|
600
|
-
|
601
|
+
if $orphan_groups
|
602
|
+
shading_surface_group = OpenStudio::Model::ShadingSurfaceGroup.new(@openstudio_model)
|
603
|
+
shading_surface_group.setShadingSurfaceType('Building')
|
604
|
+
end
|
601
605
|
@hash[:orphaned_shades].each do |shade|
|
602
606
|
shade_object = Shade.new(shade)
|
603
607
|
openstudio_shade = shade_object.to_openstudio(@openstudio_model)
|
604
|
-
|
608
|
+
if $orphan_groups
|
609
|
+
openstudio_shade.setShadingSurfaceGroup(shading_surface_group)
|
610
|
+
end
|
605
611
|
end
|
606
612
|
end
|
607
613
|
end
|
608
614
|
|
609
615
|
def create_orphaned_faces
|
610
616
|
if @hash[:orphaned_faces]
|
611
|
-
|
612
|
-
|
617
|
+
if $orphan_groups
|
618
|
+
shading_surface_group = OpenStudio::Model::ShadingSurfaceGroup.new(@openstudio_model)
|
619
|
+
shading_surface_group.setShadingSurfaceType('Building')
|
620
|
+
end
|
613
621
|
@hash[:orphaned_faces].each do |face|
|
614
622
|
face_object = Face.new(face)
|
615
623
|
openstudio_shade = face_object.to_openstudio_shade(@openstudio_model, shading_surface_group)
|
624
|
+
if $orphan_groups
|
625
|
+
openstudio_shade.setShadingSurfaceGroup(shading_surface_group)
|
626
|
+
end
|
616
627
|
end
|
617
628
|
end
|
618
629
|
end
|
619
630
|
|
620
631
|
def create_orphaned_apertures
|
621
632
|
if @hash[:orphaned_apertures]
|
622
|
-
|
623
|
-
|
624
|
-
|
633
|
+
if $orphan_groups
|
634
|
+
shading_surface_group = OpenStudio::Model::ShadingSurfaceGroup.new(@openstudio_model)
|
635
|
+
shading_surface_group.setShadingSurfaceType('Building')
|
636
|
+
end
|
637
|
+
@hash[:orphaned_apertures].each do |ap|
|
625
638
|
ap_object = Aperture.new(ap)
|
626
639
|
openstudio_shade = ap_object.to_openstudio_shade(@openstudio_model, shading_surface_group)
|
640
|
+
if $orphan_groups
|
641
|
+
openstudio_shade.setShadingSurfaceGroup(shading_surface_group)
|
642
|
+
end
|
627
643
|
end
|
628
644
|
end
|
629
645
|
end
|
630
646
|
|
631
647
|
def create_orphaned_doors
|
632
648
|
if @hash[:orphaned_doors]
|
633
|
-
|
634
|
-
|
635
|
-
|
649
|
+
if $orphan_groups
|
650
|
+
shading_surface_group = OpenStudio::Model::ShadingSurfaceGroup.new(@openstudio_model)
|
651
|
+
shading_surface_group.setShadingSurfaceType('Building')
|
652
|
+
end
|
653
|
+
@hash[:orphaned_doors].each do |dr|
|
636
654
|
dr_object = Door.new(dr)
|
637
655
|
openstudio_shade = dr_object.to_openstudio_shade(@openstudio_model, shading_surface_group)
|
656
|
+
if $orphan_groups
|
657
|
+
openstudio_shade.setShadingSurfaceGroup(shading_surface_group)
|
658
|
+
end
|
638
659
|
end
|
639
660
|
end
|
640
661
|
end
|
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.31.
|
4
|
+
version: 2.31.13
|
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: 2022-
|
14
|
+
date: 2022-08-01 00:00:00.000000000 Z
|
15
15
|
dependencies:
|
16
16
|
- !ruby/object:Gem::Dependency
|
17
17
|
name: bundler
|