urbanopt-scenario 0.4.2 → 0.6.0

data/lib/urbanopt/scenario/scenario_post_processor_base.rb

@@ -1,21 +1,31 @@
 # *********************************************************************************
-# URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
+# URBANopt™, Copyright (c) 2019-2021, 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.
-#
+
+# Redistribution of this software, without modification, must refer to the software
+# by the same designation. Redistribution of a modified version of this software
+# (i) may not refer to the modified version by the same designation, or by any
+# confusingly similar designation, and (ii) must refer to the underlying software
+# originally provided by Alliance as “URBANopt”. Except to comply with the foregoing,
+# the term “URBANopt”, or any confusingly similar designation may not be used to
+# refer to any modified version of this software or any modified version of the
+# underlying software originally provided by Alliance without the prior written
+# consent of Alliance.
+
 # 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.
@@ -35,7 +45,7 @@ module URBANopt
       # ScenarioPostProcessorBase post-processes a Scenario to create scenario level results.
       ##
       # [parameters:]
-      # +scenario_base+ - _ScenarioBase_ - An object of ScenarioBase class.
+      # * +scenario_base+ - _ScenarioBase_ - An object of ScenarioBase class.
       def initialize(scenario_base)
         @scenario_base = scenario_base
       end
@@ -53,7 +63,7 @@ module URBANopt
       # Add results from a simulation_dir to this result.
       ##
       # [parameters:]
-      # +simulation_dir+ - _SimulationDirOSW_ - An object on SimulationDirOSW class.
+      # * +simulation_dir+ - _SimulationDirOSW_ - An object on SimulationDirOSW class.
       def add_simulation_dir(simulation_dir)
         raise 'add_simulation_dir not implemented for ScenarioPostProcessorBase, override in your class'
       end

data/lib/urbanopt/scenario/scenario_post_processor_default.rb

@@ -1,21 +1,31 @@
 # *********************************************************************************
-# URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
+# URBANopt™, Copyright (c) 2019-2021, 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.
-#
+
+# Redistribution of this software, without modification, must refer to the software
+# by the same designation. Redistribution of a modified version of this software
+# (i) may not refer to the modified version by the same designation, or by any
+# confusingly similar designation, and (ii) must refer to the underlying software
+# originally provided by Alliance as “URBANopt”. Except to comply with the foregoing,
+# the term “URBANopt”, or any confusingly similar designation may not be used to
+# refer to any modified version of this software or any modified version of the
+# underlying software originally provided by Alliance without the prior written
+# consent of Alliance.
+
 # 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.
@@ -32,8 +42,6 @@ require 'urbanopt/scenario/scenario_post_processor_base'
 require 'urbanopt/reporting/default_reports'
 
 require 'csv'
-require 'json'
-require 'fileutils'
 require 'sqlite3'
 
 module URBANopt
@@ -43,7 +51,7 @@ module URBANopt
       # ScenarioPostProcessorBase post-processes a scenario to create scenario level results
       ##
       # [parameters:]
-      # +scenario_base+ - _ScenarioBase_ - An object of ScenarioBase class.
+      # * +scenario_base+ - _ScenarioBase_ - An object of ScenarioBase class.
       def initialize(scenario_base)
         super(scenario_base)
 
@@ -69,7 +77,7 @@ module URBANopt
       # Add results from a simulation_dir to this result.
       ##
       # [parameters:]
-      # +simulation_dir+ - _SimulationDirOSW_ - An object on SimulationDirOSW class.
+      # * +simulation_dir+ - _SimulationDirOSW_ - An object on SimulationDirOSW class.
       def add_simulation_dir(simulation_dir)
         feature_reports = URBANopt::Reporting::DefaultReports::FeatureReport.from_simulation_dir(simulation_dir)
 
@@ -86,6 +94,9 @@ module URBANopt
 
       # Create database file with scenario-level results
       #   Sum values for each timestep across all features. Save to new table in a new database
