urbanopt-reporting 0.1.0 → 0.3.1

data/docs/package.json

@@ -0,0 +1,30 @@
+{
+  "name": "urbanopt-reporting-gem-docs",
+  "version": "0.0.1",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "dev": "vuepress dev",
+    "build": "vuepress build",
+    "deploy": "gh-pages -d .vuepress/dist"
+  },
+  "author": "NREL",
+  "dependencies": {
+    "highlight.js": "^10.3.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",
+    "webpack-dev-middleware": "^3.6.0"
+  },
+  "devDependencies": {
+    "braces": "^3.0.2",
+    "dot-prop": "^5.3.0",
+    "gh-pages": "^3.1.0",
+    "js-yaml": "^3.14.0",
+    "minimist": ">=1.2.3",
+    "node-forge": ">=0.10.0",
+    "serialize-javascript": "^5.0.1",
+    "set-value": "^3.0.2",
+    "yargs-parser": "^20.2.3"
+  }
+}

data/docs/schemas/scenario-schema.md

@@ -0,0 +1,3 @@
+# Scenario Schema
+
+<ScenarioSchema />

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,
@@ -71,6 +71,11 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
     feature_type.setDefaultValue('Building')
     args << feature_type
 
+    feature_location = OpenStudio::Measure::OSArgument.makeStringArgument('feature_location', false)
+    feature_location.setDisplayName('URBANopt Feature Location')
+    feature_location.setDefaultValue('0')
+    args << feature_location
+
     # make an argument for the frequency
     reporting_frequency_chs = OpenStudio::StringVector.new
     reporting_frequency_chs << 'Detailed'
@@ -94,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
@@ -158,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
@@ -168,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
@@ -193,6 +220,9 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
                        'District Heating Inlet Temperature', 'District Heating Outlet Temperature', 'Cooling Coil Total Cooling Rate',
                        'Heating Coil Heating Rate']
 
+    tes_timeseries_data = ['Ice Thermal Storage End Fraction', 'Cooling coil Ice Thermal Storage End Fraction']
+    timeseries_data += tes_timeseries_data
+
     timeseries_data.each do |ts|
       result << OpenStudio::IdfObject.load("Output:Variable,*,#{ts},#{reporting_frequency};").get
     end
@@ -220,11 +250,14 @@ 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
     # apply unit conversion
     value_converted = OpenStudio.convert(value, from_units, to_units)
     if value_converted.is_initialized
@@ -254,6 +287,7 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
     feature_id = runner.getStringArgumentValue('feature_id', user_arguments)
     feature_name = runner.getStringArgumentValue('feature_name', user_arguments)
     feature_type = runner.getStringArgumentValue('feature_type', user_arguments)
+    feature_location = runner.getStringArgumentValue('feature_location', user_arguments)
 
     # Assign the user inputs to variables
     reporting_frequency = runner.getStringArgumentValue('reporting_frequency', user_arguments)
@@ -318,37 +352,41 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
     # Get Location information and store in the feature_report
     ##
 
-    # latitude
-    latitude = epw_file.latitude
-    feature_report.location.latitude = latitude
-
-    # longitude
-    longitude = epw_file.longitude
-    feature_report.location.longitude = longitude
+    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
+      # latitude
+      feature_report.location.latitude_deg = latitude
+      # longitude
+      feature_report.location.longitude_deg = longitude
+    end
 
     # surface_elevation
     elev = sql_query(runner, sql_file, 'InputVerificationandResultsSummary', "TableName='General' AND RowName='Elevation' AND ColumnName='Value'")
-    feature_report.location.surface_elevation = elev
+    feature_report.location.surface_elevation_ft = elev
 
     ##########################################################################
     ##
+
     # Get program information and store in the feature_report
     ##
 
     # floor_area
     floor_area = sql_query(runner, sql_file, 'AnnualBuildingUtilityPerformanceSummary', "TableName='Building Area' AND RowName='Total Building Area' AND ColumnName='Area'")
-    feature_report.program.floor_area = convert_units(floor_area, 'm^2', 'ft^2')
+    feature_report.program.floor_area_sqft = convert_units(floor_area, 'm^2', 'ft^2')
 
     # conditioned_area
     conditioned_area = sql_query(runner, sql_file, 'AnnualBuildingUtilityPerformanceSummary', "TableName='Building Area' AND RowName='Net Conditioned Building Area' AND ColumnName='Area'")
