urbanopt-reporting 0.1.0 → 0.3.1

data/lib/urbanopt/reporting/default_reports/feature_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,
@@ -36,6 +36,7 @@ require_relative  'timeseries_csv'
 require_relative  'distributed_generation'
 require_relative  'power_distribution'
 require_relative  'validator'
+require_relative  'thermal_storage'
 
 require 'json-schema'
 require 'json'
@@ -52,7 +53,7 @@ module URBANopt
       ##
       class FeatureReport
         attr_accessor :id, :name, :directory_name, :feature_type, :timesteps_per_hour, :simulation_status,
-                      :timeseries_csv, :location, :program, :design_parameters, :construction_costs, :reporting_periods, :distributed_generation, :power_distribution # :nodoc:
+                      :timeseries_csv, :location, :program, :design_parameters, :construction_costs, :reporting_periods, :distributed_generation, :power_distribution, :thermal_storage # :nodoc:
         ##
         # Each FeatureReport object corresponds to a single Feature.
         ##
@@ -88,6 +89,8 @@ module URBANopt
 
           @power_distribution = PowerDistribution.new(hash[:power_distribution])
 
+          @thermal_storage = ThermalStorage.new(hash[:thermal_storage])
+
           # initialize class variables @@validator and @@schema
           @@validator ||= Validator.new
           @@schema ||= @@validator.schema
@@ -108,6 +111,7 @@ module URBANopt
           hash[:reporting_periods] = []
           hash[:distributed_generation] = {}
           hash[:power_distribution] = {}
+          hash[:thermal_storage] = {}
           return hash
         end
 
@@ -209,6 +213,8 @@ module URBANopt
 
           result[:power_distribution] = @power_distribution.to_hash if @power_distribution
 
+          result[:thermal_storage] = @thermal_storage.to_hash if @thermal_storage
+
           # validate feature_report properties against schema
           if @@validator.validate(@@schema[:definitions][:FeatureReport][:properties], result).any?
             raise "feature_report properties does not match schema: #{@@validator.validate(@@schema[:definitions][:FeatureReport][:properties], result)}"
@@ -217,31 +223,36 @@ module URBANopt
           return result
         end
 
-        ##
-        # Saves the 'default_feature_report.json' and 'default_feature_report.csv' files
+        ## 
+        # Calls the individual functions to save 'default_feature_report.json' and 'default_feature_report.csv'
+        # For backward compatibility and ease of use
         ##
         # [parameters]:
-        # +file_name+ - _String_ - Assign a name to the saved feature report results file without an extension
+        # +file_name+ - _String_ - Assign a name to the saved feature report file without an extension
         def save_feature_report(file_name = 'default_feature_report')
+          save_json_report(file_name)
+          save_csv_report(file_name)
+        end
+
+        ##
+        # Saves the 'default_feature_report.json' file to the results directory
+        ##
+        # [parameters]:
+        # +file_name+ - _String_ - Assign a name to the saved feature report file without an extension
+        def save_json_report(file_name = 'default_feature_report')
           # reassign the initialize local variable @file_name to the file name input.
           @file_name = file_name
 
+          # define the results_dir_path
+          results_dir_path = File.join(@directory_name, 'feature_reports')
           # create feature reports directory
-          Dir.mkdir(File.join(@directory_name, 'feature_reports')) unless Dir.exist?(File.join(@directory_name, 'feature_reports'))
-
-          # save the csv data
-          old_timeseries_path = nil
-          if !@timeseries_csv.path.nil?
-            old_timeseries_path = @timeseries_csv.path
-          end
-
-          @timeseries_csv.path = File.join(@directory_name, 'feature_reports', file_name + '.csv')
-          @timeseries_csv.save_data
+          Dir.mkdir(results_dir_path) unless Dir.exist?(File.join(@directory_name, 'feature_reports'))
 
+          ## save json rport
           # feature_hash
           feature_hash = to_hash
 
