ReportUtilityBills: fix calculation of production credits

Changelog.md

@@ -7,6 +7,9 @@ __New Features__
 
 __Bugfixes__
 - Allows additional flexibility for multiple `Attic`/`Foundation` elements.
+- ReportUtilityBills measure:
+  - When PV is present, account for battery storage and generator production as Energy instead of PV Credit.
+  - Fixes not accounting for battery storage and generator production when PV is not present.
 
 ## OpenStudio-HPXML v1.8.1
 

HPXMLtoOpenStudio/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>hpxm_lto_openstudio</name>
   <uid>b1543b30-9465-45ff-ba04-1d1f85e763bc</uid>
-  <version_id>381502ab-7765-4f0b-a10b-78f2efc7bfd3</version_id>
-  <version_modified>2024-06-17T18:00:58Z</version_modified>
+  <version_id>87813cc6-5733-47ec-91ec-3e2096b8bfa9</version_id>
+  <version_modified>2024-06-17T21:54:33Z</version_modified>
   <xml_checksum>D8922A73</xml_checksum>
   <class_name>HPXMLtoOpenStudio</class_name>
   <display_name>HPXML to OpenStudio Translator</display_name>
@@ -447,7 +447,7 @@
       <filename>schedule_files/battery.csv</filename>
       <filetype>csv</filetype>
       <usage_type>resource</usage_type>
-      <checksum>C1350909</checksum>
+      <checksum>971B85EE</checksum>
     </file>
     <file>
       <filename>schedule_files/hvac-variable-system-maximum-power-ratios-varied.csv</filename>

HPXMLtoOpenStudio/resources/schedule_files/battery.csv

@@ -6,9 +6,6 @@ battery
 0
 0
 0
-0
-0
-0
 1
 1
 0.5
@@ -8759,3 +8756,6 @@ battery
 0
 0
 0
+0
+0
+0

ReportUtilityBills/measure.rb

@@ -202,12 +202,18 @@ def energyPlusOutputRequests(runner, user_arguments)
     has_fuel = hpxml.has_fuels(Constants.FossilFuels, hpxml.to_doc)
     has_fuel[HPXML::FuelTypeElectricity] = true
 
-    # Fuel outputs
+    # Has production
     has_pv = @hpxml_buildings.select { |hpxml_bldg| !hpxml_bldg.pv_systems.empty? }.size > 0
+    has_battery = @model.getElectricLoadCenterStorageLiIonNMCBatterys.size > 0 # has modeled battery
+    has_generator = @hpxml_buildings.select { |hpxml_bldg| !hpxml_bldg.generators.empty? }.size > 0
+
+    # Fuel outputs
     fuels.each do |(fuel_type, is_production), fuel|
       fuel.meters.each do |meter|
         next unless has_fuel[hpxml_fuel_map[fuel_type]]
-        next if is_production && !has_pv
+        next if is_production && !has_pv # we don't need to request these meters if there isn't pv
+        next if meter.include?('ElectricStorage') && !has_battery # we don't need to request this meter if there isn't a modeled battery
+        next if meter.include?('Cogeneration') && !has_generator # we don't need to request this meter if there isn't a generator
 
         result << OpenStudio::IdfObject.load("Output:Meter,#{meter},monthly;").get
         if fuel_type == FT::Elec && @hpxml_header.utility_bill_scenarios.has_detailed_electric_rates