-    feature_report.program.conditioned_area = convert_units(conditioned_area, 'm^2', 'ft^2')
+    feature_report.program.conditioned_area_sqft = convert_units(conditioned_area, 'm^2', 'ft^2')
 
     # unconditioned_area
     unconditioned_area = sql_query(runner, sql_file, 'AnnualBuildingUtilityPerformanceSummary', "TableName='Building Area' AND RowName='Unconditioned Building Area' AND ColumnName='Area'")
-    feature_report.program.unconditioned_area = convert_units(unconditioned_area, 'm^2', 'ft^2')
+    feature_report.program.unconditioned_area_sqft = convert_units(unconditioned_area, 'm^2', 'ft^2')
 
     # footprint_area
-    feature_report.program.footprint_area = convert_units(floor_area, 'm^2', 'ft^2')
+    feature_report.program.footprint_area_sqft = convert_units(floor_area, 'm^2', 'ft^2')
 
     # maximum_number_of_stories
     number_of_stories = building.standardsNumberOfStories.get if building.standardsNumberOfStories.is_initialized
@@ -358,7 +396,7 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
     # maximum_roof_height
     floor_to_floor_height = building.nominalFloortoFloorHeight.to_f
     maximum_roof_height = number_of_stories * floor_to_floor_height
-    feature_report.program.maximum_roof_height = maximum_roof_height
+    feature_report.program.maximum_roof_height_ft = maximum_roof_height
 
     # maximum_number_of_stories_above_ground
     number_of_stories_above_ground = building.standardsNumberOfAboveGroundStories.get if building.standardsNumberOfAboveGroundStories.is_initialized
@@ -419,36 +457,36 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
     ## window_area
     # north_window_area
     north_window_area = sql_query(runner, sql_file, 'InputVerificationandResultsSummary', "TableName='Window-Wall Ratio' AND RowName='Window Opening Area' AND ColumnName='North (315 to 45 deg)'").to_f
-    feature_report.program.window_area[:north_window_area] = convert_units(north_window_area, 'm^2', 'ft^2')
+    feature_report.program.window_area_sqft[:north_window_area_sqft] = convert_units(north_window_area, 'm^2', 'ft^2')
     # south_window_area
     south_window_area = sql_query(runner, sql_file, 'InputVerificationandResultsSummary', "TableName='Window-Wall Ratio' AND RowName='Window Opening Area' AND ColumnName='South (135 to 225 deg)'").to_f
-    feature_report.program.window_area[:south_window_area] = convert_units(south_window_area, 'm^2', 'ft^2')
+    feature_report.program.window_area_sqft[:south_window_area_sqft] = convert_units(south_window_area, 'm^2', 'ft^2')
     # east_window_area
     east_window_area = sql_query(runner, sql_file, 'InputVerificationandResultsSummary', "TableName='Window-Wall Ratio' AND RowName='Window Opening Area' AND ColumnName='East (45 to 135 deg)'").to_f
-    feature_report.program.window_area[:east_window_area] = convert_units(east_window_area, 'm^2', 'ft^2')
+    feature_report.program.window_area_sqft[:east_window_area_sqft] = convert_units(east_window_area, 'm^2', 'ft^2')
     # west_window_area
     west_window_area = sql_query(runner, sql_file, 'InputVerificationandResultsSummary', "TableName='Window-Wall Ratio' AND RowName='Window Opening Area' AND ColumnName='West (225 to 315 deg)'").to_f
-    feature_report.program.window_area[:west_window_area] = convert_units(west_window_area, 'm^2', 'ft^2')
+    feature_report.program.window_area_sqft[:west_window_area_sqft] = convert_units(west_window_area, 'm^2', 'ft^2')
     # total_window_area
     total_window_area = north_window_area + south_window_area + east_window_area + west_window_area
-    feature_report.program.window_area[:total_window_area] = convert_units(total_window_area, 'm^2', 'ft^2')
+    feature_report.program.window_area_sqft[:total_window_area_sqft] = convert_units(total_window_area, 'm^2', 'ft^2')
 
     ## wall_area
     # north_wall_area
     north_wall_area = sql_query(runner, sql_file, 'InputVerificationandResultsSummary', "TableName='Window-Wall Ratio' AND RowName='Gross Wall Area' AND ColumnName='North (315 to 45 deg)'").to_f
