urbanopt-reporting 0.2.0 → 0.2.1

data/docs/package.json

@@ -0,0 +1,30 @@
+{
+  "name": "urbanopt-reporting-gem-docs",
+  "version": "0.0.1",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "dev": "vuepress dev",
+    "build": "vuepress build",
+    "deploy": "gh-pages -d .vuepress/dist"
+  },
+  "author": "NREL",
+  "dependencies": {
+    "highlight.js": "^10.3.1",
+    "json-schema-ref-parser": "^9.0.6",
+    "json-schema-view-js": "git+https://git@github.com/bgschiller/json-schema-view-js.git",
+    "vuepress": "^1.7.1",
+    "webpack-dev-middleware": "^3.6.0"
+  },
+  "devDependencies": {
+    "braces": "^3.0.2",
+    "dot-prop": "^5.3.0",
+    "gh-pages": "^3.1.0",
+    "js-yaml": "^3.14.0",
+    "minimist": ">=1.2.3",
+    "node-forge": ">=0.10.0",
+    "serialize-javascript": "^5.0.1",
+    "set-value": "^3.0.2",
+    "yargs-parser": "^20.2.3"
+  }
+}

data/docs/schemas/scenario-schema.md

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

data/lib/measures/default_feature_reports/measure.rb

@@ -333,14 +333,14 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
       # get longitude from feature_location
       longitude = (feature_location.split(',')[1].delete! '[]').to_f
       # latitude
-      feature_report.location.latitude = latitude
+      feature_report.location.latitude_deg = latitude
       # longitude
-      feature_report.location.longitude = longitude
+      feature_report.location.longitude_deg = longitude
     end
 
     # surface_elevation
     elev = sql_query(runner, sql_file, 'InputVerificationandResultsSummary', "TableName='General' AND RowName='Elevation' AND ColumnName='Value'")
-    feature_report.location.surface_elevation = elev
+    feature_report.location.surface_elevation_ft = elev
 
     ##########################################################################
     ##
@@ -350,18 +350,18 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
 
     # floor_area
     floor_area = sql_query(runner, sql_file, 'AnnualBuildingUtilityPerformanceSummary', "TableName='Building Area' AND RowName='Total Building Area' AND ColumnName='Area'")
-    feature_report.program.floor_area = convert_units(floor_area, 'm^2', 'ft^2')
+    feature_report.program.floor_area_sqft = convert_units(floor_area, 'm^2', 'ft^2')
 
     # conditioned_area
     conditioned_area = sql_query(runner, sql_file, 'AnnualBuildingUtilityPerformanceSummary', "TableName='Building Area' AND RowName='Net Conditioned Building Area' AND ColumnName='Area'")
-    feature_report.program.conditioned_area = convert_units(conditioned_area, 'm^2', 'ft^2')
+    feature_report.program.conditioned_area_sqft = convert_units(conditioned_area, 'm^2', 'ft^2')
 
     # unconditioned_area
     unconditioned_area = sql_query(runner, sql_file, 'AnnualBuildingUtilityPerformanceSummary', "TableName='Building Area' AND RowName='Unconditioned Building Area' AND ColumnName='Area'")
-    feature_report.program.unconditioned_area = convert_units(unconditioned_area, 'm^2', 'ft^2')
+    feature_report.program.unconditioned_area_sqft = convert_units(unconditioned_area, 'm^2', 'ft^2')
 
     # footprint_area
-    feature_report.program.footprint_area = convert_units(floor_area, 'm^2', 'ft^2')
+    feature_report.program.footprint_area_sqft = convert_units(floor_area, 'm^2', 'ft^2')
 
     # maximum_number_of_stories
     number_of_stories = building.standardsNumberOfStories.get if building.standardsNumberOfStories.is_initialized
@@ -371,7 +371,7 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
     # maximum_roof_height
     floor_to_floor_height = building.nominalFloortoFloorHeight.to_f
     maximum_roof_height = number_of_stories * floor_to_floor_height
