urbanopt-reporting 0.2.1 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73d4a00d402cdde91643c03b38449beb6978e5e6cb1af0b9102d607a3c865548
-  data.tar.gz: 8dd9ba4afbd16ba9a08f32edb24e0939cb9689b55683cd50c18a1e002f7fb4fd
+  metadata.gz: 75187e938a1cbfabd1d74eba912af03fcd2aade54955a490d68ea1b97b229dd2
+  data.tar.gz: 25b56a46e4569a71a7c01964bf64f2a14d8c30fdc9f6f5167fd61b40f272eb52
 SHA512:
-  metadata.gz: 75c674f97c37f9cdb64ab7c0e523691aae8027dbf74a25be38634924676a526de207306bd0ac05de533e24071af73e98a898058f120748b0c100fcc4f2a3b927
-  data.tar.gz: 44eed7300f9b94e85b431bf7fcee1d47e5a2480f0801036b9839d3b8ea9f057c42e498cd2ef99863abf30375db9be5f2f2acfdc0d2b6a4cd954c5a4759509a46
+  metadata.gz: 5a5f20c29cc1eec6aafeece4479a52c4c5a6a0ecfb0374a0b8f243551f9a7d49ecfbcf25b233ce7e19441551adcd87c5eb668ad509d4c87b0681ea1a187da6b2
+  data.tar.gz: bccc2ad11e97d3330f2706cb9a7d32c5c0209130af88738854e6d56fb6d34b5ccfcc8b51b42633d3f359bf4c03c34d4888108528bd38c558c96ec06569c92e9d

data/CHANGELOG.md

@@ -1,5 +1,44 @@
 # URBANopt Reporting Gem
 
