urbanopt-reporting 0.1.0 → 0.3.1

data/lib/urbanopt/reporting/default_reports/reporting_period.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,
@@ -43,16 +43,16 @@ module URBANopt
       # ReportingPeriod includes all the results of a specific reporting period.
       ##
       class ReportingPeriod
-        attr_accessor :id, :name, :multiplier, :start_date, :end_date, :month, :day_of_month, :year, :total_site_energy, :total_source_energy,
-                      :net_site_energy, :net_source_energy, :total_utility_cost, :net_utility_cost, :utility_costs, :electricity, :natural_gas, :additional_fuel, :district_cooling,
-                      :district_heating, :water, :electricity_produced, :end_uses, :energy_production, :photovoltaic,
-                      :fuel_type, :total_cost, :usage_cost, :demand_cost, :comfort_result, :time_setpoint_not_met_during_occupied_cooling,
+        attr_accessor :id, :name, :multiplier, :start_date, :end_date, :month, :day_of_month, :year, :total_site_energy_kwh, :total_source_energy_kwh,
+                      :net_site_energy_kwh, :net_source_energy_kwh, :total_utility_cost_dollar, :net_utility_cost_dollar, :utility_costs_dollar, :electricity_kwh, :natural_gas_kwh, :propane_kwh, :fuel_oil_kwh, :other_fuels_kwh, :district_cooling_kwh,
+                      :district_heating_kwh, :water_qbft, :electricity_produced_kwh, :end_uses, :energy_production_kwh, :photovoltaic,
+                      :fuel_type, :total_cost_dollar, :usage_cost_dollar, :demand_cost_dollar, :comfort_result, :time_setpoint_not_met_during_occupied_cooling,
                       :time_setpoint_not_met_during_occupied_heating, :time_setpoint_not_met_during_occupied_hours, :hours_out_of_comfort_bounds_PMV, :hours_out_of_comfort_bounds_PPD #:nodoc:
         # ReportingPeriod class initializes the reporting period attributes:
-        # +:id+ , +:name+ , +:multiplier+ , +:start_date+ , +:end_date+ , +:month+ , +:day_of_month+ , +:year+ , +:total_site_energy+ , +:total_source_energy+ ,
-        # +:net_site_energy+ , +:net_source_energy+ , +:total_utility_cost , +:net_utility_cost+ , +:utility_costs+ , +:electricity+ , +:natural_gas+ , +:additional_fuel+ , +:district_cooling+ ,
-        # +:district_heating+ , +:water+ , +:electricity_produced+ , +:end_uses+ , +:energy_production+ , +:photovoltaic+ ,
-        # +:fuel_type+ , +:total_cost+ , +:usage_cost+ , +:demand_cost+ , +:comfort_result+ , +:time_setpoint_not_met_during_occupied_cooling+ ,
+        # +:id+ , +:name+ , +:multiplier+ , +:start_date+ , +:end_date+ , +:month+ , +:day_of_month+ , +:year+ , +:total_site_energy_kwh+ , +:total_source_energy_kwh+ ,
+        # +:net_site_energy_kwh+ , +:net_source_energy_kwh+ , +:total_utility_cost_dollar , +:net_utility_cost_dollar+ , +:utility_costs_dollar+ , +:electricity_kwh+ , +:natural_gas_kwh+ , +:propane_kwh+ , +:fuel_oil_kwh+ , +:other_fuels_kwh+ , +:district_cooling_kwh+ ,
+        # +:district_heating_kwh+ , +:water_qbft+ , +:electricity_produced_kwh+ , +:end_uses+ , +:energy_production_kwh+ , +:photovoltaic_kwh+ ,
+        # +:fuel_type+ , +:total_cost_dollar+ , +:usage_cost_dollar+ , +:demand_cost_dollar+ , +:comfort_result+ , +:time_setpoint_not_met_during_occupied_cooling+ ,
         # +:time_setpoint_not_met_during_occupied_heating+ , +:time_setpoint_not_met_during_occupied_hours+
         ##
         # [parameters:]
@@ -68,24 +68,26 @@ module URBANopt
           @start_date = Date.new(hash[:start_date])
           @end_date = Date.new(hash[:end_date])
 