-    feature_report.program.wall_area[:north_wall_area] = convert_units(north_wall_area, 'm^2', 'ft^2')
+    feature_report.program.wall_area_sqft[:north_wall_area_sqft] = convert_units(north_wall_area, 'm^2', 'ft^2')
     # south_wall_area
     south_wall_area = sql_query(runner, sql_file, 'InputVerificationandResultsSummary', "TableName='Window-Wall Ratio' AND RowName='Gross Wall Area' AND ColumnName='South (135 to 225 deg)'").to_f
-    feature_report.program.wall_area[:south_wall_area] = convert_units(south_wall_area, 'm^2', 'ft^2')
+    feature_report.program.wall_area_sqft[:south_wall_area_sqft] = convert_units(south_wall_area, 'm^2', 'ft^2')
     # east_wall_area
     east_wall_area = sql_query(runner, sql_file, 'InputVerificationandResultsSummary', "TableName='Window-Wall Ratio' AND RowName='Gross Wall Area' AND ColumnName='East (45 to 135 deg)'").to_f
-    feature_report.program.wall_area[:east_wall_area] = convert_units(east_wall_area, 'm^2', 'ft^2')
+    feature_report.program.wall_area_sqft[:east_wall_area_sqft] = convert_units(east_wall_area, 'm^2', 'ft^2')
     # west_wall_area
     west_wall_area = sql_query(runner, sql_file, 'InputVerificationandResultsSummary', "TableName='Window-Wall Ratio' AND RowName='Gross Wall Area' AND ColumnName='West (225 to 315 deg)'").to_f
-    feature_report.program.wall_area[:west_wall_area] = convert_units(west_wall_area, 'm^2', 'ft^2')
+    feature_report.program.wall_area_sqft[:west_wall_area_sqft] = convert_units(west_wall_area, 'm^2', 'ft^2')
     # total_wall_area
     total_wall_area = north_wall_area + south_wall_area + east_wall_area + west_wall_area
-    feature_report.program.wall_area[:total_wall_area] = convert_units(total_wall_area, 'm^2', 'ft^2')
+    feature_report.program.wall_area_sqft[:total_wall_area_sqft] = convert_units(total_wall_area, 'm^2', 'ft^2')
 
     # total_roof_area
     total_roof_area = 0.0
@@ -457,12 +495,12 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
         total_roof_area += surface.netArea
       end
     end
-    feature_report.program.roof_area[:total_roof_area] = convert_units(total_roof_area, 'm^2', 'ft^2')
+    feature_report.program.roof_area_sqft[:total_roof_area_sqft] = convert_units(total_roof_area, 'm^2', 'ft^2')
 
     # orientation
     # RK: a more robust method should be implemented to find orientation(finding main axis of the building using aspect ratio)
     building_rotation = model.getBuilding.northAxis
-    feature_report.program.orientation = building_rotation
+    feature_report.program.orientation_deg = building_rotation
 
     # aspect_ratio
     north_wall_area = sql_query(runner, sql_file, 'InputVerificationandResultsSummary', "TableName='Window-Wall Ratio' AND RowName='Gross Wall Area' AND ColumnName='North (315 to 45 deg)'")
@@ -473,7 +511,40 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
 
     # total_construction_cost
     total_construction_cost = sql_query(runner, sql_file, 'Life-Cycle Cost Report', "TableName='Present Value for Recurring, Nonrecurring and Energy Costs (Before Tax)' AND RowName='LCC_MAT - BUILDING - LIFE CYCLE COSTS' AND ColumnName='Cost'")
-    feature_report.program.total_construction_cost = total_construction_cost
+    feature_report.program.total_construction_cost_dollar = total_construction_cost
+
+    # packaged thermal storage capacities by cooling coil
+    ptes_keys = sql_file.availableKeyValues('RUN Period 1', 'Zone Timestep', 'Cooling Coil Ice Thermal Storage End Fraction')
+    if ptes_keys.empty?
+      ptes_size = nil
+      runner.registerWarning('Query failed for Packaged Ice Thermal Storage Capacity')
+    else
+      begin
+        ptes_size = 0
+        ptes_keys.each do |pk|
+          ptes_size += sql_query(runner, sql_file, 'ComponentSizingSummary', "TableName='Coil:Cooling:DX:SingleSpeed:ThermalStorage' AND RowName='#{pk}' AND ColumnName='Ice Storage Capacity'").to_f
+        end
+        ptes_size = convert_units(ptes_size, 'GJ', 'kWh')
+      rescue StandardError
+        runner.registerWarning('Query ptes_size.get failed')
+      end
+    end
+    feature_report.thermal_storage.ptes_size_kwh = ptes_size
+
+    # get the central tank thermal storage capacity
+    its_size = nil
+    its_size_index = sql_file.execAndReturnFirstDouble("SELECT ReportVariableDataDictionaryIndex FROM ReportVariableDataDictionary WHERE VariableName='Ice Thermal Storage Capacity'")
+    if its_size_index.empty?
+      runner.registerWarning('Query failed for Ice Thermal Storage Capacity')
+    else
+      begin
+        its_size = sql_file.execAndReturnFirstDouble("SELECT VariableValue FROM ReportVariableData WHERE ReportVariableDataDictionaryIndex=#{its_size_index}").get
+        its_size = convert_units(its_size.to_f, 'GJ', 'kWh')
+      rescue StandardError
+        runner.registerWarning('Query its_size.get failed')
+      end
+    end
+    feature_report.thermal_storage.its_size_kwh = its_size
 
     ############################################################################
     ##
