urbanopt-scenario 0.1.1 → 0.3.0

data/lib/urbanopt/scenario/default_reports/power_distribution.rb

@@ -0,0 +1,102 @@
+# *********************************************************************************
+# URBANopt, 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,
+# are permitted provided that the following conditions are met:
+#
+# Redistributions of source code must retain the above copyright notice, this list
+# of conditions and the following disclaimer.
+#
+# Redistributions in binary form must reproduce the above copyright notice, this
+# list of conditions and the following disclaimer in the documentation and/or other
+# materials provided with the distribution.
+#
+# Neither the name of the copyright holder nor the names of its contributors may be
+# used to endorse or promote products derived from this software without specific
+# prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+# OF THE POSSIBILITY OF SUCH DAMAGE.
+# *********************************************************************************
+
+require 'json'
+require 'urbanopt/scenario/default_reports/validator'
+require 'json-schema'
+
+module URBANopt
+  module Scenario
+    module DefaultReports
+      ##
+      # power_distributio include eletrical power distribution systems information.
+      ##
+      class PowerDistribution
+        attr_accessor :under_voltage_hours, :over_voltage_hours # :nodoc:
+        ##
+        # PowerDistrinution class intialize all power_distribution attributes:
+        # +:under_voltage_hours+ , +:over_voltage_hours+
+        ##
+        # [parameters:]
+        # +hash+ - _Hash_ - A hash which may contain a deserialized power_distribution.
+        ##
+        def initialize(hash = {})
+          hash.delete_if { |k, v| v.nil? }
+          hash = defaults.merge(hash)
+
+          @under_voltage_hours = hash[:under_voltage_hours]
+          @over_voltage_hours = hash[:over_voltage_hours]
+
+          # initialize class variables @@validator and @@schema
+          @@validator ||= Validator.new
+          @@schema ||= @@validator.schema
+        end
+
+        ##
+        # Assigns default values if attribute values do not exist.
+        ##
+        def defaults
+          hash = {}
+          hash[:under_voltage_hours] = nil
+          hash[:over_voltage_hours] = nil
+
+          return hash
+        end
+
+        ##
+        # Converts to a Hash equivalent for JSON serialization.
+        ##
+        # - Exclude attributes with nil values.
+        # - Validate power_distribution hash properties against schema.
+        ##
+        def to_hash
+          result = {}
+          result[:under_voltage_hours] = @under_voltage_hours if @under_voltage_hours
+          result[:over_voltage_hours] = @over_voltage_hours if @over_voltage_hours
+
+          # validate power_distribution properties against schema
+          if @@validator.validate(@@schema[:definitions][:PowerDistribution][:properties], result).any?
+            raise "power_distribution properties does not match schema: #{@@validator.validate(@@schema[:definitions][:PowerDistribution][:properties], result)}"
+          end
+
+          return result
+        end
+
+        ##
+        # Merges muliple power distribution results together.
+        ##
+        # +new_costs+ - _Array_ - An array of ConstructionCost objects.
+        def merge_power_distribition
+          # method to be developed for any attributes to be aggregated or merged
+        end
+      end
+    end
+  end
+end

data/lib/urbanopt/scenario/default_reports/program.rb

@@ -44,7 +44,7 @@ module URBANopt
                       :number_of_parking_spaces_charging, :parking_footprint_area, :maximum_parking_height, :maximum_number_of_parking_stories,
                       :maximum_number_of_parking_stories_above_ground, :number_of_residential_units, :building_types, :building_type, :maximum_occupancy,
                       :area, :window_area, :north_window_area, :south_window_area, :east_window_area, :west_window_area, :wall_area, :roof_area, :equipment_roof_area,
-                      :photovoltaic_roof_area, :available_roof_area, :total_roof_area, :orientation, :aspect_ratio # :nodoc:
+                      :photovoltaic_roof_area, :available_roof_area, :total_roof_area, :orientation, :aspect_ratio, :total_construction_cost # :nodoc:
         # Program class initialize building program attributes: +:site_area+ , +:floor_area+ , +:conditioned_area+ , +:unconditioned_area+ ,
         # +:footprint_area+ , +:maximum_roof_height, +:maximum_number_of_stories+ , +:maximum_number_of_stories_above_ground+ , +:parking_area+ ,
         # +:number_of_parking_spaces+ , +:number_of_parking_spaces_charging+ , +:parking_footprint_area+ , +:maximum_parking_height+ , +:maximum_number_of_parking_stories+ ,
