openstudio-common-measures 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23485b6df8dceaed500819385e9a77c3080ca63684d2465fce4ef91734dd0103
-  data.tar.gz: 8cf223a7bcb5f849ae95d7ca92b743416835facf5d1c251aea7f008f14c70bc8
+  metadata.gz: 72f5781d905e2c6aed62ded29659058d7fbc5d52a1a33a8e440b44e4b522a3be
+  data.tar.gz: 19a23d3e3bb95f2470a699808b5f26ee4524d6192fe12eb2cd4dddf167274f35
 SHA512:
-  metadata.gz: a569112ba70451f4271cd69d9019697f6e851175aef6cb33e2de1997caac96e147302c105e97253f023e68f225b20c71cf07877303b173ec074a8d4a3a552e31
-  data.tar.gz: f0750ca35baf89308f1eea973dc3d7f5ac426b98eed196b32d688ba7ce4b1eb30ae64e619792a2a6be5b2c61019205092ee992bcfd39a4ce8fcedd6140c738fa
+  metadata.gz: 022bbbcc90db51554e035e0d5f5a0705003ae74216ea897d35aa35b095767e2064c6d543065cae72b2b71bd7ec6c458bf191be44ecdee6a9fd5634fab9a2a86d
+  data.tar.gz: 35545aec9130ec071f7f89aaebd3bb3100dff75d2d0b18ef183c267b08b47371ccf2840a9b57ce8c9eeec7dfd4d6fc90022a2245a0e748a08a5d98778598189f

data/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)

data/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)

data/lib/measures/ReportModelChanges/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>report_model_changes</name>
   <uid>6d66b426-908f-4528-9fe5-523b9d2f49c5</uid>
-  <version_id>d04c43f1-5011-4fca-b59c-1c7fd7081e0d</version_id>
-  <version_modified>20220506T153446Z</version_modified>
+  <version_id>50c52c2b-b884-4689-8dc6-86755d399c6f</version_id>
+  <version_modified>20220622T165903Z</version_modified>
   <xml_checksum>1E1F8B97</xml_checksum>
   <class_name>ReportModelChanges</class_name>
   <display_name>ReportModelChanges</display_name>

data/lib/measures/add_ems_emissions_reporting/measure.rb

@@ -307,19 +307,19 @@ class AddEMSEmissionsReporting < OpenStudio::Measure::ModelMeasure
     sch_file.setMinutesperItem(60)
 
     # add EMS sensor for future schedule file
-    sch_sens = OpenStudio::Model::EnergyManagementSystemSensor.new(model, 'Schedule Value')
-    sch_sens.setKeyName("#{future_subregion} #{future_year} Future Hourly Emissions Sch")
-    sch_sens.setName('Fut_Sen')
+    fut_sens = OpenStudio::Model::EnergyManagementSystemSensor.new(model, 'Schedule Value')
+    fut_sens.setKeyName("#{future_subregion} #{future_year} Future Hourly Emissions Sch")
+    fut_sens.setName('Fut_Sen')
 
     # add EMS sensor for historical schedule file
-    sch_sens = OpenStudio::Model::EnergyManagementSystemSensor.new(model, 'Schedule Value')
-    sch_sens.setKeyName("#{hourly_historical_subregion} #{hourly_historical_year} Historical Hourly Emissions Sch")
-    sch_sens.setName('His_Sen')
+    his_sens = OpenStudio::Model::EnergyManagementSystemSensor.new(model, 'Schedule Value')
+    his_sens.setKeyName("#{hourly_historical_subregion} #{hourly_historical_year} Historical Hourly Emissions Sch")
+    his_sens.setName('His_Sen')
 
     # add whole-building electricity sensor