-          json_name_path = File.join(@directory_name, 'feature_reports', file_name + '.json')
+          json_name_path = File.join(results_dir_path, file_name + '.json')
 
           File.open(json_name_path, 'w') do |f|
             f.puts JSON.pretty_generate(feature_hash)
@@ -253,13 +264,33 @@ module URBANopt
             end
           end
 
-          if !old_timeseries_path.nil?
-            @timeseries_csv.path = old_timeseries_path
-          else
-            @timeseries_csv.path = File.join(@directory_name, 'feature_reports', file_name + '.csv')
+        end
+
+        ##
+        # Saves the 'default_feature_report.csv' file to the results directory
+        ##
+        # [parameters]:
+        # +file_name+ - _String_ - Assign a name to the saved feature report file without an extension
+        def save_csv_report(file_name = 'default_feature_report')
+          # reassign the initialize local variable @file_name to the file name input.
+          @file_name = file_name
+
+          # define the results_dir_path
+          results_dir_path = File.join(@directory_name, 'feature_reports')
+          # create feature reports directory
+          Dir.mkdir(results_dir_path) unless Dir.exist?(File.join(@directory_name, 'feature_reports'))
+
+          ## copy CSV report to the new feature_reports folder
+          # get all folder names in the feature diectory
+          directory_folders = Dir.glob "#{@directory_name}/*/"
+          # copy the CSV report to the new feature_reports folder
+          directory_folders.each do |f|
+            if f.include? '_default_feature_reports'
+              FileUtils.cp(File.join(f, 'default_feature_reports.csv'), File.join(results_dir_path, @file_name +'.csv'))
+            end
           end
-          return true
         end
+        
       end
     end
   end

data/lib/urbanopt/reporting/default_reports/generator.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,
@@ -60,7 +60,7 @@ module URBANopt
           @@schema ||= @@validator.schema
 
           # initialize @@logger
-          @@logger ||= URBANopt::Scenario::DefaultReports.logger
+          @@logger ||= URBANopt::Reporting::DefaultReports.logger
         end
 
         ##

data/lib/urbanopt/reporting/default_reports/location.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,
@@ -39,9 +39,9 @@ module URBANopt
       # Location include all location information.
       ##
       class Location
-        attr_accessor :latitude, :longitude, :surface_elevation, :weather_filename #:nodoc:
+        attr_accessor :latitude_deg, :longitude_deg, :surface_elevation_ft, :weather_filename #:nodoc:
         ##
-        # Location class initialize location attributes: +:latitude+ , +:longitude+ , +:surface_elevation+ , +:weather_filename+
+        # Location class initialize location attributes: +:latitude_deg+ , +:longitude_deg+ , +:surface_elevation_ft+ , +:weather_filename+
         ##
         # [parameters:]
         # +hash+ - _Hash_ - A hash which may contain a deserialized location.
@@ -50,9 +50,9 @@ module URBANopt
           hash.delete_if { |k, v| v.nil? }
           hash = defaults.merge(hash)
 
-          @latitude = hash[:latitude]
-          @longitude = hash[:longitude]
-          @surface_elevation = hash[:surface_elevation]
+          @latitude_deg = hash[:latitude_deg]
+          @longitude_deg = hash[:longitude_deg]
+          @surface_elevation_ft = hash[:surface_elevation_ft]
           @weather_filename = hash[:weather_filename]
 
           # initialize class variables @@validator and @@schema
@@ -68,9 +68,9 @@ module URBANopt
         ##
         def to_hash
           result = {}
-          result[:latitude] = @latitude if @latitude
-          result[:longitude] = @longitude if @longitude
-          result[:surface_elevation] = @surface_elevation if @surface_elevation
+          result[:latitude_deg] = @latitude_deg if @latitude_deg
+          result[:longitude_deg] = @longitude_deg if @longitude_deg
+          result[:surface_elevation_ft] = @surface_elevation_ft if @surface_elevation_ft
           result[:weather_filename] = @weather_filename if @weather_filename
 
           # validate location properties against schema
@@ -86,9 +86,9 @@ module URBANopt
         ##
         def defaults
           hash = {}