-          @total_site_energy = hash[:total_site_energy]
-          @total_source_energy = hash[:total_source_energy]
-          @net_site_energy = hash [:net_site_energy]
-          @net_source_energy = hash [:net_source_energy]
-          @net_utility_cost = hash [:net_utility_cost]
-          @total_utility_cost = hash [:total_utility_cost]
-          @electricity = hash [:electricity]
-          @natural_gas = hash [:natural_gas]
-          @additional_fuel = hash [:additional_fuel]
-          @district_cooling = hash [:district_cooling]
-          @district_heating = hash[:district_heating]
-          @water = hash[:water]
-          @electricity_produced = hash[:electricity_produced]
+          @total_site_energy_kwh = hash[:total_site_energy_kwh]
+          @total_source_energy_kwh = hash[:total_source_energy_kwh]
+          @net_site_energy_kwh = hash[:net_site_energy_kwh]
+          @net_source_energy_kwh = hash[:net_source_energy_kwh]
+          @net_utility_cost_dollar = hash[:net_utility_cost_dollar]
+          @total_utility_cost_dollar = hash[:total_utility_cost_dollar]
+          @electricity_kwh = hash[:electricity_kwh]
+          @natural_gas_kwh = hash[:natural_gas_kwh]
+          @propane_kwh = hash[:propane_kwh]
+          @fuel_oil_kwh = hash[:fuel_oil_kwh]
+          @other_fuels_kwh = hash[:other_fuels_kwh]
+          @district_cooling_kwh = hash[:district_cooling_kwh]
+          @district_heating_kwh = hash[:district_heating_kwh]
+          @water_qbft = hash[:water_qbft]
+          @electricity_produced_kwh = hash[:electricity_produced_kwh]
           @end_uses = EndUses.new(hash[:end_uses])
 
-          @energy_production = hash[:energy_production]
+          @energy_production_kwh = hash[:energy_production_kwh]
 
-          @utility_costs = hash[:utility_costs]
+          @utility_costs_dollar = hash[:utility_costs_dollar]
 
           @comfort_result = hash[:comfort_result]
 
@@ -106,22 +108,24 @@ module URBANopt
           hash[:start_date] = Date.new.to_hash
           hash[:end_date] = Date.new.to_hash
 
-          hash[:total_site_energy] = nil
-          hash[:total_source_energy] = nil
-          hash [:net_site_energy] = nil
-          hash [:net_source_energy] = nil
-          hash [:net_utility_cost] = nil
-          hash [:total_utility_cost] = nil
-          hash [:electricity] = nil
-          hash [:natural_gas] = nil
-          hash [:additional_fuel] = nil
-          hash [:district_cooling] = nil
-          hash[:district_heating] = nil
-
-          hash[:electricity_produced] = nil
+          hash[:total_site_energy_kwh] = nil
+          hash[:total_source_energy_kwh] = nil
+          hash[:net_site_energy_kwh] = nil
+          hash[:net_source_energy_kwh] = nil
+          hash[:net_utility_cost_dollar] = nil
+          hash[:total_utility_cost_dollar] = nil
+          hash[:electricity_kwh] = nil
+          hash[:natural_gas_kwh] = nil
+          hash[:propane_kwh] = nil
+          hash[:fuel_oil_kwh] = nil
+          hash[:other_fuels_kwh] = nil
+          hash[:district_cooling_kwh] = nil
+          hash[:district_heating_kwh] = nil
+
+          hash[:electricity_produced_kwh] = nil
           hash[:end_uses] = EndUses.new.to_hash
-          hash[:energy_production] = { electricity_produced: { photovoltaic: nil } }
-          hash[:utility_costs] = [{ fuel_type: nil, total_cost: nil, usage_cost: nil, demand_cost: nil }]
+          hash[:energy_production_kwh] = { electricity_produced: { photovoltaic: nil } }
+          hash[:utility_costs_dollar] = [{ fuel_type: nil, total_cost_dollar: nil, usage_cost_dollar: nil, demand_cost_dollar: nil }]
           hash[:comfort_result] = { time_setpoint_not_met_during_occupied_cooling: nil, time_setpoint_not_met_during_occupied_heating: nil,
                                     time_setpoint_not_met_during_occupied_hours: nil, hours_out_of_comfort_bounds_PMV: nil, hours_out_of_comfort_bounds_PPD: nil }
 