-    feature_report.program.maximum_roof_height = maximum_roof_height
+    feature_report.program.maximum_roof_height_ft = maximum_roof_height
 
     # maximum_number_of_stories_above_ground
     number_of_stories_above_ground = building.standardsNumberOfAboveGroundStories.get if building.standardsNumberOfAboveGroundStories.is_initialized
@@ -432,36 +432,36 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
     ## window_area
     # north_window_area
     north_window_area = sql_query(runner, sql_file, 'InputVerificationandResultsSummary', "TableName='Window-Wall Ratio' AND RowName='Window Opening Area' AND ColumnName='North (315 to 45 deg)'").to_f
-    feature_report.program.window_area[:north_window_area] = convert_units(north_window_area, 'm^2', 'ft^2')
+    feature_report.program.window_area_sqft[:north_window_area_sqft] = convert_units(north_window_area, 'm^2', 'ft^2')
     # south_window_area
     south_window_area = sql_query(runner, sql_file, 'InputVerificationandResultsSummary', "TableName='Window-Wall Ratio' AND RowName='Window Opening Area' AND ColumnName='South (135 to 225 deg)'").to_f
-    feature_report.program.window_area[:south_window_area] = convert_units(south_window_area, 'm^2', 'ft^2')
+    feature_report.program.window_area_sqft[:south_window_area_sqft] = convert_units(south_window_area, 'm^2', 'ft^2')
     # east_window_area
     east_window_area = sql_query(runner, sql_file, 'InputVerificationandResultsSummary', "TableName='Window-Wall Ratio' AND RowName='Window Opening Area' AND ColumnName='East (45 to 135 deg)'").to_f
-    feature_report.program.window_area[:east_window_area] = convert_units(east_window_area, 'm^2', 'ft^2')
+    feature_report.program.window_area_sqft[:east_window_area_sqft] = convert_units(east_window_area, 'm^2', 'ft^2')
     # west_window_area
     west_window_area = sql_query(runner, sql_file, 'InputVerificationandResultsSummary', "TableName='Window-Wall Ratio' AND RowName='Window Opening Area' AND ColumnName='West (225 to 315 deg)'").to_f
-    feature_report.program.window_area[:west_window_area] = convert_units(west_window_area, 'm^2', 'ft^2')
+    feature_report.program.window_area_sqft[:west_window_area_sqft] = convert_units(west_window_area, 'm^2', 'ft^2')
     # total_window_area
     total_window_area = north_window_area + south_window_area + east_window_area + west_window_area
-    feature_report.program.window_area[:total_window_area] = convert_units(total_window_area, 'm^2', 'ft^2')
+    feature_report.program.window_area_sqft[:total_window_area_sqft] = convert_units(total_window_area, 'm^2', 'ft^2')
 
     ## wall_area
     # north_wall_area
     north_wall_area = sql_query(runner, sql_file, 'InputVerificationandResultsSummary', "TableName='Window-Wall Ratio' AND RowName='Gross Wall Area' AND ColumnName='North (315 to 45 deg)'").to_f
-    feature_report.program.wall_area[:north_wall_area] = convert_units(north_wall_area, 'm^2', 'ft^2')
+    feature_report.program.wall_area_sqft[:north_wall_area_sqft] = convert_units(north_wall_area, 'm^2', 'ft^2')
     # south_wall_area
     south_wall_area = sql_query(runner, sql_file, 'InputVerificationandResultsSummary', "TableName='Window-Wall Ratio' AND RowName='Gross Wall Area' AND ColumnName='South (135 to 225 deg)'").to_f
-    feature_report.program.wall_area[:south_wall_area] = convert_units(south_wall_area, 'm^2', 'ft^2')
+    feature_report.program.wall_area_sqft[:south_wall_area_sqft] = convert_units(south_wall_area, 'm^2', 'ft^2')
     # east_wall_area
     east_wall_area = sql_query(runner, sql_file, 'InputVerificationandResultsSummary', "TableName='Window-Wall Ratio' AND RowName='Gross Wall Area' AND ColumnName='East (45 to 135 deg)'").to_f