@@ -81,6 +81,7 @@ module URBANopt
           @roof_area = hash[:roof_area]
           @orientation = hash[:orientation]
           @aspect_ratio = hash[:aspect_ratio]
+          @total_construction_cost = hash[:total_construction_cost]
 
           # initialize class variables @@validator and @@schema
           @@validator ||= Validator.new
@@ -114,6 +115,7 @@ module URBANopt
           hash[:roof_area] = { equipment_roof_area: nil, photovoltaic_roof_area: nil, available_roof_area: nil, total_roof_area: nil }
           hash[:orientation] = nil
           hash[:aspect_ratio] = nil
+          hash[:total_construction_cost] = nil
           return hash
         end
 
@@ -167,6 +169,8 @@ module URBANopt
           result[:orientation] = @orientation if @orientation
           result[:aspect_ratio] = @aspect_ratio if @aspect_ratio
 
+          result[:total_construction_cost] = @total_construction_cost if @total_construction_cost
+
           # validate program properties against schema
           if @@validator.validate(@@schema[:definitions][:Program][:properties], result).any?
             raise "program properties does not match schema: #{@@validator.validate(@@schema[:definitions][:Program][:properties], result)}"
@@ -215,7 +219,6 @@ module URBANopt
         # [parameters:]
         # +other+ - _Program_ - An object of Program class.
         ##
-        # rubocop:disable Metrics/AbcSize # :nodoc:
         def add_program(other)
           @site_area = add_values(@site_area, other.site_area)
 
@@ -234,6 +237,7 @@ module URBANopt
           @maximum_number_of_parking_stories = max_value(@maximum_number_of_parking_stories, other.maximum_number_of_parking_stories)
           @maximum_number_of_parking_stories_above_ground = max_value(maximum_number_of_parking_stories_above_ground, other.maximum_number_of_parking_stories_above_ground)
           @number_of_residential_units = add_values(@number_of_residential_units, other.number_of_residential_units)
+          @total_construction_cost = add_values(@total_construction_cost, other.total_construction_cost)
 
           @building_types = other.building_types
 

data/lib/urbanopt/scenario/default_reports/reporting_period.rb

@@ -43,14 +43,14 @@ module URBANopt
       ##
       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, :net_utility_cost, :electricity, :natural_gas, :additional_fuel, :district_cooling,
-                      :district_heating, :water, :electricity_produced, :end_uses, :energy_production, :photovoltaic, :utility_costs,
+                      :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,
-                      :time_setpoint_not_met_during_occupied_heating, :time_setpoint_not_met_during_occupied_hours #:nodoc:
+                      :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+ , +:net_utility_cost+ , +:electricity+ , +:natural_gas+ , +:additional_fuel+ , +:district_cooling+ ,
-        # +:district_heating+ , +:water+ , +:electricity_produced+ , +:end_uses+ , +:energy_production+ , +:photovoltaic+ , +:utility_costs+ ,
+        # +: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+ ,
         # +:time_setpoint_not_met_during_occupied_heating+ , +:time_setpoint_not_met_during_occupied_hours+
         ##
@@ -72,6 +72,7 @@ module URBANopt
           @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]
@@ -109,6 +110,7 @@ module URBANopt
           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
@@ -119,7 +121,8 @@ module URBANopt
           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[: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 }
+          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 }
 
           return hash
         end
@@ -143,6 +146,7 @@ module URBANopt
           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
@@ -204,13 +208,13 @@ module URBANopt
         ##
         # +new_period+ - _ReportingPeriod_ - An object of ReportingPeriod class.
         ##
-        # rubocop: disable Metrics/AbcSize
         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)
@@ -230,9 +234,9 @@ module URBANopt
           end
 
           if existing_period.utility_costs
-
+            # RK: this need to be updated
             existing_period.utility_costs.each_with_index do |item, i|