-    sch_sens = OpenStudio::Model::EnergyManagementSystemSensor.new(model, 'Facility Total Purchased Electricity Energy')
-    sch_sens.setKeyName('Whole Building')
-    sch_sens.setName('Ele_Sen')
+    ele_sens = OpenStudio::Model::EnergyManagementSystemSensor.new(model, 'Facility Total Purchased Electricity Energy')
+    ele_sens.setKeyName('Whole Building')
+    ele_sens.setName('Ele_Sen')
 
     ems_prgm = OpenStudio::Model::EnergyManagementSystemProgram.new(model)
     ems_prgm.setName('Emissions_Calc_Prgm')
@@ -354,7 +354,7 @@ class AddEMSEmissionsReporting < OpenStudio::Measure::ModelMeasure
 
     # add future hourly EMS output variable
     ems_var1 = OpenStudio::Model::EnergyManagementSystemOutputVariable.new(model, 'fut_hr')
-    ems_var1.setName('Future_Hourly_Emissions_Var')
+    ems_var1.setName('Future_Hourly_Electricity_Emissions')
     ems_var1.setEMSVariableName('fut_hr')
     ems_var1.setTypeOfDataInVariable('Summed')
     ems_var1.setUpdateFrequency('SystemTimestep')
@@ -363,7 +363,7 @@ class AddEMSEmissionsReporting < OpenStudio::Measure::ModelMeasure
 
     # add historical hourly EMS output variable
     ems_var2 = OpenStudio::Model::EnergyManagementSystemOutputVariable.new(model, 'his_hr')
-    ems_var2.setName('Historical_Hourly_Emissions_Var')
+    ems_var2.setName('Historical_Hourly_Electricity_Emissions')
     ems_var2.setEMSVariableName('his_hr')
     ems_var2.setTypeOfDataInVariable('Summed')
     ems_var2.setUpdateFrequency('SystemTimestep')
@@ -372,7 +372,7 @@ class AddEMSEmissionsReporting < OpenStudio::Measure::ModelMeasure
 
     # add future annual EMS output variable
     ems_var3 = OpenStudio::Model::EnergyManagementSystemOutputVariable.new(model, 'fut_yr')
-    ems_var3.setName('Future_Annual_Emissions_Var')
+    ems_var3.setName('Future_Annual_Electricity_Emissions')
     ems_var3.setEMSVariableName('fut_yr')
     ems_var3.setTypeOfDataInVariable('Summed')
     ems_var3.setUpdateFrequency('SystemTimestep')
@@ -381,7 +381,7 @@ class AddEMSEmissionsReporting < OpenStudio::Measure::ModelMeasure
 
     # add historical annual EMS output variable
     ems_var4 = OpenStudio::Model::EnergyManagementSystemOutputVariable.new(model, 'his_yr')
-    ems_var4.setName('Historical_Annual_Emissions_Var')
+    ems_var4.setName('Historical_Annual_Electricity_Emissions')
     ems_var4.setEMSVariableName('his_yr')
     ems_var4.setTypeOfDataInVariable('Summed')
     ems_var4.setUpdateFrequency('SystemTimestep')
@@ -392,7 +392,7 @@ class AddEMSEmissionsReporting < OpenStudio::Measure::ModelMeasure
     ##### add emissions intensity 
     # add future hourly EMS output variable
     ems_var5 = OpenStudio::Model::EnergyManagementSystemOutputVariable.new(model, 'fut_hr_intensity')
-    ems_var5.setName('Future_Hourly_Emissions_Intensity_Var')
+    ems_var5.setName('Future_Hourly_Electricity_Emissions_Intensity')
     ems_var5.setEMSVariableName('fut_hr_intensity')
     ems_var5.setTypeOfDataInVariable('Summed')
     ems_var5.setUpdateFrequency('SystemTimestep')
@@ -401,7 +401,7 @@ class AddEMSEmissionsReporting < OpenStudio::Measure::ModelMeasure
 
     # add historical hourly EMS output variable
     ems_var6 = OpenStudio::Model::EnergyManagementSystemOutputVariable.new(model, 'his_hr_intensity')