-    feature_report.program.wall_area[:east_wall_area] = convert_units(east_wall_area, 'm^2', 'ft^2')
+    feature_report.program.wall_area_sqft[:east_wall_area_sqft] = convert_units(east_wall_area, 'm^2', 'ft^2')
     # west_wall_area
     west_wall_area = sql_query(runner, sql_file, 'InputVerificationandResultsSummary', "TableName='Window-Wall Ratio' AND RowName='Gross Wall Area' AND ColumnName='West (225 to 315 deg)'").to_f
-    feature_report.program.wall_area[:west_wall_area] = convert_units(west_wall_area, 'm^2', 'ft^2')
+    feature_report.program.wall_area_sqft[:west_wall_area_sqft] = convert_units(west_wall_area, 'm^2', 'ft^2')
     # total_wall_area
     total_wall_area = north_wall_area + south_wall_area + east_wall_area + west_wall_area
-    feature_report.program.wall_area[:total_wall_area] = convert_units(total_wall_area, 'm^2', 'ft^2')
+    feature_report.program.wall_area_sqft[:total_wall_area_sqft] = convert_units(total_wall_area, 'm^2', 'ft^2')
 
     # total_roof_area
     total_roof_area = 0.0
@@ -470,12 +470,12 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
         total_roof_area += surface.netArea
       end
     end
-    feature_report.program.roof_area[:total_roof_area] = convert_units(total_roof_area, 'm^2', 'ft^2')
+    feature_report.program.roof_area_sqft[:total_roof_area_sqft] = convert_units(total_roof_area, 'm^2', 'ft^2')
 
     # orientation
     # RK: a more robust method should be implemented to find orientation(finding main axis of the building using aspect ratio)
     building_rotation = model.getBuilding.northAxis
-    feature_report.program.orientation = building_rotation
+    feature_report.program.orientation_deg = building_rotation
 
     # aspect_ratio
     north_wall_area = sql_query(runner, sql_file, 'InputVerificationandResultsSummary', "TableName='Window-Wall Ratio' AND RowName='Gross Wall Area' AND ColumnName='North (315 to 45 deg)'")
@@ -486,7 +486,7 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
 
     # total_construction_cost
     total_construction_cost = sql_query(runner, sql_file, 'Life-Cycle Cost Report', "TableName='Present Value for Recurring, Nonrecurring and Energy Costs (Before Tax)' AND RowName='LCC_MAT - BUILDING - LIFE CYCLE COSTS' AND ColumnName='Cost'")
-    feature_report.program.total_construction_cost = total_construction_cost
+    feature_report.program.total_construction_cost_dollar = total_construction_cost
 
     # packaged thermal storage capacities by cooling coil
     ptes_keys = sql_file.availableKeyValues('RUN Period 1', 'Zone Timestep', 'Cooling Coil Ice Thermal Storage End Fraction')
@@ -504,7 +504,7 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
         runner.registerWarning('Query ptes_size.get failed')
       end
     end
-    feature_report.thermal_storage.ptes_size = ptes_size
+    feature_report.thermal_storage.ptes_size_kwh = ptes_size
 
     # get the central tank thermal storage capacity
     its_size = nil
@@ -519,7 +519,7 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
         runner.registerWarning('Query its_size.get failed')
       end
     end
-    feature_report.thermal_storage.its_size = its_size
+    feature_report.thermal_storage.its_size_kwh = its_size
 
     ############################################################################
     ##
@@ -550,48 +550,48 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
 
     # total_site_energy
     total_site_energy = sql_query(runner, sql_file, 'AnnualBuildingUtilityPerformanceSummary', "TableName='Site and Source Energy' AND RowName='Total Site Energy' AND ColumnName='Total Energy'")
-    feature_report.reporting_periods[0].total_site_energy = convert_units(total_site_energy, 'GJ', 'kBtu')
+    feature_report.reporting_periods[0].total_site_energy_kwh = convert_units(total_site_energy, 'GJ', 'kWh')
 
     # total_source_energy
     total_source_energy = sql_query(runner, sql_file, 'AnnualBuildingUtilityPerformanceSummary', "TableName='Site and Source Energy' AND RowName='Total Source Energy' AND ColumnName='Total Energy'")