@@ -142,32 +146,34 @@ module URBANopt
           result[:multiplier] = @multiplier if @multiplier
           result[:start_date] = @start_date.to_hash if @start_date
           result[:end_date] = @end_date.to_hash if @end_date
-          result[:total_site_energy] = @total_site_energy if @total_site_energy
-          result[:total_source_energy] = @total_source_energy if @total_source_energy
-          result[:net_site_energy] = @net_site_energy if @net_site_energy
-          result[:net_source_energy] = @net_source_energy if @net_source_energy
-          result[:net_utility_cost] = @net_utility_cost if @net_utility_cost
-          result[:total_utility_cost] = @total_utility_cost if @total_utility_cost
-          result[:electricity] = @electricity if @electricity
-          result[:natural_gas] = @natural_gas if @natural_gas
-          result[:additional_fuel] = @additional_fuel if @additional_fuel
-          result[:district_cooling] = @district_cooling if @district_cooling
-          result[:district_heating] = @district_heating if @district_heating
-          result[:water] = @water if @water
-          result[:electricity_produced] = @electricity_produced if @electricity_produced
+          result[:total_site_energy_kwh] = @total_site_energy_kwh if @total_site_energy_kwh
+          result[:total_source_energy_kwh] = @total_source_energy_kwh if @total_source_energy_kwh
+          result[:net_site_energy_kwh] = @net_site_energy_kwh if @net_site_energy_kwh
+          result[:net_source_energy_kwh] = @net_source_energy_kwh if @net_source_energy_kwh
+          result[:net_utility_cost_dollar] = @net_utility_cost_dollar if @net_utility_cost_dollar
+          result[:total_utility_cost_dollar] = @total_utility_cost_dollar if @total_utility_cost_dollar
+          result[:electricity_kwh] = @electricity_kwh if @electricity_kwh
+          result[:natural_gas_kwh] = @natural_gas_kwh if @natural_gas_kwh
+          result[:propane_kwh] = @propane_kwh if @propane_kwh
+          result[:fuel_oil_kwh] = @fuel_oil_kwh if @fuel_oil_kwh
+          result[:other_fuels_kwh] = @other_fuels_kwh if @other_fuels_kwh
+          result[:district_cooling_kwh] = @district_cooling_kwh if @district_cooling_kwh
+          result[:district_heating_kwh] = @district_heating_kwh if @district_heating_kwh
+          result[:water_qbft] = @water_qbft if @water_qbft
+          result[:electricity_produced_kwh] = @electricity_produced_kwh if @electricity_produced_kwh
           result[:end_uses] = @end_uses.to_hash if @end_uses
 
-          energy_production_hash = @energy_production if @energy_production
-          energy_production_hash.delete_if { |k, v| v.nil? }
-          energy_production_hash.each do |eph|
+          energy_production_kwh_hash = @energy_production_kwh if @energy_production_kwh
+          energy_production_kwh_hash.delete_if { |k, v| v.nil? }
+          energy_production_kwh_hash.each do |eph|
             eph.delete_if { |k, v| v.nil? }
           end
 
-          result[:energy_production] = energy_production_hash if @energy_production
+          result[:energy_production_kwh] = energy_production_kwh_hash if @energy_production_kwh
 
-          if @utility_costs.any?
-            result[:utility_costs] = @utility_costs
-            @utility_costs.each do |uc|
+          if @utility_costs_dollar.any?
+            result[:utility_costs_dollar] = @utility_costs_dollar
+            @utility_costs_dollar.each do |uc|
               uc&.delete_if { |k, v| v.nil? }
             end
           end
@@ -211,34 +217,36 @@ module URBANopt
         ##
         def self.merge_reporting_period(existing_period, new_period)
           # modify the existing_period by summing up the results