-          hash[:latitude] = nil
-          hash[:longitude] = nil
-          hash[:surface_elevation] = nil
+          hash[:latitude_deg] = nil
+          hash[:longitude_deg] = nil
+          hash[:surface_elevation_ft] = nil
           hash[:weather_filename] = nil
 
           return hash

data/lib/urbanopt/reporting/default_reports/logger.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/power_distribution.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/program.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,
@@ -40,18 +40,18 @@ module URBANopt
       # Program includes all building program related information.
       ##
       class Program
-        attr_accessor :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,
+        attr_accessor :site_area_sqft, :floor_area_sqft, :conditioned_area_sqft, :unconditioned_area_sqft, :footprint_area_sqft, :maximum_roof_height_ft,
+                      :maximum_number_of_stories, :maximum_number_of_stories_above_ground, :parking_area_sqft, :number_of_parking_spaces,
+                      :number_of_parking_spaces_charging, :parking_footprint_area_sqft, :maximum_parking_height_ft, :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, :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+ ,
+                      :area_sqft, :window_area_sqft, :north_window_area_sqft, :south_window_area_sqft, :east_window_area_sqft, :west_window_area_sqft, :wall_area_sqft, :roof_area_sqft, :equipment_roof_area_sqft,
+                      :photovoltaic_roof_area_sqft, :available_roof_area_sqft, :total_roof_area_sqft, :orientation_deg, :aspect_ratio, :total_construction_cost_dollar # :nodoc:
+        # Program class initialize building program attributes: +:site_area_sqft+ , +:floor_area_sqft+ , +:conditioned_area_sqft+ , +:unconditioned_area_sqft+ ,
+        # +:footprint_area_sqft+ , +:maximum_roof_height_ft, +:maximum_number_of_stories+ , +:maximum_number_of_stories_above_ground+ , +:parking_area_sqft+ ,
+        # +:number_of_parking_spaces+ , +:number_of_parking_spaces_charging+ , +:parking_footprint_area_sqft+ , +:maximum_parking_height_ft+ , +: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+
+        # +:area_sqft+ , +:window_area_sqft+ , +:north_window_area_sqft+ , +:south_window_area_sqft+ , +:east_window_area_sqft+ , +:west_window_area_sqft+ , +:wall_area_sqft+ , +:roof_area_sqft+ ,
+        # +:equipment_roof_area_sqft+ , +:photovoltaic_roof_area_sqft+ , +:available_roof_area_sqft+ , +:total_roof_area_sqft+ , +:orientation_deg+ , +:aspect_ratio+
         ##
         # [parameters:]
         # +hash+ - _Hash_ - A hash which may contain a deserialized program.
@@ -60,29 +60,29 @@ module URBANopt
           hash.delete_if { |k, v| v.nil? }
           hash = defaults.merge(hash)
 
-          @site_area = hash[:site_area]
-          @floor_area = hash[:floor_area]
-          @conditioned_area = hash[:conditioned_area]
-          @unconditioned_area = hash[:unconditioned_area]
-          @footprint_area = hash[:footprint_area]
-          @maximum_roof_height = hash[:maximum_roof_height]
+          @site_area_sqft = hash[:site_area_sqft]
+          @floor_area_sqft = hash[:floor_area_sqft]
+          @conditioned_area_sqft = hash[:conditioned_area_sqft]
+          @unconditioned_area_sqft = hash[:unconditioned_area_sqft]
+          @footprint_area_sqft = hash[:footprint_area_sqft]
+          @maximum_roof_height_ft = hash[:maximum_roof_height_ft]
           @maximum_number_of_stories = hash[:maximum_number_of_stories]
           @maximum_number_of_stories_above_ground = hash[:maximum_number_of_stories_above_ground]
-          @parking_area = hash[:parking_area]
+          @parking_area_sqft = hash[:parking_area_sqft]
           @number_of_parking_spaces = hash[:number_of_parking_spaces]
           @number_of_parking_spaces_charging = hash[:number_of_parking_spaces_charging]
