urbanopt-reporting 0.3.7 → 0.4.3

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: c7f77ced3ece4ad3c08bc93a92108e57b4fc83bbd982304d2ceee67b5f6260ab
4
- data.tar.gz: 026a4b1d4fd2bfe3690444092eee67ef47c936a5bbdbcc6318c4c0403b2ddf1e
3
+ metadata.gz: c92d06bb505fd5f444e2aa734c939eb2abb0eef2a39c9ebd03ca3515c5417cc0
4
+ data.tar.gz: 9561cd08c28272ac2451291203594f08184bc7020a6d59ea13d0bce1cbc3935e
5
5
  SHA512:
6
- metadata.gz: 95161e4c8f6019163f112607c2c6d7576b1eb436a89f90ce91434e21096debfe7ee488c78fb107cd92eccedceab61700b1632333f7819b684bc05e9f611cf06f
7
- data.tar.gz: 988b4612f950580f7baeaadc10845f71e5e5be954143f5374e9615184d74fee37893c7110682bc1476319faa536283350956e480c5fe603f12f1d531af438b14
6
+ metadata.gz: d43ec65e56d9bfbfdf4959987181d7d00e55349e7ff02434d998c2237f074c636dc118c1575cdfe467a885e2363e481442ee7252a21ad45bae0042fcb17a3e2a
7
+ data.tar.gz: bb99b14333c2b514aa9ed33c102ce0cdc9ebc750b5c774cdcdbae526b1b4cee19317152010540a0e1d45a9c06ba6b768de9982852e518f8c51eae26b41d7b003
data/.rubocop.yml CHANGED
@@ -3,8 +3,7 @@ AllCops:
3
3
  - gems/**/*
4
4
  - measures/**/*
5
5
  - spec/files/**/measures/**/*
6
-
6
+ require: rubocop-performance
7
7
 
8
8
  inherit_from:
9
- - http://s3.amazonaws.com/openstudio-resources/styles/rubocop_v3.yml
10
-
9
+ - http://s3.amazonaws.com/openstudio-resources/styles/rubocop_v4.yml
data/CHANGELOG.md CHANGED
@@ -1,6 +1,29 @@
1
1
  # URBANopt Reporting Gem
2
2
 