@@ -504,78 +575,132 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
 
     # total_site_energy
     total_site_energy = sql_query(runner, sql_file, 'AnnualBuildingUtilityPerformanceSummary', "TableName='Site and Source Energy' AND RowName='Total Site Energy' AND ColumnName='Total Energy'")
-    feature_report.reporting_periods[0].total_site_energy = convert_units(total_site_energy, 'GJ', 'kBtu')
+    feature_report.reporting_periods[0].total_site_energy_kwh = convert_units(total_site_energy, 'GJ', 'kWh')
 
     # total_source_energy
     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 = convert_units(total_source_energy, 'GJ', 'kBtu')
+    feature_report.reporting_periods[0].total_source_energy_kwh = convert_units(total_source_energy, 'GJ', 'kWh')
 
     # 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 = convert_units(net_site_energy, 'GJ', 'kBtu')
+    feature_report.reporting_periods[0].net_site_energy_kwh = convert_units(net_site_energy, 'GJ', 'kWh')
 
     # net_source_energy
     net_source_energy = sql_query(runner, sql_file, 'AnnualBuildingUtilityPerformanceSummary', "TableName='Site and Source Energy' AND RowName='Net Source Energy' AND ColumnName='Total Energy'")
-    feature_report.reporting_periods[0].net_source_energy = convert_units(net_source_energy, 'GJ', 'kBtu')
+    feature_report.reporting_periods[0].net_source_energy_kwh = convert_units(net_source_energy, 'GJ', 'kWh')
 
     # electricity
     electricity = sql_query(runner, sql_file, 'AnnualBuildingUtilityPerformanceSummary', "TableName='End Uses' AND RowName='Total End Uses' AND ColumnName='Electricity'")
-    feature_report.reporting_periods[0].electricity = convert_units(electricity, 'GJ', 'kBtu')
+    feature_report.reporting_periods[0].electricity_kwh = convert_units(electricity, 'GJ', 'kWh')
 
     # natural_gas
     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 = convert_units(natural_gas, 'GJ', 'kBtu')
+    feature_report.reporting_periods[0].natural_gas_kwh = convert_units(natural_gas, 'GJ', 'kWh')
+
+    # 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?
 
-    # additional_fuel
+    # 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 = convert_units(additional_fuel, 'GJ', 'kBtu')
+    # 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 = convert_units(district_cooling, 'GJ', 'kBtu')
+    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 = convert_units(district_heating, 'GJ', 'kBtu')
+    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'")
     # feature_report.reporting_periods[0].water = convert_units(water, 'm3', 'ft3')
-    feature_report.reporting_periods[0].water = water
+    feature_report.reporting_periods[0].water_qbft = water
 
     # electricity_produced
     electricity_produced = sql_query(runner, sql_file, 'AnnualBuildingUtilityPerformanceSummary', "TableName='Electric Loads Satisfied' AND RowName='Total On-Site and Utility Electric Sources' AND ColumnName='Electricity'")
-    feature_report.reporting_periods[0].electricity_produced = convert_units(electricity_produced, 'GJ', 'kBtu')
+    feature_report.reporting_periods[0].electricity_produced_kwh = convert_units(electricity_produced, 'GJ', 'kWh')
 
     ## 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
-          m = feature_report.reporting_periods[0].end_uses.send(x)
+        x = ft.tr(' ', '_').downcase
+        if x.include? 'water'
+          x_u = x + '_qbft'
         else