-          @parking_footprint_area = hash[:parking_footprint_area]
-          @maximum_parking_height = hash[:maximum_parking_height]
+          @parking_footprint_area_sqft = hash[:parking_footprint_area_sqft]
+          @maximum_parking_height_ft = hash[:maximum_parking_height_ft]
           @maximum_number_of_parking_stories = hash[:maximum_number_of_parking_stories]
           @maximum_number_of_parking_stories_above_ground = hash[:maximum_number_of_parking_stories_above_ground]
           @number_of_residential_units = hash[:number_of_residential_units]
           @building_types = hash[:building_types]
-          @window_area = hash[:window_area]
-          @wall_area = hash[:wall_area]
-          @roof_area = hash[:roof_area]
-          @orientation = hash[:orientation]
+          @window_area_sqft = hash[:window_area_sqft]
+          @wall_area_sqft = hash[:wall_area_sqft]
+          @roof_area_sqft = hash[:roof_area_sqft]
+          @orientation_deg = hash[:orientation_deg]
           @aspect_ratio = hash[:aspect_ratio]
-          @total_construction_cost = hash[:total_construction_cost]
+          @total_construction_cost_dollar = hash[:total_construction_cost_dollar]
 
           # initialize class variables @@validator and @@schema
           @@validator ||= Validator.new
@@ -94,29 +94,29 @@ module URBANopt
         ##
         def defaults
           hash = {}
-          hash[:site_area] = nil
-          hash[:floor_area] = nil
-          hash[:conditioned_area] = nil
-          hash[:unconditioned_area] = nil
-          hash[:footprint_area] = nil
-          hash[:maximum_roof_height] = nil
+          hash[:site_area_sqft] = nil
+          hash[:floor_area_sqft] = nil
+          hash[:conditioned_area_sqft] = nil
+          hash[:unconditioned_area_sqft] = nil
+          hash[:footprint_area_sqft] = nil
+          hash[:maximum_roof_height_ft] = nil
           hash[:maximum_number_of_stories] = nil
           hash[:maximum_number_of_stories_above_ground] = nil
-          hash[:parking_area] = nil
+          hash[:parking_area_sqft] = nil
           hash[:number_of_parking_spaces] = nil
           hash[:number_of_parking_spaces_charging] = nil
-          hash[:parking_footprint_area] = nil
-          hash[:maximum_parking_height] = nil
+          hash[:parking_footprint_area_sqft] = nil
+          hash[:maximum_parking_height_ft] = nil
           hash[:maximum_number_of_parking_stories] = nil
           hash[:maximum_number_of_parking_stories_above_ground] = nil
           hash[:number_of_residential_units] = nil
-          hash[:building_types] = [{ building_type: nil, maximum_occupancy: nil, floor_area: nil }]
-          hash[:window_area] = { north_window_area: nil, south_window_area: nil, east_window_area: nil, west_window_area: nil, total_window_area: nil }
-          hash[:wall_area] = { north_wall_area: nil, south_wall_area: nil, east_wall_area: nil, west_wall_area: nil, total_wall_area: nil }
-          hash[:roof_area] = { equipment_roof_area: nil, photovoltaic_roof_area: nil, available_roof_area: nil, total_roof_area: nil }
-          hash[:orientation] = nil
+          hash[:building_types] = [{ building_type: nil, maximum_occupancy: nil, floor_area_sqft: nil }]
+          hash[:window_area_sqft] = { north_window_area_sqft: nil, south_window_area_sqft: nil, east_window_area_sqft: nil, west_window_area_sqft: nil, total_window_area_sqft: nil }
+          hash[:wall_area_sqft] = { north_wall_area_sqft: nil, south_wall_area_sqft: nil, east_wall_area_sqft: nil, west_wall_area_sqft: nil, total_wall_area_sqft: nil }
+          hash[:roof_area_sqft] = { equipment_roof_area_sqft: nil, photovoltaic_roof_area_sqft: nil, available_roof_area_sqft: nil, total_roof_area_sqft: nil }
+          hash[:orientation_deg] = nil
           hash[:aspect_ratio] = nil