-    feature_report.reporting_periods[0].total_source_energy = convert_units(total_source_energy, 'GJ', 'kBtu')
+    feature_report.reporting_periods[0].total_source_energy_kwh = convert_units(total_source_energy, 'GJ', 'kWh')
 
     # net_site_energy
     net_site_energy = sql_query(runner, sql_file, 'AnnualBuildingUtilityPerformanceSummary', "TableName='Site and Source Energy' AND RowName='Net Site Energy' AND ColumnName='Total Energy'")
-    feature_report.reporting_periods[0].net_site_energy = convert_units(net_site_energy, 'GJ', 'kBtu')
+    feature_report.reporting_periods[0].net_site_energy_kwh = convert_units(net_site_energy, 'GJ', 'kWh')
 
     # net_source_energy
     net_source_energy = sql_query(runner, sql_file, 'AnnualBuildingUtilityPerformanceSummary', "TableName='Site and Source Energy' AND RowName='Net Source Energy' AND ColumnName='Total Energy'")
-    feature_report.reporting_periods[0].net_source_energy = convert_units(net_source_energy, 'GJ', 'kBtu')
+    feature_report.reporting_periods[0].net_source_energy_kwh = convert_units(net_source_energy, 'GJ', 'kWh')
 
     # electricity
     electricity = sql_query(runner, sql_file, 'AnnualBuildingUtilityPerformanceSummary', "TableName='End Uses' AND RowName='Total End Uses' AND ColumnName='Electricity'")
-    feature_report.reporting_periods[0].electricity = convert_units(electricity, 'GJ', 'kBtu')
+    feature_report.reporting_periods[0].electricity_kwh = convert_units(electricity, 'GJ', 'kWh')
 
     # natural_gas
     natural_gas = sql_query(runner, sql_file, 'AnnualBuildingUtilityPerformanceSummary', "TableName='End Uses' AND RowName='Total End Uses' AND ColumnName='Natural Gas'")
-    feature_report.reporting_periods[0].natural_gas = convert_units(natural_gas, 'GJ', 'kBtu')
+    feature_report.reporting_periods[0].natural_gas_kwh = convert_units(natural_gas, 'GJ', 'kWh')
 
     # additional_fuel
     additional_fuel = sql_query(runner, sql_file, 'AnnualBuildingUtilityPerformanceSummary', "TableName='End Uses' AND RowName='Total End Uses' AND ColumnName='Additional Fuel'")
-    feature_report.reporting_periods[0].additional_fuel = convert_units(additional_fuel, 'GJ', 'kBtu')
+    feature_report.reporting_periods[0].additional_fuel_kwh = convert_units(additional_fuel, 'GJ', 'kWh')
 
     # district_cooling
     district_cooling = sql_query(runner, sql_file, 'AnnualBuildingUtilityPerformanceSummary', "TableName='End Uses' AND RowName='Total End Uses' AND ColumnName='District Cooling'")
-    feature_report.reporting_periods[0].district_cooling = convert_units(district_cooling, 'GJ', 'kBtu')
+    feature_report.reporting_periods[0].district_cooling_kwh = convert_units(district_cooling, 'GJ', 'kWh')
 
     # district_heating
     district_heating = sql_query(runner, sql_file, 'AnnualBuildingUtilityPerformanceSummary', "TableName='End Uses' AND RowName='Total End Uses' AND ColumnName='District Heating'")
-    feature_report.reporting_periods[0].district_heating = convert_units(district_heating, 'GJ', 'kBtu')
+    feature_report.reporting_periods[0].district_heating_kwh = convert_units(district_heating, 'GJ', 'kWh')
 
     # water
     water = sql_query(runner, sql_file, 'AnnualBuildingUtilityPerformanceSummary', "TableName='End Uses' AND RowName='Total End Uses' AND ColumnName='Water'")
     # feature_report.reporting_periods[0].water = convert_units(water, 'm3', 'ft3')