-          existing_period.total_site_energy = add_values(existing_period.total_site_energy, new_period.total_site_energy)
-          existing_period.total_source_energy = add_values(existing_period.total_source_energy, new_period.total_source_energy)
-          existing_period.net_source_energy = add_values(existing_period.net_source_energy, new_period.net_source_energy)
-          existing_period.net_utility_cost = add_values(existing_period.net_utility_cost, new_period.net_utility_cost)
-          existing_period.total_utility_cost = add_values(existing_period.total_utility_cost, new_period.total_utility_cost)
-          existing_period.electricity = add_values(existing_period.electricity, new_period.electricity)
-          existing_period.natural_gas = add_values(existing_period.natural_gas, new_period.natural_gas)
-          existing_period.additional_fuel = add_values(existing_period.additional_fuel, new_period.additional_fuel)
-          existing_period.district_cooling = add_values(existing_period.district_cooling, new_period.district_cooling)
-          existing_period.district_heating = add_values(existing_period.district_heating, new_period.district_heating)
-          existing_period.water = add_values(existing_period.water, new_period.water)
-          existing_period.electricity_produced = add_values(existing_period.electricity_produced, new_period.electricity_produced)
+          existing_period.total_site_energy_kwh = add_values(existing_period.total_site_energy_kwh, new_period.total_site_energy_kwh)
+          existing_period.total_source_energy_kwh = add_values(existing_period.total_source_energy_kwh, new_period.total_source_energy_kwh)
+          existing_period.net_source_energy_kwh = add_values(existing_period.net_source_energy_kwh, new_period.net_source_energy_kwh)
+          existing_period.net_utility_cost_dollar = add_values(existing_period.net_utility_cost_dollar, new_period.net_utility_cost_dollar)
+          existing_period.total_utility_cost_dollar = add_values(existing_period.total_utility_cost_dollar, new_period.total_utility_cost_dollar)
+          existing_period.electricity_kwh = add_values(existing_period.electricity_kwh, new_period.electricity_kwh)
+          existing_period.natural_gas_kwh = add_values(existing_period.natural_gas_kwh, new_period.natural_gas_kwh)
+          existing_period.propane_kwh = add_values(existing_period.propane_kwh, new_period.propane_kwh)
+          existing_period.fuel_oil_kwh = add_values(existing_period.fuel_oil_kwh, new_period.fuel_oil_kwh)
+          existing_period.other_fuels_kwh = add_values(existing_period.other_fuels_kwh, new_period.other_fuels_kwh)
+          existing_period.district_cooling_kwh = add_values(existing_period.district_cooling_kwh, new_period.district_cooling_kwh)
+          existing_period.district_heating_kwh = add_values(existing_period.district_heating_kwh, new_period.district_heating_kwh)
+          existing_period.water_qbft = add_values(existing_period.water_qbft, new_period.water_qbft)
+          existing_period.electricity_produced_kwh = add_values(existing_period.electricity_produced_kwh, new_period.electricity_produced_kwh)
 
           # merge end uses
           new_end_uses = new_period.end_uses
           existing_period.end_uses&.merge_end_uses!(new_end_uses)
 
-          if existing_period.energy_production
-            if existing_period.energy_production[:electricity_produced]
-              existing_period.energy_production[:electricity_produced][:photovoltaic] = add_values(existing_period.energy_production[:electricity_produced][:photovoltaic], new_period.energy_production[:electricity_produced][:photovoltaic])
+          if existing_period.energy_production_kwh
+            if existing_period.energy_production_kwh[:electricity_produced_kwh]
+              existing_period.energy_production_kwh[:electricity_produced_kwh][:photovoltaic_kwh] = add_values(existing_period.energy_production_kwh[:electricity_produced][:photovoltaic], new_period.energy_production_kwh[:electricity_produced_kwh][:photovoltaic_kwh])
             end
           end
 