-              existing_period.utility_costs[i][:fuel_type] = add_values(existing_period.utility_costs[i][:fuel_type], new_period.utility_costs[i][:fuel_type])
+              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])
@@ -244,6 +248,8 @@ module URBANopt
             existing_period.comfort_result[:time_setpoint_not_met_during_occupied_cooling] = add_values(existing_period.comfort_result[:time_setpoint_not_met_during_occupied_cooling], new_period.comfort_result[:time_setpoint_not_met_during_occupied_cooling])
             existing_period.comfort_result[:time_setpoint_not_met_during_occupied_heating] = add_values(existing_period.comfort_result[:time_setpoint_not_met_during_occupied_heating], new_period.comfort_result[:time_setpoint_not_met_during_occupied_heating])
             existing_period.comfort_result[:time_setpoint_not_met_during_occupied_hours] = add_values(existing_period.comfort_result[:time_setpoint_not_met_during_occupied_hours], new_period.comfort_result[:time_setpoint_not_met_during_occupied_hours])
+            existing_period.comfort_result[:hours_out_of_comfort_bounds_PMV] = add_values(existing_period.comfort_result[:hours_out_of_comfort_bounds_PMV], new_period.comfort_result[:hours_out_of_comfort_bounds_PMV])
+            existing_period.comfort_result[:hours_out_of_comfort_bounds_PPD] = add_values(existing_period.comfort_result[:hours_out_of_comfort_bounds_PPD], new_period.comfort_result[:hours_out_of_comfort_bounds_PPD])
           end
 
           return existing_period

data/lib/urbanopt/scenario/default_reports/scenario_report.rb

@@ -78,6 +78,7 @@ module URBANopt
           @timeseries_csv = TimeseriesCSV.new(hash[:timeseries_csv])
           @location = Location.new(hash[:location])
           @program = Program.new(hash[:program])
+          @distributed_generation = DistributedGeneration.new(hash[:distributed_generation] || {})
 
           @construction_costs = []
           hash[:construction_costs].each do |cc|
@@ -95,8 +96,8 @@ module URBANopt
             @feature_reports << FeatureReport.new(fr)
           end
 
-          @distributed_generation = DistributedGeneration.new(hash[:distributed_generation] || {})
           @file_name = 'default_scenario_report'
+
           # initialize class variables @@validator and @@schema
           @@validator ||= Validator.new
           @@schema ||= @@validator.schema
@@ -142,15 +143,15 @@ module URBANopt
         end
 
         ##
-        # Saves the 'default_feature_report.json' and 'default_scenario_report.csv' files
+        # Saves the 'default_scenario_report.json' and 'default_scenario_report.csv' files
         ##
         # [parameters]:
-        # +file_name+ - _String_ - Assign a name to the saved scenario results file
+        # +file_name+ - _String_ - Assign a name to the saved scenario results file without an extension
         def save(file_name = 'default_scenario_report')
           # reassign the initialize local variable @file_name to the file name input.
           @file_name = file_name
 
-          # save the csv data
+          # save the scenario reports csv and json data
           old_timeseries_path = nil
           if !@timeseries_csv.path.nil?
             old_timeseries_path = @timeseries_csv.path
@@ -181,8 +182,14 @@ module URBANopt
           if !old_timeseries_path.nil?
             @timeseries_csv.path = old_timeseries_path
           else
-            @timeseries_csv.path = File.join(@directory_name, 'default_scenario_report.csv')
+            @timeseries_csv.path = File.join(@directory_name, file_name + '.csv')
           end
+
+          # save the feature reports csv and json data
+          # @feature_reports.each do |feature_report|
+          #  feature_report.save_feature_report()
+          # end
+
           return true
         end
 
@@ -243,14 +250,24 @@ module URBANopt
         # +feature_report+ - _FeatureReport_ - An object of FeatureReport class.
         ##
         def add_feature_report(feature_report)
-          if @timesteps_per_hour.nil?
+          # check if the timesteps_per_hour are identical
+          if @timesteps_per_hour.nil? || @timesteps_per_hour == ''
             @timesteps_per_hour = feature_report.timesteps_per_hour
           else
-            if feature_report.timesteps_per_hour != @timesteps_per_hour
+            if feature_report.timesteps_per_hour.is_a?(Integer) && feature_report.timesteps_per_hour != @timesteps_per_hour
               raise "FeatureReport timesteps_per_hour = '#{feature_report.timesteps_per_hour}' does not match scenario timesteps_per_hour '#{@timesteps_per_hour}'"
             end
           end
 
