openstudio-calibration 0.9.0 → 0.11.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +7 -0
- data/Gemfile +1 -1
- data/Jenkinsfile +1 -1
- data/LICENSE.md +1 -1
- data/README.md +2 -0
- data/Rakefile +3 -0
- data/lib/measures/AddMonthlyJSONUtilityData/LICENSE.md +1 -1
- data/lib/measures/AddMonthlyJSONUtilityData/measure.rb +3 -3
- data/lib/measures/AddMonthlyJSONUtilityData/measure.xml +12 -12
- data/lib/measures/AddMonthlyUtilityData/LICENSE.md +1 -1
- data/lib/measures/AddMonthlyUtilityData/measure.xml +29 -29
- data/lib/measures/CalibrationReports/LICENSE.md +1 -1
- data/lib/measures/CalibrationReports/README.md +2 -2
- data/lib/measures/CalibrationReports/measure.rb +1 -3
- data/lib/measures/CalibrationReports/measure.xml +41 -42
- data/lib/measures/CalibrationReportsEnhanced/LICENSE.md +1 -1
- data/lib/measures/CalibrationReportsEnhanced/measure.rb +21 -22
- data/lib/measures/CalibrationReportsEnhanced/measure.xml +41 -41
- data/lib/measures/CoilCoolingDXSingleSpeedMultiplier/LICENSE.md +1 -1
- data/lib/measures/CoilCoolingDXSingleSpeedMultiplier/measure.rb +12 -12
- data/lib/measures/CoilCoolingDXSingleSpeedMultiplier/measure.xml +14 -14
- data/lib/measures/CoilCoolingDXSingleSpeedPercentChange/LICENSE.md +1 -1
- data/lib/measures/CoilCoolingDXSingleSpeedPercentChange/measure.rb +12 -12
- data/lib/measures/CoilCoolingDXSingleSpeedPercentChange/measure.xml +14 -14
- data/lib/measures/CoilCoolingDXTwoSpeedMultiplier/LICENSE.md +1 -1
- data/lib/measures/CoilCoolingDXTwoSpeedMultiplier/measure.rb +21 -23
- data/lib/measures/CoilCoolingDXTwoSpeedMultiplier/measure.xml +14 -14
- data/lib/measures/CoilCoolingDXTwoSpeedPercentChange/LICENSE.md +1 -1
- data/lib/measures/CoilCoolingDXTwoSpeedPercentChange/measure.rb +21 -23
- data/lib/measures/CoilCoolingDXTwoSpeedPercentChange/measure.xml +14 -14
- data/lib/measures/CoilCoolingWaterMultiplier/LICENSE.md +1 -1
- data/lib/measures/CoilCoolingWaterMultiplier/measure.rb +33 -43
- data/lib/measures/CoilCoolingWaterMultiplier/measure.xml +14 -14
- data/lib/measures/CoilCoolingWaterPercentChange/LICENSE.md +1 -1
- data/lib/measures/CoilCoolingWaterPercentChange/measure.rb +33 -43
- data/lib/measures/CoilCoolingWaterPercentChange/measure.xml +14 -14
- data/lib/measures/CoilHeatingElectricMultiplier/LICENSE.md +1 -1
- data/lib/measures/CoilHeatingElectricMultiplier/measure.rb +8 -8
- data/lib/measures/CoilHeatingElectricMultiplier/measure.xml +14 -14
- data/lib/measures/CoilHeatingElectricPercentChange/LICENSE.md +1 -1
- data/lib/measures/CoilHeatingElectricPercentChange/measure.rb +8 -8
- data/lib/measures/CoilHeatingElectricPercentChange/measure.xml +14 -14
- data/lib/measures/CoilHeatingGasMultiplier/LICENSE.md +1 -1
- data/lib/measures/CoilHeatingGasMultiplier/measure.rb +8 -8
- data/lib/measures/CoilHeatingGasMultiplier/measure.xml +14 -14
- data/lib/measures/CoilHeatingGasPercentChange/LICENSE.md +1 -1
- data/lib/measures/CoilHeatingGasPercentChange/measure.rb +8 -8
- data/lib/measures/CoilHeatingGasPercentChange/measure.xml +14 -14
- data/lib/measures/CoilHeatingWaterMultiplier/LICENSE.md +1 -1
- data/lib/measures/CoilHeatingWaterMultiplier/measure.rb +13 -15
- data/lib/measures/CoilHeatingWaterMultiplier/measure.xml +14 -14
- data/lib/measures/CoilHeatingWaterPercentChange/LICENSE.md +1 -1
- data/lib/measures/CoilHeatingWaterPercentChange/measure.rb +13 -15
- data/lib/measures/CoilHeatingWaterPercentChange/measure.xml +14 -14
- data/lib/measures/ConstructionLayerZeroMaterialProperties/LICENSE.md +1 -1
- data/lib/measures/ConstructionLayerZeroMaterialProperties/measure.rb +4 -4
- data/lib/measures/ConstructionLayerZeroMaterialProperties/measure.xml +12 -12
- data/lib/measures/ElectricBaseboardEfficiencyAndCapacity/LICENSE.md +1 -1
- data/lib/measures/ElectricBaseboardEfficiencyAndCapacity/measure.xml +11 -11
- data/lib/measures/ExteriorWallThermalPropertiesMultiplier/LICENSE.md +1 -1
- data/lib/measures/ExteriorWallThermalPropertiesMultiplier/measure.rb +8 -5
- data/lib/measures/ExteriorWallThermalPropertiesMultiplier/measure.xml +18 -18
- data/lib/measures/ExteriorWallThermalPropertiesPercentChange/LICENSE.md +1 -1
- data/lib/measures/ExteriorWallThermalPropertiesPercentChange/measure.rb +8 -5
- data/lib/measures/ExteriorWallThermalPropertiesPercentChange/measure.xml +18 -18
- data/lib/measures/FansMultiplier/LICENSE.md +1 -1
- data/lib/measures/FansMultiplier/measure.rb +8 -8
- data/lib/measures/FansMultiplier/measure.xml +14 -14
- data/lib/measures/FansPercentChange/LICENSE.md +1 -1
- data/lib/measures/FansPercentChange/measure.rb +8 -8
- data/lib/measures/FansPercentChange/measure.xml +14 -14
- data/lib/measures/GeneralCalibrationMeasureMultiplier/LICENSE.md +1 -1
- data/lib/measures/GeneralCalibrationMeasureMultiplier/measure.rb +2 -2
- data/lib/measures/GeneralCalibrationMeasureMultiplier/measure.xml +16 -16
- data/lib/measures/GeneralCalibrationMeasurePercentChange/LICENSE.md +1 -1
- data/lib/measures/GeneralCalibrationMeasurePercentChange/measure.rb +2 -2
- data/lib/measures/GeneralCalibrationMeasurePercentChange/measure.xml +16 -16
- data/lib/measures/HardSizeHvac/LICENSE.md +1 -1
- data/lib/measures/HardSizeHvac/measure.rb +2 -4
- data/lib/measures/HardSizeHvac/measure.xml +19 -19
- data/lib/measures/RValueOfInsulationForConstructionMultiplier/LICENSE.md +1 -1
- data/lib/measures/RValueOfInsulationForConstructionMultiplier/measure.rb +7 -9
- data/lib/measures/RValueOfInsulationForConstructionMultiplier/measure.xml +12 -12
- data/lib/measures/RValueOfInsulationForConstructionPercentageChange/LICENSE.md +1 -1
- data/lib/measures/RValueOfInsulationForConstructionPercentageChange/measure.rb +7 -9
- data/lib/measures/RValueOfInsulationForConstructionPercentageChange/measure.xml +12 -12
- data/lib/measures/RoofThermalPropertiesMultiplier/LICENSE.md +1 -1
- data/lib/measures/RoofThermalPropertiesMultiplier/measure.rb +8 -5
- data/lib/measures/RoofThermalPropertiesMultiplier/measure.xml +18 -18
- data/lib/measures/RoofThermalPropertiesPercentChange/LICENSE.md +1 -1
- data/lib/measures/RoofThermalPropertiesPercentChange/measure.rb +8 -5
- data/lib/measures/RoofThermalPropertiesPercentChange/measure.xml +18 -18
- data/lib/measures/TimeseriesObjectiveFunction/LICENSE.md +1 -1
- data/lib/measures/TimeseriesObjectiveFunction/measure.rb +26 -23
- data/lib/measures/TimeseriesObjectiveFunction/measure.xml +11 -16
- data/lib/measures/TimeseriesObjectiveFunction/resources/report.html.erb +3 -0
- data/lib/measures/TimeseriesPlot/LICENSE.md +1 -1
- data/lib/measures/TimeseriesPlot/measure.rb +1 -3
- data/lib/measures/TimeseriesPlot/measure.xml +13 -13
- data/lib/measures/TimeseriesPlot/resources/report.html.erb +3 -0
- data/lib/measures/WaterHeaterMixedMultiplier/LICENSE.md +1 -1
- data/lib/measures/WaterHeaterMixedMultiplier/measure.rb +17 -22
- data/lib/measures/WaterHeaterMixedMultiplier/measure.xml +14 -14
- data/lib/measures/WaterHeaterMixedPercentChange/LICENSE.md +1 -1
- data/lib/measures/WaterHeaterMixedPercentChange/measure.rb +17 -22
- data/lib/measures/WaterHeaterMixedPercentChange/measure.xml +14 -14
- data/lib/measures/inspect_and_edit_parametric_schedules/LICENSE.md +1 -1
- data/lib/measures/inspect_and_edit_parametric_schedules/measure.rb +13 -11
- data/lib/measures/inspect_and_edit_parametric_schedules/measure.xml +29 -29
- data/lib/measures/shift_hours_of_operation/LICENSE.md +1 -1
- data/lib/measures/shift_hours_of_operation/measure.rb +31 -29
- data/lib/measures/shift_hours_of_operation/measure.xml +51 -37
- data/lib/openstudio/calibration/version.rb +1 -1
- data/openstudio-calibration.gemspec +12 -6
- metadata +55 -13
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: b401ddec18f7089152be37bcabaa9e67f29a0a972ce012569144e6de3bc14033
|
|
4
|
+
data.tar.gz: 6726be89bb08a47fed6c781639dc1db1f6768210738d8095e54f0c0cc08280e6
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 0140f232c9ffe54fe70712ed727be7fcf52b99eb8d2dcf74b78760d6e87a554a4b57e0dd4754e5b4c0b3f4a6131bc90013c1ae77842d096642c206a56a3941d8
|
|
7
|
+
data.tar.gz: 995942ade0573ae6190b0b26c4546a86c0ffb86e98901aa0a32dd2acbf227a51c19678de769b1686f86a8f014dd03f4fe3de75fbc6bfac153bbf3a34ab3aba8e
|
data/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,12 @@
|
|
|
1
1
|
# OpenStudio Calibration Measures Gem
|
|
2
2
|
|
|
3
|
+
## Version 0.11.0
|
|
4
|
+
* Support for OpenStudio 3.9 (upgrade to standards gem 0.7.0, extension gem 0.8.1)
|
|
5
|
+
|
|
6
|
+
## Version 0.10.0
|
|
7
|
+
* Support for OpenStudio 3.8 (upgrade to standards gem 0.6.0, extension gem 0.8.0)
|
|
8
|
+
* Support Ruby 3.2.2
|
|
9
|
+
|
|
3
10
|
## Version 0.9.0
|
|
4
11
|
* Updating dependencies and licenses for OpenStudio 3.7 (upgrade to standards gem 0.5.0, extension gem 0.7.0)
|
|
5
12
|
* Fixed [#54]( https://github.com/NREL/openstudio-calibration-gem/issues/54 ), OS API changes break some measures
|
data/Gemfile
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
source 'http://rubygems.org'
|
|
2
2
|
|
|
3
|
+
# Specify your gem's dependencies in openstudio-model-articulation.gemspec
|
|
3
4
|
gemspec
|
|
4
5
|
|
|
5
6
|
# Local gems are useful when developing and integrating the various dependencies.
|
|
@@ -10,7 +11,6 @@ gemspec
|
|
|
10
11
|
# checkout the latest version (develop) from github.
|
|
11
12
|
allow_local = ENV['FAVOR_LOCAL_GEMS']
|
|
12
13
|
|
|
13
|
-
|
|
14
14
|
if allow_local && File.exist?('../OpenStudio-extension-gem')
|
|
15
15
|
gem 'openstudio-extension', path: '../OpenStudio-extension-gem'
|
|
16
16
|
elsif allow_local
|
data/Jenkinsfile
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
//Jenkins pipelines are stored in shared libraries. Please see: https://github.com/NREL/cbci_jenkins_libs
|
|
2
2
|
|
|
3
|
-
@Library('cbci_shared_libs') _
|
|
3
|
+
@Library('cbci_shared_libs@developExtension') _
|
|
4
4
|
|
|
5
5
|
// Build for PR to develop branch only.
|
|
6
6
|
if ((env.CHANGE_ID) && (env.CHANGE_TARGET) ) { // check if set
|
data/LICENSE.md
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
OpenStudio(R), Copyright (c) 2008,
|
|
1
|
+
OpenStudio(R), Copyright (c) 2008, 2024 Alliance for Sustainable Energy, LLC.
|
|
2
2
|
|
|
3
3
|
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
|
|
4
4
|
|
data/README.md
CHANGED
data/Rakefile
CHANGED
|
@@ -14,6 +14,9 @@ require 'openstudio/calibration'
|
|
|
14
14
|
rake_task = OpenStudio::Extension::RakeTask.new
|
|
15
15
|
rake_task.set_extension_class(OpenStudio::Calibration::Extension, 'nrel/openstudio-calibration-gem')
|
|
16
16
|
|
|
17
|
+
require 'rubocop/rake_task'
|
|
18
|
+
RuboCop::RakeTask.new
|
|
19
|
+
|
|
17
20
|
require 'openstudio_measure_tester/rake_task'
|
|
18
21
|
OpenStudioMeasureTester::RakeTask.new
|
|
19
22
|
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
OpenStudio(R), Copyright (c) 2008,
|
|
1
|
+
OpenStudio(R), Copyright (c) 2008, 2024 Alliance for Sustainable Energy, LLC.
|
|
2
2
|
|
|
3
3
|
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
|
|
4
4
|
|
|
@@ -121,7 +121,7 @@ class AddMonthlyJSONUtilityData < OpenStudio::Measure::ModelMeasure
|
|
|
121
121
|
args << set_runperiod
|
|
122
122
|
|
|
123
123
|
args
|
|
124
|
-
end
|
|
124
|
+
end
|
|
125
125
|
|
|
126
126
|
# define what happens when the measure is run
|
|
127
127
|
def run(model, runner, user_arguments)
|
|
@@ -243,8 +243,8 @@ class AddMonthlyJSONUtilityData < OpenStudio::Measure::ModelMeasure
|
|
|
243
243
|
runner.registerFinalCondition('Utility bill data has been added to the model.')
|
|
244
244
|
|
|
245
245
|
true
|
|
246
|
-
end
|
|
247
|
-
end
|
|
246
|
+
end
|
|
247
|
+
end
|
|
248
248
|
|
|
249
249
|
# this allows the measure to be use by the application
|
|
250
250
|
AddMonthlyJSONUtilityData.new.registerWithApplication
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
<?xml version="1.0"?>
|
|
2
2
|
<measure>
|
|
3
|
-
<schema_version>3.
|
|
3
|
+
<schema_version>3.1</schema_version>
|
|
4
4
|
<name>add_monthly_json_utility_data</name>
|
|
5
5
|
<uid>6da969e0-4256-49bf-9607-26504cc3d423</uid>
|
|
6
|
-
<version_id>
|
|
7
|
-
<version_modified>
|
|
6
|
+
<version_id>2dd7a637-0ecb-49bc-948b-b58861579022</version_id>
|
|
7
|
+
<version_modified>2024-11-16T23:44:46Z</version_modified>
|
|
8
8
|
<xml_checksum>057E8D9D</xml_checksum>
|
|
9
9
|
<class_name>AddMonthlyJSONUtilityData</class_name>
|
|
10
10
|
<display_name>Add Monthly JSON Utility Data</display_name>
|
|
@@ -132,10 +132,10 @@
|
|
|
132
132
|
</attributes>
|
|
133
133
|
<files>
|
|
134
134
|
<file>
|
|
135
|
-
<filename>
|
|
136
|
-
<filetype>
|
|
137
|
-
<usage_type>
|
|
138
|
-
<checksum>
|
|
135
|
+
<filename>LICENSE.md</filename>
|
|
136
|
+
<filetype>md</filetype>
|
|
137
|
+
<usage_type>license</usage_type>
|
|
138
|
+
<checksum>8696A072</checksum>
|
|
139
139
|
</file>
|
|
140
140
|
<file>
|
|
141
141
|
<filename>README.md</filename>
|
|
@@ -144,10 +144,10 @@
|
|
|
144
144
|
<checksum>9A5C0ABF</checksum>
|
|
145
145
|
</file>
|
|
146
146
|
<file>
|
|
147
|
-
<filename>
|
|
148
|
-
<filetype>
|
|
149
|
-
<usage_type>
|
|
150
|
-
<checksum>
|
|
147
|
+
<filename>README.md.erb</filename>
|
|
148
|
+
<filetype>erb</filetype>
|
|
149
|
+
<usage_type>readmeerb</usage_type>
|
|
150
|
+
<checksum>703C9964</checksum>
|
|
151
151
|
</file>
|
|
152
152
|
<file>
|
|
153
153
|
<version>
|
|
@@ -158,7 +158,7 @@
|
|
|
158
158
|
<filename>measure.rb</filename>
|
|
159
159
|
<filetype>rb</filetype>
|
|
160
160
|
<usage_type>script</usage_type>
|
|
161
|
-
<checksum>
|
|
161
|
+
<checksum>CB47CCE7</checksum>
|
|
162
162
|
</file>
|
|
163
163
|
</files>
|
|
164
164
|
</measure>
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
OpenStudio(R), Copyright (c) 2008,
|
|
1
|
+
OpenStudio(R), Copyright (c) 2008, 2024 Alliance for Sustainable Energy, LLC.
|
|
2
2
|
|
|
3
3
|
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
|
|
4
4
|
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
<?xml version="1.0"?>
|
|
2
2
|
<measure>
|
|
3
|
-
<schema_version>3.
|
|
3
|
+
<schema_version>3.1</schema_version>
|
|
4
4
|
<name>add_monthly_utility_data</name>
|
|
5
5
|
<uid>6da969e0-4256-49bf-9607-26504cc3d421</uid>
|
|
6
|
-
<version_id>
|
|
7
|
-
<version_modified>
|
|
6
|
+
<version_id>258d8536-e7ac-4e7e-b12a-170981419ece</version_id>
|
|
7
|
+
<version_modified>2024-11-16T23:44:47Z</version_modified>
|
|
8
8
|
<xml_checksum>9064277D</xml_checksum>
|
|
9
9
|
<class_name>AddMonthlyUtilityData</class_name>
|
|
10
10
|
<display_name>AddMonthlyUtilityData</display_name>
|
|
@@ -68,22 +68,10 @@
|
|
|
68
68
|
</attributes>
|
|
69
69
|
<files>
|
|
70
70
|
<file>
|
|
71
|
-
<filename>
|
|
72
|
-
<filetype>
|
|
73
|
-
<usage_type>
|
|
74
|
-
<checksum>
|
|
75
|
-
</file>
|
|
76
|
-
<file>
|
|
77
|
-
<filename>gas_billed_usages.json</filename>
|
|
78
|
-
<filetype>json</filetype>
|
|
79
|
-
<usage_type>test</usage_type>
|
|
80
|
-
<checksum>379ABCEE</checksum>
|
|
81
|
-
</file>
|
|
82
|
-
<file>
|
|
83
|
-
<filename>README.md.erb</filename>
|
|
84
|
-
<filetype>erb</filetype>
|
|
85
|
-
<usage_type>readmeerb</usage_type>
|
|
86
|
-
<checksum>703C9964</checksum>
|
|
71
|
+
<filename>LICENSE.md</filename>
|
|
72
|
+
<filetype>md</filetype>
|
|
73
|
+
<usage_type>license</usage_type>
|
|
74
|
+
<checksum>8696A072</checksum>
|
|
87
75
|
</file>
|
|
88
76
|
<file>
|
|
89
77
|
<filename>README.md</filename>
|
|
@@ -92,16 +80,10 @@
|
|
|
92
80
|
<checksum>9049427C</checksum>
|
|
93
81
|
</file>
|
|
94
82
|
<file>
|
|
95
|
-
<filename>
|
|
96
|
-
<filetype>
|
|
97
|
-
<usage_type>
|
|
98
|
-
<checksum>
|
|
99
|
-
</file>
|
|
100
|
-
<file>
|
|
101
|
-
<filename>AddMonthlyUtilityData_Test.rb</filename>
|
|
102
|
-
<filetype>rb</filetype>
|
|
103
|
-
<usage_type>test</usage_type>
|
|
104
|
-
<checksum>24648035</checksum>
|
|
83
|
+
<filename>README.md.erb</filename>
|
|
84
|
+
<filetype>erb</filetype>
|
|
85
|
+
<usage_type>readmeerb</usage_type>
|
|
86
|
+
<checksum>703C9964</checksum>
|
|
105
87
|
</file>
|
|
106
88
|
<file>
|
|
107
89
|
<version>
|
|
@@ -114,5 +96,23 @@
|
|
|
114
96
|
<usage_type>script</usage_type>
|
|
115
97
|
<checksum>C25C9D2C</checksum>
|
|
116
98
|
</file>
|
|
99
|
+
<file>
|
|
100
|
+
<filename>AddMonthlyUtilityData_Test.rb</filename>
|
|
101
|
+
<filetype>rb</filetype>
|
|
102
|
+
<usage_type>test</usage_type>
|
|
103
|
+
<checksum>A7E682C1</checksum>
|
|
104
|
+
</file>
|
|
105
|
+
<file>
|
|
106
|
+
<filename>electric_billed_usages.json</filename>
|
|
107
|
+
<filetype>json</filetype>
|
|
108
|
+
<usage_type>test</usage_type>
|
|
109
|
+
<checksum>5F884191</checksum>
|
|
110
|
+
</file>
|
|
111
|
+
<file>
|
|
112
|
+
<filename>gas_billed_usages.json</filename>
|
|
113
|
+
<filetype>json</filetype>
|
|
114
|
+
<usage_type>test</usage_type>
|
|
115
|
+
<checksum>379ABCEE</checksum>
|
|
116
|
+
</file>
|
|
117
117
|
</files>
|
|
118
118
|
</measure>
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
OpenStudio(R), Copyright (c) 2008,
|
|
1
|
+
OpenStudio(R), Copyright (c) 2008, 2024 Alliance for Sustainable Energy, LLC.
|
|
2
2
|
|
|
3
3
|
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
|
|
4
4
|
|
|
@@ -15,9 +15,7 @@ class CalibrationReports < OpenStudio::Measure::ReportingMeasure
|
|
|
15
15
|
|
|
16
16
|
# define the arguments that the user will input
|
|
17
17
|
def arguments
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
args
|
|
18
|
+
OpenStudio::Measure::OSArgumentVector.new
|
|
21
19
|
end
|
|
22
20
|
|
|
23
21
|
# define what happens when the measure is run
|
|
@@ -1,11 +1,10 @@
|
|
|
1
1
|
<?xml version="1.0"?>
|
|
2
2
|
<measure>
|
|
3
|
-
<schema_version>3.
|
|
4
|
-
<error>wrong number of arguments (given 1, expected 0)</error>
|
|
3
|
+
<schema_version>3.1</schema_version>
|
|
5
4
|
<name>calibration_reports</name>
|
|
6
5
|
<uid>2baede0a-65f3-47ec-b5f6-9c21d0f91aff</uid>
|
|
7
|
-
<version_id>
|
|
8
|
-
<version_modified>
|
|
6
|
+
<version_id>89001671-a5ff-41c1-bca7-8ce744484437</version_id>
|
|
7
|
+
<version_modified>2024-11-16T23:44:49Z</version_modified>
|
|
9
8
|
<xml_checksum>2C8A3EEF</xml_checksum>
|
|
10
9
|
<class_name>CalibrationReports</class_name>
|
|
11
10
|
<display_name>Calibration Reports</display_name>
|
|
@@ -31,16 +30,33 @@
|
|
|
31
30
|
</attributes>
|
|
32
31
|
<files>
|
|
33
32
|
<file>
|
|
34
|
-
<filename>
|
|
35
|
-
<filetype>
|
|
36
|
-
<usage_type>
|
|
37
|
-
<checksum>
|
|
33
|
+
<filename>LICENSE.md</filename>
|
|
34
|
+
<filetype>md</filetype>
|
|
35
|
+
<usage_type>license</usage_type>
|
|
36
|
+
<checksum>8696A072</checksum>
|
|
38
37
|
</file>
|
|
39
38
|
<file>
|
|
40
|
-
<filename>
|
|
41
|
-
<filetype>
|
|
42
|
-
<usage_type>
|
|
43
|
-
<checksum>
|
|
39
|
+
<filename>README.md</filename>
|
|
40
|
+
<filetype>md</filetype>
|
|
41
|
+
<usage_type>readme</usage_type>
|
|
42
|
+
<checksum>32E77F5D</checksum>
|
|
43
|
+
</file>
|
|
44
|
+
<file>
|
|
45
|
+
<filename>README.md.erb</filename>
|
|
46
|
+
<filetype>erb</filetype>
|
|
47
|
+
<usage_type>readmeerb</usage_type>
|
|
48
|
+
<checksum>703C9964</checksum>
|
|
49
|
+
</file>
|
|
50
|
+
<file>
|
|
51
|
+
<version>
|
|
52
|
+
<software_program>OpenStudio</software_program>
|
|
53
|
+
<identifier>2.0.0</identifier>
|
|
54
|
+
<min_compatible>2.0.0</min_compatible>
|
|
55
|
+
</version>
|
|
56
|
+
<filename>measure.rb</filename>
|
|
57
|
+
<filetype>rb</filetype>
|
|
58
|
+
<usage_type>script</usage_type>
|
|
59
|
+
<checksum>2647EEDB</checksum>
|
|
44
60
|
</file>
|
|
45
61
|
<file>
|
|
46
62
|
<filename>report.html.in</filename>
|
|
@@ -49,16 +65,16 @@
|
|
|
49
65
|
<checksum>4444C3A6</checksum>
|
|
50
66
|
</file>
|
|
51
67
|
<file>
|
|
52
|
-
<filename>
|
|
53
|
-
<filetype>
|
|
54
|
-
<usage_type>
|
|
55
|
-
<checksum>
|
|
68
|
+
<filename>CalibrationReports_Test.rb</filename>
|
|
69
|
+
<filetype>rb</filetype>
|
|
70
|
+
<usage_type>test</usage_type>
|
|
71
|
+
<checksum>125E14F8</checksum>
|
|
56
72
|
</file>
|
|
57
73
|
<file>
|
|
58
|
-
<filename>
|
|
74
|
+
<filename>ExampleModel.osm</filename>
|
|
59
75
|
<filetype>osm</filetype>
|
|
60
76
|
<usage_type>test</usage_type>
|
|
61
|
-
<checksum>
|
|
77
|
+
<checksum>5A314A0A</checksum>
|
|
62
78
|
</file>
|
|
63
79
|
<file>
|
|
64
80
|
<filename>ExampleModelNoDemandInput.osm</filename>
|
|
@@ -67,33 +83,16 @@
|
|
|
67
83
|
<checksum>9A565F93</checksum>
|
|
68
84
|
</file>
|
|
69
85
|
<file>
|
|
70
|
-
<filename>
|
|
71
|
-
<filetype>
|
|
72
|
-
<usage_type>
|
|
73
|
-
<checksum>
|
|
74
|
-
</file>
|
|
75
|
-
<file>
|
|
76
|
-
<filename>LICENSE.md</filename>
|
|
77
|
-
<filetype>md</filetype>
|
|
78
|
-
<usage_type>license</usage_type>
|
|
79
|
-
<checksum>BFFB1AA6</checksum>
|
|
80
|
-
</file>
|
|
81
|
-
<file>
|
|
82
|
-
<version>
|
|
83
|
-
<software_program>OpenStudio</software_program>
|
|
84
|
-
<identifier>2.0.0</identifier>
|
|
85
|
-
<min_compatible>2.0.0</min_compatible>
|
|
86
|
-
</version>
|
|
87
|
-
<filename>measure.rb</filename>
|
|
88
|
-
<filetype>rb</filetype>
|
|
89
|
-
<usage_type>script</usage_type>
|
|
90
|
-
<checksum>20C72976</checksum>
|
|
86
|
+
<filename>ExampleModelNoGasInput.osm</filename>
|
|
87
|
+
<filetype>osm</filetype>
|
|
88
|
+
<usage_type>test</usage_type>
|
|
89
|
+
<checksum>142393A2</checksum>
|
|
91
90
|
</file>
|
|
92
91
|
<file>
|
|
93
|
-
<filename>
|
|
94
|
-
<filetype>
|
|
92
|
+
<filename>USA_CO_Golden-NREL.724666_TMY3.epw</filename>
|
|
93
|
+
<filetype>epw</filetype>
|
|
95
94
|
<usage_type>test</usage_type>
|
|
96
|
-
<checksum>
|
|
95
|
+
<checksum>BDF687C1</checksum>
|
|
97
96
|
</file>
|
|
98
97
|
</files>
|
|
99
98
|
</measure>
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
OpenStudio(R), Copyright (c) 2008,
|
|
1
|
+
OpenStudio(R), Copyright (c) 2008, 2024 Alliance for Sustainable Energy, LLC.
|
|
2
2
|
|
|
3
3
|
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
|
|
4
4
|
|
|
@@ -65,7 +65,7 @@ class CalibrationReportsEnhanced < OpenStudio::Measure::ReportingMeasure
|
|
|
65
65
|
args << fuel_oil_cvrmse_limit
|
|
66
66
|
|
|
67
67
|
args
|
|
68
|
-
end
|
|
68
|
+
end
|
|
69
69
|
|
|
70
70
|
def outputs
|
|
71
71
|
result = OpenStudio::Measure::OSOutputVector.new
|
|
@@ -559,6 +559,7 @@ class CalibrationReportsEnhanced < OpenStudio::Measure::ReportingMeasure
|
|
|
559
559
|
end
|
|
560
560
|
|
|
561
561
|
next unless os_version >= min_version_feature1
|
|
562
|
+
|
|
562
563
|
if actual_consumption > 0.0
|
|
563
564
|
runner.registerValue("#{utility_bill_fuel_type}_consumption_actual",
|
|
564
565
|
actual_consumption,
|
|
@@ -579,6 +580,7 @@ class CalibrationReportsEnhanced < OpenStudio::Measure::ReportingMeasure
|
|
|
579
580
|
'%')
|
|
580
581
|
end
|
|
581
582
|
next unless !actual_consumption_values.empty? && (actual_consumption_values.size == modeled_consumption_values.size)
|
|
583
|
+
|
|
582
584
|
sum_squares = 0.0
|
|
583
585
|
actual_consumption_values.each_index do |i|
|
|
584
586
|
sum_squares += (actual_consumption_values[i] - modeled_consumption_values[i])**2
|
|
@@ -591,26 +593,23 @@ class CalibrationReportsEnhanced < OpenStudio::Measure::ReportingMeasure
|
|
|
591
593
|
actual_consumption_values.size)
|
|
592
594
|
runner.registerValue("#{utility_bill_fuel_type}_rmse",
|
|
593
595
|
rmse,
|
|
594
|
-
utilityBill.consumptionUnit
|
|
596
|
+
"#{utilityBill.consumptionUnit}^0.5")
|
|
595
597
|
end
|
|
596
598
|
|
|
597
|
-
if os_version >= min_version_feature1
|
|
598
|
-
|
|
599
|
-
|
|
600
|
-
all_actual_consumption_values
|
|
601
|
-
sum_squares += (all_actual_consumption_values[i] - all_modeled_consumption_values[i])**2
|
|
602
|
-
end
|
|
603
|
-
rmse = Math.sqrt(sum_squares / all_actual_consumption_values.size)
|
|
604
|
-
runner.registerValue('total_sum_of_squares',
|
|
605
|
-
sum_squares,
|
|
606
|
-
'kBtu')
|
|
607
|
-
runner.registerValue('total_dof',
|
|
608
|
-
all_actual_consumption_values.size)
|
|
609
|
-
runner.registerValue('total_rmse',
|
|
610
|
-
rmse,
|
|
611
|
-
'kBtu^0.5')
|
|
599
|
+
if os_version >= min_version_feature1 && (!all_actual_consumption_values.empty? && (all_actual_consumption_values.size == all_modeled_consumption_values.size))
|
|
600
|
+
sum_squares = 0.0
|
|
601
|
+
all_actual_consumption_values.each_index do |i|
|
|
602
|
+
sum_squares += (all_actual_consumption_values[i] - all_modeled_consumption_values[i])**2
|
|
612
603
|
end
|
|
613
|
-
|
|
604
|
+
rmse = Math.sqrt(sum_squares / all_actual_consumption_values.size)
|
|
605
|
+
runner.registerValue('total_sum_of_squares',
|
|
606
|
+
sum_squares,
|
|
607
|
+
'kBtu')
|
|
608
|
+
runner.registerValue('total_dof',
|
|
609
|
+
all_actual_consumption_values.size)
|
|
610
|
+
runner.registerValue('total_rmse',
|
|
611
|
+
rmse,
|
|
612
|
+
'kBtu^0.5')
|
|
614
613
|
end
|
|
615
614
|
|
|
616
615
|
elecStartDate = elecStartDate[0..-2]
|
|
@@ -728,7 +727,7 @@ class CalibrationReportsEnhanced < OpenStudio::Measure::ReportingMeasure
|
|
|
728
727
|
else
|
|
729
728
|
(cvrmse <= gas_cvrmse_limit)
|
|
730
729
|
end
|
|
731
|
-
result_hash[match_data[1]
|
|
730
|
+
result_hash["#{match_data[1]}_cvrmse_within_limit"] = within_limit
|
|
732
731
|
within_limit_i = if within_limit
|
|
733
732
|
1
|
|
734
733
|
else
|
|
@@ -747,7 +746,7 @@ class CalibrationReportsEnhanced < OpenStudio::Measure::ReportingMeasure
|
|
|
747
746
|
else
|
|
748
747
|
(nmbe.abs <= gas_nmbe_limit)
|
|
749
748
|
end
|
|
750
|
-
result_hash[match_data[1]
|
|
749
|
+
result_hash["#{match_data[1]}_nmbe_within_limit"] = within_limit
|
|
751
750
|
within_limit_i = if within_limit
|
|
752
751
|
1
|
|
753
752
|
else
|
|
@@ -761,8 +760,8 @@ class CalibrationReportsEnhanced < OpenStudio::Measure::ReportingMeasure
|
|
|
761
760
|
end
|
|
762
761
|
|
|
763
762
|
true
|
|
764
|
-
end
|
|
765
|
-
end
|
|
763
|
+
end
|
|
764
|
+
end
|
|
766
765
|
|
|
767
766
|
# this allows the measure to be use by the application
|
|
768
767
|
CalibrationReportsEnhanced.new.registerWithApplication
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
<?xml version="1.0"?>
|
|
2
2
|
<measure>
|
|
3
|
-
<schema_version>3.
|
|
3
|
+
<schema_version>3.1</schema_version>
|
|
4
4
|
<name>calibration_reports_enhanced</name>
|
|
5
5
|
<uid>e6642d40-7366-4647-8724-53a37991d668</uid>
|
|
6
|
-
<version_id>
|
|
7
|
-
<version_modified>
|
|
6
|
+
<version_id>e97d879f-dc9a-4af2-a4d7-b79b07ed9a4b</version_id>
|
|
7
|
+
<version_modified>2024-11-16T23:44:47Z</version_modified>
|
|
8
8
|
<xml_checksum>2C8A3EEF</xml_checksum>
|
|
9
9
|
<class_name>CalibrationReportsEnhanced</class_name>
|
|
10
10
|
<display_name>Calibration Reports Enhanced</display_name>
|
|
@@ -311,28 +311,16 @@
|
|
|
311
311
|
</attributes>
|
|
312
312
|
<files>
|
|
313
313
|
<file>
|
|
314
|
-
<filename>
|
|
315
|
-
<filetype>
|
|
316
|
-
<usage_type>
|
|
317
|
-
<checksum>
|
|
318
|
-
</file>
|
|
319
|
-
<file>
|
|
320
|
-
<filename>USA_CO_Golden-NREL.724666_TMY3.epw</filename>
|
|
321
|
-
<filetype>epw</filetype>
|
|
322
|
-
<usage_type>test</usage_type>
|
|
323
|
-
<checksum>BDF687C1</checksum>
|
|
324
|
-
</file>
|
|
325
|
-
<file>
|
|
326
|
-
<filename>report.html.in</filename>
|
|
327
|
-
<filetype>in</filetype>
|
|
328
|
-
<usage_type>resource</usage_type>
|
|
329
|
-
<checksum>B112BA5D</checksum>
|
|
314
|
+
<filename>LICENSE.md</filename>
|
|
315
|
+
<filetype>md</filetype>
|
|
316
|
+
<usage_type>license</usage_type>
|
|
317
|
+
<checksum>8696A072</checksum>
|
|
330
318
|
</file>
|
|
331
319
|
<file>
|
|
332
|
-
<filename>
|
|
333
|
-
<filetype>
|
|
334
|
-
<usage_type>
|
|
335
|
-
<checksum>
|
|
320
|
+
<filename>README.md</filename>
|
|
321
|
+
<filetype>md</filetype>
|
|
322
|
+
<usage_type>readme</usage_type>
|
|
323
|
+
<checksum>9073A0CD</checksum>
|
|
336
324
|
</file>
|
|
337
325
|
<file>
|
|
338
326
|
<filename>README.md.erb</filename>
|
|
@@ -341,33 +329,45 @@
|
|
|
341
329
|
<checksum>703C9964</checksum>
|
|
342
330
|
</file>
|
|
343
331
|
<file>
|
|
344
|
-
<
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
332
|
+
<version>
|
|
333
|
+
<software_program>OpenStudio</software_program>
|
|
334
|
+
<identifier>1.11.0</identifier>
|
|
335
|
+
<min_compatible>1.11.0</min_compatible>
|
|
336
|
+
</version>
|
|
337
|
+
<filename>measure.rb</filename>
|
|
338
|
+
<filetype>rb</filetype>
|
|
339
|
+
<usage_type>script</usage_type>
|
|
340
|
+
<checksum>AD9FA578</checksum>
|
|
348
341
|
</file>
|
|
349
342
|
<file>
|
|
350
|
-
<filename>
|
|
351
|
-
<filetype>
|
|
352
|
-
<usage_type>
|
|
353
|
-
<checksum>
|
|
343
|
+
<filename>report.html.in</filename>
|
|
344
|
+
<filetype>in</filetype>
|
|
345
|
+
<usage_type>resource</usage_type>
|
|
346
|
+
<checksum>B112BA5D</checksum>
|
|
354
347
|
</file>
|
|
355
348
|
<file>
|
|
356
349
|
<filename>CalibrationReportsEnhanced_Test.rb</filename>
|
|
357
350
|
<filetype>rb</filetype>
|
|
358
351
|
<usage_type>test</usage_type>
|
|
359
|
-
<checksum>
|
|
352
|
+
<checksum>97772676</checksum>
|
|
360
353
|
</file>
|
|
361
354
|
<file>
|
|
362
|
-
<
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
<
|
|
369
|
-
<
|
|
370
|
-
<
|
|
355
|
+
<filename>ExampleModel.osm</filename>
|
|
356
|
+
<filetype>osm</filetype>
|
|
357
|
+
<usage_type>test</usage_type>
|
|
358
|
+
<checksum>5A314A0A</checksum>
|
|
359
|
+
</file>
|
|
360
|
+
<file>
|
|
361
|
+
<filename>ExampleModel_FuelOil.osm</filename>
|
|
362
|
+
<filetype>osm</filetype>
|
|
363
|
+
<usage_type>test</usage_type>
|
|
364
|
+
<checksum>4FC9D41F</checksum>
|
|
365
|
+
</file>
|
|
366
|
+
<file>
|
|
367
|
+
<filename>USA_CO_Golden-NREL.724666_TMY3.epw</filename>
|
|
368
|
+
<filetype>epw</filetype>
|
|
369
|
+
<usage_type>test</usage_type>
|
|
370
|
+
<checksum>BDF687C1</checksum>
|
|
371
371
|
</file>
|
|
372
372
|
</files>
|
|
373
373
|
</measure>
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
OpenStudio(R), Copyright (c) 2008,
|
|
1
|
+
OpenStudio(R), Copyright (c) 2008, 2024 Alliance for Sustainable Energy, LLC.
|
|
2
2
|
|
|
3
3
|
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
|
|
4
4
|
|