+      ##
+      # [parameters:]
+      # * +file_name+ - _String_ - Assign a name to the saved scenario results file
       def create_scenario_db_file(file_name = @default_save_name)
         new_db_file = File.join(@initialization_hash[:directory_name], "#{file_name}.db")
         scenario_db = SQLite3::Database.open new_db_file
@@ -97,8 +108,9 @@ module URBANopt
           Hour VARCHAR(255),
           Minute VARCHAR(255),
           Dst INTEGER,
-          ReportDataDictionaryIndex INTEGER,
-          Value INTEGER
+          FuelType VARCHAR(255),
+          Value INTEGER,
+          FuelUnits VARCHAR(255)
           )"
 
         values_arr = []
@@ -121,18 +133,19 @@ module URBANopt
         else
           raise "Couldn't find scenario CSV: #{scenario_csv}"
         end
-        feature_1_name = File.basename(feature_list[0]) # Get name of first feature, so we can read eplusout.sql from there
-        uo_output_sql_file = File.join(@initialization_hash[:directory_name], feature_1_name, 'eplusout.sql')
         feature_list.each do |feature| # Loop through each feature in the scenario
+          uo_output_sql_file = File.join(@initialization_hash[:directory_name], File.basename(feature), 'eplusout.sql')
           feature_db = SQLite3::Database.open uo_output_sql_file
           # Doing "db.results_as_hash = true" is prettier, but in this case significantly slower.
 
-          # RDDI == 10 is the timestep value for facility electricity in OS 3.0.1
-          # TODO: Dynamically read RDDI from table RDDI, insted of hardcoding it
-          elec_query = feature_db.query "SELECT ReportData.TimeIndex, Time.Year, Time.Month, Time.Day, Time.Hour, Time.Minute, Time.Dst, ReportData.Value
+          elec_query = feature_db.query "SELECT ReportData.TimeIndex, Time.Year, Time.Month, Time.Day, Time.Hour,
+            Time.Minute, Time.Dst, ReportData.Value
           FROM ReportData
           INNER JOIN Time ON Time.TimeIndex=ReportData.TimeIndex
-          WHERE ReportDataDictionaryIndex == 10
+          INNER JOIN ReportDataDictionary AS rddi ON rddi.ReportDataDictionaryIndex=ReportData.ReportDataDictionaryIndex
+          WHERE rddi.IndexGroup == 'Facility:Electricity'
+          AND rddi.ReportingFrequency == 'Zone Timestep'
+          AND Time.Year > 1900
           ORDER BY ReportData.TimeIndex"
 
           elec_query.each do |row| # Add up all the values for electricity usage across all Features at this timestep
@@ -149,12 +162,14 @@ module URBANopt
           end # End elec_query
           elec_query.close
 
-          # RDDI == 1382 is the timestep value for facility gas in OS 3.0.1
-          # TODO: Dynamically read RDDI from table RDDI, insted of hardcoding it
-          gas_query = feature_db.query "SELECT ReportData.TimeIndex, Time.Year, Time.Month, Time.Day, Time.Hour, Time.Minute, Time.Dst, ReportData.Value
+          gas_query = feature_db.query "SELECT ReportData.TimeIndex, Time.Year, Time.Month, Time.Day, Time.Hour,
+            Time.Minute, Time.Dst, ReportData.Value
           FROM ReportData
           INNER JOIN Time ON Time.TimeIndex=ReportData.TimeIndex
-          WHERE ReportDataDictionaryIndex == 1382
+          INNER JOIN ReportDataDictionary AS rddi ON rddi.ReportDataDictionaryIndex=ReportData.ReportDataDictionaryIndex
+          WHERE rddi.IndexGroup == 'Facility:Gas'
+          AND rddi.ReportingFrequency == 'Zone Timestep'
+          AND Time.Year > 1900
           ORDER BY ReportData.TimeIndex"
 
           gas_query.each do |row|
@@ -175,8 +190,8 @@ module URBANopt
         elec_sql = []
         gas_sql = []
         values_arr.each do |i|