-    feature_report.reporting_periods[0].water = water
+    feature_report.reporting_periods[0].water_qbft = water
 
     # electricity_produced
     electricity_produced = sql_query(runner, sql_file, 'AnnualBuildingUtilityPerformanceSummary', "TableName='Electric Loads Satisfied' AND RowName='Total On-Site and Utility Electric Sources' AND ColumnName='Electricity'")
-    feature_report.reporting_periods[0].electricity_produced = convert_units(electricity_produced, 'GJ', 'kBtu')
+    feature_report.reporting_periods[0].electricity_produced_kwh = convert_units(electricity_produced, 'GJ', 'kWh')
 
     ## end_uses
 
@@ -610,17 +610,26 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
         # report each query in its corresponding feature report obeject
         if ft.include? ' '
           x = ft.tr(' ', '_').downcase
-          m = feature_report.reporting_periods[0].end_uses.send(x)
+          if x.include? 'water'
+            x_u = x + '_qbft'
+          else
+            x_u = x + '_kwh'
+          end
+          m = feature_report.reporting_periods[0].end_uses.send(x_u)
         else
-          m = feature_report.reporting_periods[0].end_uses.send(ft.downcase)
-
+          if ft.downcase.include? 'water'
+            ft_u = ft + '_qbft'
+          else
+            ft_u = ft + '_kwh'
+          end
+          m = feature_report.reporting_periods[0].end_uses.send(ft_u.downcase)
         end
 
         if eu.include? ' '
           y = eu.tr(' ', '_').downcase
-          m.send("#{y}=", convert_units(sql_r, 'GJ', 'kBtu'))
+          m.send("#{y}=", convert_units(sql_r, 'GJ', 'kWh'))
         else
-          m.send("#{eu.downcase}=", convert_units(sql_r, 'GJ', 'kBtu'))
+          m.send("#{eu.downcase}=", convert_units(sql_r, 'GJ', 'kWh'))
         end
       end
     end
@@ -629,20 +638,20 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
     ## electricity_produced
     # photovoltaic
     photovoltaic_power = sql_query(runner, sql_file, 'AnnualBuildingUtilityPerformanceSummary', "TableName='Electric Loads Satisfied' AND RowName='Photovoltaic Power' AND ColumnName='Electricity'")
-    feature_report.reporting_periods[0].energy_production[:electricity_produced][:photovoltaic] = convert_units(photovoltaic_power, 'GJ', 'kBtu')
+    feature_report.reporting_periods[0].energy_production_kwh[:electricity_produced][:photovoltaic] = convert_units(photovoltaic_power, 'GJ', 'kWh')
 
     ## Total utility cost
     total_utility_cost = sql_query(runner, sql_file, 'Economics Results Summary Report', "TableName='Annual Cost' AND RowName='Cost' AND ColumnName='Total'")
-    feature_report.reporting_periods[0].total_utility_cost = total_utility_cost
+    feature_report.reporting_periods[0].total_utility_cost_dollar = total_utility_cost
 
     ## Utility Costs
     # electricity utility cost
     elec_utility_cost = sql_query(runner, sql_file, 'Economics Results Summary Report', "TableName='Annual Cost' AND RowName='Cost' AND ColumnName='Electric'")
-    feature_report.reporting_periods[0].utility_costs[0][:fuel_type] = 'Electricity'
-    feature_report.reporting_periods[0].utility_costs[0][:total_cost] = elec_utility_cost
+    feature_report.reporting_periods[0].utility_costs_dollar[0][:fuel_type] = 'Electricity'
+    feature_report.reporting_periods[0].utility_costs_dollar[0][:total_cost] = elec_utility_cost
     # gas utility cost
     gas_utility_cost = sql_query(runner, sql_file, 'Economics Results Summary Report', "TableName='Annual Cost' AND RowName='Cost' AND ColumnName='Gas'")
