urbanopt-reporting 0.5.0 → 0.6.2

data/lib/measures/.rubocop.yml

@@ -1,5 +1,7 @@
 AllCops:
   Exclude:
-    - 'spec/test_measures/**/*'
+    - gems/**/*
+require: rubocop-performance
+
 inherit_from:
-  - http://s3.amazonaws.com/openstudio-resources/styles/rubocop_v3.yml
+  - http://s3.amazonaws.com/openstudio-resources/styles/rubocop_v4.yml

data/lib/measures/default_feature_reports/measure.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt™, Copyright (c) 2019-2021, Alliance for Sustainable Energy, LLC, and other
+# URBANopt™, Copyright (c) 2019-2022, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without modification,
@@ -215,6 +215,8 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
     result << OpenStudio::IdfObject.load("Output:Meter:MeterFileOnly,NaturalGas:Facility,#{reporting_frequency};").get
     result << OpenStudio::IdfObject.load("Output:Meter:MeterFileOnly,DistrictCooling:Facility,#{reporting_frequency};").get
     result << OpenStudio::IdfObject.load("Output:Meter:MeterFileOnly,DistrictHeating:Facility,#{reporting_frequency};").get
+    result << OpenStudio::IdfObject.load("Output:Meter:MeterFileOnly,Propane:Facility,#{reporting_frequency};").get
+    result << OpenStudio::IdfObject.load("Output:Meter:MeterFileOnly,FuelOilNo2:Facility,#{reporting_frequency};").get
 
     # result << OpenStudio::IdfObject.load("Output:Meter:MeterFileOnly,Cooling:Electricity,#{reporting_frequency};").get
     # result << OpenStudio::IdfObject.load("Output:Meter:MeterFileOnly,Heating:Electricity,#{reporting_frequency};").get
@@ -230,6 +232,15 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
     result << OpenStudio::IdfObject.load('Output:Variable,*,Heating Coil Heating Rate,hourly; !- HVAC Average [W];').get
     # result << OpenStudio::IdfObject.load("Output:Variable,*,Exterior Equipment:Electric Vehicles,#{reporting_frequency};").get
 