-          elec_sql << "(#{i[:time_index]}, #{i[:year]}, #{i[:month]}, #{i[:day]}, #{i[:hour]}, #{i[:minute]}, #{i[:dst]}, 10, #{i[:elec_val]})"
-          gas_sql << "(#{i[:time_index]}, #{i[:year]}, #{i[:month]}, #{i[:day]}, #{i[:hour]}, #{i[:minute]}, #{i[:dst]}, 1382, #{i[:gas_val]})"
+          elec_sql << "(#{i[:time_index]}, #{i[:year]}, #{i[:month]}, #{i[:day]}, #{i[:hour]}, #{i[:minute]}, #{i[:dst]}, 'Electricity', #{i[:elec_val]}, 'J')"
+          gas_sql << "(#{i[:time_index]}, #{i[:year]}, #{i[:month]}, #{i[:day]}, #{i[:hour]}, #{i[:minute]}, #{i[:dst]}, 'Gas', #{i[:gas_val]}, 'J')"
         end
 
         # Put summed Values into the database
@@ -189,7 +204,7 @@ module URBANopt
       # Save scenario result
       ##
       # [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
       def save(file_name = @default_save_name)
         @scenario_result.save
 

data/lib/urbanopt/scenario/scenario_post_processor_opendss.rb

@@ -1,21 +1,31 @@
 # *********************************************************************************
-# URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
+# URBANopt™, Copyright (c) 2019-2021, 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.
-#
+
+# Redistribution of this software, without modification, must refer to the software
+# by the same designation. Redistribution of a modified version of this software
+# (i) may not refer to the modified version by the same designation, or by any
+# confusingly similar designation, and (ii) must refer to the underlying software
+# originally provided by Alliance as “URBANopt”. Except to comply with the foregoing,
+# the term “URBANopt”, or any confusingly similar designation may not be used to
+# refer to any modified version of this software or any modified version of the
+# underlying software originally provided by Alliance without the prior written
+# consent of Alliance.
+
 # 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.
@@ -34,7 +44,6 @@ require 'urbanopt/reporting/default_reports'
 require 'csv'
 require 'json'
 require 'fileutils'
-require 'pathname'
 
 module URBANopt
   module Scenario
@@ -43,8 +52,8 @@ module URBANopt
       # OpenDSSPostProcessor post-processes OpenDSS results to selected OpenDSS results and integrate them in scenario and feature reports.
       ##
       # [parameters:]
-      # +scenario_report+ - _ScenarioBase_ - An object of Scenario_report class.
-      # +opendss_results_dir_name+ - _directory name of opendss results
+      # * +scenario_report+ - _ScenarioBase_ - An object of Scenario_report class.
+      # * +opendss_results_dir_name+ - _directory name of opendss results
       def initialize(scenario_report, opendss_results_dir_name = 'opendss')
         if !scenario_report.nil?
           @scenario_report = scenario_report
@@ -202,9 +211,9 @@ module URBANopt
       # Save csv report method
       ##
       # [parameters:]
-      # +feature_report+ - _feature report object_ - An onject of the feature report
-      # +updated_feature_report_csv+ - _CSV_ - An updated feature report csv
-      # +file_name+ - _String_ - Assigned name to save the file with no extension
+      # * +feature_report+ - _feature report object_ - An onject of the feature report
+      # * +updated_feature_report_csv+ - _CSV_ - An updated feature report csv
+      # * +file_name+ - _String_ - Assigned name to save the file with no extension
       def save_csv(feature_report, updated_feature_report_csv, file_name = 'default_feature_report')
         File.write(File.join(feature_report.directory_name, 'feature_reports', "#{file_name}.csv"), updated_feature_report_csv)
       end
@@ -213,7 +222,7 @@ module URBANopt
       # create opendss json report results
       ##
       # [parameters:]
-      # +feature_report+ - _feature report object_ - An onject of the feature report
+      # * +feature_report+ - _feature report object_ - An onject of the feature report
       def add_summary_results(feature_report)
         under_voltage_hrs = 0
         over_voltage_hrs = 0
@@ -258,7 +267,7 @@ module URBANopt
           updated_feature_csv = merge_data(@feature_reports_data[id], @opendss_data[id])
 
           # save fetaure reports
-          feature_report.save_feature_report('default_feature_report_opendss')
+          feature_report.save_json_report('default_feature_report_opendss')
 
           # resave updated csv report
           save_csv(feature_report, updated_feature_csv, 'default_feature_report_opendss')
@@ -268,7 +277,8 @@ module URBANopt
         save_transformers_reports
 
         # save the updated scenario reports
-        @scenario_report.save(file_name = 'scenario_report_opendss')
+        # set save_feature_reports to false since only the scenario reports should be saved now
+        @scenario_report.save(file_name = 'scenario_report_opendss', save_feature_reports = false)
       end
     end
   end

data/lib/urbanopt/scenario/scenario_runner_base.rb

@@ -1,21 +1,31 @@
 # *********************************************************************************
-# URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
+# URBANopt™, Copyright (c) 2019-2021, 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.
-#
+
+# Redistribution of this software, without modification, must refer to the software
+# by the same designation. Redistribution of a modified version of this software
+# (i) may not refer to the modified version by the same designation, or by any
+# confusingly similar designation, and (ii) must refer to the underlying software
+# originally provided by Alliance as “URBANopt”. Except to comply with the foregoing,
+# the term “URBANopt”, or any confusingly similar designation may not be used to
+# refer to any modified version of this software or any modified version of the
+# underlying software originally provided by Alliance without the prior written
+# consent of Alliance.
+
 # 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.
@@ -40,8 +50,9 @@ module URBANopt
       # Create all SimulationDirs for Scenario.
       ##
       # [parameters:]
-      # +scenario+ - _ScenarioBase_ - Scenario to create simulation input files for scenario.
-      # +force_clear+ - _Bool_ - Clear Scenario before creating simulation input files
+      # * +scenario+ - _ScenarioBase_ - Scenario to create simulation input files for scenario.
+      # * +force_clear+ - _Bool_ - Clear Scenario before creating simulation input files
+      ##
       # [return:] _Array_ Returns an array of all SimulationDirs, even those created previously, for Scenario.
       def create_simulation_files(scenario, force_clear = false)
         raise 'create_input_files is not implemented for ScenarioRunnerBase, override in your class'
@@ -51,9 +62,9 @@ module URBANopt
       # Create and run all SimulationFiles for Scenario.
       ##
       # [parameters:]
-      # +scenario+ - _ScenarioBase_ - Scenario to create and run simulation input files for.
-      # +force_clear+ - _Bool_ - Clear Scenario before creating Simulation input files.
-      #
+      # * +scenario+ - _ScenarioBase_ - Scenario to create and run simulation input files for.
+      # * +force_clear+ - _Bool_ - Clear Scenario before creating Simulation input files.
+      ##
       # [return:] _Array_ Returns an array of all SimulationDirs, even those created previously, for Scenario.
       def run(scenario, force_clear = false, options = {})
         raise 'run is not implemented for ScenarioRunnerBase, override in your class'

data/lib/urbanopt/scenario/scenario_runner_osw.rb

@@ -1,21 +1,31 @@
 # *********************************************************************************
-# URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
+# URBANopt™, Copyright (c) 2019-2021, 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.
-#
+
+# Redistribution of this software, without modification, must refer to the software
+# by the same designation. Redistribution of a modified version of this software
+# (i) may not refer to the modified version by the same designation, or by any
+# confusingly similar designation, and (ii) must refer to the underlying software
+# originally provided by Alliance as “URBANopt”. Except to comply with the foregoing,
+# the term “URBANopt”, or any confusingly similar designation may not be used to
+# refer to any modified version of this software or any modified version of the
+# underlying software originally provided by Alliance without the prior written
+# consent of Alliance.
+
 # 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.
@@ -46,8 +56,9 @@ module URBANopt
       # Create all OSWs for Scenario.
       ##
       # [parameters:]
-      # +scenario+ - _ScenarioBase_ - Scenario to create simulation input files for.
-      # +force_clear+ - _Bool_ - Clear Scenario before creating simulation input files.
+      # * +scenario+ - _ScenarioBase_ - Scenario to create simulation input files for.
+      # * +force_clear+ - _Bool_ - Clear Scenario before creating simulation input files.
+      ##
       # [return:] _Array_ Returns array of all SimulationDirs, even those created previously, for Scenario.
       def create_simulation_files(scenario, force_clear = false)
         if force_clear
@@ -79,8 +90,9 @@ module URBANopt
       # - Run osw file groups in order and store simulation failure in a array.
       ##
       # [parameters:]
-      # +scenario+ - _ScenarioBase_ - Scenario to create and run SimulationFiles for.
-      # +force_clear+ - _Bool_ - Clear Scenario before creating SimulationFiles.
+      # * +scenario+ - _ScenarioBase_ - Scenario to create and run SimulationFiles for.
+      # * +force_clear+ - _Bool_ - Clear Scenario before creating SimulationFiles.
+      ##
       # [return:] _Array_ Returns array of all SimulationFiles, even those created previously, for Scenario.
       def run(scenario, force_clear = false, options = {})
         # instantiate openstudio runner - use the defaults for now. If need to change then create

data/lib/urbanopt/scenario/scenario_visualization.rb

@@ -1,21 +1,31 @@
 # *********************************************************************************
-# URBANopt (tm), Copyright (c) 2019-2020, Alliance for Sustainable Energy, LLC, and other
+# URBANopt™, Copyright (c) 2019-2021, 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.
-#
+
+# Redistribution of this software, without modification, must refer to the software
+# by the same designation. Redistribution of a modified version of this software
+# (i) may not refer to the modified version by the same designation, or by any
+# confusingly similar designation, and (ii) must refer to the underlying software
+# originally provided by Alliance as “URBANopt”. Except to comply with the foregoing,
+# the term “URBANopt”, or any confusingly similar designation may not be used to
+# refer to any modified version of this software or any modified version of the
+# underlying software originally provided by Alliance without the prior written
+# consent of Alliance.
+
 # 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.
@@ -31,21 +41,22 @@
 require 'csv'
 require 'date'
 require 'json'
-require 'fileutils'
 
 module URBANopt
   module Scenario
     class ResultVisualization
-      def self.create_visualization(run_dir, feature = true)
+      def self.create_visualization(run_dir, feature = true, feature_names = false)
         @all_results = []
-        run_dir.each do |folder|
-          name = folder.split('/')[-1]
 
+        run_dir.each do |folder|
           # create visualization for scenarios
           if feature == false
+            name = folder.split('/')[-1]
             csv_dir = File.join(folder, 'default_scenario_report.csv')
           # create visualization for features
           elsif feature == true
+            index = run_dir.index(folder)
+            name = folder.split('/')[-1] + '-' + feature_names[index]
             csv_dir = File.join(folder, 'feature_reports/default_feature_report.csv')
           end
 
@@ -181,14 +192,13 @@ module URBANopt
                     monthly_sum_dec += v.to_f
                     i += 1
                   end
-                  # sum up all values for annual aggregate
-                  if k <= size
-                    annual_sum += v.to_f
-                    k += 1
-                  end
+
                 end
               end
 
+              # sum up monthly values for annual aggregate
+              annual_sum = monthly_sum_jan + monthly_sum_feb + monthly_sum_mar + monthly_sum_apr + monthly_sum_may + monthly_sum_jun + monthly_sum_jul + monthly_sum_aug + monthly_sum_sep + monthly_sum_oct + monthly_sum_nov + monthly_sum_dec
+
               # store headers as key and monthly sums as values for each header
               monthly_totals[headers_unitless[j]] = [monthly_sum_jan, monthly_sum_feb, monthly_sum_mar, monthly_sum_apr, monthly_sum_may, monthly_sum_jun, monthly_sum_jul, monthly_sum_aug, monthly_sum_sep, monthly_sum_oct, monthly_sum_nov, monthly_sum_dec]