-    ems_var6.setName('Historical_Hourly_Emissions_Intensity_Var')
+    ems_var6.setName('Historical_Hourly_Electricity_Emissions_Intensity')
     ems_var6.setEMSVariableName('his_hr_intensity')
     ems_var6.setTypeOfDataInVariable('Summed')
     ems_var6.setUpdateFrequency('SystemTimestep')
@@ -410,7 +410,7 @@ class AddEMSEmissionsReporting < OpenStudio::Measure::ModelMeasure
 
     # add future annual EMS output variable
     ems_var7 = OpenStudio::Model::EnergyManagementSystemOutputVariable.new(model, 'fut_yr_intensity')
-    ems_var7.setName('Future_Annual_Emissions_Intensity_Var')
+    ems_var7.setName('Future_Annual_Electricity_Emissions_Intensity')
     ems_var7.setEMSVariableName('fut_yr_intensity')
     ems_var7.setTypeOfDataInVariable('Summed')
     ems_var7.setUpdateFrequency('SystemTimestep')
@@ -419,7 +419,7 @@ class AddEMSEmissionsReporting < OpenStudio::Measure::ModelMeasure
 
     # add historical annual EMS output variable
     ems_var8 = OpenStudio::Model::EnergyManagementSystemOutputVariable.new(model, 'his_yr_intensity')
-    ems_var8.setName('Historical_Annual_Emissions_Intensity_Var')
+    ems_var8.setName('Historical_Annual_Electricity_Emissions_Intensity')
     ems_var8.setEMSVariableName('his_yr_intensity')
     ems_var8.setTypeOfDataInVariable('Summed')
     ems_var8.setUpdateFrequency('SystemTimestep')
@@ -427,45 +427,44 @@ class AddEMSEmissionsReporting < OpenStudio::Measure::ModelMeasure
     ems_var8.setUnits('kg/ft2')
 
     # add future hourly reporting output variable
-    out_var1 = OpenStudio::Model::OutputVariable.new('Future_Hourly_Emissions_Var', model)
+    out_var1 = OpenStudio::Model::OutputVariable.new('Future_Hourly_Electricity_Emissions', model)
     out_var1.setKeyValue('EMS')
     out_var1.setReportingFrequency('hourly')
 
     # add historical hourly reporting output variable
-    out_var2 = OpenStudio::Model::OutputVariable.new('Historical_Hourly_Emissions_Var', model)
+    out_var2 = OpenStudio::Model::OutputVariable.new('Historical_Hourly_Electricity_Emissions', model)
     out_var2.setKeyValue('EMS')
     out_var2.setReportingFrequency('hourly')
 
     # add future annual reporting output variable
-    out_var3 = OpenStudio::Model::OutputVariable.new('Future_Annual_Emissions_Var', model)
+    out_var3 = OpenStudio::Model::OutputVariable.new('Future_Annual_Electricity_Emissions', model)
     out_var3.setKeyValue('EMS')
     out_var3.setReportingFrequency('hourly')
 
     # add historical annual reporting output variable
-    out_var4 = OpenStudio::Model::OutputVariable.new('Historical_Annual_Emissions_Var', model)
+    out_var4 = OpenStudio::Model::OutputVariable.new('Historical_Annual_Electricity_Emissions', model)
     out_var4.setKeyValue('EMS')
     out_var4.setReportingFrequency('hourly')
 
     # add future hourly intensity reporting output variable
-    out_var5 = OpenStudio::Model::OutputVariable.new('Future_Hourly_Emissions_Intensity_Var', model)
+    out_var5 = OpenStudio::Model::OutputVariable.new('Future_Hourly_Electricity_Emissions_Intensity', model)
     out_var5.setKeyValue('EMS')
     out_var5.setReportingFrequency('hourly')
 
     # add historical hourly intensity reporting output variable
-    out_var6 = OpenStudio::Model::OutputVariable.new('Historical_Hourly_Emissions_Intensity_Var', model)
+    out_var6 = OpenStudio::Model::OutputVariable.new('Historical_Hourly_Electricity_Emissions_Intensity', model)
     out_var6.setKeyValue('EMS')
     out_var6.setReportingFrequency('hourly')
 
     # add future annual intensity reporting output variable