-          hash[:total_construction_cost] = nil
+          hash[:total_construction_cost_dollar] = nil
           return hash
         end
 
@@ -128,19 +128,19 @@ module URBANopt
         ##
         def to_hash
           result = {}
-          result[:site_area] = @site_area if @site_area
-          result[:floor_area] = @floor_area if @floor_area
-          result[:conditioned_area] = @conditioned_area if @conditioned_area
-          result[:unconditioned_area] = @unconditioned_area if @unconditioned_area
-          result[:footprint_area] = @footprint_area if @footprint_area
-          result[:maximum_roof_height] = @maximum_roof_height if @maximum_roof_height
+          result[:site_area_sqft] = @site_area_sqft if @site_area_sqft
+          result[:floor_area_sqft] = @floor_area_sqft if @floor_area_sqft
+          result[:conditioned_area_sqft] = @conditioned_area_sqft if @conditioned_area_sqft
+          result[:unconditioned_area_sqft] = @unconditioned_area_sqft if @unconditioned_area_sqft
+          result[:footprint_area_sqft] = @footprint_area_sqft if @footprint_area_sqft
+          result[:maximum_roof_height_ft] = @maximum_roof_height_ft if @maximum_roof_height_ft
           result[:maximum_number_of_stories] = @maximum_number_of_stories if @maximum_number_of_stories
           result[:maximum_number_of_stories_above_ground] = @maximum_number_of_stories_above_ground if @maximum_number_of_parking_stories_above_ground
-          result[:parking_area] = @parking_area if @parking_area
+          result[:parking_area_sqft] = @parking_area_sqft if @parking_area_sqft
           result[:number_of_parking_spaces] = @number_of_parking_spaces if @number_of_parking_spaces
           result[:number_of_parking_spaces_charging] = @number_of_parking_spaces_charging if @number_of_parking_spaces_charging
-          result[:parking_footprint_area] = @parking_footprint_area if @parking_footprint_area
-          result[:maximum_parking_height] = @maximum_parking_height if @maximum_parking_height
+          result[:parking_footprint_area_sqft] = @parking_footprint_area_sqft if @parking_footprint_area_sqft
+          result[:maximum_parking_height_ft] = @maximum_parking_height_ft if @maximum_parking_height_ft
           result[:maximum_number_of_parking_stories] = @maximum_number_of_parking_stories if @maximum_number_of_parking_stories
           result[:maximum_number_of_parking_stories_above_ground] = @maximum_number_of_parking_stories_above_ground if @maximum_number_of_parking_stories_above_ground
           result[:number_of_residential_units] = @number_of_residential_units if @number_of_residential_units
@@ -152,25 +152,25 @@ module URBANopt
             end
           end
 
-          # result[:window_area] = @window_area if @window_area
-          window_area_hash = @window_area if @window_area
-          window_area_hash.delete_if { |k, v| v.nil? }
-          result[:window_area] = window_area_hash if @window_area
+          # result[:window_area_sqft] = @window_area_sqft if @window_area_sqft
+          window_area_sqft_hash = @window_area_sqft if @window_area_sqft
+          window_area_sqft_hash.delete_if { |k, v| v.nil? }
+          result[:window_area_sqft] = window_area_sqft_hash if @window_area_sqft
 
-          # result[:wall_area] = @wall_area if @wall_area
-          wall_area_hash = @wall_area if @wall_area
-          wall_area_hash.delete_if { |k, v| v.nil? }
-          result[:wall_area] = wall_area_hash if @wall_area
+          # result[:wall_area_sqft] = @wall_area_sqft if @wall_area_sqft
+          wall_area_sqft_hash = @wall_area_sqft if @wall_area_sqft
+          wall_area_sqft_hash.delete_if { |k, v| v.nil? }
+          result[:wall_area_sqft] = wall_area_sqft_hash if @wall_area_sqft
 