-          existing_period.utility_costs&.each_with_index do |item, i|
-            existing_period.utility_costs[i][:fuel_type] = existing_period.utility_costs[i][:fuel_type]
-            existing_period.utility_costs[i][:total_cost] = add_values(existing_period.utility_costs[i][:total_cost], new_period.utility_costs[i][:total_cost])
-            existing_period.utility_costs[i][:usage_cost] = add_values(existing_period.utility_costs[i][:usage_cost], new_period.utility_costs[i][:usage_cost])
-            existing_period.utility_costs[i][:demand_cost] = add_values(existing_period.utility_costs[i][:demand_cost], new_period.utility_costs[i][:demand_cost])
+          existing_period.utility_costs_dollar&.each_with_index do |item, i|
+            existing_period.utility_costs_dollar[i][:fuel_type] = existing_period.utility_costs_dollar[i][:fuel_type]
+            existing_period.utility_costs_dollar[i][:total_cost] = add_values(existing_period.utility_costs_dollar[i][:total_cost], new_period.utility_costs_dollar[i][:total_cost])
+            existing_period.utility_costs_dollar[i][:usage_cost] = add_values(existing_period.utility_costs_dollar[i][:usage_cost], new_period.utility_costs_dollar[i][:usage_cost])
+            existing_period.utility_costs_dollar[i][:demand_cost] = add_values(existing_period.utility_costs_dollar[i][:demand_cost], new_period.utility_costs_dollar[i][:demand_cost])
           end
 
           if existing_period.comfort_result

data/lib/urbanopt/reporting/default_reports/scenario_report.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,

data/lib/urbanopt/reporting/default_reports/schema/README.md

@@ -1,6 +1,6 @@
 # URBANopt Scenario Schema
 