3
+ ## Version 0.4.3
4
+ Date Range: 10/16/21 - 11/12/21
5
+
6
+ - Fixed [#93]( https://github.com/urbanopt/urbanopt-reporting-gem/issues/93 ), Fix aggregation of storage system typo
7
+
8
+ ## Version 0.4.2
9
+ Date Range: 07/01/21 - 10/15/21
10
+
11
+ - Fixed [#86]( https://github.com/urbanopt/urbanopt-reporting-gem/issues/86 ), Add location of PV to Scenario and Feature optimization reopt reports #86
12
+ - Fixed [#77]( https://github.com/urbanopt/urbanopt-reporting-gem/issues/77 ), Fix test_with_openstudio model failures
13
+
14
+ ## Version 0.4.1
15
+ Date Range: 04/27/23 - 07/01/21
16
+
17
+ - Fixed [#80](https://github.com/urbanopt/urbanopt-reporting-gem/issues/80), Update rubocop configs to v4
18
+ -
19
+ ## Version 0.4.0
20
+
21
+ Date Range: 03/27/21 - 04/26/21
22
+
23
+ - Update dependencies for OpenStudio 3.2.0 and Ruby 2.7
24
+
3
25
  ## Version 0.3.7
26
+
4
27
  Date Range: 02/12/21 - 03/26/21
5
28
 
6
29
  - Fixed [#47]( https://github.com/urbanopt/urbanopt-reporting-gem/issues/47 ), Default features report bugfixes and updates
data/LICENSE.md CHANGED
@@ -1,39 +1,27 @@
1
- # License
2
-
3
- URBANopt™, Copyright (c) 2019-2021, Alliance for Sustainable Energy, LLC, and other
1
+ URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
4
2
  contributors. All rights reserved.
5
3
 
6
- Redistribution and use in source and binary forms, with or without modification,
4
+ Redistribution and use in source and binary forms, with or without modification,
7
5
  are permitted provided that the following conditions are met:
8
6
 
9
- Redistributions of source code must retain the above copyright notice, this list
7
+ Redistributions of source code must retain the above copyright notice, this list
10
8
  of conditions and the following disclaimer.
11
9
 
12
- Redistributions in binary form must reproduce the above copyright notice, this
13
- list of conditions and the following disclaimer in the documentation and/or other
10
+ Redistributions in binary form must reproduce the above copyright notice, this
11
+ list of conditions and the following disclaimer in the documentation and/or other
14
12
  materials provided with the distribution.
15
-
16
- Neither the name of the copyright holder nor the names of its contributors may be
17
- used to endorse or promote products derived from this software without specific
13
+
14
+ Neither the name of the copyright holder nor the names of its contributors may be
15
+ used to endorse or promote products derived from this software without specific
18
16
  prior written permission.
19
17
 
20
- Redistribution of this software, without modification, must refer to the software
21
- by the same designation. Redistribution of a modified version of this software
22
- (i) may not refer to the modified version by the same designation, or by any
23
- confusingly similar designation, and (ii) must refer to the underlying software
24
- originally provided by Alliance as “URBANopt”. Except to comply with the foregoing,
25
- the term “URBANopt”, or any confusingly similar designation may not be used to
26
- refer to any modified version of this software or any modified version of the
27
- underlying software originally provided by Alliance without the prior written
28
- consent of Alliance.
29
-
30
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
31
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
32
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
33
- IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
34
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
35
- BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
36
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
37
- LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
38
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
18
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
19
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
20
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
21
+ IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
22
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
23
+ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
24
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
25
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
26
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
39
27
  OF THE POSSIBILITY OF SUCH DAMAGE.
@@ -428,10 +428,12 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
428
428
  feature_report.program.maximum_roof_height_ft = feature_report.program.maximum_number_of_stories_above_ground * floor_to_floor_height
429
429
 
430
430
  # footprint_area
431
- if not ['Residential'].include?(building.standardsBuildingType.get)
432
- feature_report.program.footprint_area_sqft = feature_report.program.floor_area_sqft / number_of_stories
433
- else
434
- feature_report.program.footprint_area_sqft = convert_units(floor_area, 'm^2', 'ft^2') / building.additionalProperties.getFeatureAsInteger('NumberOfConditionedStories').get
431
+ if building.standardsBuildingType.is_initialized
432
+ if not ['Residential'].include?(building.standardsBuildingType.get)
433
+ feature_report.program.footprint_area_sqft = feature_report.program.floor_area_sqft / number_of_stories
434
+ else
435
+ feature_report.program.footprint_area_sqft = convert_units(floor_area, 'm^2', 'ft^2') / building.additionalProperties.getFeatureAsInteger('NumberOfConditionedStories').get
436
+ end
435
437
  end
436
438
 
437
439
  # number_of_residential_units
@@ -1,10 +1,11 @@
1
1
  <?xml version="1.0"?>
2
2
  <measure>
3
3
  <schema_version>3.0</schema_version>
4
+ <error>wrong number of arguments (given 1, expected 0)</error>
4
5
  <name>default_feature_reports</name>
5
6
  <uid>9ee3135a-8070-4408-bfa1-b75fecf9dd4f</uid>
6
- <version_id>d4f5b2e2-f93d-4ce2-9c68-ed29714fdc0c</version_id>
7
- <version_modified>20201208T230102Z</version_modified>
7
+ <version_id>136d51d4-9a61-48cd-b068-0e02c4094e76</version_id>
8
+ <version_modified>20210427T174740Z</version_modified>
8
9
  <xml_checksum>FB304155</xml_checksum>
9
10
  <class_name>DefaultFeatureReports</class_name>
10
11
  <display_name>DefaultFeatureReports</display_name>
@@ -120,12 +121,6 @@
120
121
  <usage_type>readmeerb</usage_type>
121
122
  <checksum>703C9964</checksum>
122
123
  </file>
123
- <file>
124
- <filename>example_model.osm</filename>
125
- <filetype>osm</filetype>
126
- <usage_type>test</usage_type>
127
- <checksum>CC4BFFAF</checksum>
128
- </file>
129
124
  <file>
130
125
  <filename>README.md</filename>
131
126
  <filetype>md</filetype>
@@ -138,11 +133,17 @@
138
133
  <usage_type>license</usage_type>
139
134
  <checksum>BBD19F47</checksum>
140
135
  </file>
136
+ <file>
137
+ <filename>example_model.osm</filename>
138
+ <filetype>osm</filetype>
139
+ <usage_type>test</usage_type>
140
+ <checksum>A178EC04</checksum>
141
+ </file>
141
142
  <file>
142
143
  <filename>default_feature_reports_test.rb</filename>
143
144
  <filetype>rb</filetype>
144
145
  <usage_type>test</usage_type>
145
- <checksum>19681175</checksum>
146
+ <checksum>0C4ED2E7</checksum>
146
147
  </file>
147
148
  <file>
148
149
  <version>
@@ -153,8 +154,7 @@
153
154
  <filename>measure.rb</filename>
154
155
  <filetype>rb</filetype>
155
156
  <usage_type>script</usage_type>
156
- <checksum>48AEB753</checksum>
157
+ <checksum>CD1AFD42</checksum>
157
158
  </file>
158
159
  </files>
159
160
  </measure>
160
- <error>wrong number of arguments (given 1, expected 0)</error>
@@ -1,27 +1,27 @@
1
- OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved.
1
+ URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
2
+ contributors. All rights reserved.
2
3
 
3
- Redistribution and use in source and binary forms, with or without modification, are permitted
4
- provided that the following conditions are met:
4
+ Redistribution and use in source and binary forms, with or without modification,
5
+ are permitted provided that the following conditions are met:
5
6
 
6
- (1) Redistributions of source code must retain the above copyright notice, this list of conditions
7
- and the following disclaimer.
7
+ Redistributions of source code must retain the above copyright notice, this list
8
+ of conditions and the following disclaimer.
8
9
 
9
- (2) Redistributions in binary form must reproduce the above copyright notice, this list of conditions
10
- and the following disclaimer in the documentation and/or other materials provided with the distribution.
10
+ Redistributions in binary form must reproduce the above copyright notice, this
11
+ list of conditions and the following disclaimer in the documentation and/or other
12
+ materials provided with the distribution.
13
+
14
+ Neither the name of the copyright holder nor the names of its contributors may be
15
+ used to endorse or promote products derived from this software without specific
16
+ prior written permission.
11
17
 
12
- (3) Neither the name of the copyright holder nor the names of any contributors may be used to endorse
13
- or promote products derived from this software without specific prior written permission from the
14
- respective party.
15
-
16
- (4) Other than as required in clauses (1) and (2), distributions in any form of modifications or other
17
- derivative works may not use the "OpenStudio" trademark, "OS", "os", or any other confusingly similar
18
- designation without specific prior written permission from Alliance for Sustainable Energy, LLC.
19
-
20
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
21
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
22
- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER, THE UNITED STATES GOVERNMENT,
23
- OR ANY CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
24
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
25
- OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
26
- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
27
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
18
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
19
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
20
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
21
+ IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
22
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
23
+ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
24
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
25
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
26
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
27
+ OF THE POSSIBILITY OF SUCH DAMAGE.
@@ -1,39 +1,45 @@
1
- # *******************************************************************************
2
- # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
3
- # All rights reserved.
4
- # Redistribution and use in source and binary forms, with or without
5
- # modification, are permitted provided that the following conditions are met:
6
- #
7
- # (1) Redistributions of source code must retain the above copyright notice,
8
- # this list of conditions and the following disclaimer.
9
- #
10
- # (2) Redistributions in binary form must reproduce the above copyright notice,
11
- # this list of conditions and the following disclaimer in the documentation
12
- # and/or other materials provided with the distribution.
13
- #
14
- # (3) Neither the name of the copyright holder nor the names of any contributors
15
- # may be used to endorse or promote products derived from this software without
16
- # specific prior written permission from the respective party.
17
- #
18
- # (4) Other than as required in clauses (1) and (2), distributions in any form
19
- # of modifications or other derivative works may not use the "OpenStudio"
20
- # trademark, "OS", "os", or any other confusingly similar designation without
21
- # specific prior written permission from Alliance for Sustainable Energy, LLC.
22
- #
23
- # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND ANY CONTRIBUTORS
24
- # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
25
- # THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
26
- # ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER(S), ANY CONTRIBUTORS, THE
27
- # UNITED STATES GOVERNMENT, OR THE UNITED STATES DEPARTMENT OF ENERGY, NOR ANY OF
28
- # THEIR EMPLOYEES, BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
29
- # EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
30
- # OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
31
- # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
32
- # STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
33
- # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
34
- # *******************************************************************************
1
+ # *********************************************************************************
2
+ # URBANopt™, Copyright (c) 2019-2021, Alliance for Sustainable Energy, LLC, and other
3
+ # contributors. All rights reserved.
4
+
5
+ # Redistribution and use in source and binary forms, with or without modification,
6
+ # are permitted provided that the following conditions are met:
7
+
8
+ # Redistributions of source code must retain the above copyright notice, this list
9
+ # of conditions and the following disclaimer.
10
+
11
+ # Redistributions in binary form must reproduce the above copyright notice, this
12
+ # list of conditions and the following disclaimer in the documentation and/or other
13
+ # materials provided with the distribution.
14
+
15
+ # Neither the name of the copyright holder nor the names of its contributors may be
16
+ # used to endorse or promote products derived from this software without specific
17
+ # prior written permission.
18
+
19
+ # Redistribution of this software, without modification, must refer to the software
20
+ # by the same designation. Redistribution of a modified version of this software
21
+ # (i) may not refer to the modified version by the same designation, or by any
22
+ # confusingly similar designation, and (ii) must refer to the underlying software
23
+ # originally provided by Alliance as “URBANopt”. Except to comply with the foregoing,
24
+ # the term “URBANopt”, or any confusingly similar designation may not be used to
25
+ # refer to any modified version of this software or any modified version of the
26
+ # underlying software originally provided by Alliance without the prior written
27
+ # consent of Alliance.
28
+
29
+ # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
30
+ # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
31
+ # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
32
+ # IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
33
+ # INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
34
+ # BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
35
+ # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
36
+ # LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
37
+ # OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
38
+ # OF THE POSSIBILITY OF SUCH DAMAGE.
39
+ # *********************************************************************************
35
40
 
36
41
  require 'erb'
42
+ require 'date'
37
43
 
38
44
  # This measure is originally from https://github.com/urbanopt/DES_HVAC
39
45
  # start the measure
@@ -68,21 +74,6 @@ class ExportModelicaLoads < OpenStudio::Measure::ReportingMeasure
68
74
  super(runner, user_arguments)
69
75
 
70
76
  result = OpenStudio::IdfObjectVector.new
71
-
72
- # To use the built-in error checking we need the model...
73
- # get the last model and sql file
74
- model = runner.lastOpenStudioModel
75
- if model.empty?
76
- runner.registerError('Cannot find last model.')
77
- return false
78
- end
79
- model = model.get
80
-
81
- # use the built-in error checking
82
- if !runner.validateUserArguments(arguments(model), user_arguments)
83
- return false
84
- end
85
-
86
77
  result << OpenStudio::IdfObject.load('Output:Variable,,Site Mains Water Temperature,timestep;').get
87
78
  result << OpenStudio::IdfObject.load('Output:Variable,,Site Outdoor Air Drybulb Temperature,timestep;').get
88
79
  result << OpenStudio::IdfObject.load('Output:Variable,,Site Outdoor Air Relative Humidity,timestep;').get
@@ -3,8 +3,8 @@
3
3
  <schema_version>3.0</schema_version>
4
4
  <name>export_modelica_loads</name>
5
5
  <uid>7051db01-2e55-4223-b5b5-fee615b68dd0</uid>
6
- <version_id>7782f28c-19e6-449d-8cf3-e3f915550ebd</version_id>
7
- <version_modified>20201203T151454Z</version_modified>
6
+ <version_id>e80d1948-12bf-4a07-b8b2-cab73c6f8235</version_id>
7
+ <version_modified>20210427T174740Z</version_modified>
8
8
  <xml_checksum>2C8A3EEF</xml_checksum>
9
9
  <class_name>ExportModelicaLoads</class_name>
10
10
  <display_name>Export Modelica Loads</display_name>
@@ -41,18 +41,6 @@
41
41
  <usage_type>doc</usage_type>
42
42
  <checksum>00000000</checksum>
43
43
  </file>
44
- <file>
45
- <filename>export_modelica_loads_test.rb</filename>
46
- <filetype>rb</filetype>
47
- <usage_type>test</usage_type>
48
- <checksum>83EC81AC</checksum>
49
- </file>
50
- <file>
51
- <filename>example_model.osm</filename>
52
- <filetype>osm</filetype>
53
- <usage_type>test</usage_type>
54
- <checksum>39B6E26C</checksum>
55
- </file>
56
44
  <file>
57
45
  <filename>USA_CO_Golden-NREL.724666_TMY3.epw</filename>
58
46
  <filetype>epw</filetype>
@@ -65,18 +53,30 @@
65
53
  <usage_type>resource</usage_type>
66
54
  <checksum>3F69E3FB</checksum>
67
55
  </file>
68
- <file>
69
- <filename>LICENSE.md</filename>
70
- <filetype>md</filetype>
71
- <usage_type>license</usage_type>
72
- <checksum>E0468DD6</checksum>
73
- </file>
74
56
  <file>
75
57
  <filename>README.md</filename>
76
58
  <filetype>md</filetype>
77
59
  <usage_type>readme</usage_type>
78
60
  <checksum>544E6A47</checksum>
79
61
  </file>
62
+ <file>
63
+ <filename>export_modelica_loads_test.rb</filename>
64
+ <filetype>rb</filetype>
65
+ <usage_type>test</usage_type>
66
+ <checksum>15232067</checksum>
67
+ </file>
68
+ <file>
69
+ <filename>example_model.osm</filename>
70
+ <filetype>osm</filetype>
71
+ <usage_type>test</usage_type>
72
+ <checksum>A2B6C1DD</checksum>
73
+ </file>
74
+ <file>
75
+ <filename>LICENSE.md</filename>
76
+ <filetype>md</filetype>
77
+ <usage_type>license</usage_type>
78
+ <checksum>BBD19F47</checksum>
79
+ </file>
80
80
  <file>
81
81
  <version>
82
82
  <software_program>OpenStudio</software_program>
@@ -86,7 +86,7 @@
86
86
  <filename>measure.rb</filename>
87
87
  <filetype>rb</filetype>
88
88
  <usage_type>script</usage_type>
89
- <checksum>AE19F661</checksum>
89
+ <checksum>DA574F8F</checksum>
90
90
  </file>
91
91
  </files>
92
92
  </measure>
@@ -1 +1,27 @@
1
- Insert your license here
1
+ URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
2
+ contributors. All rights reserved.
3
+
4
+ Redistribution and use in source and binary forms, with or without modification,
5
+ are permitted provided that the following conditions are met:
6
+
7
+ Redistributions of source code must retain the above copyright notice, this list
8
+ of conditions and the following disclaimer.
9
+
10
+ Redistributions in binary form must reproduce the above copyright notice, this
11
+ list of conditions and the following disclaimer in the documentation and/or other
12
+ materials provided with the distribution.
13
+
14
+ Neither the name of the copyright holder nor the names of its contributors may be
15
+ used to endorse or promote products derived from this software without specific
16
+ prior written permission.
17
+
18
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
19
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
20
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
21
+ IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
22
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
23
+ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
24
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
25
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
26
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
27
+ OF THE POSSIBILITY OF SUCH DAMAGE.
@@ -1,37 +1,42 @@
1
- # *******************************************************************************
2
- # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
3
- # All rights reserved.
4
- # Redistribution and use in source and binary forms, with or without
5
- # modification, are permitted provided that the following conditions are met:
6
- #
7
- # (1) Redistributions of source code must retain the above copyright notice,
8
- # this list of conditions and the following disclaimer.
9
- #
10
- # (2) Redistributions in binary form must reproduce the above copyright notice,
11
- # this list of conditions and the following disclaimer in the documentation
12
- # and/or other materials provided with the distribution.
13
- #
14
- # (3) Neither the name of the copyright holder nor the names of any contributors
15
- # may be used to endorse or promote products derived from this software without
16
- # specific prior written permission from the respective party.
17
- #
18
- # (4) Other than as required in clauses (1) and (2), distributions in any form
19
- # of modifications or other derivative works may not use the "OpenStudio"
20
- # trademark, "OS", "os", or any other confusingly similar designation without
21
- # specific prior written permission from Alliance for Sustainable Energy, LLC.
22
- #
23
- # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND ANY CONTRIBUTORS
24
- # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
25
- # THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
26
- # ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER(S), ANY CONTRIBUTORS, THE
27
- # UNITED STATES GOVERNMENT, OR THE UNITED STATES DEPARTMENT OF ENERGY, NOR ANY OF
28
- # THEIR EMPLOYEES, BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
29
- # EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
30
- # OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
31
- # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
32
- # STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
33
- # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
34
- # *******************************************************************************
1
+ # *********************************************************************************
2
+ # URBANopt™, Copyright (c) 2019-2021, Alliance for Sustainable Energy, LLC, and other
3
+ # contributors. All rights reserved.
4
+
5
+ # Redistribution and use in source and binary forms, with or without modification,
6
+ # are permitted provided that the following conditions are met:
7
+
8
+ # Redistributions of source code must retain the above copyright notice, this list
9
+ # of conditions and the following disclaimer.
10
+
11
+ # Redistributions in binary form must reproduce the above copyright notice, this
12
+ # list of conditions and the following disclaimer in the documentation and/or other
13
+ # materials provided with the distribution.
14
+
15
+ # Neither the name of the copyright holder nor the names of its contributors may be
16
+ # used to endorse or promote products derived from this software without specific
17
+ # prior written permission.
18
+
19
+ # Redistribution of this software, without modification, must refer to the software
20
+ # by the same designation. Redistribution of a modified version of this software
21
+ # (i) may not refer to the modified version by the same designation, or by any
22
+ # confusingly similar designation, and (ii) must refer to the underlying software
23
+ # originally provided by Alliance as “URBANopt”. Except to comply with the foregoing,
24
+ # the term “URBANopt”, or any confusingly similar designation may not be used to
25
+ # refer to any modified version of this software or any modified version of the
26
+ # underlying software originally provided by Alliance without the prior written
27
+ # consent of Alliance.
28
+
29
+ # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
30
+ # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
31
+ # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
32
+ # IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
33
+ # INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
34
+ # BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
35
+ # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
36
+ # LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
37
+ # OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
38
+ # OF THE POSSIBILITY OF SUCH DAMAGE.
39
+ # *********************************************************************************
35
40
 
36
41
  require 'erb'
37
42
 
@@ -3,8 +3,8 @@
3
3
  <schema_version>3.0</schema_version>
4
4
  <name>export_time_series_loads_csv</name>
5
5
  <uid>9fcf6116-c2eb-43d6-93f0-e1bdd822f768</uid>
6
- <version_id>3a539fd4-3978-4d0f-bd25-a54905fc7306</version_id>
7
- <version_modified>20201212T061249Z</version_modified>
6
+ <version_id>61d25864-a1a9-4082-974c-d04057271848</version_id>
7
+ <version_modified>20210427T174739Z</version_modified>
8
8
  <xml_checksum>9BF1E6AC</xml_checksum>
9
9
  <class_name>ExportTimeSeriesLoadsCSV</class_name>
10
10
  <display_name>ExportTimeSeriesLoadsCSV</display_name>
@@ -72,12 +72,6 @@
72
72
  </attribute>
73
73
  </attributes>
74
74
  <files>
75
- <file>
76
- <filename>LICENSE.md</filename>
77
- <filetype>md</filetype>
78
- <usage_type>license</usage_type>
79
- <checksum>CD7F5672</checksum>
80
- </file>
81
75
  <file>
82
76
  <filename>README.md.erb</filename>
83
77
  <filetype>erb</filetype>
@@ -108,23 +102,35 @@
108
102
  <usage_type>test</usage_type>
109
103
  <checksum>15AD3659</checksum>
110
104
  </file>
105
+ <file>
106
+ <filename>README.md</filename>
107
+ <filetype>md</filetype>
108
+ <usage_type>readme</usage_type>
109
+ <checksum>08F470AC</checksum>
110
+ </file>
111
+ <file>
112
+ <filename>LICENSE.md</filename>
113
+ <filetype>md</filetype>
114
+ <usage_type>license</usage_type>
115
+ <checksum>BBD19F47</checksum>
116
+ </file>
111
117
  <file>
112
118
  <filename>os_lib_helper_methods.rb</filename>
113
119
  <filetype>rb</filetype>
114
120
  <usage_type>resource</usage_type>
115
- <checksum>5C26809A</checksum>
121
+ <checksum>94DD761F</checksum>
116
122
  </file>
117
123
  <file>
118
124
  <filename>export_time_series_modelica_test.rb</filename>
119
125
  <filetype>rb</filetype>
120
126
  <usage_type>test</usage_type>
121
- <checksum>B595A09A</checksum>
127
+ <checksum>6B6CFF0B</checksum>
122
128
  </file>
123
129
  <file>
124
130
  <filename>building_loads.csv</filename>
125
131
  <filetype>csv</filetype>
126
132
  <usage_type>test</usage_type>
127
- <checksum>1E8091B8</checksum>
133
+ <checksum>393EEB17</checksum>
128
134
  </file>
129
135
  <file>
130
136
  <version>
@@ -135,13 +141,7 @@
135
141
  <filename>measure.rb</filename>
136
142
  <filetype>rb</filetype>
137
143
  <usage_type>script</usage_type>
138
- <checksum>C172F942</checksum>
139
- </file>
140
- <file>
141
- <filename>README.md</filename>
142
- <filetype>md</filetype>
143
- <usage_type>readme</usage_type>
144
- <checksum>08F470AC</checksum>
144
+ <checksum>0FC4AA70</checksum>
145
145
  </file>
146
146
  </files>
147
147
  </measure>
@@ -1,37 +1,42 @@
1
- # *******************************************************************************
2
- # OpenStudio(R), Copyright (c) 2008-2019, Alliance for Sustainable Energy, LLC.
3
- # All rights reserved.
4
- # Redistribution and use in source and binary forms, with or without
5
- # modification, are permitted provided that the following conditions are met:
6
- #
7
- # (1) Redistributions of source code must retain the above copyright notice,
8
- # this list of conditions and the following disclaimer.
9
- #
10
- # (2) Redistributions in binary form must reproduce the above copyright notice,
11
- # this list of conditions and the following disclaimer in the documentation
12
- # and/or other materials provided with the distribution.
13
- #
14
- # (3) Neither the name of the copyright holder nor the names of any contributors
15
- # may be used to endorse or promote products derived from this software without
16
- # specific prior written permission from the respective party.
17
- #
18
- # (4) Other than as required in clauses (1) and (2), distributions in any form
19
- # of modifications or other derivative works may not use the "OpenStudio"
20
- # trademark, "OS", "os", or any other confusingly similar designation without
21
- # specific prior written permission from Alliance for Sustainable Energy, LLC.
22
- #
23
- # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND ANY CONTRIBUTORS
24
- # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
25
- # THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
26
- # ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER(S), ANY CONTRIBUTORS, THE
27
- # UNITED STATES GOVERNMENT, OR THE UNITED STATES DEPARTMENT OF ENERGY, NOR ANY OF
28
- # THEIR EMPLOYEES, BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
29
- # EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
30
- # OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
31
- # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
32
- # STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
33
- # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
34
- # *******************************************************************************
1
+ # *********************************************************************************
2
+ # URBANopt™, Copyright (c) 2019-2021, Alliance for Sustainable Energy, LLC, and other
3
+ # contributors. All rights reserved.
4
+
5
+ # Redistribution and use in source and binary forms, with or without modification,
6
+ # are permitted provided that the following conditions are met:
7
+
8
+ # Redistributions of source code must retain the above copyright notice, this list
9
+ # of conditions and the following disclaimer.
10
+
11
+ # Redistributions in binary form must reproduce the above copyright notice, this
12
+ # list of conditions and the following disclaimer in the documentation and/or other
13
+ # materials provided with the distribution.
14
+
15
+ # Neither the name of the copyright holder nor the names of its contributors may be
16
+ # used to endorse or promote products derived from this software without specific
17
+ # prior written permission.
18
+
19
+ # Redistribution of this software, without modification, must refer to the software
20
+ # by the same designation. Redistribution of a modified version of this software
21
+ # (i) may not refer to the modified version by the same designation, or by any
22
+ # confusingly similar designation, and (ii) must refer to the underlying software
23
+ # originally provided by Alliance as “URBANopt”. Except to comply with the foregoing,
24
+ # the term “URBANopt”, or any confusingly similar designation may not be used to
25
+ # refer to any modified version of this software or any modified version of the
26
+ # underlying software originally provided by Alliance without the prior written
27
+ # consent of Alliance.
28
+
29
+ # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
30
+ # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
31
+ # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
32
+ # IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
33
+ # INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
34
+ # BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
35
+ # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
36
+ # LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
37
+ # OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
38
+ # OF THE POSSIBILITY OF SUCH DAMAGE.
39
+ # *********************************************************************************
35
40
 
36
41
  module OsLib_HelperMethods
37
42
  # populate choice argument from model objects
@@ -476,7 +476,7 @@ module URBANopt
476
476
 
477
477
  new_dgen.storage.each do |storage|
478
478
  existing_dgen.storage.push storage
479
- if existing_dgen.total_wind_kw.nil?
479
+ if existing_dgen.total_storage_kw.nil?
480
480
  existing_dgen.total_storage_kw = storage.size_kw
481
481
  existing_dgen.total_storage_kwh = storage.size_kwh
482
482
  else
@@ -128,6 +128,15 @@
128
128
  "size_kw": {
129
129
  "description": "rated power in kW",
130
130
  "type": "string"
131
+ },
132
+ "location": {
133
+ "description": "Location of PV. Available options are roof, ground or both.",
134
+ "type": "string",
135
+ "enum": [
136
+ "roof",
137
+ "ground",
138
+ "both"
139
+ ]
131
140
  }
132
141
  }
133
142
  },
@@ -52,6 +52,7 @@ module URBANopt
52
52
  # _Float_ - power capacity in kilowatts
53
53
  #
54
54
  attr_accessor :size_kw
55
+ attr_accessor :location
55
56
 
56
57
  ##
57
58
  # Initialize SolarPV attributes from a hash. Solar PV attributes currently are limited to power capacity.
@@ -65,6 +66,7 @@ module URBANopt
65
66
 
66
67
  @size_kw = hash[:size_kw]
67
68
  @id = hash[:id]
69
+ @location = hash[:location]
68
70
 
69
71
  # initialize class variables @@validator and @@schema
70
72
  @@validator ||= Validator.new
@@ -81,6 +83,7 @@ module URBANopt
81
83
  result = {}
82
84
 
83
85
  result[:size_kw] = @size_kw if @size_kw
86
+ result[:location] = @location if @location
84
87
 
85
88
  return result
86
89
  end
@@ -40,6 +40,6 @@
40
40
 
41
41
  module URBANopt
42
42
  module Reporting
43
- VERSION = '0.3.7'.freeze
43
+ VERSION = '0.4.3'.freeze
44
44
  end
45
45
  end
@@ -22,12 +22,12 @@ Gem::Specification.new do |spec|
22
22
  spec.bindir = 'exe'
23
23
  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
24
24
  spec.require_paths = ['lib']
25
- spec.required_ruby_version = '~> 2.5.0'
25
+ spec.required_ruby_version = '~> 2.7.0'
26
26
 
27
- spec.add_development_dependency 'bundler', '~> 2.1'
27
+ spec.add_development_dependency 'bundler', '>= 2.1.0'
28
28
  spec.add_development_dependency 'rake', '~> 13.0'
29
29
  spec.add_development_dependency 'rspec', '~> 3.7'
30
30
  spec.add_runtime_dependency 'json-schema', '~> 2.8'
31
31
  spec.add_runtime_dependency 'json_pure', '~> 2.3'
32
- spec.add_runtime_dependency 'openstudio-extension', '~> 0.3.2'
32
+ spec.add_runtime_dependency 'openstudio-extension', '~> 0.4.3'
33
33
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: urbanopt-reporting
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.7
4
+ version: 0.4.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Rawad El Kontar
@@ -9,22 +9,22 @@ authors:
9
9
  autorequire:
10
10
  bindir: exe
11
11
  cert_chain: []
12
- date: 2021-03-31 00:00:00.000000000 Z
12
+ date: 2021-11-12 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: bundler
16
16
  requirement: !ruby/object:Gem::Requirement
17
17
  requirements:
18
- - - "~>"
18
+ - - ">="
19
19
  - !ruby/object:Gem::Version
20
- version: '2.1'
20
+ version: 2.1.0
21
21
  type: :development
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: '2.1'
27
+ version: 2.1.0
28
28
  - !ruby/object:Gem::Dependency
29
29
  name: rake
30
30
  requirement: !ruby/object:Gem::Requirement
@@ -87,14 +87,14 @@ dependencies:
87
87
  requirements:
88
88
  - - "~>"
89
89
  - !ruby/object:Gem::Version
90
- version: 0.3.2
90
+ version: 0.4.3
91
91
  type: :runtime
92
92
  prerelease: false
93
93
  version_requirements: !ruby/object:Gem::Requirement
94
94
  requirements:
95
95
  - - "~>"
96
96
  - !ruby/object:Gem::Version
97
- version: 0.3.2
97
+ version: 0.4.3
98
98
  description: Library include scenario default reporting measure and scenario defaults
99
99
  reports schema and classes
100
100
  email:
@@ -199,7 +199,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
199
199
  requirements:
200
200
  - - "~>"
201
201
  - !ruby/object:Gem::Version
202
- version: 2.5.0
202
+ version: 2.7.0
203
203
  required_rubygems_version: !ruby/object:Gem::Requirement
204
204
  requirements:
205
205
  - - ">="