-          # result[:roof_area] = @roof_area if @roof_area
-          roof_area_hash = @roof_area if @roof_area
-          roof_area_hash.delete_if { |k, v| v.nil? }
-          result[:roof_area] = roof_area_hash if @roof_area
+          # result[:roof_area_sqft] = @roof_area_sqft if @roof_area_sqft
+          roof_area_sqft_hash = @roof_area_sqft if @roof_area_sqft
+          roof_area_sqft_hash.delete_if { |k, v| v.nil? }
+          result[:roof_area_sqft] = roof_area_sqft_hash if @roof_area_sqft
 
-          result[:orientation] = @orientation if @orientation
+          result[:orientation_deg] = @orientation_deg if @orientation_deg
           result[:aspect_ratio] = @aspect_ratio if @aspect_ratio
 
-          result[:total_construction_cost] = @total_construction_cost if @total_construction_cost
+          result[:total_construction_cost_dollar] = @total_construction_cost_dollar if @total_construction_cost_dollar
 
           # validate program properties against schema
           if @@validator.validate(@@schema[:definitions][:Program][:properties], result).any?
@@ -221,43 +221,43 @@ module URBANopt
         # +other+ - _Program_ - An object of Program class.
         ##
         def add_program(other)
-          @site_area = add_values(@site_area, other.site_area)
+          @site_area_sqft = add_values(@site_area_sqft, other.site_area_sqft)
 
-          @floor_area = add_values(@floor_area, other.floor_area)
-          @conditioned_area = add_values(@conditioned_area, other.conditioned_area)
-          @unconditioned_area = add_values(@unconditioned_area, other.unconditioned_area)
-          @footprint_area = add_values(@footprint_area, other.footprint_area)
-          @maximum_roof_height = max_value(@maximum_roof_height, other.maximum_roof_height)
+          @floor_area_sqft = add_values(@floor_area_sqft, other.floor_area_sqft)
+          @conditioned_area_sqft = add_values(@conditioned_area_sqft, other.conditioned_area_sqft)
+          @unconditioned_area_sqft = add_values(@unconditioned_area_sqft, other.unconditioned_area_sqft)
+          @footprint_area_sqft = add_values(@footprint_area_sqft, other.footprint_area_sqft)
+          @maximum_roof_height_ft = max_value(@maximum_roof_height_ft, other.maximum_roof_height_ft)
           @maximum_number_of_stories = max_value(@maximum_number_of_stories, other.maximum_number_of_stories)
           @maximum_number_of_stories_above_ground = max_value(@maximum_number_of_stories_above_ground, other.maximum_number_of_stories_above_ground)
-          @parking_area = add_values(@parking_area, other.parking_area)
+          @parking_area_sqft = add_values(@parking_area_sqft, other.parking_area_sqft)
           @number_of_parking_spaces = add_values(@number_of_parking_spaces, other.number_of_parking_spaces)
           @number_of_parking_spaces_charging = add_values(@number_of_parking_spaces_charging, other.number_of_parking_spaces_charging)
-          @parking_footprint_area = add_values(@parkig_footprint_area, other.parking_footprint_area)
-          @maximum_parking_height = max_value(@maximum_parking_height, other.maximum_parking_height)
+          @parking_footprint_area_sqft = add_values(@parkig_footprint_area_sqft, other.parking_footprint_area_sqft)
+          @maximum_parking_height_ft = max_value(@maximum_parking_height_ft, other.maximum_parking_height_ft)
           @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)
+          @total_construction_cost_dollar = add_values(@total_construction_cost_dollar, other.total_construction_cost_dollar)
 
           @building_types = other.building_types
 