-The URBANopt Scenario Gem includes functionality for defining scenarios, running simulations, and post-processing results.  An URBANopt Scenario describes a specific set of options to apply to each Feature in a FeatureFile (e.g. each GeoJSON Feature in an URBANopt GeoJSON File).  User defined SimulationMapper classes translate each Feature to a SimulationDir which is a directory containing simulation input files.  A ScenarioRunner is used to perform simulations for each SimulationDir.  Finally, a ScenarioPostProcessor can run on a Scenario to generate scenario level results.  The [URBANopt Scenario Gem Design Document](https://docs.google.com/document/d/1ExcGuHliaSvPlrYevAJTSV8XAtTQXz_KQqH3p4iQDwg/edit) describes the gem in more detail.  The [URBANopt Example Project](https://github.com/urbanopt/urbanopt-example-project) demonstrates how to use the URBANopt Scenario Gem to perform a scenario analysis.
+The URBANopt <sup>&trade;</sup> Scenario Gem includes functionality for defining scenarios, running simulations, and post-processing results.  An URBANopt Scenario describes a specific set of options to apply to each Feature in a FeatureFile (e.g. each GeoJSON Feature in an URBANopt GeoJSON File).  User defined SimulationMapper classes translate each Feature to a SimulationDir which is a directory containing simulation input files.  A ScenarioRunner is used to perform simulations for each SimulationDir.  Finally, a ScenarioPostProcessor can run on a Scenario to generate scenario level results.  The [URBANopt Scenario Gem Design Document](https://docs.google.com/document/d/1ExcGuHliaSvPlrYevAJTSV8XAtTQXz_KQqH3p4iQDwg/edit) describes the gem in more detail.  The [URBANopt Example Project](https://github.com/urbanopt/urbanopt-example-project) demonstrates how to use the URBANopt Scenario Gem to perform a scenario analysis.
 
 ## Reporting output units
 

data/lib/urbanopt/reporting/default_reports/schema/scenario_csv_columns.txt

@@ -2,6 +2,9 @@ Datetime
 Electricity:Facility
 ElectricityProduced:Facility
 Gas:Facility
+Propane:Facility
+FuelOil#2:Facility
+OtherFuels:Facility
 Cooling:Electricity
 Heating:Electricity
 InteriorLights:Electricity
@@ -15,6 +18,18 @@ HeatRejection:Gas
 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
@@ -31,4 +46,6 @@ ElectricityProduced:Facility Power
 Electricity:Facility Apparent Power
 ElectricityProduced:Facility Apparent Power
 Net Power
-Net Apparent Power
+Net Apparent Power
+Ice Thermal Storage End Fraction
+Cooling Coil Ice Thermal Storage End Fraction

data/lib/urbanopt/reporting/default_reports/schema/scenario_schema.json

@@ -63,6 +63,9 @@
 				},
 				"distributed_generation": {
 					"$ref": "#/definitions/DistributedGeneration"
+				},
+				"thermal_storage": {
+					"$ref": "#/definitions/ThermalStorage"
 				}
 			},
 			"required": [
@@ -216,6 +219,9 @@
 				},
 				"power_distribution": {
 					"$ref": "#/definitions/PowerDistribution"
+				},
+				"thermal_storage": {
+					"$ref": "#/definitions/ThermalStorage"
 				}
 			},
 			"required": [
@@ -257,69 +263,77 @@
 				"end_date": {
 					"$ref": "#/definitions/Date"
 				},
-				"total_site_energy": {
-					"description": "Total energy used on site, does not include generation (kBtu)",
+				"total_site_energy_kwh": {
+					"description": "Total energy used on site, does not include generation (kWh)",
 					"type": "number"
 				},
-				"total_source_energy": {
-					"description": "Total source energy used, does not include generation (kBtu)",
+				"total_source_energy_kwh": {
+					"description": "Total source energy used, does not include generation (kWh)",
 					"type": "number"
 				},
-				"net_site_energy": {
-					"description": "Net site energy (kBtu)",
+				"net_site_energy_kwh": {
+					"description": "Net site energy (kWh)",
 					"type": "number"
 				},
-				"net_source_energy": {
-					"description": "Net source energy (kBtu)",
+				"net_source_energy_kwh": {
+					"description": "Net source energy (kWh)",
 					"type": "number"
 				},
-				"total_utility_cost": {
-					"description": "Total utility cost",
+				"total_utility_cost_dollar": {
+					"description": "Total utility cost ($)",
 					"type": "number"
 				},
-				"net_utility_cost": {
-					"description": "Net utility cost for reporting period includes generation",
+				"net_utility_cost_dollar": {
+					"description": "Net utility cost for reporting period includes generation ($)",
 					"type": "number"
 				},
-				"utility_costs": {
+				"utility_costs_dollar": {
 					"type": "array",
 					"items": {
 						"$ref": "#/definitions/UtilityCost"
 					}
 				},
-				"electricity": {
+				"electricity_kwh": {
 					"description": "Sum of all electricity used, does not include electricity produced (kWh)",
 					"type": "number"
 				},
-				"natural_gas": {
-					"description": "Sum of all natural gas end uses consumption (kBtu)",
+				"natural_gas_kwh": {
+					"description": "Sum of all natural gas end uses consumption (kWh)",
 					"type": "number"
 				},
-				"additional_fuel": {
-					"description": "Sum of all additional fuel end uses consumption (kBtu)",
+        "propane_kwh": {
+					"description": "Sum of all propane end uses consumption (kWh)",
+					"type": "number"
+        },
+        "fuel_oil_kwh": {
+					"description": "Sum of all fuel oil #2 end uses consumption (kWh)",
+					"type": "number"
+        },
+				"other_fuels_kwh": {
+					"description": "Sum of all other (fuel oil #1, diesel, gasoline, coal, steam) fuel end uses consumption (kWh)",
 					"type": "number"
 				},
-				"district_cooling": {
-					"description": "Sum of all distric cooling end uses consumption (kBtu)",
+				"district_cooling_kwh": {
+					"description": "Sum of all distric cooling end uses consumption (kWh)",
 					"type": "number"
 				},
-				"district_heating": {
-					"description": "Sum of all distric heating end uses consumption (kBtu)",
+				"district_heating_kwh": {
+					"description": "Sum of all distric heating end uses consumption (kWh)",
 					"type": "number"
 				},
-				"water": {
+				"water_qbft": {
 					"description": "Sum of all water end uses consumption (ft^3)",
 					"type": "number"
 				},
-				"electricity_produced": {
+				"electricity_produced_kwh": {
 					"description": "Sum of all electricity produced (kWh)",
 					"type": "number"
 				},
 				"end_uses": {
 					"$ref": "#/definitions/EndUses"
 				},
-				"energy_production": {
-					"description": "Energy produced for reporting period.  Electricity reported in kWh, water in m^3, all others in kBtu.",
+				"energy_production_kwh": {
+					"description": "Energy produced for reporting period.  Water reported in m^3, all others in kWh.",
 					"type": "object",
 					"properties": {
 						"electricity_produced": {
@@ -356,25 +370,31 @@
 			"additionalProperties": false
 		},
 		"EndUses": {
-			"description": "End uses for reporting period.  Does not include energy produced. Electricity reported in kWh, water in m^3, all others in kBtu.",
+			"description": "End uses for reporting period.  Does not include energy produced. Water reported in m^3, all others in kWh.",
 			"type": "object",
 			"properties": {
-				"electricity": {
+				"electricity_kwh": {
 					"$ref": "#/definitions/EndUse"
 				},
-				"natural_gas": {
+				"natural_gas_kwh": {
 					"$ref": "#/definitions/EndUse"
 				},
-				"additional_fuel": {
+        "propane_kwh": {
+          "$ref": "#/definitions/EndUse"
+        },
+        "fuel_oil_kwh": {
+          "$ref": "#/definitions/EndUse"
+        },
+				"other_fuels_kwh": {
 					"$ref": "#/definitions/EndUse"
 				},
-				"district_cooling": {
+				"district_cooling_kwh": {
 					"$ref": "#/definitions/EndUse"
 				},
-				"district_heating": {
+				"district_heating_kwh": {
 					"$ref": "#/definitions/EndUse"
 				},
-				"water": {
+				"water_qbft": {
 					"$ref": "#/definitions/EndUse"
 				}
 			},
@@ -516,9 +536,11 @@
 					"enum": [
 						"Electricity",
 						"Natural Gas",
+            "Propane",
+            "Fuel Oil",
 						"District Cooling",
 						"District Heating",
-						"Additional Fuel",
+						"Other Fuels",
 						"Water"
 					]
 				},
@@ -540,15 +562,15 @@
 		"Location": {
 			"type": "object",
 			"properties": {
-				"latitude": {
-					"description": "(deg)",
+				"latitude_deg": {
+					"description": "latitude for the centroid of the feature (deg)",
 					"type": "number"
 				},
-				"longitude": {
-					"description": "(deg)",
+				"longitude_deg": {
+					"description": "longitude for the centroid of the feature (deg)",
 					"type": "number"
 				},
-				"surface_elevation": {
+				"surface_elevation_ft": {
 					"description": "The surface elevation (above NAVD88 datum) (ft).",
 					"type": "number"
 				},
@@ -567,27 +589,27 @@
 		"Program": {
 			"type": "object",
 			"properties": {
-				"site_area": {
+				"site_area_sqft": {
 					"description": "Area of the entire site or lot (ft^2)",
 					"type": "number"
 				},
-				"floor_area": {
+				"floor_area_sqft": {
 					"description": "Building gross floor area (ft^2)",
 					"type": "number"
 				},
-				"conditioned_area": {
+				"conditioned_area_sqft": {
 					"description": "Building conditioned floor area (ft^2)",
 					"type": "number"
 				},
-				"unconditioned_area": {
+				"unconditioned_area_sqft": {
 					"description": "Building unconditioned floor area (ft^2)",
 					"type": "number"
 				},
-				"footprint_area": {
+				"footprint_area_sqft": {
 					"description": "Building floorprint area (ft^2)",
 					"type": "number"
 				},
-				"maximum_roof_height": {
+				"maximum_roof_height_ft": {
 					"description": "Maximum height of the roof relative to surface elevation (ft)",
 					"type": "number"
 				},
@@ -599,7 +621,7 @@
 					"description": "The maximum number of building stories above ground",
 					"type": "number"
 				},
-				"parking_area": {
+				"parking_area_sqft": {
 					"description": "Parking gross area (ft^2)",
 					"type": "number"
 				},
@@ -611,11 +633,11 @@
 					"description": "Number of parking spaces with electric vehicle charging",
 					"type": "number"
 				},
-				"parking_footprint_area": {
+				"parking_footprint_area_sqft": {
 					"description": "Parking floorprint area (ft^2)",
 					"type": "number"
 				},
-				"maximum_parking_height": {
+				"maximum_parking_height_ft": {
 					"description": "Maximum height of the parking structure relative to surface elevation (ft)",
 					"type": "number"
 				},
@@ -637,84 +659,84 @@
 						"$ref": "#/definitions/BuildingType"
 					}
 				},
-				"window_area": {
+				"window_area_sqft": {
 					"description": "Exterior windows gross area (ft^2)",
 					"type": "object",
 					"properties": {
-						"north_window_area": {
+						"north_window_area_sqft": {
 							"type": "number"
 						},
-						"south_window_area": {
+						"south_window_area_sqft": {
 							"type": "number"
 						},
-						"east_window_area": {
+						"east_window_area_sqft": {
 							"type": "number"
 						},
-						"west_window_area": {
+						"west_window_area_sqft": {
 							"type": "number"
 						},
-						"total_window_area": {
+						"total_window_area_sqft": {
 							"type": "number"
 						}
 					},
 					"required": [
-						"total_window_area"
+						"total_window_area_sqft"
 					],
 					"additionalProperties": false
 				},
-				"wall_area": {
+				"wall_area_sqft": {
 					"description": "exterior walls gross area (ft^2)",
 					"type": "object",
 					"properties": {
-						"north_wall_area": {
+						"north_wall_area_sqft": {
 							"type": "number"
 						},
-						"south_wall_area": {
+						"south_wall_area_sqft": {
 							"type": "number"
 						},
-						"east_wall_area": {
+						"east_wall_area_sqft": {
 							"type": "number"
 						},
-						"west_wall_area": {
+						"west_wall_area_sqft": {
 							"type": "number"
 						},
-						"total_wall_area": {
+						"total_wall_area_sqft": {
 							"type": "number"
 						}
 					},
 					"required": [
-						"north_wall_area",
-						"south_wall_area",
-						"east_wall_area",
-						"west_wall_area",
-						"total_wall_area"
+						"north_wall_area_sqft",
+						"south_wall_area_sqft",
+						"east_wall_area_sqft",
+						"west_wall_area_sqft",
+						"total_wall_area_sqft"
 					],
 					"additionalProperties": false
 				},
-				"roof_area": {
+				"roof_area_sqft": {
 					"type": "object",
 					"properties": {
-						"equipment_roof_area": {
+						"equipment_roof_area_sqft": {
 							"type": "number"
 						},
-						"photovoltaic_roof_area": {
+						"photovoltaic_roof_area_sqft": {
 							"type": "number"
 						},
-						"available_roof_area": {
+						"available_roof_area_sqft": {
 							"description": "gross roof area (ft^2)",
 							"type": "number"
 						},
-						"total_roof_area": {
+						"total_roof_area_sqft": {
 							"description": "Exterior roofs gross area (ft^2)",
 							"type": "number"
 						}
 					},
 					"required": [
-						"total_roof_area"
+						"total_roof_area_sqft"
 					],
 					"additionalProperties": false
 				},
-				"orientation": {
+				"orientation_deg": {
 					"description": "Rotation of longest axis from East-West,about up axis (deg)",
 					"type": "number"
 				},
@@ -722,22 +744,22 @@
 					"description": "Ratio of longest to shortest axis",
 					"type": "number"
 				},
-				"total_construction_cost": {
+				"total_construction_cost_dollar": {
 					"description": "total construction cost calculated from the defined cost per floor area ($)",
 					"type": "number"
 				}
 			},
 			"required": [
-				"floor_area",
-				"conditioned_area",
-				"unconditioned_area",
-				"footprint_area",
-				"maximum_roof_height",
+				"floor_area_sqft",
+				"conditioned_area_sqft",
+				"unconditioned_area_sqft",
+				"footprint_area_sqft",
+				"maximum_roof_height_ft",
 				"number_of_residential_units",
 				"building_types",
-				"window_area",
-				"wall_area",
-				"roof_area"
+				"window_area_sqft",
+				"wall_area_sqft",
+				"roof_area_sqft"
 			],
 			"additionalProperties": false
 		},
@@ -852,6 +874,19 @@
 					"type": "number"
 				}
 			}
+		},
+		"ThermalStorage": {
+			"type": "object",
+			"properties": {
+				"its_size": {
+					"description": "Total central plant TES capacity in kWh",
+					"type": "number"
+				},
+				"ptes_size": {
+					"description": "Total distributed/packaged TES capacity in kWh",
+					"type": "number"
+				}
+			}
 		}
 	}
 }