From de93382a6001fb60b933bcd5bb9ea27296177ac5 Mon Sep 17 00:00:00 2001
From: kflemin <2205659+kflemin@users.noreply.github.com>
Date: Wed, 22 Jun 2022 11:00:41 -0600
Subject: [PATCH] prepping 0.6.1 release
---
CHANGELOG.md | 6 ++++++
README.md | 4 ++--
lib/measures/ReportModelChanges/measure.xml | 4 ++--
lib/measures/add_ems_emissions_reporting/measure.xml | 6 +++---
.../envelope_and_internal_load_breakdown/measure.xml | 6 +++---
.../resources/report.html.erb | 1 +
lib/measures/example_report/measure.xml | 6 +++---
lib/measures/example_report/resources/report.html.erb | 1 +
lib/measures/generic_qaqc/measure.xml | 6 +++---
lib/measures/generic_qaqc/resources/report.html.erb | 1 +
lib/measures/hvac_psychrometric_chart/measure.xml | 6 +++---
.../hvac_psychrometric_chart/resources/report.html.erb | 1 +
lib/measures/openstudio_results/measure.xml | 6 +++---
lib/measures/openstudio_results/resources/report.html.erb | 1 +
lib/measures/set_run_period/measure.xml | 4 ++--
lib/openstudio/common_measures/version.rb | 2 +-
16 files changed, 36 insertions(+), 25 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a4d509a5..1267abca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
# OpenStudio Common Measures Gem
+## Version 0.6.1
+
+- Fixed [#107]( https://github.com/NREL/openstudio-common-measures-gem/pull/107 ), Added natural gas emissions calculations
+- Fixed [#109]( https://github.com/NREL/openstudio-common-measures-gem/pull/109 ), changed variable names to include Electricity and removed "_Var"
+
+
## Version 0.6.0
* Support for OpenStudio 3.4 (upgrade to standards gem 0.2.16, no extension gem upgrade)
diff --git a/README.md b/README.md
index f26315a6..15bb61ea 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ bundle exec rake openstudio:test_with_openstudio
|OpenStudio Common Measures Gem|OpenStudio|Ruby|
|:--------------:|:----------:|:--------:|
-| 0.6.0 | 3.4 | 2.7 |
+| 0.6.0 - 0.6.1 | 3.4 | 2.7 |
| 0.5.0 | 3.3 | 2.7 |
| 0.4.0 - 0,4.2 | 3.2 | 2.7 |
| 0.3.0 - 0.3.2 | 3.1 | 2.5 |
@@ -51,7 +51,7 @@ Please review the [OpenStudio Contribution Policy](https://openstudio.net/openst
# Releasing
-* Update `CHANGELOG.md`
+* Update `CHANGELOG.md` with the `rake openstudio:change_log` command
* Run `rake openstudio:rubocop:auto_correct`
* Run `rake openstudio:update_copyright`
* Run `rake openstudio:update_measures` (this has to be done last since prior tasks alter measure files)
diff --git a/lib/measures/ReportModelChanges/measure.xml b/lib/measures/ReportModelChanges/measure.xml
index 16fe1a69..3e13e3df 100644
--- a/lib/measures/ReportModelChanges/measure.xml
+++ b/lib/measures/ReportModelChanges/measure.xml
@@ -3,8 +3,8 @@
3.0
report_model_changes
6d66b426-908f-4528-9fe5-523b9d2f49c5
- d04c43f1-5011-4fca-b59c-1c7fd7081e0d
- 20220506T153446Z
+ 50c52c2b-b884-4689-8dc6-86755d399c6f
+ 20220622T165903Z
1E1F8B97
ReportModelChanges
ReportModelChanges
diff --git a/lib/measures/add_ems_emissions_reporting/measure.xml b/lib/measures/add_ems_emissions_reporting/measure.xml
index 7cb74d00..065e2bdb 100644
--- a/lib/measures/add_ems_emissions_reporting/measure.xml
+++ b/lib/measures/add_ems_emissions_reporting/measure.xml
@@ -3,8 +3,8 @@
3.0
add_ems_emissions_reporting
e8fe9153-5e70-4769-afa0-6da0045aa529
- ebb131d4-44c3-4c0c-8b5b-1d50fe282cda
- 20220504T174701Z
+ bc9ea375-7d2a-4a45-bf7a-d63518c651f8
+ 20220622T165904Z
976EB6EB
AddEMSEmissionsReporting
Add EMS to Report Emissions
@@ -593,7 +593,7 @@
measure.rb
rb
script
- AD699109
+ 149C1DD7
diff --git a/lib/measures/envelope_and_internal_load_breakdown/measure.xml b/lib/measures/envelope_and_internal_load_breakdown/measure.xml
index 4b4c33d2..fa10b4bb 100644
--- a/lib/measures/envelope_and_internal_load_breakdown/measure.xml
+++ b/lib/measures/envelope_and_internal_load_breakdown/measure.xml
@@ -3,8 +3,8 @@
3.0
envelope_and_internal_load_breakdown
8f0e1fbb-8bc6-46e5-b6e4-db59177e2c02
- a80bd71f-7c89-4bad-95e2-8f7d02976ab1
- 20220506T153447Z
+ 2ff096f8-c72d-444a-a56e-f0633fba2013
+ 20220622T165903Z
69BA4D91
EnvelopeAndInternalLoadBreakdown
Envelope and Internal Load Breakdown
@@ -139,7 +139,7 @@
report.html.erb
erb
resource
- B6B35B79
+ 6F54D1FE
diff --git a/lib/measures/envelope_and_internal_load_breakdown/resources/report.html.erb b/lib/measures/envelope_and_internal_load_breakdown/resources/report.html.erb
index 95041b0f..4f58141f 100644
--- a/lib/measures/envelope_and_internal_load_breakdown/resources/report.html.erb
+++ b/lib/measures/envelope_and_internal_load_breakdown/resources/report.html.erb
@@ -45,6 +45,7 @@
+
diff --git a/lib/measures/example_report/measure.xml b/lib/measures/example_report/measure.xml
index 6982eb0c..129bae59 100644
--- a/lib/measures/example_report/measure.xml
+++ b/lib/measures/example_report/measure.xml
@@ -3,8 +3,8 @@
3.0
example_report
174a6f71-3e8c-4f99-9e7a-b64f2e7535d4
- a259adf9-ad89-41ba-9463-b57132e6232f
- 20220506T153442Z
+ 69180469-2020-4295-b159-80a548ad4c5c
+ 20220622T165857Z
557BF06F
ExampleReport
Example Report
@@ -167,7 +167,7 @@
report.html.erb
erb
resource
- 6F54D1FE
+ 1C5120F7
diff --git a/lib/measures/example_report/resources/report.html.erb b/lib/measures/example_report/resources/report.html.erb
index 4f58141f..6b48928d 100644
--- a/lib/measures/example_report/resources/report.html.erb
+++ b/lib/measures/example_report/resources/report.html.erb
@@ -46,6 +46,7 @@
+
diff --git a/lib/measures/generic_qaqc/measure.xml b/lib/measures/generic_qaqc/measure.xml
index bfe4863e..7010c1fa 100644
--- a/lib/measures/generic_qaqc/measure.xml
+++ b/lib/measures/generic_qaqc/measure.xml
@@ -3,8 +3,8 @@
3.0
generic_qaqc
d58d6b29-69ba-4915-b907-3c2c37ddb7c7
- 8f162fe1-b120-4d78-861a-1089ee150751
- 20220506T153448Z
+ d828bb8b-a051-4f95-96eb-e42035d8b7e3
+ 20220622T165904Z
0A3BF61C
GenericQAQC
Generic QAQC
@@ -773,7 +773,7 @@
report.html.erb
erb
resource
- 6F54D1FE
+ 1C5120F7
diff --git a/lib/measures/generic_qaqc/resources/report.html.erb b/lib/measures/generic_qaqc/resources/report.html.erb
index 4f58141f..6b48928d 100644
--- a/lib/measures/generic_qaqc/resources/report.html.erb
+++ b/lib/measures/generic_qaqc/resources/report.html.erb
@@ -46,6 +46,7 @@
+
diff --git a/lib/measures/hvac_psychrometric_chart/measure.xml b/lib/measures/hvac_psychrometric_chart/measure.xml
index fb189556..3fe80cad 100644
--- a/lib/measures/hvac_psychrometric_chart/measure.xml
+++ b/lib/measures/hvac_psychrometric_chart/measure.xml
@@ -3,8 +3,8 @@
3.0
hvac_psychrometric_chart
97213780-0727-4462-8ec0-9a6c3e475cd6
- 65abd215-893b-472a-9876-175f63f27728
- 20220506T153446Z
+ a29c8c23-4145-44d2-a1f2-08fb729c4f59
+ 20220622T165903Z
F657B621
HVACPsychrometricChart
HVAC Psychrometric Chart
@@ -94,7 +94,7 @@
report.html.erb
erb
resource
- 0006E928
+ 18298D64
diff --git a/lib/measures/hvac_psychrometric_chart/resources/report.html.erb b/lib/measures/hvac_psychrometric_chart/resources/report.html.erb
index 26f4fd04..62e368e1 100644
--- a/lib/measures/hvac_psychrometric_chart/resources/report.html.erb
+++ b/lib/measures/hvac_psychrometric_chart/resources/report.html.erb
@@ -46,6 +46,7 @@
+
diff --git a/lib/measures/openstudio_results/measure.xml b/lib/measures/openstudio_results/measure.xml
index e28f18d9..f002d27b 100644
--- a/lib/measures/openstudio_results/measure.xml
+++ b/lib/measures/openstudio_results/measure.xml
@@ -3,8 +3,8 @@
3.0
openstudio_results
a25386cd-60e4-46bc-8b11-c755f379d916
- 813ebcc3-c480-491c-9934-c1bcd1a1a478
- 20220506T153445Z
+ 1e0f1704-70fc-426f-8b79-52f67580b080
+ 20220622T165902Z
557BF06F
OpenStudioResults
OpenStudio Results
@@ -1493,7 +1493,7 @@
report.html.erb
erb
resource
- 9224834F
+ 5F603ADE
diff --git a/lib/measures/openstudio_results/resources/report.html.erb b/lib/measures/openstudio_results/resources/report.html.erb
index 6b1b60cb..f5e900b1 100644
--- a/lib/measures/openstudio_results/resources/report.html.erb
+++ b/lib/measures/openstudio_results/resources/report.html.erb
@@ -46,6 +46,7 @@
+
diff --git a/lib/measures/set_run_period/measure.xml b/lib/measures/set_run_period/measure.xml
index 2fb6afbe..4c98c0b1 100644
--- a/lib/measures/set_run_period/measure.xml
+++ b/lib/measures/set_run_period/measure.xml
@@ -3,8 +3,8 @@
3.0
set_run_period
7a84292a-3975-4ab3-9284-6edabcbe750b
- ffaa166b-6d19-454c-98a7-86d40660f333
- 20220506T153446Z
+ 887fa655-8bb1-40b4-bc13-7f3736fe1203
+ 20220622T165903Z
2AF3A68E
SetRunPeriod
SetRunPeriod
diff --git a/lib/openstudio/common_measures/version.rb b/lib/openstudio/common_measures/version.rb
index 6d3c59ed..95536ebe 100644
--- a/lib/openstudio/common_measures/version.rb
+++ b/lib/openstudio/common_measures/version.rb
@@ -35,6 +35,6 @@
module OpenStudio
module CommonMeasures
- VERSION = '0.6.0'.freeze
+ VERSION = '0.6.1'.freeze
end
end