+    ## add environmental factor outputs
+    #result << OpenStudio::IdfObject.load("Output:Meter:MeterFileOnly,Output:EnvironmentalImpactFactors,#{reporting_frequency};").get
+    # result << OpenStudio::IdfObject.load("Output:Variable,*,Environmental Impact Total N2O Emissions Carbon Equivalent Mass,#{reporting_frequency}; !- HVAC Sum [kg];").get
+    # result << OpenStudio::IdfObject.load("Output:Variable,*,Environmental Impact Total CH4 Emissions Carbon Equivalent Mass,#{reporting_frequency}; !- HVAC Sum [kg];").get
+    # result << OpenStudio::IdfObject.load("Output:Variable,*,Environmental Impact Total CO2 Emissions Carbon Equivalent Mass,#{reporting_frequency}; !- HVAC Sum [kg];").get
+    # result << OpenStudio::IdfObject.load("Output:Variable,*,Environmental Impact NaturalGas CO2 Emissions Mass,#{reporting_frequency}; !- HVAC Sum [kg];").get
+    # result << OpenStudio::IdfObject.load("Output:Variable,*,Environmental Impact NaturalGas CH4 Emissions Mass,#{reporting_frequency}; !- HVAC Sum [kg];").get
+    # result << OpenStudio::IdfObject.load("Output:Variable,*,Environmental Impact NaturalGas N2O Emissions Mass,#{reporting_frequency}; !- HVAC Sum [kg];").get
+
     timeseries_data = ['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',
@@ -240,7 +251,15 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
 
     ev_timeseries_data = ['Exterior Equipment:Electric Vehicles']
 
+    emissions_timeseries_data = ['Future_Annual_Electricity_Emissions', 'Future_Hourly_Electricity_Emissions',
+                                  'Historical_Annual_Electricity_Emissions', 'Historical_Hourly_Electricity_Emissions',
+                                  'Future_Annual_Electricity_Emissions_Intensity', 'Future_Hourly_Electricity_Emissions_Intensity',
+                                  'Historical_Annual_Electricity_Emissions_Intensity', 'Historical_Hourly_Electricity_Emissions_Intensity']
+
+
+
     timeseries_data += tes_timeseries_data
+    timeseries_data += emissions_timeseries_data
 
     timeseries_data.each do |ts|
       result << OpenStudio::IdfObject.load("Output:Variable,*,#{ts},#{reporting_frequency};").get
@@ -344,6 +363,20 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
     sql_file = sql_file.get
     model.setSqlFile(sql_file)
 
+    # Get the weather file run period (as opposed to design day run period)
+    ann_env_pd = nil
+    sql_file.availableEnvPeriods.each do |env_pd|
+      env_type = sql_file.environmentType(env_pd)
+      if env_type.is_initialized && (env_type.get == OpenStudio::EnvironmentType.new('WeatherRunPeriod'))
+        ann_env_pd = env_pd
+      end
+    end
+
+    if ann_env_pd == false
+      runner.registerError("Can't find a weather runperiod, make sure you ran an annual simulation, not just the design days.")
+      return false
+    end
+
     # get building from model
     building = model.getBuilding
 
@@ -801,22 +834,64 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
     time_setpoint_not_met_during_occupied_hours = time_setpoint_not_met_during_occupied_heating + time_setpoint_not_met_during_occupied_cooling
     feature_report.reporting_periods[0].comfort_result[:time_setpoint_not_met_during_occupied_hours] = time_setpoint_not_met_during_occupied_hours
 
-    ######################################## Reporting TImeseries Results FOR CSV File ######################################
+    # electricity emissions
+    begin
 
-    # Get the weather file run period (as opposed to design day run period)
-    ann_env_pd = nil
-    sql_file.availableEnvPeriods.each do |env_pd|
-      env_type = sql_file.environmentType(env_pd)
-      if env_type.is_initialized && (env_type.get == OpenStudio::EnvironmentType.new('WeatherRunPeriod'))
-        ann_env_pd = env_pd
-      end
-    end
+      # future_annual_emissions
+      future_annual_emissions_ts = sql_file.timeSeries(ann_env_pd.to_s, reporting_frequency.to_s, 'Future_Annual_Electricity_Emissions', 'EMS')
+      feature_report.reporting_periods[0].emissions[:future_annual_electricity_emissions_mt] = future_annual_emissions_ts.get.values.sum
 
-    if ann_env_pd == false
-      runner.registerError("Can't find a weather runperiod, make sure you ran an annual simulation, not just the design days.")
-      return false
+      # future_hourly_emissions
+      future_hourly_emissions_ts = sql_file.timeSeries(ann_env_pd.to_s, reporting_frequency.to_s, 'Future_Hourly_Electricity_Emissions', 'EMS')
+      feature_report.reporting_periods[0].emissions[:future_hourly_electricity_emissions_mt] = future_hourly_emissions_ts.get.values.sum
+
+      # historical_annual_emissions
+      historical_annual_emissions_ts = sql_file.timeSeries(ann_env_pd.to_s, reporting_frequency.to_s, 'Historical_Annual_Electricity_Emissions', 'EMS')
+      feature_report.reporting_periods[0].emissions[:historical_annual_electricity_emissions_mt] = historical_annual_emissions_ts.get.values.sum
+
+      # historical_hourly_emissions
+      historical_hourly_emissions_ts = sql_file.timeSeries(ann_env_pd.to_s, reporting_frequency.to_s, 'Historical_Hourly_Electricity_Emissions', 'EMS')
+      feature_report.reporting_periods[0].emissions[:historical_hourly_electricity_emissions_mt] = historical_hourly_emissions_ts.get.values.sum
+
+      # future_annual_emissions_intensity
+      future_annual_emissions_intensity_ts = sql_file.timeSeries(ann_env_pd.to_s, reporting_frequency.to_s, 'Future_Annual_Electricity_Emissions_Intensity', 'EMS')
+      feature_report.reporting_periods[0].emissions[:future_annual_electricity_emissions_intensity_kg_per_ft2] = future_annual_emissions_intensity_ts.get.values.sum
+
+      # future_hourly_emissions_intensity
+      future_hourly_emissions_intensity_ts = sql_file.timeSeries(ann_env_pd.to_s, reporting_frequency.to_s, 'Future_Hourly_Electricity_Emissions_Intensity', 'EMS')
+      feature_report.reporting_periods[0].emissions[:future_hourly_electricity_emissions_intensity_kg_per_ft2] = future_hourly_emissions_intensity_ts.get.values.sum
+
+      # historical_annual_emissions_intensity
+      historical_annual_emissions_intensity_ts = sql_file.timeSeries(ann_env_pd.to_s, reporting_frequency.to_s, 'Historical_Annual_Electricity_Emissions_Intensity', 'EMS')
+      feature_report.reporting_periods[0].emissions[:historical_annual_electricity_emissions_intensity_kg_per_ft2] = historical_annual_emissions_intensity_ts.get.values.sum
+
+      # historical_hourly_emissions_intensity
+      historical_hourly_emissions_intensity_ts = sql_file.timeSeries(ann_env_pd.to_s, reporting_frequency.to_s, 'Historical_Hourly_Electricity_Emissions_Intensity', 'EMS')
+      feature_report.reporting_periods[0].emissions[:historical_hourly_electricity_emissions_intensity_kg_per_ft2] = historical_hourly_emissions_intensity_ts.get.values.sum
+
+    rescue StandardError
+      @@logger.info('Emissions are not reported for this feature')
     end
 
+    ##########################################################################################################################
+    # set conversion variables
+    conv_J_mwh = 1000000 * 60 * 60 # J to MWh (1000000J/MJ * 60hr/min * 60 min/sec)
+    conv_kg_mt = 0.001 # kg to metric ton
+    conv_kbtu_J = 1054852.32 # KBtu to J (1kBtu = 1054852.32 J)
+
+    ##### Emisison factors for natural gas, propane, and fuel oil based on EPA eGRID data and calculated using 20-year GWP horizon based on ASHRAE 189.1
+    ## natural gas :  277.358126 KG/MWH
+    ## propane : 323.896704 KG/MWH
+    ## Fuel oil : 294.962046 KG/MWH
+    nat_gas_val = 277.358126
+    lpg_val = 323.896704
+    fo1_val = 294.962046
+    fo2_val = 294.962046
+
+
+    ##########################################################################################################################
+    ######################################## Reporting TImeseries Results FOR CSV File #######################################
+
     # timeseries we want to report
     requested_timeseries_names = [
       'Electricity:Facility',
@@ -862,7 +937,31 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
       'District Heating Inlet Temperature',
       'District Heating Outlet Temperature',
       'Cooling Coil Total Cooling Rate',
-      'Heating Coil Heating Rate'
+      'Heating Coil Heating Rate',
+      'Future_Annual_Electricity_Emissions',
+      'Future_Hourly_Electricity_Emissions',
+      'Historical_Annual_Electricity_Emissions',
+      'Historical_Hourly_Electricity_Emissions',
+      'Future_Annual_Electricity_Emissions_Intensity',
+      'Future_Hourly_Electricity_Emissions_Intensity',
+      'Historical_Annual_Electricity_Emissions_Intensity',
+      'Historical_Hourly_Electricity_Emissions_Intensity',
+      'Natural_Gas_Emissions',
+      'Natural_Gas_Emissions_Intensity',
+      'Propane_Emissions', 
+      'Propane_Emissions_Intensity',
+      'FuelOilNo2_Emissions',
+      'FuelOilNo2_Emissions_Intensity',
+      'Curtailed EV Power',
+      'Daily EV Charge Energy Capacity',
+      'EV Charge Ratio',
+      'Total Charged EV Energy',
+      'Total Curtailed EV Energy',
+      'Total Scheduled EV Energy',
+      'Emission Intensity Schedule Output',
+      'EV Charging Effective Schedule',
+      'EV Charging Original Schedule',
+      'EV Charging Original Load'
     ]
 
     # add thermal comfort timeseries
@@ -881,7 +980,7 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
     runner.registerInfo("All timeseries: #{requested_timeseries_names}")
 
     # timeseries variables to keep to calculate power
-    tsToKeep = ['Electricity:Facility', 'ElectricityProduced:Facility']
+    tsToKeep = ['Electricity:Facility', 'ElectricityProduced:Facility','Propane:Facility', 'NaturalGas:Facility', 'FuelOilNo2:Facility', 'FuelOilNo1:Facility']
     tsToKeepIndexes = {}
 
     ### powerFactor ###
@@ -1002,6 +1101,12 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
                           'm3'
                         when 'W'
                           'W'
+                        when 'kg'
+                          'kg'
+                        when 'MT'
+                          'MT'
+                        when 'KG/FT2'
+                          'KG/FT2'
                      end
         end
 
@@ -1022,6 +1127,103 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
           tsToKeepIndexes[timeseries_name] = key_cnt
         end
 
+        ### add emissions for natural gas, propane and fuel oil
+        # # set conversion variables
+        # conv_J_mwh = 1000000 * 60 * 60 # J to MWh (1000000J/MJ * 60hr/min * 60 min/sec)
+        # conv_kg_mt = 0.001 # kg to metric ton
+        # conv_kbtu_J = 1054852.32 # KBtu to J (1kBtu = 1054852.32 J)
+
+        # ##### Emisison factors for natural gas, propane, and fuel oil based on EPA eGRID data and calculated using 20-year GWP horizon based on ASHRAE 189.1
+        # ## natural gas :  277.358126 KG/MWH
+        # ## propane : 323.896704 KG/MWH
+        # ## Fuel oil : 294.962046 KG/MWH
+        # nat_gas_val = 277.358126
+        # lpg_val = 323.896704
+        # fo1_val = 294.962046
+        # fo2_val = 294.962046
+
+        if timeseries_name == 'Natural_Gas_Emissions'
+          newVals = Array.new(n, 0)
+          (0..n - 1).each do |j|
+            newVals[j] = (nat_gas_val * (values[tsToKeepIndexes['NaturalGas:Facility']][j].to_f * conv_kbtu_J.to_f) / conv_J_mwh.to_f ) * conv_kg_mt.to_f 
+            j += 1
+          end
+          new_unit = 'MT'
+          values[key_cnt] = newVals
+
+          # add emissions sum to feature report
+          feature_report.reporting_periods[0].emissions[:natural_gas_emissions_mt] = newVals.sum
+        end
+
+        if timeseries_name == 'Propane_Emissions'
+          newVals = Array.new(n, 0)
+          (0..n - 1).each do |j|
+            newVals[j] = (lpg_val * (values[tsToKeepIndexes['Propane:Facility']][j].to_f * conv_kbtu_J.to_f) / conv_J_mwh.to_f ) * conv_kg_mt.to_f 
+            j += 1
+          end
+          new_unit = 'MT'
+          values[key_cnt] = newVals
+
+          # add emissions sum to feature report
+          feature_report.reporting_periods[0].emissions[:propane_emissions_mt] = newVals.sum
+        end
+
+        if timeseries_name == 'FuelOilNo2_Emissions'
+          newVals = Array.new(n, 0)
+          (0..n - 1).each do |j|
+            newVals[j] = (fo2_val * (values[tsToKeepIndexes['FuelOilNo2:Facility']][j].to_f * conv_kbtu_J.to_f) / conv_J_mwh.to_f ) * conv_kg_mt.to_f 
+            j += 1
+          end
+          new_unit = 'MT'
+          values[key_cnt] = newVals
+
+          # add emissions sum to feature report
+          feature_report.reporting_periods[0].emissions[:fueloil_no2_emissions_mt] = newVals.sum
+        end
+
+        ### calculate emissions intensity metric
+        # get flr_area
+        flr_area = building.floorArea * 10.764 #change from m2 to ft2
+
+        if timeseries_name == 'Natural_Gas_Emissions_Intensity'
+          newVals = Array.new(n, 0)
+          (0..n - 1).each do |j|
+            newVals[j] = (((nat_gas_val * (values[tsToKeepIndexes['NaturalGas:Facility']][j].to_f * conv_kbtu_J.to_f) / conv_J_mwh.to_f ) * conv_kg_mt.to_f ) * 1000 / flr_area) # unit: kg/ft2 - changed mt to kg
+            j += 1
+          end
+          new_unit = 'KG/FT2'
+          values[key_cnt] = newVals
+
+          # add emissions sum to feature report
+          feature_report.reporting_periods[0].emissions[:natural_gas_emissions_intensity_kg_per_ft2] = newVals.sum
+        end
+
+        if timeseries_name == 'Propane_Emissions_Intensity'
+          newVals = Array.new(n, 0)
+          (0..n - 1).each do |j|
+            newVals[j] = (((lpg_val * (values[tsToKeepIndexes['Propane:Facility']][j].to_f * conv_kbtu_J.to_f) / conv_J_mwh.to_f ) * conv_kg_mt.to_f ) * 1000 / flr_area) # unit: kg/ft2 - changed mt to kg
+            j += 1
+          end
+          new_unit = 'KG/FT2'
+          values[key_cnt] = newVals
+
+          # add emissions sum to feature report
+          feature_report.reporting_periods[0].emissions[:propane_emissions_intensity_kg_per_ft2] = newVals.sum
+        end
+
+        if timeseries_name == 'FuelOilNo2_Emissions_Intensity'
+          newVals = Array.new(n, 0)
+          (0..n - 1).each do |j|
+            newVals[j] = (((fo2_val * (values[tsToKeepIndexes['FuelOilNo2:Facility']][j].to_f * conv_kbtu_J.to_f) / conv_J_mwh.to_f ) * conv_kg_mt.to_f ) * 1000 / flr_area) # unit: kg/ft2 - changed mt to kg
+            j += 1
+          end
+          new_unit = 'KG/FT2'
+          values[key_cnt] = newVals
+
+          # add emissions sum to feature report
+          feature_report.reporting_periods[0].emissions[:fueloil_no2_emissions_intensity_kg_per_ft2] = newVals.sum
+        end
+
         # special processing: power
         if powerTimeseries.include? timeseries_name
           # special case: net series (subtract generation from load)
@@ -1078,7 +1280,8 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
               end
             end
           end
-        end
+        end          
+          
 
         # append units to headers
         new_timeseries_name += "(#{new_unit})"
@@ -1211,6 +1414,8 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
       end
     end
 
+    puts "values = #{values}"
+
     # closing the sql file
     sql_file.close
 

data/lib/measures/export_modelica_loads/measure.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt™, Copyright (c) 2019-2021, Alliance for Sustainable Energy, LLC, and other
+# URBANopt™, Copyright (c) 2019-2022, 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/export_time_series_modelica/measure.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt™, Copyright (c) 2019-2021, Alliance for Sustainable Energy, LLC, and other
+# URBANopt™, Copyright (c) 2019-2022, 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/export_time_series_modelica/resources/os_lib_helper_methods.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt™, Copyright (c) 2019-2021, Alliance for Sustainable Energy, LLC, and other
+# URBANopt™, Copyright (c) 2019-2022, 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/construction_cost.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt™, Copyright (c) 2019-2021, Alliance for Sustainable Energy, LLC, and other
+# URBANopt™, Copyright (c) 2019-2022, 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/date.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt™, Copyright (c) 2019-2021, Alliance for Sustainable Energy, LLC, and other
+# URBANopt™, Copyright (c) 2019-2022, 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/distributed_generation.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt™, Copyright (c) 2019-2021, Alliance for Sustainable Energy, LLC, and other
+# URBANopt™, Copyright (c) 2019-2022, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without modification,
@@ -192,6 +192,15 @@ module URBANopt
         #
         attr_accessor :probs_of_surviving_by_hour_of_the_day
 
+        ##
+        # _String_ - Filepath of reopt assumptions file used, if known
+        attr_accessor :reopt_assumptions_file_path
+
+        ##
+        # _Float_ - Annual percentage of electricity supplied by renewable sources
+        #
+        attr_accessor :annual_renewable_electricity_pct
+
         ##
         # Initialize distributed generation system design and financial metrics.
         #
@@ -206,6 +215,7 @@ module URBANopt
         def initialize(hash = {})
           hash.delete_if { |k, v| v.nil? }
 
+          @annual_renewable_electricity_pct = hash[:annual_renewable_electricity_pct]
           @lcc_us_dollars = hash[:lcc_us_dollars]
           @lcc_bau_us_dollars = hash[:lcc_bau_us_dollars]
           @npv_us_dollars = hash[:npv_us_dollars]
@@ -227,6 +237,12 @@ module URBANopt
           @probs_of_surviving_by_month = hash[:probs_of_surviving_by_month]
           @probs_of_surviving_by_hour_of_the_day = hash[:probs_of_surviving_by_hour_of_the_day]
 
+          # optional
+          @reopt_assumptions_file_path = nil
+          if hash[:reopt_assumptions_file_path]
+            @reopt_assumptions_file_path = hash[:reopt_assumptions_file_path]
+          end
+
           @total_solar_pv_kw = nil
           @total_wind_kw = nil
           @total_generator_kw = nil
@@ -363,7 +379,8 @@ module URBANopt
         ##
         def to_hash
           result = {}
-
+          result[:reopt_assumptions_file_path] = @reopt_assumptions_file_path if @reopt_assumptions_file_path
+          result[:annual_renewable_electricity_pct] = @annual_renewable_electricity_pct if @annual_renewable_electricity_pct
           result[:lcc_us_dollars] = @lcc_us_dollars if @lcc_us_dollars
           result[:lcc_bau_us_dollars] = @lcc_bau_us_dollars if @lcc_bau_us_dollars
           result[:npv_us_dollars] = @npv_us_dollars if @npv_us_dollars
@@ -433,6 +450,7 @@ module URBANopt
         # Merge a distributed generation system with a new system
         ##
         def self.merge_distributed_generation(existing_dgen, new_dgen)
+          existing_dgen.annual_renewable_electricity_pct = add_values(existing_dgen.annual_renewable_electricity_pct, new_dgen.annual_renewable_electricity_pct)
           existing_dgen.lcc_us_dollars = add_values(existing_dgen.lcc_us_dollars, new_dgen.lcc_us_dollars)
           existing_dgen.lcc_bau_us_dollars = add_values(existing_dgen.lcc_bau_us_dollars, new_dgen.lcc_bau_us_dollars)
           existing_dgen.npv_us_dollars = add_values(existing_dgen.npv_us_dollars, new_dgen.npv_us_dollars)

data/lib/urbanopt/reporting/default_reports/end_use.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt™, Copyright (c) 2019-2021, Alliance for Sustainable Energy, LLC, and other
+# URBANopt™, Copyright (c) 2019-2022, 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/end_uses.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt™, Copyright (c) 2019-2021, Alliance for Sustainable Energy, LLC, and other
+# URBANopt™, Copyright (c) 2019-2022, 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/extension.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt™, Copyright (c) 2019-2021, Alliance for Sustainable Energy, LLC, and other
+# URBANopt™, Copyright (c) 2019-2022, 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/feature_report.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt™, Copyright (c) 2019-2021, Alliance for Sustainable Energy, LLC, and other
+# URBANopt™, Copyright (c) 2019-2022, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without modification,
@@ -259,7 +259,7 @@ module URBANopt
           FileUtils.mkdir_p File.dirname(@timeseries_csv.path)
           @timeseries_csv.save_data
 
-          ## save json rport
+          ## save json report
           # feature_hash
           feature_hash = to_hash
 

data/lib/urbanopt/reporting/default_reports/generator.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt™, Copyright (c) 2019-2021, Alliance for Sustainable Energy, LLC, and other
+# URBANopt™, Copyright (c) 2019-2022, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without modification,
@@ -80,7 +80,6 @@ module URBANopt
           result = {}
 
           result[:size_kw] = @size_kw if @size_kw
-
           return result
         end
 

data/lib/urbanopt/reporting/default_reports/location.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt™, Copyright (c) 2019-2021, Alliance for Sustainable Energy, LLC, and other
+# URBANopt™, Copyright (c) 2019-2022, 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/logger.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt™, Copyright (c) 2019-2021, Alliance for Sustainable Energy, LLC, and other
+# URBANopt™, Copyright (c) 2019-2022, 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/power_distribution.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt™, Copyright (c) 2019-2021, Alliance for Sustainable Energy, LLC, and other
+# URBANopt™, Copyright (c) 2019-2022, Alliance for Sustainable Energy, LLC, and other
 # contributors. All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without modification,
@@ -50,11 +50,12 @@ module URBANopt
       # power_distributio include eletrical power distribution systems information.
       ##
       class PowerDistribution
-        attr_accessor :under_voltage_hours, :over_voltage_hours # :nodoc:
+        attr_accessor :under_voltage_hours, :over_voltage_hours, :nominal_capacity,
+                      :reactance_resistance_ratio, :nominal_voltage, :max_power_kw, :max_reactive_power_kvar # :nodoc:
 
         ##
-        # PowerDistrinution class intialize all power_distribution attributes:
-        # +:under_voltage_hours+ , +:over_voltage_hours+
+        # PowerDistribution class initialize all power_distribution attributes:
+        # +:under_voltage_hours+ , +:over_voltage_hours+, +:nominal_capacity+, +:reactance_resistance_ratio+
         ##
         # [parameters:]
         # +hash+ - _Hash_ - A hash which may contain a deserialized power_distribution.
@@ -65,7 +66,11 @@ module URBANopt
 
           @under_voltage_hours = hash[:under_voltage_hours]
           @over_voltage_hours = hash[:over_voltage_hours]
-
+          @nominal_capacity = hash[:nominal_capacity]
+          @reactance_resistance_ratio = hash[:reactance_resistance_ratio]
+          @nominal_voltage = hash[:nominal_voltage] # in V
+          @max_power_kw = hash[:max_power_kw]
+          @max_reactive_power_kvar = hash[:max_reactive_power_kvar]
           # initialize class variables @@validator and @@schema
           @@validator ||= Validator.new
           @@schema ||= @@validator.schema
@@ -78,6 +83,11 @@ module URBANopt
           hash = {}
           hash[:under_voltage_hours] = nil
           hash[:over_voltage_hours] = nil
+          hash[:nominal_capacity] = nil
+          hash[:reactance_resistance_ratio] = nil
+          hash[:nominal_voltage] = nil
+          hash[:max_power_kw] = nil
+          hash[:max_reactive_power_kvar] = nil
 
           return hash
         end
@@ -92,6 +102,11 @@ module URBANopt
           result = {}
           result[:under_voltage_hours] = @under_voltage_hours if @under_voltage_hours
           result[:over_voltage_hours] = @over_voltage_hours if @over_voltage_hours
+          result[:nominal_capacity] = @nominal_capacity if @nominal_capacity
+          result[:reactance_resistance_ratio] = @reactance_resistance_ratio if @reactance_resistance_ratio
+          result[:nominal_voltage] = @nominal_voltage if @nominal_voltage
+          result[:max_power_kw] = @max_power_kw if @max_power_kw
+          result[:max_reactive_power_kvar] = @max_reactive_power_kvar if @max_reactive_power_kvar
 
           # validate power_distribution properties against schema
           if @@validator.validate(@@schema[:definitions][:PowerDistribution][:properties], result).any?
@@ -105,7 +120,7 @@ module URBANopt
         # Merges muliple power distribution results together.
         ##
         # +new_costs+ - _Array_ - An array of ConstructionCost objects.
-        def merge_power_distribition
+        def merge_power_distribution
           # method to be developed for any attributes to be aggregated or merged
         end
       end

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

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