-    feature_report.reporting_periods[0].utility_costs << { fuel_type: 'Natural Gas', total_cost: gas_utility_cost }
+    feature_report.reporting_periods[0].utility_costs_dollar << { fuel_type: 'Natural Gas', total_cost: gas_utility_cost }
 
     ## comfort_result
     # time_setpoint_not_met_during_occupied_cooling

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

@@ -39,10 +39,10 @@ module URBANopt
       # Enduses class inlclude results for each fuel type.
       ##
       class EndUses
-        attr_accessor :electricity, :natural_gas, :additional_fuel, :district_cooling, :district_heating, :water # :nodoc:
+        attr_accessor :electricity_kwh, :natural_gas_kwh, :additional_fuel_kwh, :district_cooling_kwh, :district_heating_kwh, :water_qbft # :nodoc:
         ##
-        # EndUses class intialize end_uses(fuel type) attributes: +:electricity+ , +:natural_gas+ , +:additional_fuel+ ,
-        # +:district_cooling+ , +:district_heating+ , +:water+
+        # EndUses class intialize end_uses(fuel type) attributes: +:electricity_kwh+ , +:natural_gas_kwh+ , +:additional_fuel_kwh+ ,
+        # +:district_cooling_kwh+ , +:district_heating_kwh+ , +:water_qbft+
         ##
         # [parameters:]
         # +hash+ - _Hash_ - A hash which may contain a deserialized end_uses.
@@ -51,12 +51,12 @@ module URBANopt
           hash.delete_if { |k, v| v.nil? }
           hash = defaults.merge(hash)
 
-          @electricity = EndUse.new(hash[:electricity])
-          @natural_gas = EndUse.new(hash[:natural_gas])
-          @additional_fuel = EndUse.new(hash[:additional_fuel])
-          @district_cooling = EndUse.new(hash[:district_cooling])
-          @district_heating = EndUse.new(hash[:district_heating])
-          @water = EndUse.new(hash[:water])
+          @electricity_kwh = EndUse.new(hash[:electricity_kwh])
+          @natural_gas_kwh = EndUse.new(hash[:natural_gas_kwh])
+          @additional_fuel_kwh = EndUse.new(hash[:additional_fuel_kwh])
+          @district_cooling_kwh = EndUse.new(hash[:district_cooling_kwh])
+          @district_heating_kwh = EndUse.new(hash[:district_heating_kwh])
+          @water_qbft = EndUse.new(hash[:water_qbft])
 
           # initialize class variables @@validator and @@schema
           @@validator ||= Validator.new
@@ -72,29 +72,29 @@ module URBANopt
         def to_hash
           result = {}
 
-          electricity_hash = @electricity.to_hash if @electricity.to_hash
-          electricity_hash.delete_if { |k, v| v.nil? }
-          result[:electricity] = electricity_hash if @electricity
+          electricity_kwh_hash = @electricity_kwh.to_hash if @electricity_kwh.to_hash
+          electricity_kwh_hash.delete_if { |k, v| v.nil? }
+          result[:electricity_kwh] = electricity_kwh_hash if @electricity_kwh
 
-          natural_gas_hash = @natural_gas.to_hash if @natural_gas
-          natural_gas_hash.delete_if { |k, v| v.nil? }
-          result[:natural_gas] = natural_gas_hash if @natural_gas
+          natural_gas_kwh_hash = @natural_gas_kwh.to_hash if @natural_gas_kwh
+          natural_gas_kwh_hash.delete_if { |k, v| v.nil? }
+          result[:natural_gas_kwh] = natural_gas_kwh_hash if @natural_gas_kwh
 
-          additional_fuel_hash = @additional_fuel.to_hash if @additional_fuel
-          additional_fuel_hash.delete_if { |k, v| v.nil? }
-          result[:additional_fuel] = additional_fuel_hash if @additional_fuel
+          additional_fuel_kwh_hash = @additional_fuel_kwh.to_hash if @additional_fuel_kwh
+          additional_fuel_kwh_hash.delete_if { |k, v| v.nil? }
+          result[:additional_fuel_kwh] = additional_fuel_kwh_hash if @additional_fuel_kwh
 