-          @window_area[:north_window_area] = add_values(@window_area[:north_window_area], other.window_area[:north_window_area])
-          @window_area[:south_window_area] = add_values(@window_area[:south_window_area], other.window_area[:south_window_area])
-          @window_area[:east_window_area] = add_values(@window_area[:east_window_area], other.window_area[:east_window_area])
-          @window_area[:west_window_area] = add_values(@window_area[:west_window_area], other.window_area[:west_window_area])
-          @window_area[:total_window_area] =  add_values(@window_area[:total_window_area], other.window_area[:total_window_area])
+          @window_area_sqft[:north_window_area_sqft] = add_values(@window_area_sqft[:north_window_area_sqft], other.window_area_sqft[:north_window_area_sqft])
+          @window_area_sqft[:south_window_area_sqft] = add_values(@window_area_sqft[:south_window_area_sqft], other.window_area_sqft[:south_window_area_sqft])
+          @window_area_sqft[:east_window_area_sqft] = add_values(@window_area_sqft[:east_window_area_sqft], other.window_area_sqft[:east_window_area_sqft])
+          @window_area_sqft[:west_window_area_sqft] = add_values(@window_area_sqft[:west_window_area_sqft], other.window_area_sqft[:west_window_area_sqft])
+          @window_area_sqft[:total_window_area_sqft] =  add_values(@window_area_sqft[:total_window_area_sqft], other.window_area_sqft[:total_window_area_sqft])
 
-          @wall_area[:north_wall_area] = add_values(@wall_area[:north_wall_area], other.wall_area[:north_wall_area])
-          @wall_area[:south_wall_area] = add_values(@wall_area[:south_wall_area], other.wall_area[:south_wall_area])
-          @wall_area[:east_wall_area] = add_values(@wall_area[:east_wall_area], other.wall_area[:east_wall_area])
-          @wall_area[:west_wall_area] = add_values(@wall_area[:west_wall_area], other.wall_area[:west_wall_area])
-          @wall_area[:total_wall_area] = add_values(@wall_area[:total_wall_area], other.wall_area[:total_wall_area])
+          @wall_area_sqft[:north_wall_area_sqft] = add_values(@wall_area_sqft[:north_wall_area_sqft], other.wall_area_sqft[:north_wall_area_sqft])
+          @wall_area_sqft[:south_wall_area_sqft] = add_values(@wall_area_sqft[:south_wall_area_sqft], other.wall_area_sqft[:south_wall_area_sqft])
+          @wall_area_sqft[:east_wall_area_sqft] = add_values(@wall_area_sqft[:east_wall_area_sqft], other.wall_area_sqft[:east_wall_area_sqft])
+          @wall_area_sqft[:west_wall_area_sqft] = add_values(@wall_area_sqft[:west_wall_area_sqft], other.wall_area_sqft[:west_wall_area_sqft])
+          @wall_area_sqft[:total_wall_area_sqft] = add_values(@wall_area_sqft[:total_wall_area_sqft], other.wall_area_sqft[:total_wall_area_sqft])
 
-          @roof_area[:equipment_roof_area] = add_values(@roof_area[:equipment_roof_area], other.roof_area[:equipment_roof_area])
-          @roof_area[:photovoltaic_roof_area] = add_values(@roof_area[:photovoltaic_roof_area], other.roof_area[:photovoltaic_roof_area])
-          @roof_area[:available_roof_area] = add_values(@roof_area[:available_roof_area], other.roof_area[:available_roof_area])
-          @roof_area[:total_roof_area] = add_values(@roof_area[:total_roof_area], other.roof_area[:total_roof_area])
+          @roof_area_sqft[:equipment_roof_area_sqft] = add_values(@roof_area_sqft[:equipment_roof_area_sqft], other.roof_area_sqft[:equipment_roof_area_sqft])
+          @roof_area_sqft[:photovoltaic_roof_area_sqft] = add_values(@roof_area_sqft[:photovoltaic_roof_area_sqft], other.roof_area_sqft[:photovoltaic_roof_area_sqft])
+          @roof_area_sqft[:available_roof_area_sqft] = add_values(@roof_area_sqft[:available_roof_area_sqft], other.roof_area_sqft[:available_roof_area_sqft])
+          @roof_area_sqft[:total_roof_area_sqft] = add_values(@roof_area_sqft[:total_roof_area_sqft], other.roof_area_sqft[:total_roof_area_sqft])
         end
       end
     end