@@ -702,8 +708,8 @@ def get_utility_bills(fuels, utility_rates, utility_bills, utility_bill_scenario
   # @return [TODO] TODO
   def setup_fuel_outputs()
     fuels = {}
-    fuels[[FT::Elec, false]] = Fuel.new(meters: ["#{EPlus::FuelTypeElectricity}:Facility"], units: UtilityBills.get_fuel_units(HPXML::FuelTypeElectricity))
-    fuels[[FT::Elec, true]] = Fuel.new(meters: ["#{EPlus::FuelTypeElectricity}Produced:Facility"], units: UtilityBills.get_fuel_units(HPXML::FuelTypeElectricity))
+    fuels[[FT::Elec, false]] = Fuel.new(meters: ["#{EPlus::FuelTypeElectricity}:Facility", "ElectricStorage:#{EPlus::FuelTypeElectricity}Produced", "Cogeneration:#{EPlus::FuelTypeElectricity}Produced"], units: UtilityBills.get_fuel_units(HPXML::FuelTypeElectricity))
+    fuels[[FT::Elec, true]] = Fuel.new(meters: ["Photovoltaic:#{EPlus::FuelTypeElectricity}Produced", "PowerConversion:#{EPlus::FuelTypeElectricity}Produced"], units: UtilityBills.get_fuel_units(HPXML::FuelTypeElectricity))
     fuels[[FT::Gas, false]] = Fuel.new(meters: ["#{EPlus::FuelTypeNaturalGas}:Facility"], units: UtilityBills.get_fuel_units(HPXML::FuelTypeNaturalGas))
     fuels[[FT::Oil, false]] = Fuel.new(meters: ["#{EPlus::FuelTypeOil}:Facility"], units: UtilityBills.get_fuel_units(HPXML::FuelTypeOil))
     fuels[[FT::Propane, false]] = Fuel.new(meters: ["#{EPlus::FuelTypePropane}:Facility"], units: UtilityBills.get_fuel_units(HPXML::FuelTypePropane))
@@ -749,7 +755,7 @@ def get_outputs(fuels, utility_bill_scenario)
 
       timeseries_freq = 'monthly'
       timeseries_freq = 'hourly' if fuel_type == FT::Elec && !utility_bill_scenario.elec_tariff_filepath.nil?
-      fuel.timeseries = get_report_meter_data_timeseries(fuel.meters, unit_conv, 0, timeseries_freq)
+      fuel.timeseries = get_report_meter_data_timeseries(fuel.meters, unit_conv, timeseries_freq)
     end
   end
 
@@ -760,7 +766,7 @@ def get_outputs(fuels, utility_bill_scenario)
   # @param unit_adder [TODO] TODO
   # @param timeseries_freq [TODO] TODO
   # @return [TODO] TODO
-  def get_report_meter_data_timeseries(meter_names, unit_conv, unit_adder, timeseries_freq)
+  def get_report_meter_data_timeseries(meter_names, unit_conv, timeseries_freq)
     msgpack_timeseries_name = { 'hourly' => 'Hourly',
                                 'monthly' => 'Monthly' }[timeseries_freq]
     begin
@@ -771,12 +777,18 @@ def get_report_meter_data_timeseries(meter_names, unit_conv, unit_adder, timeser
       return [0.0]
     end
     indexes = cols.each_index.select { |i| meter_names.include? cols[i]['Variable'] }
+    meter_names = indexes.each.collect { |i| cols[i]['Variable'] }
+    indexes = Hash[indexes.zip(meter_names)]
+
     vals = []
     rows.each do |row|
       row = row[row.keys[0]]
       val = 0.0
-      indexes.each do |i|
-        val += row[i] * unit_conv + unit_adder
+      indexes.each do |i, meter_name|
+        r = row[i]
+        r *= -1 if ["ElectricStorage:#{EPlus::FuelTypeElectricity}Produced", "Cogeneration:#{EPlus::FuelTypeElectricity}Produced"].include?(meter_name) # positive for this meter means producing
+
+        val += r * unit_conv
       end
       vals << val
     end

ReportUtilityBills/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>report_utility_bills</name>
   <uid>ca88a425-e59a-4bc4-af51-c7e7d1e960fe</uid>
-  <version_id>2b64d6ee-3ffd-4cc9-8d03-d4d074889bd0</version_id>
-  <version_modified>2024-06-05T21:34:48Z</version_modified>
+  <version_id>83f4626c-58a4-4b5d-a678-6fc6e2191393</version_id>
+  <version_modified>2024-06-14T18:08:56Z</version_modified>
   <xml_checksum>15BF4E57</xml_checksum>
   <class_name>ReportUtilityBills</class_name>
   <display_name>Utility Bills Report</display_name>
@@ -180,7 +180,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>AD1D9C67</checksum>
+      <checksum>CD8AE948</checksum>
     </file>
     <file>
       <filename>detailed_rates/Sample Flat Rate Min Annual Charge.json</filename>
@@ -254,6 +254,12 @@
       <usage_type>resource</usage_type>
       <checksum>4508028D</checksum>
     </file>
+    <file>
+      <filename>detailed_rates/Sample Time-of-Use Rate High Peak.json</filename>
+      <filetype>json</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>1F5FA05C</checksum>
+    </file>
     <file>
       <filename>detailed_rates/Sample Time-of-Use Rate Min Annual Charge.json</filename>
       <filetype>json</filetype>
@@ -300,7 +306,7 @@
       <filename>util.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>4286D643</checksum>
+      <checksum>07D9572B</checksum>
     </file>
     <file>
       <filename>Contains Demand Charges.json</filename>
@@ -342,7 +348,7 @@
       <filename>test_report_utility_bills.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>CDF8B24F</checksum>
+      <checksum>7B65C730</checksum>
     </file>
   </files>
 </measure>