-          m = feature_report.reporting_periods[0].end_uses.send(ft.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', 'kBtu'))
-        else
-          m.send("#{eu.downcase}=", convert_units(sql_r, 'GJ', 'kBtu'))
+        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
 
@@ -583,20 +708,20 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
     ## electricity_produced
     # photovoltaic
     photovoltaic_power = sql_query(runner, sql_file, 'AnnualBuildingUtilityPerformanceSummary', "TableName='Electric Loads Satisfied' AND RowName='Photovoltaic Power' AND ColumnName='Electricity'")
-    feature_report.reporting_periods[0].energy_production[:electricity_produced][:photovoltaic] = convert_units(photovoltaic_power, 'GJ', 'kBtu')
+    feature_report.reporting_periods[0].energy_production_kwh[:electricity_produced][:photovoltaic] = convert_units(photovoltaic_power, 'GJ', 'kWh')
 
     ## Total utility cost
     total_utility_cost = sql_query(runner, sql_file, 'Economics Results Summary Report', "TableName='Annual Cost' AND RowName='Cost' AND ColumnName='Total'")
-    feature_report.reporting_periods[0].total_utility_cost = total_utility_cost
+    feature_report.reporting_periods[0].total_utility_cost_dollar = total_utility_cost
 
     ## Utility Costs
     # electricity utility cost
     elec_utility_cost = sql_query(runner, sql_file, 'Economics Results Summary Report', "TableName='Annual Cost' AND RowName='Cost' AND ColumnName='Electric'")
-    feature_report.reporting_periods[0].utility_costs[0][:fuel_type] = 'Electricity'
-    feature_report.reporting_periods[0].utility_costs[0][:total_cost] = elec_utility_cost
+    feature_report.reporting_periods[0].utility_costs_dollar[0][:fuel_type] = 'Electricity'
+    feature_report.reporting_periods[0].utility_costs_dollar[0][:total_cost] = elec_utility_cost
     # gas utility cost
     gas_utility_cost = sql_query(runner, sql_file, 'Economics Results Summary Report', "TableName='Annual Cost' AND RowName='Cost' AND ColumnName='Gas'")
-    feature_report.reporting_periods[0].utility_costs << { fuel_type: 'Natural Gas', total_cost: gas_utility_cost }
+    feature_report.reporting_periods[0].utility_costs_dollar << { fuel_type: 'Natural Gas', total_cost: gas_utility_cost }
 
     ## comfort_result
     # time_setpoint_not_met_during_occupied_cooling
@@ -634,6 +759,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',
@@ -647,6 +775,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',
@@ -669,6 +809,10 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
     powerTimeseries = ['Net Electric Energy', 'Electricity:Facility Power', 'ElectricityProduced:Facility Power', 'Electricity:Facility Apparent Power', 'ElectricityProduced:Facility Apparent Power', 'Net Power', 'Net Apparent Power']
     requested_timeseries_names += powerTimeseries
 
+    # add additional thermal storage timeseries
+    tesTimeseries = ['Ice Thermal Storage End Fraction', 'Cooling Coil Ice Thermal Storage End Fraction']
+    requested_timeseries_names += tesTimeseries
+
     # register info all timeseries
     runner.registerInfo("All timeseries: #{requested_timeseries_names}")
 
@@ -706,8 +850,12 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
       puts " *********timeseries_name = #{timeseries_name}******************"
       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)
+      # get all the key values that this timeseries can be reported for (e.g. if PMV is requested for each zone)      
+      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 = ['']
@@ -751,7 +899,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
@@ -766,10 +918,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
@@ -870,6 +1027,22 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
         #   puts "units = #{new_unit}"
         # end
 
+        # thermal storage ice end fractions have multiple timeseries, aggregate into a single series with consistent name and use the average value at each timestep
+        if tesTimeseries.include? timeseries_name
+
+          # set up array if 1st key_value
+          if key_i == 0
+            runner.registerInfo("SETTING UP NEW ARRAY FOR: #{timeseries_name}")
+            tmpArray = Array.new(n, 1)
+          end
+
+          # add to array (keep min value at each timestep)
+          (0..(n - 1)).each do |ind|
+            tVal = values[key_cnt][ind].to_f
+            tmpArray[ind] = [tVal, tmpArray[ind]].min
+          end
+        end
+
         # comfort results usually have multiple timeseries (per zone), aggregate into a single series with consistent name and use worst value at each timestep
         if comfortTimeseries.include? timeseries_name