buildingsync 0.2.0 → 0.2.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/deploy.yml +30 -0
- data/.gitignore +18 -18
- data/CHANGELOG.md +10 -0
- data/LICENSE.md +2 -2
- data/README.md +44 -37
- data/Rakefile +1 -1
- data/buildingsync.gemspec +4 -2
- data/doc_templates/LICENSE.md +2 -2
- data/doc_templates/copyright_erb.txt +2 -2
- data/doc_templates/copyright_js.txt +2 -2
- data/doc_templates/copyright_ruby.txt +2 -2
- data/lib/buildingsync/all_resource_total.rb +2 -2
- data/lib/buildingsync/audit_date.rb +2 -2
- data/lib/buildingsync/constants.rb +2 -2
- data/lib/buildingsync/contact.rb +2 -2
- data/lib/buildingsync/extension.rb +2 -2
- data/lib/buildingsync/generator.rb +2 -2
- data/lib/buildingsync/get_bcl_weather_file.rb +2 -2
- data/lib/buildingsync/helpers/helper.rb +2 -2
- data/lib/buildingsync/helpers/xml_get_set.rb +2 -2
- data/lib/buildingsync/makers/workflow_maker.rb +14 -5
- data/lib/buildingsync/makers/workflow_maker_base.rb +2 -2
- data/lib/buildingsync/model_articulation/building.rb +2 -2
- data/lib/buildingsync/model_articulation/building_section.rb +2 -2
- data/lib/buildingsync/model_articulation/building_system.rb +2 -2
- data/lib/buildingsync/model_articulation/envelope_system.rb +2 -2
- data/lib/buildingsync/model_articulation/exterior_floor_system_type.rb +2 -2
- data/lib/buildingsync/model_articulation/facility.rb +2 -2
- data/lib/buildingsync/model_articulation/foundation_system_type.rb +2 -2
- data/lib/buildingsync/model_articulation/hvac_system.rb +2 -2
- data/lib/buildingsync/model_articulation/lighting_system.rb +2 -2
- data/lib/buildingsync/model_articulation/loads_system.rb +2 -2
- data/lib/buildingsync/model_articulation/location_element.rb +2 -2
- data/lib/buildingsync/model_articulation/measure.rb +2 -2
- data/lib/buildingsync/model_articulation/roof_system_type.rb +2 -2
- data/lib/buildingsync/model_articulation/service_hot_water_system.rb +2 -2
- data/lib/buildingsync/model_articulation/site.rb +2 -2
- data/lib/buildingsync/model_articulation/spatial_element.rb +5 -7
- data/lib/buildingsync/model_articulation/wall_system_type.rb +2 -2
- data/lib/buildingsync/report.rb +2 -2
- data/lib/buildingsync/resource_use.rb +2 -2
- data/lib/buildingsync/scenario.rb +2 -2
- data/lib/buildingsync/selection_tool.rb +7 -7
- data/lib/buildingsync/time_series.rb +2 -2
- data/lib/buildingsync/translator.rb +10 -8
- data/lib/buildingsync/utility.rb +2 -2
- data/lib/buildingsync/version.rb +3 -3
- data/lib/buildingsync.rb +2 -2
- metadata +34 -5
- data/Jenkinsfile +0 -10
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 9cd2125fde3053d18ca0faacaf116e0cabe0226287e123431b85d3693e9c449f
|
|
4
|
+
data.tar.gz: c0247f2f029b0eb613c8290da3fae7216a75c9fc3f30c6187e9824e076263d61
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 0e7ef4aa32f54837f651986d66f0e7ec82429683f20e88517fba3e2150879cdee29e2fc906dd896d2c07b2b09614caf681ce38ddec9b2990dd0856680d593b8b
|
|
7
|
+
data.tar.gz: 4c71adc2ad347fbdee91976e63d82b4177e89f916bb0dc45c71ec528b902b308bde237e70dd2ba9d94e98289e09e4c57f1964572348fac4914097ed1c163bb3d
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
# Currently deploy only builds the documentation and pushes to gh-pages
|
|
2
|
+
name: Deploy
|
|
3
|
+
on:
|
|
4
|
+
push:
|
|
5
|
+
branches:
|
|
6
|
+
- develop
|
|
7
|
+
jobs:
|
|
8
|
+
build-and-deploy:
|
|
9
|
+
runs-on: ubuntu-latest
|
|
10
|
+
steps:
|
|
11
|
+
- name: Checkout 🛎️
|
|
12
|
+
uses: actions/checkout@v2.3.1
|
|
13
|
+
|
|
14
|
+
- name: Setup Ruby
|
|
15
|
+
uses: ruby/setup-ruby@v1
|
|
16
|
+
with:
|
|
17
|
+
ruby-version: '2.5'
|
|
18
|
+
|
|
19
|
+
- name: Install and Build
|
|
20
|
+
run: |
|
|
21
|
+
gem install bundler
|
|
22
|
+
bundle install
|
|
23
|
+
bundle exec yard - README.md
|
|
24
|
+
SITEMAP_BASEURL=https://buildingsync-gem.buildingsync.net bundle exec yard doc --plugin sitemap
|
|
25
|
+
|
|
26
|
+
- name: Deploy
|
|
27
|
+
uses: JamesIves/github-pages-deploy-action@4.1.1
|
|
28
|
+
with:
|
|
29
|
+
branch: gh-pages
|
|
30
|
+
folder: doc
|
data/.gitignore
CHANGED
|
@@ -1,25 +1,26 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
1
|
+
.bundle
|
|
2
|
+
.yardoc
|
|
3
|
+
.ruby-version
|
|
4
|
+
.python-version
|
|
5
|
+
Gemfile.lock
|
|
6
|
+
gems
|
|
7
|
+
_yardoc
|
|
8
|
+
coverage
|
|
9
|
+
doc
|
|
10
|
+
pkg
|
|
11
|
+
spec/reports
|
|
12
|
+
tmp
|
|
13
|
+
spec/output
|
|
14
|
+
SR1
|
|
15
|
+
SRvt
|
|
16
16
|
.DS_Store
|
|
17
|
-
|
|
17
|
+
lib/data
|
|
18
|
+
schedules-*.csv
|
|
18
19
|
# rspec failure tracking
|
|
19
20
|
.rspec_status
|
|
20
21
|
|
|
21
22
|
# Ignore IDE files
|
|
22
|
-
|
|
23
|
+
.idea
|
|
23
24
|
*.rubocop-http*
|
|
24
25
|
|
|
25
26
|
# measures tests
|
|
@@ -30,4 +31,3 @@ spec/files/filecomparison/in.idf
|
|
|
30
31
|
spec/files/filecomparison/in.osm
|
|
31
32
|
spec/weather/weather_file.json
|
|
32
33
|
|
|
33
|
-
.DS_Store
|
data/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,15 @@
|
|
|
1
1
|
# BuildingSync Gem
|
|
2
2
|
|
|
3
|
+
## Version 0.2.1
|
|
4
|
+
|
|
5
|
+
- Update copyright dates
|
|
6
|
+
- Update URL for BuildingSync selection tool
|
|
7
|
+
- Include buildingsync/generators when including gem by default
|
|
8
|
+
- BuildingSync to OpenStudio Translation for MLOD 200
|
|
9
|
+
- Add action for building the documentation
|
|
10
|
+
- Fix purge measures method to only remove measures with SKIP argument set to True
|
|
11
|
+
- Map "Common" BuildingSync floor area type
|
|
12
|
+
|
|
3
13
|
## Version 0.2.0
|
|
4
14
|
|
|
5
15
|
This is released as a minor version since we are so early stage, even though it has many breaking changes. Most of the 'high-level API' (translator) remains.
|
data/LICENSE.md
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
OpenStudio(R), Copyright (c) 2008-
|
|
2
|
-
BuildingSync(R), Copyright (c) 2015-
|
|
1
|
+
OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
|
|
2
|
+
BuildingSync(R), Copyright (c) 2015-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
|
|
3
3
|
|
|
4
4
|
Redistribution and use in source and binary forms, with or without modification, are permitted
|
|
5
5
|
provided that the following conditions are met:
|
data/README.md
CHANGED
|
@@ -1,40 +1,48 @@
|
|
|
1
1
|
# BuildingSync
|
|
2
2
|
|
|
3
|
-
|
|
3
|
+
|
|
4
4
|
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
* convert BuildingSync XML file into:
|
|
8
|
-
|
|
9
|
-
* an OpenStudio Baseline model
|
|
5
|
+
The BuildingSync-Gem is a repository of helpers for reading and writing BuildingSync XML files, and for using that data
|
|
6
|
+
to drive energy simulations of the subject building. See full documentation [here](https://buildingsync-gem.buildingsync.net).
|
|
10
7
|
|
|
11
|
-
|
|
8
|
+
All of the following are supported:
|
|
12
9
|
|
|
13
|
-
*
|
|
10
|
+
* convert BuildingSync XML file into:
|
|
11
|
+
* an OpenStudio Baseline model
|
|
12
|
+
* an OpenStudio workflow for each scenario defined in the XML file
|
|
13
|
+
* enable simulation of the baseline model and all workflows and
|
|
14
|
+
* insert simulation results back into the Building XML file.
|
|
14
15
|
|
|
15
|
-
* insert simulation results back into the Building XML file.
|
|
16
16
|
## Installation
|
|
17
17
|
|
|
18
|
-
|
|
18
|
+
The BuildingSync Gem requires installation of OpenStudio, specifically [OpenStudio v3.0.1](https://openstudio-builds.s3.amazonaws.com/index.html?prefix=3.0.1/).
|
|
19
|
+
The newer versions of OpenStudio have minor breaking changes that have not been addressed in this repository yet. After OpenStudio is
|
|
20
|
+
installed, then export the path of the folder that contains the openstudio.rb file to RUBYLIB environment variable
|
|
21
|
+
(e.g., `export RUBYLIB=/Applications/OpenStudio-3.0.1/Ruby`)
|
|
19
22
|
|
|
23
|
+
After installing OpenStudio and setting the environment variable, then add this line to your application's Gemfile:
|
|
20
24
|
```ruby
|
|
21
|
-
gem 'buildingsync'
|
|
25
|
+
gem 'buildingsync', '0.2.1'
|
|
22
26
|
```
|
|
23
27
|
|
|
24
28
|
And then execute:
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
29
|
+
```bash
|
|
30
|
+
bundle install
|
|
31
|
+
```
|
|
28
32
|
|
|
29
33
|
Or install it yourself as:
|
|
30
|
-
|
|
31
|
-
|
|
34
|
+
```bash
|
|
35
|
+
gem install 'buildingsync'
|
|
36
|
+
```
|
|
32
37
|
|
|
33
38
|
## Usage
|
|
34
39
|
|
|
35
|
-
All of the features described above are provided by the translator class, as shown in the following sample code
|
|
40
|
+
All of the features described above are provided by the translator class, as shown in the following sample code. There
|
|
41
|
+
are also BuildingSync Gem example files in [this repository](https://github.com/BuildingSync/BuildingSync-gem-examples).
|
|
36
42
|
|
|
37
43
|
```ruby
|
|
44
|
+
require 'buildingsync/translator'
|
|
45
|
+
|
|
38
46
|
building_sync_xml_file_path = 'path/to/bsync.xml'
|
|
39
47
|
out_path = 'path/to/output_dir'
|
|
40
48
|
|
|
@@ -50,7 +58,6 @@ translator.setup_and_sizing_run
|
|
|
50
58
|
# path/to/output_dir/scenario_name
|
|
51
59
|
translator.write_osws
|
|
52
60
|
|
|
53
|
-
|
|
54
61
|
# run all simulations
|
|
55
62
|
translator.run_osws
|
|
56
63
|
|
|
@@ -68,38 +75,38 @@ translator.prepare_final_xml
|
|
|
68
75
|
file_name = 'abc-123.xml'
|
|
69
76
|
translator.save_xml(file_name)
|
|
70
77
|
```
|
|
78
|
+
|
|
71
79
|
## Testing
|
|
72
80
|
|
|
73
81
|
Check out the repository and then execute:
|
|
74
82
|
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
83
|
+
```bash
|
|
84
|
+
bundle install
|
|
85
|
+
bundle exec rake
|
|
86
|
+
```
|
|
78
87
|
|
|
79
88
|
## Documentation
|
|
80
89
|
|
|
81
90
|
The documentation of the BuildingSync-Gem is done with Yard (https://yardoc.org)
|
|
82
91
|
To generate the documentation locally do the following:
|
|
83
92
|
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
1. Tag release on GitHub
|
|
92
|
-
1. Go to [rubydoc.info](https://www.rubydoc.info) and click `Add Project` in the upper right
|
|
93
|
-
1. Input the git address: `git://github/BuildingSync/BuildingSync-gem.git`
|
|
94
|
-
1. Input the release tag for the desired version, eg: `v0.2.0`
|
|
95
|
-
1. Click `Go`
|
|
96
|
-
1. Profit
|
|
97
|
-
|
|
93
|
+
```bash
|
|
94
|
+
gem install yard
|
|
95
|
+
SITEMAP_BASEURL=https://buildingsync-gem.buildingsync.net bundle exec yard doc --plugin sitemap
|
|
96
|
+
```
|
|
97
|
+
|
|
98
|
+
Documentation for the develop branch is automatically released when code is merged into the branch.
|
|
99
|
+
|
|
98
100
|
# Releasing
|
|
99
101
|
|
|
100
102
|
1. Update CHANGELOG.md
|
|
101
103
|
1. Run `bundle exec rake rubocop:auto_correct`
|
|
102
|
-
1. Update version in
|
|
104
|
+
1. Update version in `lib/buildingsync/version.rb`
|
|
103
105
|
1. Create PR to main, after tests and reviews complete, then merge
|
|
104
106
|
1. Locally - from the main branch, run `bundle exec rake release`
|
|
105
|
-
1. On GitHub, go to the releases page and update the latest release tag. Name it “Version x.y.z” and copy the CHANGELOG entry into the description box.
|
|
107
|
+
1. On GitHub, go to the releases page and update the latest release tag. Name it “Version x.y.z” and copy the CHANGELOG entry into the description box.
|
|
108
|
+
|
|
109
|
+
# TODO
|
|
110
|
+
|
|
111
|
+
* [ ] Support BuildingSync 2.3.0
|
|
112
|
+
* [ ] Update to OpenStudio version 3.2.0
|
data/Rakefile
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
3
|
# *******************************************************************************
|
|
4
|
-
# OpenStudio(R), Copyright (c) 2008-
|
|
4
|
+
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
|
|
5
5
|
# All rights reserved.
|
|
6
6
|
# Redistribution and use in source and binary forms, with or without
|
|
7
7
|
# modification, are permitted provided that the following conditions are met:
|
data/buildingsync.gemspec
CHANGED
|
@@ -7,8 +7,8 @@ require 'buildingsync/version'
|
|
|
7
7
|
Gem::Specification.new do |spec|
|
|
8
8
|
spec.name = 'buildingsync'
|
|
9
9
|
spec.version = BuildingSync::VERSION
|
|
10
|
-
spec.authors = ['Nicholas Long', 'Dan Macumber', 'Katherine Fleming']
|
|
11
|
-
spec.email = ['nicholas.long@nrel.gov', 'daniel.macumber@nrel.gov', 'katherine.fleming@nrel.gov']
|
|
10
|
+
spec.authors = ['Nicholas Long', 'Cory Mosiman', 'Dan Macumber', 'Katherine Fleming']
|
|
11
|
+
spec.email = ['nicholas.long@nrel.gov', 'cory.mosiman@nrel.gov', 'daniel.macumber@nrel.gov', 'katherine.fleming@nrel.gov']
|
|
12
12
|
|
|
13
13
|
spec.summary = 'BuildingSync library for reading, writing, and exporting BuildingSync to OpenStudio'
|
|
14
14
|
spec.description = 'BuildingSync library for reading, writing, and exporting BuildingSync to OpenStudio'
|
|
@@ -34,4 +34,6 @@ Gem::Specification.new do |spec|
|
|
|
34
34
|
|
|
35
35
|
spec.add_development_dependency 'rake', '~> 13.0'
|
|
36
36
|
spec.add_development_dependency 'rspec', '~> 3.9'
|
|
37
|
+
spec.add_development_dependency 'yard', '~> 0.9.26'
|
|
38
|
+
spec.add_development_dependency 'yard-sitemap', '~> 1.0.1'
|
|
37
39
|
end
|
data/doc_templates/LICENSE.md
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
OpenStudio(R), Copyright (c) 2008-
|
|
2
|
-
BuildingSync(R), Copyright (c) 2015-
|
|
1
|
+
OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
|
|
2
|
+
BuildingSync(R), Copyright (c) 2015-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
|
|
3
3
|
|
|
4
4
|
Redistribution and use in source and binary forms, with or without modification, are permitted
|
|
5
5
|
provided that the following conditions are met:
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
<%
|
|
2
2
|
# *******************************************************************************
|
|
3
|
-
# OpenStudio(R), Copyright (c) 2008-
|
|
4
|
-
# BuildingSync(R), Copyright (c) 2015-
|
|
3
|
+
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
|
|
4
|
+
# BuildingSync(R), Copyright (c) 2015-2021, Alliance for Sustainable Energy, LLC.
|
|
5
5
|
# All rights reserved.
|
|
6
6
|
#
|
|
7
7
|
# Redistribution and use in source and binary forms, with or without
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/* @preserve
|
|
2
|
-
* OpenStudio(R), Copyright (c) 2008-
|
|
3
|
-
* BuildingSync(R), Copyright (c) 2015-
|
|
2
|
+
* OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
|
|
3
|
+
* BuildingSync(R), Copyright (c) 2015-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
|
|
4
4
|
* Use of this source code is governed by a BSD-style license that can be found at openstudio.net/license.
|
|
5
5
|
*/
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# *******************************************************************************
|
|
2
|
-
# OpenStudio(R), Copyright (c) 2008-
|
|
3
|
-
# BuildingSync(R), Copyright (c) 2015-
|
|
2
|
+
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
|
|
3
|
+
# BuildingSync(R), Copyright (c) 2015-2021, Alliance for Sustainable Energy, LLC.
|
|
4
4
|
# All rights reserved.
|
|
5
5
|
#
|
|
6
6
|
# Redistribution and use in source and binary forms, with or without
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
3
|
# *******************************************************************************
|
|
4
|
-
# OpenStudio(R), Copyright (c) 2008-
|
|
5
|
-
# BuildingSync(R), Copyright (c) 2015-
|
|
4
|
+
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
|
|
5
|
+
# BuildingSync(R), Copyright (c) 2015-2021, Alliance for Sustainable Energy, LLC.
|
|
6
6
|
# All rights reserved.
|
|
7
7
|
#
|
|
8
8
|
# Redistribution and use in source and binary forms, with or without
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
3
|
# *******************************************************************************
|
|
4
|
-
# OpenStudio(R), Copyright (c) 2008-
|
|
5
|
-
# BuildingSync(R), Copyright (c) 2015-
|
|
4
|
+
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
|
|
5
|
+
# BuildingSync(R), Copyright (c) 2015-2021, Alliance for Sustainable Energy, LLC.
|
|
6
6
|
# All rights reserved.
|
|
7
7
|
#
|
|
8
8
|
# Redistribution and use in source and binary forms, with or without
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
3
|
# *******************************************************************************
|
|
4
|
-
# OpenStudio(R), Copyright (c) 2008-
|
|
5
|
-
# BuildingSync(R), Copyright (c) 2015-
|
|
4
|
+
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
|
|
5
|
+
# BuildingSync(R), Copyright (c) 2015-2021, Alliance for Sustainable Energy, LLC.
|
|
6
6
|
# All rights reserved.
|
|
7
7
|
#
|
|
8
8
|
# Redistribution and use in source and binary forms, with or without
|
data/lib/buildingsync/contact.rb
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
3
|
# *******************************************************************************
|
|
4
|
-
# OpenStudio(R), Copyright (c) 2008-
|
|
5
|
-
# BuildingSync(R), Copyright (c) 2015-
|
|
4
|
+
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
|
|
5
|
+
# BuildingSync(R), Copyright (c) 2015-2021, Alliance for Sustainable Energy, LLC.
|
|
6
6
|
# All rights reserved.
|
|
7
7
|
#
|
|
8
8
|
# Redistribution and use in source and binary forms, with or without
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
3
|
# *******************************************************************************
|
|
4
|
-
# OpenStudio(R), Copyright (c) 2008-
|
|
5
|
-
# BuildingSync(R), Copyright (c) 2015-
|
|
4
|
+
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
|
|
5
|
+
# BuildingSync(R), Copyright (c) 2015-2021, Alliance for Sustainable Energy, LLC.
|
|
6
6
|
# All rights reserved.
|
|
7
7
|
#
|
|
8
8
|
# Redistribution and use in source and binary forms, with or without
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
3
|
# *******************************************************************************
|
|
4
|
-
# OpenStudio(R), Copyright (c) 2008-
|
|
5
|
-
# BuildingSync(R), Copyright (c) 2015-
|
|
4
|
+
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
|
|
5
|
+
# BuildingSync(R), Copyright (c) 2015-2021, Alliance for Sustainable Energy, LLC.
|
|
6
6
|
# All rights reserved.
|
|
7
7
|
#
|
|
8
8
|
# Redistribution and use in source and binary forms, with or without
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
3
|
# *******************************************************************************
|
|
4
|
-
# OpenStudio(R), Copyright (c) 2008-
|
|
5
|
-
# BuildingSync(R), Copyright (c) 2015-
|
|
4
|
+
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
|
|
5
|
+
# BuildingSync(R), Copyright (c) 2015-2021, Alliance for Sustainable Energy, LLC.
|
|
6
6
|
# All rights reserved.
|
|
7
7
|
#
|
|
8
8
|
# Redistribution and use in source and binary forms, with or without
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
3
|
# *******************************************************************************
|
|
4
|
-
# OpenStudio(R), Copyright (c) 2008-
|
|
5
|
-
# BuildingSync(R), Copyright (c) 2015-
|
|
4
|
+
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
|
|
5
|
+
# BuildingSync(R), Copyright (c) 2015-2021, Alliance for Sustainable Energy, LLC.
|
|
6
6
|
# All rights reserved.
|
|
7
7
|
#
|
|
8
8
|
# Redistribution and use in source and binary forms, with or without
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
3
|
# *******************************************************************************
|
|
4
|
-
# OpenStudio(R), Copyright (c) 2008-
|
|
5
|
-
# BuildingSync(R), Copyright (c) 2015-
|
|
4
|
+
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
|
|
5
|
+
# BuildingSync(R), Copyright (c) 2015-2021, Alliance for Sustainable Energy, LLC.
|
|
6
6
|
# All rights reserved.
|
|
7
7
|
#
|
|
8
8
|
# Redistribution and use in source and binary forms, with or without
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
3
|
# *******************************************************************************
|
|
4
|
-
# OpenStudio(R), Copyright (c) 2008-
|
|
5
|
-
# BuildingSync(R), Copyright (c) 2015-
|
|
4
|
+
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
|
|
5
|
+
# BuildingSync(R), Copyright (c) 2015-2021, Alliance for Sustainable Energy, LLC.
|
|
6
6
|
# All rights reserved.
|
|
7
7
|
#
|
|
8
8
|
# Redistribution and use in source and binary forms, with or without
|
|
@@ -518,15 +518,24 @@ module BuildingSync
|
|
|
518
518
|
# Removes unused measures from a workflow, where __SKIP__ == true
|
|
519
519
|
# @param workflow [Hash] a hash of the openstudio workflow, typically after a deep
|
|
520
520
|
# copy is made and the measures are configured for the specific scenario
|
|
521
|
+
# KAF: reworked to only delete measures with an explicit __SKIP__ == true
|
|
522
|
+
# (sometimes measure don't have a skip at all, assume we want to keep those)
|
|
521
523
|
def purge_skipped_from_workflow(workflow)
|
|
522
524
|
non_skipped = []
|
|
523
525
|
if !workflow.nil? && !workflow['steps'].nil? && workflow.key?('steps')
|
|
524
526
|
workflow['steps'].each do |step|
|
|
525
|
-
if !step.nil? && step.key?('arguments')
|
|
526
|
-
if step['arguments'].
|
|
527
|
+
if !step.nil? && step.key?('arguments')
|
|
528
|
+
if step['arguments'].nil?
|
|
529
|
+
# no arguments, keep anyway
|
|
530
|
+
non_skipped << step
|
|
531
|
+
elsif step['arguments'].key?('__SKIP__') && step['arguments']['__SKIP__'] == false
|
|
532
|
+
# skip is set to false, keep
|
|
533
|
+
non_skipped << step
|
|
534
|
+
elsif !step['arguments'].key?('__SKIP__')
|
|
535
|
+
# no "SKIP" argument, keep anyway
|
|
527
536
|
non_skipped << step
|
|
528
537
|
end
|
|
529
|
-
end
|
|
538
|
+
end
|
|
530
539
|
end
|
|
531
540
|
workflow['steps'] = non_skipped
|
|
532
541
|
end
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
3
|
# *******************************************************************************
|
|
4
|
-
# OpenStudio(R), Copyright (c) 2008-
|
|
5
|
-
# BuildingSync(R), Copyright (c) 2015-
|
|
4
|
+
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
|
|
5
|
+
# BuildingSync(R), Copyright (c) 2015-2021, Alliance for Sustainable Energy, LLC.
|
|
6
6
|
# All rights reserved.
|
|
7
7
|
#
|
|
8
8
|
# Redistribution and use in source and binary forms, with or without
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
3
|
# *******************************************************************************
|
|
4
|
-
# OpenStudio(R), Copyright (c) 2008-
|
|
5
|
-
# BuildingSync(R), Copyright (c) 2015-
|
|
4
|
+
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
|
|
5
|
+
# BuildingSync(R), Copyright (c) 2015-2021, Alliance for Sustainable Energy, LLC.
|
|
6
6
|
# All rights reserved.
|
|
7
7
|
#
|
|
8
8
|
# Redistribution and use in source and binary forms, with or without
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
3
|
# *******************************************************************************
|
|
4
|
-
# OpenStudio(R), Copyright (c) 2008-
|
|
5
|
-
# BuildingSync(R), Copyright (c) 2015-
|
|
4
|
+
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
|
|
5
|
+
# BuildingSync(R), Copyright (c) 2015-2021, Alliance for Sustainable Energy, LLC.
|
|
6
6
|
# All rights reserved.
|
|
7
7
|
#
|
|
8
8
|
# Redistribution and use in source and binary forms, with or without
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
3
|
# *******************************************************************************
|
|
4
|
-
# OpenStudio(R), Copyright (c) 2008-
|
|
5
|
-
# BuildingSync(R), Copyright (c) 2015-
|
|
4
|
+
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
|
|
5
|
+
# BuildingSync(R), Copyright (c) 2015-2021, Alliance for Sustainable Energy, LLC.
|
|
6
6
|
# All rights reserved.
|
|
7
7
|
#
|
|
8
8
|
# Redistribution and use in source and binary forms, with or without
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
3
|
# *******************************************************************************
|
|
4
|
-
# OpenStudio(R), Copyright (c) 2008-
|
|
5
|
-
# BuildingSync(R), Copyright (c) 2015-
|
|
4
|
+
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
|
|
5
|
+
# BuildingSync(R), Copyright (c) 2015-2021, Alliance for Sustainable Energy, LLC.
|
|
6
6
|
# All rights reserved.
|
|
7
7
|
#
|
|
8
8
|
# Redistribution and use in source and binary forms, with or without
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
3
|
# *******************************************************************************
|
|
4
|
-
# OpenStudio(R), Copyright (c) 2008-
|
|
5
|
-
# BuildingSync(R), Copyright (c) 2015-
|
|
4
|
+
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
|
|
5
|
+
# BuildingSync(R), Copyright (c) 2015-2021, Alliance for Sustainable Energy, LLC.
|
|
6
6
|
# All rights reserved.
|
|
7
7
|
#
|
|
8
8
|
# Redistribution and use in source and binary forms, with or without
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
3
|
# *******************************************************************************
|
|
4
|
-
# OpenStudio(R), Copyright (c) 2008-
|
|
5
|
-
# BuildingSync(R), Copyright (c) 2015-
|
|
4
|
+
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
|
|
5
|
+
# BuildingSync(R), Copyright (c) 2015-2021, Alliance for Sustainable Energy, LLC.
|
|
6
6
|
# All rights reserved.
|
|
7
7
|
#
|
|
8
8
|
# Redistribution and use in source and binary forms, with or without
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
3
|
# *******************************************************************************
|
|
4
|
-
# OpenStudio(R), Copyright (c) 2008-
|
|
5
|
-
# BuildingSync(R), Copyright (c) 2015-
|
|
4
|
+
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
|
|
5
|
+
# BuildingSync(R), Copyright (c) 2015-2021, Alliance for Sustainable Energy, LLC.
|
|
6
6
|
# All rights reserved.
|
|
7
7
|
#
|
|
8
8
|
# Redistribution and use in source and binary forms, with or without
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
3
|
# *******************************************************************************
|
|
4
|
-
# OpenStudio(R), Copyright (c) 2008-
|
|
5
|
-
# BuildingSync(R), Copyright (c) 2015-
|
|
4
|
+
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
|
|
5
|
+
# BuildingSync(R), Copyright (c) 2015-2021, Alliance for Sustainable Energy, LLC.
|
|
6
6
|
# All rights reserved.
|
|
7
7
|
#
|
|
8
8
|
# Redistribution and use in source and binary forms, with or without
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
3
|
# *******************************************************************************
|
|
4
|
-
# OpenStudio(R), Copyright (c) 2008-
|
|
5
|
-
# BuildingSync(R), Copyright (c) 2015-
|
|
4
|
+
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
|
|
5
|
+
# BuildingSync(R), Copyright (c) 2015-2021, Alliance for Sustainable Energy, LLC.
|
|
6
6
|
# All rights reserved.
|
|
7
7
|
#
|
|
8
8
|
# Redistribution and use in source and binary forms, with or without
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
3
|
# *******************************************************************************
|
|
4
|
-
# OpenStudio(R), Copyright (c) 2008-
|
|
5
|
-
# BuildingSync(R), Copyright (c) 2015-
|
|
4
|
+
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
|
|
5
|
+
# BuildingSync(R), Copyright (c) 2015-2021, Alliance for Sustainable Energy, LLC.
|
|
6
6
|
# All rights reserved.
|
|
7
7
|
#
|
|
8
8
|
# Redistribution and use in source and binary forms, with or without
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
3
|
# *******************************************************************************
|
|
4
|
-
# OpenStudio(R), Copyright (c) 2008-
|
|
5
|
-
# BuildingSync(R), Copyright (c) 2015-
|
|
4
|
+
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
|
|
5
|
+
# BuildingSync(R), Copyright (c) 2015-2021, Alliance for Sustainable Energy, LLC.
|
|
6
6
|
# All rights reserved.
|
|
7
7
|
#
|
|
8
8
|
# Redistribution and use in source and binary forms, with or without
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
3
|
# *******************************************************************************
|
|
4
|
-
# OpenStudio(R), Copyright (c) 2008-
|
|
5
|
-
# BuildingSync(R), Copyright (c) 2015-
|
|
4
|
+
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
|
|
5
|
+
# BuildingSync(R), Copyright (c) 2015-2021, Alliance for Sustainable Energy, LLC.
|
|
6
6
|
# All rights reserved.
|
|
7
7
|
#
|
|
8
8
|
# Redistribution and use in source and binary forms, with or without
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
3
|
# *******************************************************************************
|
|
4
|
-
# OpenStudio(R), Copyright (c) 2008-
|
|
5
|
-
# BuildingSync(R), Copyright (c) 2015-
|
|
4
|
+
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
|
|
5
|
+
# BuildingSync(R), Copyright (c) 2015-2021, Alliance for Sustainable Energy, LLC.
|
|
6
6
|
# All rights reserved.
|
|
7
7
|
#
|
|
8
8
|
# Redistribution and use in source and binary forms, with or without
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
3
|
# *******************************************************************************
|
|
4
|
-
# OpenStudio(R), Copyright (c) 2008-
|
|
5
|
-
# BuildingSync(R), Copyright (c) 2015-
|
|
4
|
+
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
|
|
5
|
+
# BuildingSync(R), Copyright (c) 2015-2021, Alliance for Sustainable Energy, LLC.
|
|
6
6
|
# All rights reserved.
|
|
7
7
|
#
|
|
8
8
|
# Redistribution and use in source and binary forms, with or without
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
3
|
# *******************************************************************************
|
|
4
|
-
# OpenStudio(R), Copyright (c) 2008-
|
|
5
|
-
# BuildingSync(R), Copyright (c) 2015-
|
|
4
|
+
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
|
|
5
|
+
# BuildingSync(R), Copyright (c) 2015-2021, Alliance for Sustainable Energy, LLC.
|
|
6
6
|
# All rights reserved.
|
|
7
7
|
#
|
|
8
8
|
# Redistribution and use in source and binary forms, with or without
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
3
|
# *******************************************************************************
|
|
4
|
-
# OpenStudio(R), Copyright (c) 2008-
|
|
5
|
-
# BuildingSync(R), Copyright (c) 2015-
|
|
4
|
+
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
|
|
5
|
+
# BuildingSync(R), Copyright (c) 2015-2021, Alliance for Sustainable Energy, LLC.
|
|
6
6
|
# All rights reserved.
|
|
7
7
|
#
|
|
8
8
|
# Redistribution and use in source and binary forms, with or without
|
|
@@ -67,7 +67,7 @@ module BuildingSync
|
|
|
67
67
|
@space_types_floor_area = nil
|
|
68
68
|
@conditioned_floor_area_heated_only = nil
|
|
69
69
|
@conditioned_floor_area_cooled_only = nil
|
|
70
|
-
@conditioned_floor_area_heated_cooled =
|
|
70
|
+
@conditioned_floor_area_heated_cooled = 0
|
|
71
71
|
@custom_conditioned_above_grade_floor_area = nil
|
|
72
72
|
@custom_conditioned_below_grade_floor_area = nil
|
|
73
73
|
|
|
@@ -85,12 +85,10 @@ module BuildingSync
|
|
|
85
85
|
floor_area_type = floor_area_element.elements["#{@ns}:FloorAreaType"].text
|
|
86
86
|
if floor_area_type == 'Gross'
|
|
87
87
|
@total_floor_area = OpenStudio.convert(validate_positive_number_excluding_zero('gross_floor_area', floor_area), 'ft^2', 'm^2').get
|
|
88
|
-
elsif floor_area_type == 'Heated and Cooled'
|
|
89
|
-
@conditioned_floor_area_heated_cooled = OpenStudio.convert(validate_positive_number_excluding_zero('@heated_and_cooled_floor_area', floor_area), 'ft^2', 'm^2').get
|
|
90
88
|
elsif floor_area_type == 'Footprint'
|
|
91
89
|
@footprint_floor_area = OpenStudio.convert(validate_positive_number_excluding_zero('@footprint_floor_area', floor_area), 'ft^2', 'm^2').get
|
|
92
|
-
elsif floor_area_type == 'Conditioned'
|
|
93
|
-
@conditioned_floor_area_heated_cooled
|
|
90
|
+
elsif floor_area_type == 'Conditioned' || floor_area_type == 'Common' || floor_area_type == 'Heated and Cooled'
|
|
91
|
+
@conditioned_floor_area_heated_cooled += OpenStudio.convert(validate_positive_number_excluding_zero('@conditioned_floor_area_heated_cooled', floor_area), 'ft^2', 'm^2').get
|
|
94
92
|
elsif floor_area_type == 'Heated Only'
|
|
95
93
|
@conditioned_floor_area_heated_only = OpenStudio.convert(validate_positive_number_excluding_zero('@heated_only_floor_area', floor_area), 'ft^2', 'm^2').get
|
|
96
94
|
elsif floor_area_type == 'Cooled Only'
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
3
|
# *******************************************************************************
|
|
4
|
-
# OpenStudio(R), Copyright (c) 2008-
|
|
5
|
-
# BuildingSync(R), Copyright (c) 2015-
|
|
4
|
+
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
|
|
5
|
+
# BuildingSync(R), Copyright (c) 2015-2021, Alliance for Sustainable Energy, LLC.
|
|
6
6
|
# All rights reserved.
|
|
7
7
|
#
|
|
8
8
|
# Redistribution and use in source and binary forms, with or without
|
data/lib/buildingsync/report.rb
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
3
|
# *******************************************************************************
|
|
4
|
-
# OpenStudio(R), Copyright (c) 2008-
|
|
5
|
-
# BuildingSync(R), Copyright (c) 2015-
|
|
4
|
+
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
|
|
5
|
+
# BuildingSync(R), Copyright (c) 2015-2021, Alliance for Sustainable Energy, LLC.
|
|
6
6
|
# All rights reserved.
|
|
7
7
|
#
|
|
8
8
|
# Redistribution and use in source and binary forms, with or without
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
3
|
# *******************************************************************************
|
|
4
|
-
# OpenStudio(R), Copyright (c) 2008-
|
|
5
|
-
# BuildingSync(R), Copyright (c) 2015-
|
|
4
|
+
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
|
|
5
|
+
# BuildingSync(R), Copyright (c) 2015-2021, Alliance for Sustainable Energy, LLC.
|
|
6
6
|
# All rights reserved.
|
|
7
7
|
#
|
|
8
8
|
# Redistribution and use in source and binary forms, with or without
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
3
|
# *******************************************************************************
|
|
4
|
-
# OpenStudio(R), Copyright (c) 2008-
|
|
5
|
-
# BuildingSync(R), Copyright (c) 2015-
|
|
4
|
+
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
|
|
5
|
+
# BuildingSync(R), Copyright (c) 2015-2021, Alliance for Sustainable Energy, LLC.
|
|
6
6
|
# All rights reserved.
|
|
7
7
|
#
|
|
8
8
|
# Redistribution and use in source and binary forms, with or without
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
3
|
# *******************************************************************************
|
|
4
|
-
# OpenStudio(R), Copyright (c) 2008-
|
|
5
|
-
# BuildingSync(R), Copyright (c) 2015-
|
|
4
|
+
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
|
|
5
|
+
# BuildingSync(R), Copyright (c) 2015-2021, Alliance for Sustainable Energy, LLC.
|
|
6
6
|
# All rights reserved.
|
|
7
7
|
#
|
|
8
8
|
# Redistribution and use in source and binary forms, with or without
|
|
@@ -41,16 +41,16 @@ require 'net/http'
|
|
|
41
41
|
require 'net/http/post/multipart'
|
|
42
42
|
|
|
43
43
|
module BuildingSync
|
|
44
|
-
# Class for communicating with SelectionTool
|
|
44
|
+
# Class for communicating with SelectionTool on the BuildingSync website
|
|
45
45
|
class SelectionTool
|
|
46
46
|
# initialize the selection tools class
|
|
47
|
-
# @note See documentation here: https://github.com/buildingsync/
|
|
47
|
+
# @note See documentation here: https://github.com/buildingsync/buildingsync-website#validator
|
|
48
48
|
# @note Use core Net::HTTPS
|
|
49
49
|
# @param xml_path [String]
|
|
50
|
-
def initialize(xml_path, version = '2.
|
|
50
|
+
def initialize(xml_path, version = '2.2.0')
|
|
51
51
|
@hash_response = nil
|
|
52
|
-
version = '2.
|
|
53
|
-
url = URI.parse('https://
|
|
52
|
+
version = '2.2.0' if version.nil?
|
|
53
|
+
url = URI.parse('https://buildingsync.net/api/validate')
|
|
54
54
|
|
|
55
55
|
params = { 'schema_version' => version }
|
|
56
56
|
params[:file] = UploadIO.new(xml_path, 'text/xml', File.basename(xml_path))
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
3
|
# *******************************************************************************
|
|
4
|
-
# OpenStudio(R), Copyright (c) 2008-
|
|
5
|
-
# BuildingSync(R), Copyright (c) 2015-
|
|
4
|
+
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
|
|
5
|
+
# BuildingSync(R), Copyright (c) 2015-2021, Alliance for Sustainable Energy, LLC.
|
|
6
6
|
# All rights reserved.
|
|
7
7
|
#
|
|
8
8
|
# Redistribution and use in source and binary forms, with or without
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
3
|
# *******************************************************************************
|
|
4
|
-
# OpenStudio(R), Copyright (c) 2008-
|
|
5
|
-
# BuildingSync(R), Copyright (c) 2015-
|
|
4
|
+
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
|
|
5
|
+
# BuildingSync(R), Copyright (c) 2015-2021, Alliance for Sustainable Energy, LLC.
|
|
6
6
|
# All rights reserved.
|
|
7
7
|
#
|
|
8
8
|
# Redistribution and use in source and binary forms, with or without
|
|
@@ -38,6 +38,7 @@
|
|
|
38
38
|
# *******************************************************************************
|
|
39
39
|
require 'rexml/document'
|
|
40
40
|
require 'buildingsync/constants'
|
|
41
|
+
require 'buildingsync/generator'
|
|
41
42
|
|
|
42
43
|
require_relative 'model_articulation/spatial_element'
|
|
43
44
|
require_relative 'makers/workflow_maker'
|
|
@@ -80,7 +81,7 @@ module BuildingSync
|
|
|
80
81
|
|
|
81
82
|
@schema_version = doc.root.attributes['version']
|
|
82
83
|
if @schema_version.nil?
|
|
83
|
-
@schema_version = '2.
|
|
84
|
+
@schema_version = '2.2.0'
|
|
84
85
|
end
|
|
85
86
|
|
|
86
87
|
# test for the namespace
|
|
@@ -92,8 +93,8 @@ module BuildingSync
|
|
|
92
93
|
if validate_xml_file_against_schema
|
|
93
94
|
validate_xml
|
|
94
95
|
else
|
|
95
|
-
OpenStudio.logFree(OpenStudio::Info, 'BuildingSync.Translator.initialize', "File '#{xml_file_path}' was not validated against the BuildingSync schema")
|
|
96
|
-
puts "File '#{xml_file_path}' was not validated against the BuildingSync schema"
|
|
96
|
+
OpenStudio.logFree(OpenStudio::Info, 'BuildingSync.Translator.initialize', "File '#{xml_file_path}' was not validated against the BuildingSync schema version #{@schema_version}")
|
|
97
|
+
puts "File '#{xml_file_path}' was not validated against the BuildingSync schema version #{@schema_version}"
|
|
97
98
|
end
|
|
98
99
|
|
|
99
100
|
super(doc, ns)
|
|
@@ -108,11 +109,12 @@ module BuildingSync
|
|
|
108
109
|
if !selection_tool.validate_schema
|
|
109
110
|
raise "File '#{@xml_file_path}' does not valid against the BuildingSync schema"
|
|
110
111
|
else
|
|
111
|
-
OpenStudio.logFree(OpenStudio::Info, 'BuildingSync.Translator.initialize', "File '#{@xml_file_path}' is valid against the BuildingSync schema")
|
|
112
|
+
OpenStudio.logFree(OpenStudio::Info, 'BuildingSync.Translator.initialize', "File '#{@xml_file_path}' is valid against the BuildingSync schema version #{@schema_version}")
|
|
112
113
|
puts "File '#{@xml_file_path}' is valid against the BuildingSync schema"
|
|
113
114
|
end
|
|
114
|
-
rescue StandardError
|
|
115
|
-
|
|
115
|
+
rescue StandardError => error
|
|
116
|
+
puts "ERROR: #{error}"
|
|
117
|
+
OpenStudio.logFree(OpenStudio::Error, 'BuildingSync.Translator.initialize', "File '#{@xml_file_path}' does not validate against the BuildingSync schema version #{@schema_version}")
|
|
116
118
|
end
|
|
117
119
|
|
|
118
120
|
# @see WorkflowMaker.setup_and_sizing_run
|
data/lib/buildingsync/utility.rb
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
3
|
# *******************************************************************************
|
|
4
|
-
# OpenStudio(R), Copyright (c) 2008-
|
|
5
|
-
# BuildingSync(R), Copyright (c) 2015-
|
|
4
|
+
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
|
|
5
|
+
# BuildingSync(R), Copyright (c) 2015-2021, Alliance for Sustainable Energy, LLC.
|
|
6
6
|
# All rights reserved.
|
|
7
7
|
#
|
|
8
8
|
# Redistribution and use in source and binary forms, with or without
|
data/lib/buildingsync/version.rb
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
3
|
# *******************************************************************************
|
|
4
|
-
# OpenStudio(R), Copyright (c) 2008-
|
|
5
|
-
# BuildingSync(R), Copyright (c) 2015-
|
|
4
|
+
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
|
|
5
|
+
# BuildingSync(R), Copyright (c) 2015-2021, Alliance for Sustainable Energy, LLC.
|
|
6
6
|
# All rights reserved.
|
|
7
7
|
#
|
|
8
8
|
# Redistribution and use in source and binary forms, with or without
|
|
@@ -41,5 +41,5 @@
|
|
|
41
41
|
# provides features for reading BldgSync XML files, generating baseline models, creating scenario workflows, running simulations and adding simulation results to the BldgSync file
|
|
42
42
|
module BuildingSync
|
|
43
43
|
# version of the BuildingSync gem
|
|
44
|
-
VERSION = '0.2.
|
|
44
|
+
VERSION = '0.2.1'
|
|
45
45
|
end
|
data/lib/buildingsync.rb
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
3
|
# *******************************************************************************
|
|
4
|
-
# OpenStudio(R), Copyright (c) 2008-
|
|
5
|
-
# BuildingSync(R), Copyright (c) 2015-
|
|
4
|
+
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
|
|
5
|
+
# BuildingSync(R), Copyright (c) 2015-2021, Alliance for Sustainable Energy, LLC.
|
|
6
6
|
# All rights reserved.
|
|
7
7
|
#
|
|
8
8
|
# Redistribution and use in source and binary forms, with or without
|
metadata
CHANGED
|
@@ -1,16 +1,17 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: buildingsync
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.2.
|
|
4
|
+
version: 0.2.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Nicholas Long
|
|
8
|
+
- Cory Mosiman
|
|
8
9
|
- Dan Macumber
|
|
9
10
|
- Katherine Fleming
|
|
10
11
|
autorequire:
|
|
11
12
|
bindir: exe
|
|
12
13
|
cert_chain: []
|
|
13
|
-
date: 2021-
|
|
14
|
+
date: 2021-09-13 00:00:00.000000000 Z
|
|
14
15
|
dependencies:
|
|
15
16
|
- !ruby/object:Gem::Dependency
|
|
16
17
|
name: bundler
|
|
@@ -124,10 +125,39 @@ dependencies:
|
|
|
124
125
|
- - "~>"
|
|
125
126
|
- !ruby/object:Gem::Version
|
|
126
127
|
version: '3.9'
|
|
128
|
+
- !ruby/object:Gem::Dependency
|
|
129
|
+
name: yard
|
|
130
|
+
requirement: !ruby/object:Gem::Requirement
|
|
131
|
+
requirements:
|
|
132
|
+
- - "~>"
|
|
133
|
+
- !ruby/object:Gem::Version
|
|
134
|
+
version: 0.9.26
|
|
135
|
+
type: :development
|
|
136
|
+
prerelease: false
|
|
137
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
138
|
+
requirements:
|
|
139
|
+
- - "~>"
|
|
140
|
+
- !ruby/object:Gem::Version
|
|
141
|
+
version: 0.9.26
|
|
142
|
+
- !ruby/object:Gem::Dependency
|
|
143
|
+
name: yard-sitemap
|
|
144
|
+
requirement: !ruby/object:Gem::Requirement
|
|
145
|
+
requirements:
|
|
146
|
+
- - "~>"
|
|
147
|
+
- !ruby/object:Gem::Version
|
|
148
|
+
version: 1.0.1
|
|
149
|
+
type: :development
|
|
150
|
+
prerelease: false
|
|
151
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
152
|
+
requirements:
|
|
153
|
+
- - "~>"
|
|
154
|
+
- !ruby/object:Gem::Version
|
|
155
|
+
version: 1.0.1
|
|
127
156
|
description: BuildingSync library for reading, writing, and exporting BuildingSync
|
|
128
157
|
to OpenStudio
|
|
129
158
|
email:
|
|
130
159
|
- nicholas.long@nrel.gov
|
|
160
|
+
- cory.mosiman@nrel.gov
|
|
131
161
|
- daniel.macumber@nrel.gov
|
|
132
162
|
- katherine.fleming@nrel.gov
|
|
133
163
|
executables: []
|
|
@@ -135,12 +165,12 @@ extensions: []
|
|
|
135
165
|
extra_rdoc_files: []
|
|
136
166
|
files:
|
|
137
167
|
- ".github/workflows/continuous_integration.yml"
|
|
168
|
+
- ".github/workflows/deploy.yml"
|
|
138
169
|
- ".gitignore"
|
|
139
170
|
- ".rspec"
|
|
140
171
|
- ".rubocop.yml"
|
|
141
172
|
- CHANGELOG.md
|
|
142
173
|
- Gemfile
|
|
143
|
-
- Jenkinsfile
|
|
144
174
|
- LICENSE.md
|
|
145
175
|
- README.md
|
|
146
176
|
- Rakefile
|
|
@@ -214,8 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
214
244
|
- !ruby/object:Gem::Version
|
|
215
245
|
version: '0'
|
|
216
246
|
requirements: []
|
|
217
|
-
|
|
218
|
-
rubygems_version: 2.7.6.2
|
|
247
|
+
rubygems_version: 3.1.4
|
|
219
248
|
signing_key:
|
|
220
249
|
specification_version: 4
|
|
221
250
|
summary: BuildingSync library for reading, writing, and exporting BuildingSync to
|
data/Jenkinsfile
DELETED
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
//Jenkins pipelines are stored in shared libaries. Please see: https://github.com/tijcolem/nrel_cbci_jenkins_libs
|
|
2
|
-
|
|
3
|
-
@Library('cbci_shared_libs') _
|
|
4
|
-
|
|
5
|
-
// Build for PR to develop branch only.
|
|
6
|
-
if ((env.CHANGE_ID) && (env.CHANGE_TARGET) ) { // check if set
|
|
7
|
-
|
|
8
|
-
building_sync_gems()
|
|
9
|
-
|
|
10
|
-
}
|