-          district_cooling_hash = @district_cooling.to_hash if @district_cooling
-          district_cooling_hash.delete_if { |k, v| v.nil? }
-          result[:district_cooling] = district_cooling_hash if @district_cooling
+          district_cooling_kwh_hash = @district_cooling_kwh.to_hash if @district_cooling_kwh
+          district_cooling_kwh_hash.delete_if { |k, v| v.nil? }
+          result[:district_cooling_kwh] = district_cooling_kwh_hash if @district_cooling_kwh
 
-          district_heating_hash = @district_heating.to_hash if @district_heating
-          district_heating_hash.delete_if { |k, v| v.nil? }
-          result[:district_heating] = district_heating_hash if @district_heating
+          district_heating_kwh_hash = @district_heating_kwh.to_hash if @district_heating_kwh
+          district_heating_kwh_hash.delete_if { |k, v| v.nil? }
+          result[:district_heating_kwh] = district_heating_kwh_hash if @district_heating_kwh
 
-          water_hash = @water.to_hash if @water
-          water_hash.delete_if { |k, v| v.nil? }
-          result[:water] = water_hash if @water
+          water_qbft_hash = @water_qbft.to_hash if @water_qbft
+          water_qbft_hash.delete_if { |k, v| v.nil? }
+          result[:water_qbft] = water_qbft_hash if @water_qbft
 
           # validate end_uses properties against schema
           if @@validator.validate(@@schema[:definitions][:EndUses][:properties], result).any?
@@ -109,12 +109,12 @@ module URBANopt
         ##
         def defaults
           hash = {}
-          hash[:electricity] = EndUse.new.to_hash
-          hash[:natural_gas] = EndUse.new.to_hash
-          hash[:additional_fuel] = EndUse.new.to_hash
-          hash[:district_cooling] = EndUse.new.to_hash
-          hash[:district_heating] = EndUse.new.to_hash
-          hash[:water] = EndUse.new.to_hash
+          hash[:electricity_kwh] = EndUse.new.to_hash
+          hash[:natural_gas_kwh] = EndUse.new.to_hash
+          hash[:additional_fuel_kwh] = EndUse.new.to_hash
+          hash[:district_cooling_kwh] = EndUse.new.to_hash
+          hash[:district_heating_kwh] = EndUse.new.to_hash
+          hash[:water_qbft] = EndUse.new.to_hash
 
           return hash
         end
@@ -127,11 +127,11 @@ module URBANopt
         ##
         def merge_end_uses!(new_end_uses)
           # modify the existing_period by summing up the results ; # sum results only if they exist
-          @electricity.merge_end_use!(new_end_uses.electricity)
-          @natural_gas.merge_end_use!(new_end_uses.natural_gas)
-          @additional_fuel.merge_end_use!(new_end_uses.additional_fuel)
-          @district_cooling.merge_end_use!(new_end_uses.district_cooling)
-          @district_heating.merge_end_use!(new_end_uses.district_heating)
+          @electricity_kwh.merge_end_use!(new_end_uses.electricity_kwh)
+          @natural_gas_kwh.merge_end_use!(new_end_uses.natural_gas_kwh)
+          @additional_fuel_kwh.merge_end_use!(new_end_uses.additional_fuel_kwh)
+          @district_cooling_kwh.merge_end_use!(new_end_uses.district_cooling_kwh)
+          @district_heating_kwh.merge_end_use!(new_end_uses.district_heating_kwh)
           return self
         end
       end

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

@@ -224,30 +224,24 @@ module URBANopt
         end
 
         ##
-        # Saves the 'default_feature_report.json' and 'default_feature_report.csv' files
+        # Saves the 'default_feature_report.json' file to the results directory
         ##
         # [parameters]:
-        # +file_name+ - _String_ - Assign a name to the saved feature report results file without an extension
-        def save_feature_report(file_name = 'default_feature_report')
+        # +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)
@@ -259,13 +253,35 @@ 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