+## Version 0.3.4
+
+Date Range: 01/14/21 - 01/15/21
+
+- Fixed [#53]( https://github.com/urbanopt/urbanopt-reporting-gem/issues/53 ), Make subfolders in feature saving if necessary
+- Fixed [#55]( https://github.com/urbanopt/urbanopt-reporting-gem/issues/55 ), Fix new measures
+
+## Version 0.3.3
+
+Date Range: 12/09/20 - 01/13/21
+
+- Fixed [#36]( https://github.com/urbanopt/urbanopt-reporting-gem/issues/36 ), Add reporting measure for district heating/cooling system mass flow rates
+- Fixed [#37]( https://github.com/urbanopt/urbanopt-reporting-gem/issues/37 ), Add EUI to default report
+- Fixed [#38]( https://github.com/urbanopt/urbanopt-reporting-gem/issues/38 ), Add better error handling around convert_units
+- Fixed [#43]( https://github.com/urbanopt/urbanopt-reporting-gem/issues/43 ), Add available_roof_area calculation
+- Fixed [#44]( https://github.com/urbanopt/urbanopt-reporting-gem/issues/44 ), Fix coordinates order
+
+## Version 0.3.2
+
+Date Range: 12/07/20 - 12/08/20
+
+- Fixed [#27]( https://github.com/urbanopt/urbanopt-reporting-gem/issues/27 ), reporting measure fails when there are no additional fuels in the model
+- Fixed [#29]( https://github.com/urbanopt/urbanopt-reporting-gem/issues/29 ), restore save_feature_report function for backward compatibility
+- Fixed [#32]( https://github.com/urbanopt/urbanopt-reporting-gem/issues/32 ), bump extension-gem dependency
+
+## Version 0.3.1
+
+Date Range: 11/26/2020 - 12/07/2020
+
+- Fixed [#19]( https://github.com/urbanopt/urbanopt-reporting-gem/pull/19 ), check for nil values to avoid crashing unit conversion
+- Fixed [#24]( https://github.com/urbanopt/urbanopt-reporting-gem/pull/24 ), Support reporting of other fuels
+- Fixed [#28]( https://github.com/urbanopt/urbanopt-reporting-gem/pull/28 ), fix for other_fuels being nil and restore save_feature_report function
+
+## Version 0.3.0
+
+Date Range: 11/12/2020 - 11/25/2020
+
+- Updating dependencies to support OpenStudio 3.1.0
+
 ## Version 0.2.1
 
 Date Range: 09/22/2020 - 11/12/2020
@@ -29,4 +68,4 @@ Date Range: 08/27/2020 - 09/21/2020
 
 08/17/2020
 
-Initial release of the urbanopt-reporting gem.
+Initial release of the urbanopt-reporting gem.

data/LICENSE.md

@@ -1,4 +1,4 @@
-URBANopt<sup>&trade;</sup>, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other 
+URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other 
 contributors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, 

data/doc_templates/LICENSE.md

@@ -1,4 +1,4 @@
-URBANopt™, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other 
+URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other 
 contributors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, 

data/doc_templates/copyright_erb.txt

@@ -1,6 +1,6 @@
 <%
   # *********************************************************************************
-  # URBANopt™, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
+  # URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
   # contributors. All rights reserved.
   #
   # Redistribution and use in source and binary forms, with or without modification,

data/doc_templates/copyright_js.txt

@@ -1,4 +1,4 @@
 /* @preserve
- * URBANopt™, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other contributors. All rights reserved.
+ * URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other contributors. All rights reserved.
  * Use of this source code is governed by the BSD 3-Clause license.
 */

data/doc_templates/copyright_ruby.txt

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt™, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
+# URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,

data/docs/package-lock.json

@@ -4814,9 +4814,9 @@
       "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ=="
     },
     "highlight.js": {
-      "version": "10.3.1",
-      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.3.1.tgz",
-      "integrity": "sha512-jeW8rdPdhshYKObedYg5XGbpVgb1/DT4AHvDFXhkU7UnGSIjy9kkJ7zHG7qplhFHMitTSzh5/iClKQk3Kb2RFQ=="
+      "version": "10.4.1",
+      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.4.1.tgz",
+      "integrity": "sha512-yR5lWvNz7c85OhVAEAeFhVCc/GV4C30Fjzc/rCP0aCWzc1UUOPUk55dK/qdwTZHBvMZo+eZ2jpk62ndX/xMFlg=="
     },
     "hmac-drbg": {
       "version": "1.0.1",

data/docs/package.json

@@ -10,7 +10,7 @@
   },
   "author": "NREL",
   "dependencies": {
-    "highlight.js": "^10.3.1",
+    "highlight.js": "^10.4.1",
     "json-schema-ref-parser": "^9.0.6",
     "json-schema-view-js": "git+https://git@github.com/bgschiller/json-schema-view-js.git",
     "vuepress": "^1.7.1",

data/lib/measures/default_feature_reports/LICENSE.md

@@ -1,4 +1,4 @@
-URBANopt™, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other 
+URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other 
 contributors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, 

data/lib/measures/default_feature_reports/measure.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt™, Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
+# URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -99,37 +99,39 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
 
   # define fuel types
   def fuel_types
-    fuel_types = [
-      'Electricity',
-      'Gas',
-      'AdditionalFuel',
-      'DistrictCooling',
-      'DistrictHeating',
-      'Water'
-    ]
+    fuel_types = {
+      'Electricity' => 'Electricity',
+      'Gas' => 'Natural Gas',
+      'FuelOil#2' => 'Fuel Oil #2',
+      'Propane' => 'Propane',
+      'AdditionalFuel' => 'Additional Fuel',
+      'DistrictCooling' => 'District Cooling',
+      'DistrictHeating' => 'District Heating',
+      'Water' => 'Water'
+    }
 
     return fuel_types
   end
 
   # define enduses
   def end_uses
-    end_uses = [
-      'Heating',
-      'Cooling',
-      'InteriorLights',
-      'ExteriorLights',
-      'InteriorEquipment',
-      'ExteriorEquipment',
-      'Fans',
-      'Pumps',
-      'HeatRejection',
-      'Humidifier',
-      'HeatRecovery',
-      'WaterSystems',
-      'Refrigeration',
-      'Generators',
-      'Facility'
-    ]
+    end_uses = {
+      'Heating' => 'Heating',
+      'Cooling' => 'Cooling',
+      'InteriorLights' => 'Interior Lighting',
+      'ExteriorLights' => 'Exterior Lighting',
+      'InteriorEquipment' => 'Interior Equipment',
+      'ExteriorEquipment' => 'Exterior Equipment',
+      'Fans' => 'Fans',
+      'Pumps' => 'Pumps',
+      'HeatRejection' => 'Heat Rejection',
+      'Humidifier' => 'Humidification',
+      'HeatRecovery' => 'Heat Recovery',
+      'WaterSystems' => 'Water Systems',
+      'Refrigeration' => 'Refrigeration',
+      'Generators' => 'Generators',
+      'Facility' => 'Facility'
+    }
 
     return end_uses
   end
@@ -163,7 +165,9 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
 
     # Request the output for each end use/fuel type combination
     end_uses.each do |end_use|
+      end_use, = end_use
       fuel_types.each do |fuel_type|
+        fuel_type, = fuel_type
         variable_name = if end_use == 'Facility'
                           "#{fuel_type}:#{end_use}"
                         else
@@ -173,6 +177,24 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
       end
     end
 
+    # OtherFuels
+    other_fuels = ['FuelOil#1', 'Diesel', 'Gasoline', 'Coal', 'Steam']
+    other_fuel_uses = ['HeatRejection', 'Heating', 'WaterSystems', 'InteriorEquipment']
+    custom_meter_facility = 'Meter:Custom,OtherFuels:Facility,OtherFuel1'
+    other_fuel_uses.each do |end_use|
+      custom_meter = "Meter:Custom,#{end_use}:OtherFuels,OtherFuel1"
+      other_fuels.each do |other_fuel|
+        result << OpenStudio::IdfObject.load("Output:Meter,#{end_use}:#{other_fuel},#{reporting_frequency};").get
+        custom_meter_facility += ",,#{end_use}:#{other_fuel}"
+        custom_meter += ",,#{end_use}:#{other_fuel}"
+      end
+      custom_meter += ';'
+      result << OpenStudio::IdfObject.load(custom_meter).get
+      result << OpenStudio::IdfObject.load("Output:Meter,#{end_use}:OtherFuels,#{reporting_frequency};").get
+    end
+    result << OpenStudio::IdfObject.load("#{custom_meter_facility};").get
+    result << OpenStudio::IdfObject.load("Output:Meter,OtherFuels:Facility,#{reporting_frequency};").get
+
     # Request the output for each end use/fuel type combination
     result << OpenStudio::IdfObject.load("Output:Meter:MeterFileOnly,Electricity:Facility,#{reporting_frequency};").get
     result << OpenStudio::IdfObject.load("Output:Meter:MeterFileOnly,ElectricityProduced:Facility,#{reporting_frequency};").get
@@ -228,11 +250,19 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
       end
     end
 
-    val
+    return val
   end
 
   # unit conversion method
   def convert_units(value, from_units, to_units)
+    if value.nil?
+      return nil
+    end
+    if from_units.nil? || to_units.nil?
+      @runner.registerError("Cannot convert units...from_units: #{from_units} or to_units: #{to_units} left blank.")
+      return nil
+    end
+
     # apply unit conversion
     value_converted = OpenStudio.convert(value, from_units, to_units)
     if value_converted.is_initialized
@@ -328,10 +358,10 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
     ##
 
     if feature_location.include? '['
-      # get latitude from feature_location
-      latitude = (feature_location.split(',')[0].delete! '[]').to_f
       # get longitude from feature_location
-      longitude = (feature_location.split(',')[1].delete! '[]').to_f
+      longitude = (feature_location.split(',')[0].delete! '[]').to_f
+      # get latitude from feature_location
+      latitude = (feature_location.split(',')[1].delete! '[]').to_f
       # latitude
       feature_report.location.latitude_deg = latitude
       # longitude
@@ -470,7 +500,22 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
         total_roof_area += surface.netArea
       end
     end
-    feature_report.program.roof_area_sqft[:total_roof_area_sqft] = convert_units(total_roof_area, 'm^2', 'ft^2')
+
+    total_roof_area_sqft = convert_units(total_roof_area, 'm^2', 'ft^2')
+    feature_report.program.roof_area_sqft[:total_roof_area_sqft] = total_roof_area_sqft
+
+    # available_roof_area_sqft
+    # RK: a more robust method should be implemented to find the available_roof_area
+    # assign available roof area to be a percentage of the total roof area
+
+    if building_types[0][:building_type].include? 'Single-Family Detached'
+      feature_report.program.roof_area_sqft[:available_roof_area_sqft] = 0.45 * total_roof_area_sqft
+    else
+      feature_report.program.roof_area_sqft[:available_roof_area_sqft] = 0.75 * total_roof_area_sqft
+    end
+
+    # RK: Temporary solution: assign available roof area to be equal to total roof area
+    # feature_report.program.roof_area_sqft[:available_roof_area_sqft] = total_roof_area_sqft
 
     # orientation
     # RK: a more robust method should be implemented to find orientation(finding main axis of the building using aspect ratio)
@@ -556,6 +601,22 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
     total_source_energy = sql_query(runner, sql_file, 'AnnualBuildingUtilityPerformanceSummary', "TableName='Site and Source Energy' AND RowName='Total Source Energy' AND ColumnName='Total Energy'")
     feature_report.reporting_periods[0].total_source_energy_kwh = convert_units(total_source_energy, 'GJ', 'kWh')
 
+    # EUI is only valid with a full year of energy data
+    if begin_month == 1 && begin_day_of_month == 1 && end_month == 12 && end_day_of_month == 31
+      # calculate site EUI
+      site_EUI_kwh_per_m2 = feature_report.reporting_periods[0].total_site_energy_kwh / floor_area
+      site_EUI_kbtu_per_ft2 = convert_units(total_site_energy, 'GJ', 'kBtu') / feature_report.program.floor_area_sqft
+      # add site EUI to feature report
+      feature_report.reporting_periods[0].site_EUI_kwh_per_m2 = site_EUI_kwh_per_m2
+      feature_report.reporting_periods[0].site_EUI_kbtu_per_ft2 = site_EUI_kbtu_per_ft2
+      # calculate source EUI
+      source_EUI_kwh_per_m2 = feature_report.reporting_periods[0].total_source_energy_kwh / floor_area
+      source_EUI_kbtu_per_ft2 = convert_units(total_source_energy, 'GJ', 'kBtu') / feature_report.program.floor_area_sqft
+      # add source EUI to feature report
+      feature_report.reporting_periods[0].source_EUI_kwh_per_m2 = source_EUI_kwh_per_m2
+      feature_report.reporting_periods[0].source_EUI_kbtu_per_ft2 = source_EUI_kbtu_per_ft2
+    end
+
     # net_site_energy
     net_site_energy = sql_query(runner, sql_file, 'AnnualBuildingUtilityPerformanceSummary', "TableName='Site and Source Energy' AND RowName='Net Site Energy' AND ColumnName='Total Energy'")
     feature_report.reporting_periods[0].net_site_energy_kwh = convert_units(net_site_energy, 'GJ', 'kWh')
@@ -572,17 +633,37 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
     natural_gas = sql_query(runner, sql_file, 'AnnualBuildingUtilityPerformanceSummary', "TableName='End Uses' AND RowName='Total End Uses' AND ColumnName='Natural Gas'")
     feature_report.reporting_periods[0].natural_gas_kwh = convert_units(natural_gas, 'GJ', 'kWh')
 
-    # additional_fuel
+    # propane
+    propane = sql_query(runner, sql_file, 'EnergyMeters', "TableName='Annual and Peak Values - Other' AND RowName='Propane:Facility' AND ColumnName='Annual Value'")
+    feature_report.reporting_periods[0].propane_kwh = 0.0
+    feature_report.reporting_periods[0].propane_kwh = convert_units(propane, 'GJ', 'kWh') unless propane.nil?
+
+    # fuel_oil
+    fuel_oil = sql_query(runner, sql_file, 'EnergyMeters', "TableName='Annual and Peak Values - Other' AND RowName='FuelOil#2:Facility' AND ColumnName='Annual Value'")
+    feature_report.reporting_periods[0].fuel_oil_kwh = 0.0
+    feature_report.reporting_periods[0].fuel_oil_kwh = convert_units(fuel_oil, 'GJ', 'kWh') unless fuel_oil.nil?
+
+    # other_fuels
     additional_fuel = sql_query(runner, sql_file, 'AnnualBuildingUtilityPerformanceSummary', "TableName='End Uses' AND RowName='Total End Uses' AND ColumnName='Additional Fuel'")
-    feature_report.reporting_periods[0].additional_fuel_kwh = convert_units(additional_fuel, 'GJ', 'kWh')
+    # ensure additional fuel is not nil
+    feature_report.reporting_periods[0].other_fuels_kwh = 0.0
+    feature_report.reporting_periods[0].other_fuels_kwh = convert_units(additional_fuel, 'GJ', 'kWh') unless additional_fuel.nil?
+    feature_report.reporting_periods[0].other_fuels_kwh -= feature_report.reporting_periods[0].propane_kwh
+    feature_report.reporting_periods[0].other_fuels_kwh -= feature_report.reporting_periods[0].fuel_oil_kwh
 
     # district_cooling
     district_cooling = sql_query(runner, sql_file, 'AnnualBuildingUtilityPerformanceSummary', "TableName='End Uses' AND RowName='Total End Uses' AND ColumnName='District Cooling'")
     feature_report.reporting_periods[0].district_cooling_kwh = convert_units(district_cooling, 'GJ', 'kWh')
+    building_types.each do |i|
+      feature_report.reporting_periods[0].district_cooling_kwh = 0.0 if i[:building_type].include?('Single-Family Detached')
+    end
 
     # district_heating
     district_heating = sql_query(runner, sql_file, 'AnnualBuildingUtilityPerformanceSummary', "TableName='End Uses' AND RowName='Total End Uses' AND ColumnName='District Heating'")
     feature_report.reporting_periods[0].district_heating_kwh = convert_units(district_heating, 'GJ', 'kWh')
+    building_types.each do |i|
+      feature_report.reporting_periods[0].district_heating_kwh = 0.0 if i[:building_type].include?('Single-Family Detached')
+    end
 
     # water
     water = sql_query(runner, sql_file, 'AnnualBuildingUtilityPerformanceSummary', "TableName='End Uses' AND RowName='Total End Uses' AND ColumnName='Water'")
@@ -596,41 +677,66 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
     ## end_uses
 
     # get fuel type as listed in the sql file
-    fuel_type = ['Electricity', 'Natural Gas', 'Additional Fuel', 'District Cooling', 'District Heating', 'Water']
+    fueltypes = fuel_types.values
+    fueltypes.delete('Propane')
+    fueltypes.delete('Fuel Oil #2')
 
     # get enduses as listed in the sql file
-    enduses = ['Heating', 'Cooling', 'Interior Lighting', 'Exterior Lighting', 'Interior Equipment', 'Exterior Equipment', 'Fans', 'Pumps',
-               'Heat Rejection', 'Humidification', 'Heat Recovery', 'Water Systems', 'Refrigeration', 'Generators']
+    enduses = end_uses.values
+    enduses.delete('Facility')
+
+    # propane / fuel_oil
+    ['Propane', 'Fuel Oil #2'].each do |ft|
+      end_uses.keys.each do |eu|
+        next if eu == 'Facility'
+
+        sql_r = sql_query(runner, sql_file, 'EnergyMeters', "TableName='Annual and Peak Values - Other' AND RowName='#{eu}:#{ft.tr(' ', '')}' AND ColumnName='Annual Value'")
+
+        # report each query in its corresponding feature report obeject
+        x = ft.tr(' ', '_').downcase
+        x = x.gsub('_#2', '')
+        x_u = x + '_kwh'
+        m = feature_report.reporting_periods[0].end_uses.send(x_u)
+
+        y = end_uses[eu].tr(' ', '_').downcase
+        if sql_r.nil?
+          sql_r = 0.0
+        end
+        m.send("#{y}=", convert_units(sql_r, 'GJ', 'kWh'))
+      end
+    end
 
     # loop through fuel types and enduses to fill in sql_query method
-    fuel_type.each do |ft|
+    fueltypes.each do |ft|
       enduses.each do |eu|
         sql_r = sql_query(runner, sql_file, 'AnnualBuildingUtilityPerformanceSummary', "TableName='End Uses' AND RowName='#{eu}' AND ColumnName='#{ft}'")
 
         # report each query in its corresponding feature report obeject
-        if ft.include? ' '
-          x = ft.tr(' ', '_').downcase
-          if x.include? 'water'
-            x_u = x + '_qbft'
-          else
-            x_u = x + '_kwh'
-          end
-          m = feature_report.reporting_periods[0].end_uses.send(x_u)
+        x = ft.tr(' ', '_').downcase
+        if x.include? 'water'
+          x_u = x + '_qbft'
         else
-          if ft.downcase.include? 'water'
-            ft_u = ft + '_qbft'
-          else
-            ft_u = ft + '_kwh'
-          end
-          m = feature_report.reporting_periods[0].end_uses.send(ft_u.downcase)
+          x_u = x + '_kwh'
         end
+        if x_u == 'additional_fuel_kwh'
+          x_u = 'other_fuels_kwh'
+        end
+        m = feature_report.reporting_periods[0].end_uses.send(x_u)
 
-        if eu.include? ' '
-          y = eu.tr(' ', '_').downcase
-          m.send("#{y}=", convert_units(sql_r, 'GJ', 'kWh'))
-        else
-          m.send("#{eu.downcase}=", convert_units(sql_r, 'GJ', 'kWh'))
+        y = eu.tr(' ', '_').downcase
+        # ensure not nil so the equations below don't error out
+        if sql_r.nil?
+          sql_r = 0.0
+        end
+        sql_r = convert_units(sql_r, 'GJ', 'kWh')
+        if x_u == 'other_fuels_kwh'
+          sql_r -= feature_report.reporting_periods[0].end_uses.propane_kwh.send(y)
+          sql_r -= feature_report.reporting_periods[0].end_uses.fuel_oil_kwh.send(y)
         end
+        building_types.each do |i|
+          sql_r = 0.0 if i[:building_type].include?('Single-Family Detached') && x_u.include?('district')
+        end
+        m.send("#{y}=", sql_r)
       end
     end
 
@@ -689,6 +795,9 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
       'Electricity:Facility',
       'ElectricityProduced:Facility',
       'Gas:Facility',
+      'Propane:Facility',
+      'FuelOil#2:Facility',
+      'OtherFuels:Facility',
       'Cooling:Electricity',
       'Heating:Electricity',
       'InteriorLights:Electricity',
@@ -702,6 +811,18 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
       'Heating:Gas',
       'WaterSystems:Gas',
       'InteriorEquipment:Gas',
+      'HeatRejection:Propane',
+      'Heating:Propane',
+      'WaterSystems:Propane',
+      'InteriorEquipment:Propane',
+      'HeatRejection:FuelOil#2',
+      'Heating:FuelOil#2',
+      'WaterSystems:FuelOil#2',
+      'InteriorEquipment:FuelOil#2',
+      'HeatRejection:OtherFuels',
+      'Heating:OtherFuels',
+      'WaterSystems:OtherFuels',
+      'InteriorEquipment:OtherFuels',
       'DistrictCooling:Facility',
       'DistrictHeating:Facility',
       'District Cooling Chilled Water Rate',
@@ -766,7 +887,11 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
       runner.registerInfo("TIMESERIES: #{timeseries_name}")
 
       # get all the key values that this timeseries can be reported for (e.g. if PMV is requested for each zone)
-      key_values = sql_file.availableKeyValues('RUN PERIOD 1', 'Zone Timestep', timeseries_name)
+      if timeseries_name.include?('OtherFuels')
+        key_values = sql_file.availableKeyValues('RUN PERIOD 1', 'Zone Timestep', timeseries_name.upcase)
+      else
+        key_values = sql_file.availableKeyValues('RUN PERIOD 1', 'Zone Timestep', timeseries_name)
+      end
       runner.registerInfo("KEY VALUES: #{key_values}")
       if key_values.empty?
         key_values = ['']
@@ -810,7 +935,11 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
         # final_timeseries_names << new_timeseries_name
 
         # get the actual timeseries
-        ts = sql_file.timeSeries(ann_env_pd.to_s, reporting_frequency.to_s, timeseries_name, key_value)
+        if timeseries_name.include?('OtherFuels')
+          ts = sql_file.timeSeries(ann_env_pd.to_s, reporting_frequency.to_s, timeseries_name.upcase, key_value)
+        else
+          ts = sql_file.timeSeries(ann_env_pd.to_s, reporting_frequency.to_s, timeseries_name, key_value)
+        end
 
         if n.nil?
           # first timeseries should always be set
@@ -825,10 +954,15 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
           values[key_cnt] = Array.new(n, 0)
         end
 
+        # residential considerations
+        building_types.each do |i|
+          values[key_cnt] = Array.new(n, 0) if ['DistrictCooling:Facility', 'DistrictHeating:Facility'].include?(timeseries_name) && i[:building_type].include?('Single-Family Detached')
+        end
+
         # unit conversion
         old_unit = ts.get.units if ts.is_initialized
 
-        if timeseries_name.include? 'Gas'
+        if timeseries_name.include?('Gas') || timeseries_name.include?('Propane') || timeseries_name.include?('FuelOil#2') || timeseries_name.include?('OtherFuels')
           new_unit = 'kBtu'
         else
           new_unit = case old_unit.to_s