+          # check if first report_report_datetime are identical.
+          if @timeseries_csv.first_report_datetime.nil? || @timeseries_csv.first_report_datetime == ''
+            @timeseries_csv.first_report_datetime = feature_report.timeseries_csv.first_report_datetime
+          else
+            if feature_report.timeseries_csv.first_report_datetime != @timeseries_csv.first_report_datetime
+              raise "first_report_datetime '#{@first_report_datetime}' does not match other.first_report_datetime '#{feature_report.timeseries_csv.first_report_datetime}'"
+            end
+          end
+
           # check that we have not already added this feature
           id = feature_report.id
           @feature_reports.each do |existing_feature_report|

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

@@ -18,17 +18,16 @@ The URBANopt Scenario Gem includes functionality for defining scenarios, running
 
 |            output                        |  unit   |
 | -----------------------------------------| ------- |
-| Electricity:Facility                     | kbtu     |
-| ElectricityProduced:Facility             | kbtu     |
-| Gas:Facility                             | kbtu    |
-| DistrictCooling:Facility                 | kbtu    |
-| DistrictHeating:Facility                 | kbtu    |
+| Electricity:Facility                     | kWh     |
+| ElectricityProduced:Facility             | kWh     |
+| Gas:Facility                             | kBtu    |
+| DistrictCooling:Facility                 | kWh     |
+| DistrictHeating:Facility                 | kWh     |
 | District Cooling Chilled Water Rate      | GPM     |
-| District Cooling Mass Flow Rate          | lbs/min |
-| District Cooling Inlet Temperature       | °F  |
-| District Cooling Outlet Temperature      | °F  |
+| District Cooling Mass Flow Rate          | kg/s    |
+| District Cooling Inlet Temperature       | °C  |
+| District Cooling Outlet Temperature      | °C  |
 | District Heating Hot Water Rate          | GPM     |
-| District Heating Mass Flow Rate          | lbs/min |
-| District Heating Inlet Temperature       | °F  |
-| District Heating Outlet Temperature      | °F  |
-| Electricity:Grid:ToLoad                  | kWh.    |
+| District Heating Mass Flow Rate          | kg/s    |
+| District Heating Inlet Temperature       | °C  |
+| District Heating Outlet Temperature      | °C  |

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

@@ -1,13 +1,34 @@
-Electricity:Facility	
-ElectricityProduced:Facility	
-Gas:Facility	
-DistrictCooling:Facility	
-DistrictHeating:Facility	
-District Cooling Chilled Water Rate	
-District Cooling Mass Flow Rate	
-District Cooling Inlet Temperature	
-District Cooling Outlet Temperature	
-District Heating Hot Water Rate	
-District Heating Mass Flow Rate	
-District Heating Inlet Temperature	
+Datetime
+Electricity:Facility
+ElectricityProduced:Facility
+Gas:Facility
+Cooling:Electricity
+Heating:Electricity
+InteriorLights:Electricity
+ExteriorLights:Electricity
+InteriorEquipment:Electricity
+Fans:Electricity
+Pumps:Electricity
+WaterSystems:Electricity
+HeatRejection:Electricity
+HeatRejection:Gas
+Heating:Gas
+WaterSystems:Gas
+InteriorEquipment:Gas
+DistrictCooling:Facility
+DistrictHeating:Facility
+District Cooling Chilled Water Rate
+District Cooling Mass Flow Rate
+District Cooling Inlet Temperature
+District Cooling Outlet Temperature
+District Heating Hot Water Rate
+District Heating Mass Flow Rate
+District Heating Inlet Temperature
 District Heating Outlet Temperature
+Net Electric Energy
+Electricity:Facility Power
+ElectricityProduced:Facility Power
+Electricity:Facility Apparent Power
+ElectricityProduced:Facility Apparent Power
+Net Power
+Net Apparent Power

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

@@ -64,7 +64,6 @@
 				"distributed_generation": {
 					"$ref": "#/definitions/DistributedGeneration"
 				}