-    out_var7 = OpenStudio::Model::OutputVariable.new('Future_Annual_Emissions_Intensity_Var', model)
+    out_var7 = OpenStudio::Model::OutputVariable.new('Future_Annual_Electricity_Emissions_Intensity', model)
     out_var7.setKeyValue('EMS')
     out_var7.setReportingFrequency('hourly')
 
     # add historical annual intensity reporting output variable
-    out_var8 = OpenStudio::Model::OutputVariable.new('Historical_Annual_Emissions_Intensity_Var', model)
+    out_var8 = OpenStudio::Model::OutputVariable.new('Historical_Annual_Electricity_Emissions_Intensity', model)
     out_var8.setKeyValue('EMS')
     out_var8.setReportingFrequency('hourly')
-    
 
     return true
   end

data/lib/measures/add_ems_emissions_reporting/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>add_ems_emissions_reporting</name>
   <uid>e8fe9153-5e70-4769-afa0-6da0045aa529</uid>
-  <version_id>ebb131d4-44c3-4c0c-8b5b-1d50fe282cda</version_id>
-  <version_modified>20220504T174701Z</version_modified>
+  <version_id>bc9ea375-7d2a-4a45-bf7a-d63518c651f8</version_id>
+  <version_modified>20220622T165904Z</version_modified>
   <xml_checksum>976EB6EB</xml_checksum>
   <class_name>AddEMSEmissionsReporting</class_name>
   <display_name>Add EMS to Report Emissions</display_name>
@@ -593,7 +593,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>AD699109</checksum>
+      <checksum>149C1DD7</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/envelope_and_internal_load_breakdown/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>envelope_and_internal_load_breakdown</name>
   <uid>8f0e1fbb-8bc6-46e5-b6e4-db59177e2c02</uid>
-  <version_id>a80bd71f-7c89-4bad-95e2-8f7d02976ab1</version_id>
-  <version_modified>20220506T153447Z</version_modified>
+  <version_id>2ff096f8-c72d-444a-a56e-f0633fba2013</version_id>
+  <version_modified>20220622T165903Z</version_modified>
   <xml_checksum>69BA4D91</xml_checksum>
   <class_name>EnvelopeAndInternalLoadBreakdown</class_name>
   <display_name>Envelope and Internal Load Breakdown</display_name>
@@ -139,7 +139,7 @@
       <filename>report.html.erb</filename>
       <filetype>erb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>B6B35B79</checksum>
+      <checksum>6F54D1FE</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/envelope_and_internal_load_breakdown/resources/report.html.erb

@@ -45,6 +45,7 @@
 
 
 
+
 <!DOCTYPE html>
 <html lang="en">
 <head>

data/lib/measures/example_report/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>example_report</name>
   <uid>174a6f71-3e8c-4f99-9e7a-b64f2e7535d4</uid>
-  <version_id>a259adf9-ad89-41ba-9463-b57132e6232f</version_id>
-  <version_modified>20220506T153442Z</version_modified>
+  <version_id>69180469-2020-4295-b159-80a548ad4c5c</version_id>
+  <version_modified>20220622T165857Z</version_modified>
   <xml_checksum>557BF06F</xml_checksum>
   <class_name>ExampleReport</class_name>
   <display_name>Example Report</display_name>
@@ -167,7 +167,7 @@
       <filename>report.html.erb</filename>
       <filetype>erb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>6F54D1FE</checksum>
+      <checksum>1C5120F7</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/example_report/resources/report.html.erb

@@ -46,6 +46,7 @@
 
 
 
+
 <!DOCTYPE html>
 <html lang="en">
 <head>

data/lib/measures/generic_qaqc/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>generic_qaqc</name>
   <uid>d58d6b29-69ba-4915-b907-3c2c37ddb7c7</uid>
