urbanopt-cli 0.6.0 → 0.6.4

data/example_files/reopt/base_assumptions.json

@@ -22,8 +22,8 @@
         "net_metering_limit_kw": 0,
         "interconnection_limit_kw": 100000000.0,
         "blended_monthly_demand_charges_us_dollars_per_kw": [10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10], 
-        "blended_monthly_rates_us_dollars_per_kwh": [0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13] 
-      },
+        "blended_monthly_rates_us_dollars_per_kwh": [0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13]
+     },
       "Wind": {
         "min_kw": 0,
         "max_kw": 0,
@@ -77,7 +77,7 @@
         "losses": 0.14,
         "array_type": 1,
         "module_type": 0,
-        "gcr": 0.4,
+        "gcr": 0.99,
         "dc_ac_ratio": 1.2,
         "inv_eff": 0.96,
         "radius": 0,

data/example_files/reopt/multiPV_assumptions.json

@@ -77,7 +77,7 @@
         "losses": 0.14,
         "array_type": 1,
         "module_type": 0,
-        "gcr": 0.4,
+        "gcr": 0.99,
         "dc_ac_ratio": 1.2,
         "inv_eff": 0.96,
         "radius": 0,
@@ -113,7 +113,7 @@
         "losses": 0.14,
         "array_type": 0,
         "module_type": 0,
-        "gcr": 0.4,
+        "gcr": 0.99,
         "dc_ac_ratio": 1.2,
         "inv_eff": 0.96,
         "radius": 0,

data/example_files/resources/hpxml-measures/Gemfile

@@ -2,7 +2,7 @@
 
 source 'http://rubygems.org'
 
-gem 'nokogiri', '~> 1.10'
+gem 'nokogiri', '~> 1.12'
 gem 'oga'
 gem 'schematron-nokogiri'
 gem 'rake'

data/example_files/resources/hpxml-measures/Gemfile.lock

@@ -4,27 +4,17 @@ GEM
     ansi (1.5.0)
     ast (2.4.2)
     builder (3.2.4)
-    ci_reporter (2.0.0)
-      builder (>= 2.1.2)
-    ci_reporter_minitest (1.0.0)
-      ci_reporter (~> 2.0)
-      minitest (~> 5.0)
-    codecov (0.2.12)
-      json
-      simplecov
-    docile (1.3.5)
-    json (2.5.1)
-    mini_portile2 (2.5.0)
+    mini_portile2 (2.6.1)
     minitest (5.14.4)
     minitest-reporters (1.4.3)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    nokogiri (1.11.2)
-      mini_portile2 (~> 2.5.0)
+    nokogiri (1.12.5)
+      mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
-    nokogiri (1.11.2-x64-mingw32)
+    nokogiri (1.12.5-x64-mingw32)
       racc (~> 1.4)
     oga (3.3)
       ast
@@ -38,28 +28,19 @@ GEM
     ruby-progressbar (1.11.0)
     schematron-nokogiri (0.0.3)
       nokogiri (~> 1.6)
-    simplecov (0.21.2)
-      docile (~> 1.1)
-      simplecov-html (~> 0.11)
-      simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.2)
 
 PLATFORMS
   ruby
   x64-mingw32
 
 DEPENDENCIES
-  ci_reporter_minitest (~> 1.0.0)
-  codecov (= 0.2.12)
   minitest (~> 5.9)
   minitest-reporters
-  nokogiri (~> 1.10)
+  nokogiri (~> 1.12)
   oga
   parallel
   rake
   schematron-nokogiri
-  simplecov
 
 BUNDLED WITH
-   2.2.11
+   2.2.11

data/example_files/visualization/input_visualization_feature.html

@@ -383,10 +383,13 @@
 
         var months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
         
-        var datasets = ['Electricity:Facility', 'ElectricityProduced:Facility', 'NaturalGas:Facility', 'Propane:Facility', 'FuelOilNo2:Facility', 'OtherFuels:Facility'];
+        var datasets = ['Electricity:Facility', 'REopt:ElectricityProduced:Total', 'NaturalGas:Facility', 'Propane:Facility', 'FuelOilNo2:Facility', 'OtherFuels:Facility'];
         
         var endUseKeys = ['Heating:Electricity', 'Cooling:Electricity', 'InteriorLights:Electricity', 'ExteriorLights:Electricity', 'ExteriorEquipment:Electricity', 'InteriorEquipment:Electricity', 'Fans:Electricity', 'Pumps:Electricity', 'HeatRejection:Electricity', 'WaterSystems:Electricity'];
 
+        var kbtu_datasets = ['NaturalGas:Facility', 'Propane:Facility', 'FuelOilNo2:Facility', 'OtherFuels:Facility'];
+        var changeToKbtu = false;
+
         
         var applicableEndUseKeys = [];
 
@@ -449,8 +452,7 @@
 
             // monthly fuel use
             $scope.monthlyFuelChartData[feature.name] = [];
-            var changeToKbtu = false;
-            var kbtu_datasets = ['NaturalGas:Facility', 'Propane:Facility', 'FuelOilNo2:Facility', 'OtherFuels:Facility'];
+            
             // first iterate through all kbtu datasets to see if you'll need to change to kBtu units
             _.forEach(kbtu_datasets, function (kbtu_dataset) {
               var values = feature.monthly_values[kbtu_dataset];
@@ -481,7 +483,7 @@
                     datasetUnit = 'Electricity:Facility(kWh)';
                   }
                 }
-              } else if (dataset == 'ElectricityProduced:Facility') {
+              } else if (dataset == 'REopt:ElectricityProduced:Total') {
                 // first check if there is data to include
                 if (!(values.every(item => item === 0))) {
                   if (changeToKbtu) {
@@ -530,29 +532,26 @@
           // monthly net use
           if(feature['complete_simulation'] == true){
             $scope.monthlyNetChartData[feature.name] = [];
-            var values = feature.monthly_values['NaturalGas:Facility'];
-            var changeToKbtu = false;
-            if (!(values.every(item => item === 0))) {
-              changeToKbtu = true
-            }
+            var unit = ' (kWh)'
             if (changeToKbtu){
-              var unit = ' (kBtu)'
-            }
-            else {
-              var unit = ' (kWh)'
+              unit = ' (kBtu)'
             }
 
             $scope.annualNetChartData[feature.name] = 0;
             $scope.monthlyNetChartData[feature.name].push({
               key: 'Net Energy Use' + unit,
               values: _.map(months, function (month, i) {
+                var value = 0;
                  if (changeToKbtu){
-                  var value = feature.monthly_values['Electricity:Facility'][i]*3.41 - feature.monthly_values['ElectricityProduced:Facility'][i]*3.41 + feature.monthly_values['NaturalGas:Facility'][i]; //Values are in kBtu
+                  value = feature.monthly_values['Electricity:Facility'][i]*3.41 - feature.monthly_values['REopt:ElectricityProduced:Total'][i]*3.41;
+                  _.forEach(kbtu_datasets, function(ds){
+                    value += feature.monthly_values[ds][i];
+                  });
                  }
                 else {
-                  var value = feature.monthly_values['Electricity:Facility'][i] - feature.monthly_values['ElectricityProduced:Facility'][i]; //Values are in kWh
+                  value = feature.monthly_values['Electricity:Facility'][i] - feature.monthly_values['REopt:ElectricityProduced:Total'][i]; //Values are in kWh
                 }
-                value;
+
                 $scope.annualNetChartData[feature.name] += value;
                 // global
                 monthlyNetYMin = _.min([monthlyNetYMin, value]);

data/example_files/visualization/input_visualization_scenario.html

@@ -373,10 +373,13 @@
 
         var months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
         
-        var datasets = ['Electricity:Facility', 'ElectricityProduced:Facility', 'NaturalGas:Facility', 'Propane:Facility', 'FuelOilNo2:Facility', 'OtherFuels:Facility'];
+        var datasets = ['Electricity:Facility', 'REopt:ElectricityProduced:Total', 'NaturalGas:Facility', 'Propane:Facility', 'FuelOilNo2:Facility', 'OtherFuels:Facility'];
 
         var endUseKeys = ['Heating:Electricity', 'Cooling:Electricity', 'InteriorLights:Electricity', 'ExteriorLights:Electricity', 'InteriorEquipment:Electricity', 'ExteriorEquipment:Electricity', 'Fans:Electricity', 'Pumps:Electricity', 'HeatRejection:Electricity', 'WaterSystems:Electricity'];
         
+        var kbtu_datasets = ['NaturalGas:Facility', 'Propane:Facility', 'FuelOilNo2:Facility', 'OtherFuels:Facility'];
+        var changeToKbtu = false;
+
         var applicableEndUseKeys = [];
 
         $scope.monthlyFuelChartData = {};
@@ -422,8 +425,7 @@
 
             // monthly fuel use
             $scope.monthlyFuelChartData[scenario.name] = [];
-              var changeToKbtu = false;
-              var kbtu_datasets = ['NaturalGas:Facility', 'Propane:Facility', 'FuelOilNo2:Facility', 'OtherFuels:Facility'];
+             
               // first iterate through all kbtu datasets to see if you'll need to change to kBtu units
             _.forEach(kbtu_datasets, function (kbtu_dataset) {
               var values = scenario.monthly_values[kbtu_dataset];
@@ -454,7 +456,7 @@
                     datasetUnit = 'Electricity:Facility(kWh)';
                   }
                 }
-              } else if (dataset == 'ElectricityProduced:Facility') {
+              } else if (dataset == 'REopt:ElectricityProduced:Total') {
                 // first check if there is data to include
                 if (!(values.every(item => item === 0))) {
                   if (changeToKbtu) {
@@ -502,24 +504,27 @@
             if (!(values.every(item => item === 0))) {
               changeToKbtu = true
             }
+            var unit = ' (kWh)'
             if (changeToKbtu){
-              var unit = ' (kBtu)'
-            }
-            else {
-              var unit = ' (kWh)'
+              unit = ' (kBtu)'
             }
 
             $scope.annualNetChartData[scenario.name] = 0;
             $scope.monthlyNetChartData[scenario.name].push({
               key: 'Net Energy Use' + unit,
               values: _.map(months, function (month, i) {
+                var value = 0;
                 if (changeToKbtu){
-                  var value = scenario.monthly_values['Electricity:Facility'][i]*3.41 - scenario.monthly_values['ElectricityProduced:Facility'][i]*3.41 + scenario.monthly_values['NaturalGas:Facility'][i]; //Values are in kBtu
+                  value = scenario.monthly_values['Electricity:Facility'][i]*3.41 - scenario.monthly_values['REopt:ElectricityProduced:Total'][i]*3.41 + scenario.monthly_values['NaturalGas:Facility'][i]; //Values are in kBtu
+
+                   _.forEach(kbtu_datasets, function(ds){
+                     value += scenario.monthly_values[ds][i];
+                   });
                  }
                 else {
-                  var value = scenario.monthly_values['Electricity:Facility'][i] - scenario.monthly_values['ElectricityProduced:Facility'][i]; //Values are in kWh
+                  value = scenario.monthly_values['Electricity:Facility'][i] - scenario.monthly_values['REopt:ElectricityProduced:Total'][i]; //Values are in kWh
                 }
-                value;
+                // value;
                 $scope.annualNetChartData[scenario.name] += value;
                 monthlyNetYMin = _.min([monthlyNetYMin, value]);
                 monthlyNetYMax = _.max([monthlyNetYMax, value]);

data/lib/uo_cli/version.rb

@@ -40,6 +40,6 @@
 
 module URBANopt
   module CLI
-    VERSION = '0.6.0'.freeze
+    VERSION = '0.6.4'.freeze
   end
 end

data/lib/uo_cli.rb

@@ -46,6 +46,7 @@ require 'urbanopt/geojson'
 require 'urbanopt/scenario'
 require 'urbanopt/reopt'
 require 'urbanopt/reopt_scenario'
+require 'urbanopt/rnm'
 require 'csv'
 require 'fileutils'
 require 'json'
@@ -59,10 +60,11 @@ module URBANopt
       COMMAND_MAP = {
         'create' => 'Make new things - project directory or files',
         'run' => 'Use files in your directory to simulate district energy use',
-        'opendss' => 'Run OpenDSS simulation',
         'process' => 'Post-process URBANopt simulations for additional insights',
         'visualize' => 'Visualize and compare results for features and scenarios',
         'validate' => 'Validate results with custom rules',
+        'opendss' => 'Run OpenDSS simulation',
+        'rnm' => 'Run RNM simulation',
         'delete' => 'Delete simulations for a specified scenario',
         'des_params' => 'Make a DES system parameters config file',
         'des_create' => 'Create a Modelica model',
@@ -106,9 +108,6 @@ module URBANopt
           "Add additional tags to specify the method for creating geometry, or use the default urban geometry creation method to create building geometry from geojson coordinates with core and perimeter zoning\n" \
           'Example: uo create --project-folder urbanopt_example_project', type: String, short: :p
 
-          opt :electric, "\nCreate default project with FeatureFile containing electrical network\n" \
-          "Example: uo create --project-folder urbanopt_example_project --electric", short: :l
-
           opt :create_bar, "\nCreate building geometry and add space types using the create bar from building type ratios measure\n" \
           "Refer to https://docs.urbanopt.net/ for more details about the workflow\n" \
           "Used with --project-folder\n" \
@@ -123,6 +122,15 @@ module URBANopt
           "This functionality has not been exhaustively tested and currently supports the Single-Family Detached building type and the Baseline Scenario only\n" \
           "Used with --project-folder\n" \
           "Example: uo create --project-folder urbanopt_example_project --combined\n", short: :d
+          
+          opt :electric, "\nCreate default project with FeatureFile containing electrical network, used for OpenDSS analysis\n" \
+          "Example: uo create --project-folder urbanopt_example_project --electric", short: :l
+
+          opt :streets, "\nCreate default project wiht FeatureFile containing streets, used for RNM analysis\n" \
+          "Example: uo create --project-folder urbanopt_example_project --streets", short: :t
+
+          opt :photovoltaic, "\nCreate default project with FeatureFile containing community photovoltaic for the district and ground-mount photovoltaic associated with buildings, used for REopt analysis \n" \
+          "Example: uo create --project-folder urbanopt_example_project --photovoltaic", short: :v
 
           opt :empty, "\nUse with --project-folder argument to create an empty project folder\n" \
           "Then add your own Feature file in the project directory you created,\n" \
@@ -173,11 +181,11 @@ module URBANopt
 
           opt :scenario, "\nRun OpenDSS simulations for <scenario>\n" \
           "Requires --feature also be specified\n" \
-          'Example: uo opendss --scenario baseline_scenario-2.csv --feature example_project.json', default: 'baseline_scenario.csv', short: :s
+          'Example: uo opendss --scenario baseline_scenario-2.csv --feature example_project.json', default: 'baseline_scenario.csv', required: true, short: :s
 
           opt :feature, "\nRun OpenDSS simulations according to <featurefile>\n" \
           "Requires --scenario also be specified\n" \
-          'Example: uo opendss --scenario baseline_scenario.csv --feature example_project.json', default: 'example_project_with_electric_network.json', short: :f
+          'Example: uo opendss --scenario baseline_scenario.csv --feature example_project.json', default: 'example_project_with_electric_network.json', required: true, short: :f
 
           opt :equipment, "\nRun OpenDSS simulations using <equipmentfile>. If not specified, the electrical_database.json from urbanopt-ditto-reader will be used.\n" \
           'Example: uo opendss --scenario baseline_scenario.csv --feature example_project.json', type: String, short: :e
@@ -204,6 +212,33 @@ module URBANopt
         end
       end
 
+      # Define RNM commands
+      def opt_rnm
+        @subopts = Optimist.options do
+          banner "\nURBANopt #{@command}:\n\n"
+
+          opt :scenario, "\nRun RNM simulation for <scenario>. Scenario must be run and post-processed prior to calling the rnm command.\n" \
+          "Requires --feature also be specified\n" \
+          'Example: uo rnm --scenario baseline_scenario-2.csv --feature example_project.json', default: 'baseline_scenario.csv', required: true, short: :s
+
+          opt :feature, "\nRun RNM simulation according to <featurefile>\n" \
+          "Requires --scenario also be specified\n" \
+          'Example: uo rnm --scenario baseline_scenario.csv --feature example_project.json', default: 'example_project_with_streets.json', required: true, short: :f
+
+          opt :reopt, "\nInclude processed REopt optimization results in the simulation.\n" \
+          "Example: uo rnm --scenario baseline_scenario.csv --feature example_project.json --reopt", short: :r
+
+          opt :extended_catalog, "\nUse this option to specify the extended electrical catalog path.\n" \
+          "If this option is not included, the default catalog will be used", type: String, short: :c
+
+          opt :average_peak_catalog, "\nUse this option to specify the average peak catalog path.\n" \
+          "If this option is not included, the default catalog will be used", type: String, short: :a
+
+          opt :opendss, "\n If this option is specified, an OpenDSS-compatible electrical database will be created \n" \
+          "Example: uo rnm --scenario baseline_scenario.csv --feature example_project_with_streets.json --opendss", short: :o
+        end
+      end
+
       # Define post-processing commands
       def opt_process
         @subopts = Optimist.options do
@@ -219,10 +254,16 @@ module URBANopt
           opt :reopt_feature, "\nOptimize for each building individually with REopt\n" \
           'Example: uo process --reopt-feature'
 
+          opt :reopt_resilience, "\nInclude resilience reporting in REopt optimization\n" \
+          'Example: uo process --reopt-scenario --reopt-resilience'
+
+          opt :reopt_keep_existing, "\nKeep existing reopt feature optimizations instead of rerunning them to avoid rate limit issues.\n" \
+          'Example: uo process --reopt-feature --reopt-keep-existing', short: :k
+
           opt :with_database, "\nInclude a sql database output of post-processed results\n" \
           'Example: uo process --default --with-database'
 
-          opt :reopt_scenario_assumptions_file, "\nPath to the scenario REopt assumptions JSON file you want to use. Use with the --reopt-scenario post-processor. " \
+          opt :reopt_scenario_assumptions_file, "\nPath to the scenario REopt assumptions JSON file you want to use. Use with the --reopt-scenario post-processor.\n" \
           "If not specified, the reopt/base_assumptions.json file will be used", type: String, short: :a
 
           opt :scenario, "\nSelect which scenario to optimize", default: 'baseline_scenario.csv', required: true, short: :s
@@ -344,7 +385,7 @@ module URBANopt
       @scenario_name = File.basename(@scenario_file_name, File.extname(@scenario_file_name))
     end
 
-    # Simulate energy usage as defined by ScenarioCSV\
+    # Simulate energy usage as defined by ScenarioCSV
     def self.run_func
       run_dir = File.join(@root_dir, 'run', @scenario_name.downcase)
       csv_file = File.join(@root_dir, @scenario_file_name)
@@ -493,11 +534,15 @@ module URBANopt
 
             if @opthash.subopts[:electric] == true
               FileUtils.cp(File.join(path_item, 'example_project_with_electric_network.json'), dir_name)
+            elsif @opthash.subopts[:streets] == true
+              FileUtils.cp(File.join(path_item, 'example_project_with_streets.json'), dir_name)
+            elsif @opthash.subopts[:photovoltaic] == true
+              FileUtils.cp(File.join(path_item, 'example_project_with_PV.json'), dir_name)
             end
 
             if @opthash.subopts[:floorspace] == false
 
-              if @opthash.subopts[:electric] != true
+              if @opthash.subopts[:electric] != true && @opthash.subopts[:streets] != true && @opthash.subopts[:photovoltaic] != true
                 # copy feature file
                 FileUtils.cp(File.join(path_item, 'example_project.json'), dir_name)
               end
@@ -514,6 +559,7 @@ module URBANopt
                 FileUtils.cp(File.join(path_item, 'mappers/HighEfficiency.rb'), File.join(dir_name, 'mappers'))
                 FileUtils.cp(File.join(path_item, 'mappers/ThermalStorage.rb'), File.join(dir_name, 'mappers'))
                 FileUtils.cp(File.join(path_item, 'mappers/EvCharging.rb'), File.join(dir_name, 'mappers'))
+                FileUtils.cp(File.join(path_item, 'mappers/FlexibleHotWater.rb'), File.join(dir_name, 'mappers'))
 
                 # copy osw file
                 FileUtils.cp(File.join(path_item, 'mappers/base_workflow.osw'), File.join(dir_name, 'mappers'))
@@ -728,6 +774,7 @@ module URBANopt
       puts "\nDone\n"
     end
 
+    # Run OpenDSS simulation
     if @opthash.command == 'opendss'
 
       # first check python
@@ -797,11 +844,45 @@ module URBANopt
       begin
         system(ditto_cli_root + ditto_cli_addition)
       rescue FileNotFoundError
-        abort("\nMust post-process results before running opendss. We recommend 'process --default'." \
-        "Once opendss is run, you may then 'process --opendss'")
+        abort("\nMust post-process results before running OpenDSS. We recommend 'process --default'." \
+        "Once OpenDSS is run, you may then 'process --opendss'")
       end
     end
 
+    # Run RNM Simulation
+    if @opthash.command == 'rnm'
+
+      run_dir =  File.join(@root_dir, 'run', @scenario_name.downcase)
+      # check if project has been post-processed appropriately
+      if !File.exist?(File.join(run_dir, 'default_scenario_report.json'))
+        abort("\nYou must first post-process the scenario before running RNM.  We recommend 'process --default'.")
+      end
+
+      puts 'Preparing RNM inputs'
+      # prep arguments
+      reopt = @opthash.subopts[:reopt] ? true : false
+      opendss_catalog = @opthash.subopts[:opendss] ? true : false
+
+      # if paths below are nil, default paths will be used
+      extended_catalog_path =  @opthash.subopts[:extended_catalog] ? @opthash.subopts[:extended_catalog] : nil 
+      average_peak_catalog_path = @opthash.subopts[:average_peak_catalog] ? @opthash.subopts[:average_peak_catalog] : nil
+
+      # create inputs, run sim and get results
+      begin
+        runner = URBANopt::RNM::Runner.new(@scenario_name, run_dir, @opthash.subopts[:scenario], @opthash.subopts[:feature], extended_catalog_path:extended_catalog_path, average_peak_catalog_path:average_peak_catalog_path, reopt:reopt, opendss_catalog:opendss_catalog)
+        runner.create_simulation_files
+        runner.run
+        runner.post_process
+      rescue => error
+        abort("\nError: #{error.message}")
+      end
+
+      # TODO: aggregate back into scenario reports and geojson file
+      puts "\nRNM Results saved to: #{File.join(run_dir, 'rnm-us', 'results')}"
+      puts "\nDone\n"
+
+    end
+
     # Post-process the scenario
     if @opthash.command == 'process'
       if @opthash.subopts[:default] == false && @opthash.subopts[:opendss] == false && @opthash.subopts[:reopt_scenario] == false && @opthash.subopts[:reopt_feature] == false
@@ -829,7 +910,7 @@ module URBANopt
         results << { "process_type": 'default', "status": 'Complete', "timestamp": Time.now.strftime('%Y-%m-%dT%k:%M:%S.%L') }
       elsif @opthash.subopts[:opendss] == true
         puts "\nPost-processing OpenDSS results\n"
-        opendss_folder = File.join(@root_dir, 'run', @scenario_name, 'opendss')
+        opendss_folder = File.join(@root_dir, 'run', @scenario_name.downcase, 'opendss')
         if File.directory?(opendss_folder)
           opendss_folder_name = File.basename(opendss_folder)
           opendss_post_processor = URBANopt::Scenario::OpenDSSPostProcessor.new(scenario_report, opendss_results_dir_name = opendss_folder_name)
@@ -848,15 +929,58 @@ module URBANopt
           scenario_assumptions = File.expand_path(@opthash.subopts[:reopt_scenario_assumptions_file]).to_s
         end
         puts "\nRunning the REopt Scenario post-processor with scenario assumptions file: #{scenario_assumptions}\n"
-        reopt_post_processor = URBANopt::REopt::REoptPostProcessor.new(scenario_report, scenario_assumptions, scenario_base.reopt_feature_assumptions, DEVELOPER_NREL_KEY)
+        # Add community photovoltaic if present in the Feature File
+        community_photovoltaic = []
+        feature_file = JSON.parse(File.read(File.expand_path(@opthash.subopts[:feature])), symbolize_names: true)
+        feature_file[:features].each do |feature|
+          begin
+            if feature[:properties][:district_system_type] 
+              if feature[:properties][:district_system_type] == 'Community Photovoltaic'
+                community_photovoltaic << feature
+              end
+            end
+          rescue
+          end
+        end
+        reopt_post_processor = URBANopt::REopt::REoptPostProcessor.new(
+          scenario_report,
+          scenario_assumptions,
+          scenario_base.reopt_feature_assumptions,
+          DEVELOPER_NREL_KEY,false
+        )
         if @opthash.subopts[:reopt_scenario] == true
           puts "\nPost-processing entire scenario with REopt\n"
-          scenario_report_scenario = reopt_post_processor.run_scenario_report(scenario_report: scenario_report, save_name: 'scenario_optimization')
+          scenario_report_scenario = reopt_post_processor.run_scenario_report(
+            scenario_report: scenario_report,
+            save_name: 'scenario_optimization',
+            run_resilience: @opthash.subopts[:reopt_resilience],
+            community_photovoltaic: community_photovoltaic
+          )
           results << { "process_type": 'reopt_scenario', "status": 'Complete', "timestamp": Time.now.strftime('%Y-%m-%dT%k:%M:%S.%L') }
           puts "\nDone\n"
         elsif @opthash.subopts[:reopt_feature] == true
           puts "\nPost-processing each building individually with REopt\n"
-          scenario_report_features = reopt_post_processor.run_scenario_report_features(scenario_report: scenario_report, save_names_feature_reports: ['feature_optimization'] * scenario_report.feature_reports.length, save_name_scenario_report: 'feature_optimization')
+          # Add groundmount photovoltaic if present in the Feature File
+          groundmount_photovoltaic = {}
+          feature_file = JSON.parse(File.read(File.expand_path(@opthash.subopts[:feature])), symbolize_names: true)
+          feature_file[:features].each do |feature|
+            begin
+              if feature[:properties][:district_system_type]
+                if feature[:properties][:district_system_type] == 'Ground Mount Photovoltaic'
+                  groundmount_photovoltaic[feature[:properties][:associated_building_id]] = feature[:properties][:footprint_area]
+                end
+              end
+            rescue
+            end
+          end
+            scenario_report_features = reopt_post_processor.run_scenario_report_features(
+              scenario_report: scenario_report,
+              save_names_feature_reports: ['feature_optimization'] * scenario_report.feature_reports.length,
+              save_name_scenario_report: 'feature_optimization',
+              run_resilience: @opthash.subopts[:reopt_resilience],
+              keep_existing_output: @opthash.subopts[:reopt_keep_existing],
+              groundmount_photovoltaic: groundmount_photovoltaic
+            )
           results << { "process_type": 'reopt_feature', "status": 'Complete', "timestamp": Time.now.strftime('%Y-%m-%dT%k:%M:%S.%L') }
           puts "\nDone\n"
         end
@@ -881,11 +1005,16 @@ module URBANopt
         scenario_folders = []
         scenario_report_exists = false
         Dir.glob(File.join(run_dir, '/*_scenario')) do |scenario_folder|
-          scenario_report = File.join(scenario_folder, 'default_scenario_report.csv')
-          if File.exist?(scenario_report)
-            scenario_folders << scenario_folder
+          scenario_report = File.join(scenario_folder, 'scenario_optimization.csv')
+          # Check if Scenario Optimization REopt file exists and add that
+          if File.exist?(File.join(scenario_folder, 'scenario_optimization.csv'))
+            scenario_folders << File.join(scenario_folder, 'scenario_optimization.csv')
             scenario_report_exists = true
-          else
+          # Check if Default Feature Report exists and add that
+          elsif File.exist?(File.join(scenario_folder, 'default_scenario_report.csv'))
+            scenario_folders << File.join(scenario_folder, 'default_scenario_report.csv')
+            scenario_report_exists = true
+          elsif
             puts "\nERROR: Default reports not created for #{scenario_folder}. Please use 'process --default' to create default post processing reports for all scenarios first. Visualization not generated for #{scenario_folder}.\n"
           end
         end
@@ -921,11 +1050,14 @@ module URBANopt
         feature_folders = []
         # loop through building feature ids from scenario csv
         csv['Feature Id'].each do |feature|
-          feature_report = File.join(run_dir, feature, 'feature_reports')
-          if File.exist?(feature_report)
+          # Check if Feature Optimization REopt file exists and add that
+          if File.exist?(File.join(run_dir, feature, 'feature_reports/feature_optimization.csv'))
             feature_report_exists = true
-            feature_folders << File.join(run_dir, feature)
-          else
+            feature_folders << File.join(run_dir, feature, 'feature_reports/feature_optimization.csv')
+          elsif File.exist?(File.join(run_dir, feature, 'feature_reports/default_feature_report.csv'))
+            feature_report_exists = true
+            feature_folders << File.join(run_dir, feature, 'feature_reports/default_feature_report.csv')
+          elsif
             puts "\nERROR: Default reports not created for #{feature}. Please use 'process --default' to create default post processing reports for all features first. Visualization not generated for #{feature}.\n"
           end
         end
@@ -944,7 +1076,7 @@ module URBANopt
               end
             end
           end
-          html_out_path = File.join(@root_dir, 'run', @scenario_name, 'feature_comparison.html')
+          html_out_path = File.join(@root_dir, 'run', @scenario_name.downcase, 'feature_comparison.html')
           FileUtils.cp(html_in_path, html_out_path)
           puts "\nDone\n"
         end
@@ -966,8 +1098,8 @@ module URBANopt
         feature_ids = CSV.read(@opthash.subopts[:scenario], headers: true)
         feature_list = []
         feature_ids['Feature Id'].each do |feature|
-          if Dir.exist?(File.join(@root_dir, 'run', @scenario_name, feature))
-            feature_list << File.join(@root_dir, 'run', @scenario_name, feature)
+          if Dir.exist?(File.join(@root_dir, 'run', @scenario_name.downcase, feature))
+            feature_list << File.join(@root_dir, 'run', @scenario_name.downcase, feature)
           else
             puts "Warning: did not find a directory for FeatureID: #{feature} ...skipping"
           end

data/scripts/setup-env-gitbash.sh

@@ -1,4 +1,4 @@
-#!/bin/bash 
+#!/bin/bash
 # This is a simple setup script that generates an enviroment file that
 # is used to setup the ruby enviroment to run the urbanopt-cli tool.
 # To use, just run this script in bash (e.g. ./setup-env.sh)
@@ -8,9 +8,9 @@
 
 BASE_DIR_NAME=$(dirname `which $0`)
 
-GEM_HOME=${BASE_DIR_NAME}/gems/ruby/2.5.0
-GEM_PATH=${BASE_DIR_NAME}/gems/ruby/2.5.0
-PATH=${BASE_DIR_NAME}/ruby/bin:${BASE_DIR_NAME}/gems/ruby/2.5.0/bin:$PATH
+GEM_HOME=${BASE_DIR_NAME}/gems/ruby/2.7.0
+GEM_PATH=${BASE_DIR_NAME}/gems/ruby/2.7.0
+PATH=${BASE_DIR_NAME}/ruby/bin:${BASE_DIR_NAME}/gems/ruby/2.7.0/bin:$PATH
 RUBYLIB=${BASE_DIR_NAME}/OpenStudio/Ruby
 RUBY_DLL_PATH=${BASE_DIR_NAME}/OpenStudio/Ruby
 

data/scripts/setup-env-unix.sh

@@ -1,4 +1,4 @@
-#!/bin/bash 
+#!/bin/bash
 # This is a simple setup script that generates an enviroment file that
 # is used to setup the ruby enviroment to run the urbanopt-cli tool.
 # To use, just run this script in bash (e.g. ./setup-env.sh)
@@ -7,9 +7,9 @@
 
 BASE_DIR_NAME="$(cd "$(dirname "$0")" && pwd)"
 
-GEM_HOME=${BASE_DIR_NAME}/gems/ruby/2.5.0
-GEM_PATH=${BASE_DIR_NAME}/gems/ruby/2.5.0
-PATH=${BASE_DIR_NAME}/ruby/bin:${BASE_DIR_NAME}/gems/ruby/2.5.0/bin:$PATH
+GEM_HOME=${BASE_DIR_NAME}/gems/ruby/2.7.0
+GEM_PATH=${BASE_DIR_NAME}/gems/ruby/2.7.0
+PATH=${BASE_DIR_NAME}/ruby/bin:${BASE_DIR_NAME}/gems/ruby/2.7.0/bin:$PATH
 RUBYLIB=${BASE_DIR_NAME}/OpenStudio/Ruby
 RUBY_DLL_PATH=${BASE_DIR_NAME}/OpenStudio/Ruby
 

data/scripts/setup-env.bat

@@ -3,9 +3,9 @@ IF "%HOMEPATH%"=="" exit /B
 
 SET BASE_DIR_NAME=%~d0%~p0
 
-SET GEM_HOME=%BASE_DIR_NAME%\gems\ruby\2.5.0
-SET GEM_PATH=%BASE_DIR_NAME%\gems\ruby\2.5.0
-SET PATH=%BASE_DIR_NAME%\ruby\bin;%BASE_DIR_NAME%\gems\ruby\2.5.0\bin;%PATH%
+SET GEM_HOME=%BASE_DIR_NAME%\gems\ruby\2.7.0
+SET GEM_PATH=%BASE_DIR_NAME%\gems\ruby\2.7.0
+SET PATH=%BASE_DIR_NAME%\ruby\bin;%BASE_DIR_NAME%\gems\ruby\2.7.0\bin;%PATH%
 SET RUBYLIB=%BASE_DIR_NAME%\OpenStudio\Ruby
 SET RUBY_DLL_PATH=%BASE_DIR_NAME%\OpenStudio\Ruby