-				
 			},
 			"required": [
 				"id",
@@ -83,42 +82,42 @@
 			"type": "object",
 			"properties": {
 				"lcc_us_dollars": {
-					"type": "number", 
-					"description": "Optimal lifecycle cost"
+					"description": "Optimal lifecycle cost",
+					"type": "number"
 				},
 				"npv_us_dollars": {
-					"type": "number", 
-					"description": "Net present value of savings realized by the project"
+					"description": "Net present value of savings realized by the project",
+					"type": "number"
 				},
 				"year_one_energy_cost_us_dollars": {
-					"type": "number", 
-					"description": "Optimal year one utility energy cost"
+					"description": "Optimal year one utility energy cost",
+					"type": "number"
 				},
 				"year_one_demand_cost_us_dollars": {
-					"type": "number", 
-					"description": "Optimal year one utility demand cost"
+					"description": "Optimal year one utility demand cost",
+					"type": "number"
 				},
 				"year_one_bill_us_dollars": {
-					"type": "number", 
-					"description": "Optimal year one utility bill"
+					"description": "Optimal year one utility bill",
+					"type": "number"
 				},
 				"total_energy_cost_us_dollars": {
-					"type": "number", 
-					"description": "Total utility energy cost over the lifecycle, after-tax"
+					"description": "Total utility energy cost over the lifecycle, after-tax",
+					"type": "number"
 				},
-				"SolarPV" : {
+				"SolarPV": {
 					"$ref": "#/definitions/SolarPV"
 				},
-				"Wind" : {
+				"Wind": {
 					"$ref": "#/definitions/Wind"
 				},
-				"Generator" : {
+				"Generator": {
 					"$ref": "#/definitions/Generator"
 				},
-				"Storage" : {
+				"Storage": {
 					"$ref": "#/definitions/Storage"
 				}
-			 }
+			}
 		},
 		"SolarPV": {
 			"type": "object",
@@ -214,6 +213,9 @@
 				},
 				"distributed_generation": {
 					"$ref": "#/definitions/DistributedGeneration"
+				},
+				"power_distribution": {
+					"$ref": "#/definitions/PowerDistribution"
 				}
 			},
 			"required": [
@@ -271,10 +273,20 @@
 					"description": "Net source energy (kBtu)",
 					"type": "number"
 				},
+				"total_utility_cost": {
+					"description": "Total utility cost",
+					"type": "number"
+				},
 				"net_utility_cost": {
-					"description": "Total utility cost for reporting period includes generation",
+					"description": "Net utility cost for reporting period includes generation",
 					"type": "number"
 				},
+				"utility_costs": {
+					"type": "array",
+					"items": {
+						"$ref": "#/definitions/UtilityCost"
+					}
+				},
 				"electricity": {
 					"description": "Sum of all electricity used, does not include electricity produced (kWh)",
 					"type": "number"
@@ -322,12 +334,6 @@
 					},
 					"additionalProperties": false
 				},
-				"utility_costs": {
-					"type": "array",
-					"items": {
-						"$ref": "#/definitions/UtilityCost"
-					}
-				},
 				"comfort_result": {
 					"$ref": "#/definitions/ComfortResult"
 				}
@@ -436,6 +442,12 @@
 				"time_setpoint_not_met_during_occupied_hours": {
 					"description": "(hrs)",
 					"type": "number"
+				},
+				"hours_out_of_comfort_bounds_PMV": {
+					"type": "number"
+				},
+				"hours_out_of_comfort_bounds_PPD": {
+					"type": "number"
 				}
 			},
 			"additionalProperties": false
@@ -709,6 +721,10 @@
 				"aspect_ratio": {
 					"description": "Ratio of longest to shortest axis",
 					"type": "number"
+				},
+				"total_construction_cost": {
+					"description": "total construction cost calculated from the defined cost per floor area ($)",
+					"type": "number"
 				}
 			},
 			"required": [
@@ -825,6 +841,17 @@
 				"column_names"
 			],
 			"additionalProperties": false
+		},
+		"PowerDistribution": {
+			"type": "object",
+			"properties": {
+				"over_voltage_hours": {
+					"type": "number"
+				},
+				"under_voltage_hours": {
+					"type": "number"
+				}
+			}
 		}
 	}
 }