-  <version_id>8f162fe1-b120-4d78-861a-1089ee150751</version_id>
-  <version_modified>20220506T153448Z</version_modified>
+  <version_id>d828bb8b-a051-4f95-96eb-e42035d8b7e3</version_id>
+  <version_modified>20220622T165904Z</version_modified>
   <xml_checksum>0A3BF61C</xml_checksum>
   <class_name>GenericQAQC</class_name>
   <display_name>Generic QAQC</display_name>
@@ -773,7 +773,7 @@
       <filename>report.html.erb</filename>
       <filetype>erb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>6F54D1FE</checksum>
+      <checksum>1C5120F7</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/generic_qaqc/resources/report.html.erb

@@ -46,6 +46,7 @@
 
 
 
+
 <!DOCTYPE html>
 <html lang="en">
 <head>

data/lib/measures/hvac_psychrometric_chart/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>hvac_psychrometric_chart</name>
   <uid>97213780-0727-4462-8ec0-9a6c3e475cd6</uid>
-  <version_id>65abd215-893b-472a-9876-175f63f27728</version_id>
-  <version_modified>20220506T153446Z</version_modified>
+  <version_id>a29c8c23-4145-44d2-a1f2-08fb729c4f59</version_id>
+  <version_modified>20220622T165903Z</version_modified>
   <xml_checksum>F657B621</xml_checksum>
   <class_name>HVACPsychrometricChart</class_name>
   <display_name>HVAC Psychrometric Chart</display_name>
@@ -94,7 +94,7 @@
       <filename>report.html.erb</filename>
       <filetype>erb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>0006E928</checksum>
+      <checksum>18298D64</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/hvac_psychrometric_chart/resources/report.html.erb

@@ -46,6 +46,7 @@
 
 
 
+
 <!DOCTYPE html>
 <html>
 <head>

data/lib/measures/openstudio_results/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>openstudio_results</name>
   <uid>a25386cd-60e4-46bc-8b11-c755f379d916</uid>
-  <version_id>813ebcc3-c480-491c-9934-c1bcd1a1a478</version_id>
-  <version_modified>20220506T153445Z</version_modified>
+  <version_id>1e0f1704-70fc-426f-8b79-52f67580b080</version_id>
+  <version_modified>20220622T165902Z</version_modified>
   <xml_checksum>557BF06F</xml_checksum>
   <class_name>OpenStudioResults</class_name>
   <display_name>OpenStudio Results</display_name>
@@ -1493,7 +1493,7 @@
       <filename>report.html.erb</filename>
       <filetype>erb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>9224834F</checksum>
+      <checksum>5F603ADE</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/openstudio_results/resources/report.html.erb

@@ -46,6 +46,7 @@
 
 
 
+
 <!DOCTYPE html>
 <html lang="en">
 <head>

data/lib/measures/set_run_period/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>set_run_period</name>
   <uid>7a84292a-3975-4ab3-9284-6edabcbe750b</uid>
-  <version_id>ffaa166b-6d19-454c-98a7-86d40660f333</version_id>
-  <version_modified>20220506T153446Z</version_modified>
+  <version_id>887fa655-8bb1-40b4-bc13-7f3736fe1203</version_id>
+  <version_modified>20220622T165903Z</version_modified>
   <xml_checksum>2AF3A68E</xml_checksum>
   <class_name>SetRunPeriod</class_name>
   <display_name>SetRunPeriod</display_name>

data/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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-common-measures
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - David Goldwasser
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-05-06 00:00:00.000000000 Z
+date: 2022-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -718,7 +718,7 @@ licenses: []
 metadata:
   bug_tracker_uri: https://github.com/NREL/openstudio-common-measures-gem/issues
   changelog_uri: https://github.com/NREL/openstudio-common-measures-gem/blob/develop/CHANGELOG.md
-  source_code_uri: https://github.com/NREL/openstudio-common-measures-gem/tree/v0.6.0
+  source_code_uri: https://github.com/NREL/openstudio-common-measures-gem/tree/v0.6.1
 post_install_message: 
 rdoc_options: []
 require_paths: