urbanopt-cli 0.6.2 → 0.7.1

data/example_files/visualization/input_visualization_feature.html

@@ -383,7 +383,7 @@
 
         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'];
 
@@ -483,9 +483,10 @@
                     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 ((typeof values !== 'undefined') && (!(values.every(item => item === 0)))) {
                   if (changeToKbtu) {
                     var kBtuValues = [];
                     var kwhValues = feature.monthly_values[dataset];
@@ -543,13 +544,21 @@
               values: _.map(months, function (month, i) {
                 var value = 0;
                  if (changeToKbtu){
-                  value = feature.monthly_values['Electricity:Facility'][i]*3.41 - feature.monthly_values['ElectricityProduced:Facility'][i]*3.41;
+                  value = feature.monthly_values['Electricity:Facility'][i]*3.41 + feature.monthly_values['NaturalGas:Facility'][i] + feature.monthly_values['Propane:Facility'][i] + feature.monthly_values['FuelOilNo2:Facility'][i] + feature.monthly_values['OtherFuels:Facility'][i];
+                  // check that we have ElectricityProduced monthly data
+                  if(feature.monthly_values['REopt:ElectricityProduced:Total']) {
+                    value = value - feature.monthly_values['REopt:ElectricityProduced:Total'][i]*3.41;
+                  } 
+
                   _.forEach(kbtu_datasets, function(ds){
                     value += feature.monthly_values[ds][i];
                   });
                  }
                 else {
-                  value = feature.monthly_values['Electricity:Facility'][i] - feature.monthly_values['ElectricityProduced:Facility'][i]; //Values are in kWh
+                  value = feature.monthly_values['Electricity:Facility'][i]
+                  if(feature.monthly_values['REopt:ElectricityProduced:Total']) {
+                    value = value - feature.monthly_values['REopt:ElectricityProduced:Total'][i]; //Values are in kWh
+                  }
                 }
 
                 $scope.annualNetChartData[feature.name] += value;

data/example_files/visualization/input_visualization_scenario.html

@@ -373,7 +373,7 @@
 
         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'];
         
@@ -456,9 +456,9 @@
                     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 ((typeof values !== 'undefined') && (!(values.every(item => item === 0)))) {
                   if (changeToKbtu) {
                     var kBtuValues = [];
                     var kwhValues = scenario.monthly_values[dataset];
@@ -515,14 +515,20 @@
               values: _.map(months, function (month, i) {
                 var value = 0;
                 if (changeToKbtu){
-                  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['NaturalGas:Facility'][i] + scenario.monthly_values['Propane:Facility'][i] + scenario.monthly_values['FuelOilNo2:Facility'][i] + scenario.monthly_values['OtherFuels:Facility'][i];
+                  // check that we have ElectricityProduced monthly data
+                  if(scenario.monthly_values['REopt:ElectricityProduced:Total']) {
+                    value = value - scenario.monthly_values['REopt:ElectricityProduced:Total'][i]*3.41 
+                  }
                    _.forEach(kbtu_datasets, function(ds){
                      value += scenario.monthly_values[ds][i];
                    });
                  }
                 else {
-                  value = scenario.monthly_values['Electricity:Facility'][i] - scenario.monthly_values['ElectricityProduced:Facility'][i]; //Values are in kWh
+                  value = scenario.monthly_values['Electricity:Facility'][i]
+                  if(scenario.monthly_values['REopt:ElectricityProduced:Total']) {
+                    value = value - scenario.monthly_values['REopt:ElectricityProduced:Total'][i]; //Values are in kWh
+                  }
                 }
                 // value;
                 $scope.annualNetChartData[scenario.name] += value;

data/example_files/weather/USA_NY_Buffalo-Greater.Buffalo.Intl.AP.725280_TMY3.ddy

@@ -18,11 +18,11 @@
   
  ! Using Design Conditions from "Climate Design Data 2009 ASHRAE Handbook"
  ! Buffalo Niagara Intl Ap_NY_USA Extreme Annual Wind Speeds, 1%=12.6m/s, 2.5%=11.1m/s, 5%=9.6m/s
- ! Buffalo Niagara Intl Ap_NY_USA Extreme Annual Temperatures, Max Drybulb=-19.5�C Min Drybulb=32.7�C
+ ! Buffalo Niagara Intl Ap_NY_USA Extreme Annual Temperatures, Max Drybulb=-19.5°C Min Drybulb=32.7°C
   
  ! Buffalo Niagara Intl Ap_NY_USA Annual Heating Design Conditions Wind Speed=5.1m/s Wind Dir=270
  ! Coldest Month=JAN
- ! Buffalo Niagara Intl Ap_NY_USA Annual Heating 99.6%, MaxDB=-16.3�C
+ ! Buffalo Niagara Intl Ap_NY_USA Annual Heating 99.6%, MaxDB=-16.3°C
  SizingPeriod:DesignDay,
   Buffalo Niagara Intl Ap Ann Htg 99.6% Condns DB,     !- Name
           1,      !- Month
@@ -51,7 +51,7 @@
            ,      !- ASHRAE Clear Sky Optical Depth for Diffuse Irradiance (taud)
        0.00;      !- Clearness {0.0 to 1.1}
  
- ! Buffalo Niagara Intl Ap_NY_USA Annual Heating 99%, MaxDB=-14.1�C
+ ! Buffalo Niagara Intl Ap_NY_USA Annual Heating 99%, MaxDB=-14.1°C
  SizingPeriod:DesignDay,
   Buffalo Niagara Intl Ap Ann Htg 99% Condns DB,     !- Name
           1,      !- Month
@@ -80,7 +80,7 @@
            ,      !- ASHRAE Clear Sky Optical Depth for Diffuse Irradiance (taud)
        0.00;      !- Clearness {0.0 to 1.1}
  
- ! Buffalo Niagara Intl Ap_NY_USA Annual Humidification 99.6% Design Conditions DP=>MCDB, DP=-20.4�C
+ ! Buffalo Niagara Intl Ap_NY_USA Annual Humidification 99.6% Design Conditions DP=>MCDB, DP=-20.4°C
  SizingPeriod:DesignDay,
   Buffalo Niagara Intl Ap Ann Hum_n 99.6% Condns DP=>MCDB,     !- Name
           1,      !- Month
@@ -109,7 +109,7 @@
            ,      !- ASHRAE Clear Sky Optical Depth for Diffuse Irradiance (taud)
        0.00;      !- Clearness {0.0 to 1.1}
  
- ! Buffalo Niagara Intl Ap_NY_USA Annual Humidification 99% Design Conditions DP=>MCDB, DP=-18.3�C
+ ! Buffalo Niagara Intl Ap_NY_USA Annual Humidification 99% Design Conditions DP=>MCDB, DP=-18.3°C
  SizingPeriod:DesignDay,
   Buffalo Niagara Intl Ap Ann Hum_n 99% Condns DP=>MCDB,     !- Name
           1,      !- Month
@@ -198,7 +198,7 @@
  
  ! Buffalo Niagara Intl Ap Annual Cooling Design Conditions Wind Speed=5.7m/s Wind Dir=240
  ! Hottest Month=JUL
- ! Buffalo Niagara Intl Ap_NY_USA Annual Cooling (DB=>MWB) .4%, MaxDB=30.3�C MWB=21.8�C
+ ! Buffalo Niagara Intl Ap_NY_USA Annual Cooling (DB=>MWB) .4%, MaxDB=30.3°C MWB=21.8°C
  SizingPeriod:DesignDay,
   Buffalo Niagara Intl Ap Ann Clg .4% Condns DB=>MWB,     !- Name
           7,      !- Month
@@ -226,7 +226,7 @@
       0.462,      !- ASHRAE Clear Sky Optical Depth for Beam Irradiance (taub)
       2.001;      !- ASHRAE Clear Sky Optical Depth for Diffuse Irradiance (taud)
  
- ! Buffalo Niagara Intl Ap_NY_USA Annual Cooling (DB=>MWB) 1%, MaxDB=28.9�C MWB=21.1�C
+ ! Buffalo Niagara Intl Ap_NY_USA Annual Cooling (DB=>MWB) 1%, MaxDB=28.9°C MWB=21.1°C
  SizingPeriod:DesignDay,
   Buffalo Niagara Intl Ap Ann Clg 1% Condns DB=>MWB,     !- Name
           7,      !- Month
@@ -254,7 +254,7 @@
       0.462,      !- ASHRAE Clear Sky Optical Depth for Beam Irradiance (taub)
       2.001;      !- ASHRAE Clear Sky Optical Depth for Diffuse Irradiance (taud)
  
- ! Buffalo Niagara Intl Ap_NY_USA Annual Cooling (DB=>MWB) 2%, MaxDB=27.6�C MWB=20.5�C
+ ! Buffalo Niagara Intl Ap_NY_USA Annual Cooling (DB=>MWB) 2%, MaxDB=27.6°C MWB=20.5°C
  SizingPeriod:DesignDay,
   Buffalo Niagara Intl Ap Ann Clg 2% Condns DB=>MWB,     !- Name
           7,      !- Month
@@ -282,7 +282,7 @@
       0.462,      !- ASHRAE Clear Sky Optical Depth for Beam Irradiance (taub)
       2.001;      !- ASHRAE Clear Sky Optical Depth for Diffuse Irradiance (taud)
  
- ! Buffalo Niagara Intl Ap_NY_USA Annual Cooling (WB=>MDB) .4%, MDB=27.8�C WB=23.8�C
+ ! Buffalo Niagara Intl Ap_NY_USA Annual Cooling (WB=>MDB) .4%, MDB=27.8°C WB=23.8°C
  SizingPeriod:DesignDay,
   Buffalo Niagara Intl Ap Ann Clg .4% Condns WB=>MDB,     !- Name
           7,      !- Month
@@ -310,7 +310,7 @@
       0.462,      !- ASHRAE Clear Sky Optical Depth for Beam Irradiance (taub)
       2.001;      !- ASHRAE Clear Sky Optical Depth for Diffuse Irradiance (taud)
  
- ! Buffalo Niagara Intl Ap_NY_USA Annual Cooling (WB=>MDB) 1%, MDB=26.7�C WB=22.9�C
+ ! Buffalo Niagara Intl Ap_NY_USA Annual Cooling (WB=>MDB) 1%, MDB=26.7°C WB=22.9°C
  SizingPeriod:DesignDay,
   Buffalo Niagara Intl Ap Ann Clg 1% Condns WB=>MDB,     !- Name
           7,      !- Month
@@ -338,7 +338,7 @@
       0.462,      !- ASHRAE Clear Sky Optical Depth for Beam Irradiance (taub)
       2.001;      !- ASHRAE Clear Sky Optical Depth for Diffuse Irradiance (taud)
  
- ! Buffalo Niagara Intl Ap_NY_USA Annual Cooling (WB=>MDB) 2%, MDB=25.7�C WB=21.9�C
+ ! Buffalo Niagara Intl Ap_NY_USA Annual Cooling (WB=>MDB) 2%, MDB=25.7°C WB=21.9°C
  SizingPeriod:DesignDay,
   Buffalo Niagara Intl Ap Ann Clg 2% Condns WB=>MDB,     !- Name
           7,      !- Month
@@ -366,7 +366,7 @@
       0.462,      !- ASHRAE Clear Sky Optical Depth for Beam Irradiance (taub)
       2.001;      !- ASHRAE Clear Sky Optical Depth for Diffuse Irradiance (taud)
  
- ! Buffalo Niagara Intl Ap_NY_USA Annual Cooling (DP=>MDB) .4%, MDB=26.2�C DP=22.4�C HR=0.0176
+ ! Buffalo Niagara Intl Ap_NY_USA Annual Cooling (DP=>MDB) .4%, MDB=26.2°C DP=22.4°C HR=0.0176
  SizingPeriod:DesignDay,
   Buffalo Niagara Intl Ap Ann Clg .4% Condns DP=>MDB,     !- Name
           7,      !- Month
@@ -394,7 +394,7 @@
       0.462,      !- ASHRAE Clear Sky Optical Depth for Beam Irradiance (taub)
       2.001;      !- ASHRAE Clear Sky Optical Depth for Diffuse Irradiance (taud)
  
- ! Buffalo Niagara Intl Ap_NY_USA Annual Cooling (DP=>MDB) 1%, MDB=25.4�C DP=21.5�C HR=0.0166
+ ! Buffalo Niagara Intl Ap_NY_USA Annual Cooling (DP=>MDB) 1%, MDB=25.4°C DP=21.5°C HR=0.0166
  SizingPeriod:DesignDay,
   Buffalo Niagara Intl Ap Ann Clg 1% Condns DP=>MDB,     !- Name
           7,      !- Month
@@ -422,7 +422,7 @@
       0.462,      !- ASHRAE Clear Sky Optical Depth for Beam Irradiance (taub)
       2.001;      !- ASHRAE Clear Sky Optical Depth for Diffuse Irradiance (taud)
  
- ! Buffalo Niagara Intl Ap_NY_USA Annual Cooling (DP=>MDB) 2%, MDB=24.5�C DP=20.6�C HR=0.0157
+ ! Buffalo Niagara Intl Ap_NY_USA Annual Cooling (DP=>MDB) 2%, MDB=24.5°C DP=20.6°C HR=0.0157
  SizingPeriod:DesignDay,
   Buffalo Niagara Intl Ap Ann Clg 2% Condns DP=>MDB,     !- Name
           7,      !- Month
@@ -450,7 +450,7 @@
       0.462,      !- ASHRAE Clear Sky Optical Depth for Beam Irradiance (taub)
       2.001;      !- ASHRAE Clear Sky Optical Depth for Diffuse Irradiance (taud)
  
- ! Buffalo Niagara Intl Ap_NY_USA Annual Cooling (Enthalpy=>MDB) .4%, MDB=27.9�C Enthalpy=72100.0J/kg
+ ! Buffalo Niagara Intl Ap_NY_USA Annual Cooling (Enthalpy=>MDB) .4%, MDB=27.9°C Enthalpy=72100.0J/kg
  SizingPeriod:DesignDay,
   Buffalo Niagara Intl Ap Ann Clg .4% Condns Enth=>MDB,     !- Name
           7,      !- Month
@@ -478,7 +478,7 @@
       0.462,      !- ASHRAE Clear Sky Optical Depth for Beam Irradiance (taub)
       2.001;      !- ASHRAE Clear Sky Optical Depth for Diffuse Irradiance (taud)
  
- ! Buffalo Niagara Intl Ap_NY_USA Annual Cooling (Enthalpy=>MDB) 1%, MDB=26.9�C Enthalpy=68500.0J/kg
+ ! Buffalo Niagara Intl Ap_NY_USA Annual Cooling (Enthalpy=>MDB) 1%, MDB=26.9°C Enthalpy=68500.0J/kg
  SizingPeriod:DesignDay,
   Buffalo Niagara Intl Ap Ann Clg 1% Condns Enth=>MDB,     !- Name
           7,      !- Month
@@ -506,7 +506,7 @@
       0.462,      !- ASHRAE Clear Sky Optical Depth for Beam Irradiance (taub)
       2.001;      !- ASHRAE Clear Sky Optical Depth for Diffuse Irradiance (taud)
  
- ! Buffalo Niagara Intl Ap_NY_USA Annual Cooling (Enthalpy=>MDB) 2%, MDB=25.7�C Enthalpy=65200.0J/kg
+ ! Buffalo Niagara Intl Ap_NY_USA Annual Cooling (Enthalpy=>MDB) 2%, MDB=25.7°C Enthalpy=65200.0J/kg
  SizingPeriod:DesignDay,
   Buffalo Niagara Intl Ap Ann Clg 2% Condns Enth=>MDB,     !- Name
           7,      !- Month

data/lib/uo_cli/version.rb

@@ -40,6 +40,6 @@
 
 module URBANopt
   module CLI
-    VERSION = '0.6.2'.freeze
+    VERSION = '0.7.1'.freeze
   end
 end

data/lib/uo_cli.rb

@@ -129,6 +129,9 @@ module URBANopt
           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" \
           "add Weather files in the weather folder and add OpenStudio models of Features\n" \
@@ -226,10 +229,10 @@ module URBANopt
           "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", short: :c
+          "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", short: :a
+          "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
@@ -533,11 +536,13 @@ module URBANopt
               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 && @opthash.subopts[:streets] != 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
@@ -554,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'))
@@ -799,11 +805,18 @@ module URBANopt
         featurefile = File.join(@root_dir, @feature_name)
       end
 
-      # Ensure building simulations have been run already
+      # Ensure building simulations have been run already 
+      # check through all since some folder are not datapoints
       begin
         feature_list = Pathname.new(File.expand_path(run_dir)).children.select(&:directory?)
-        some_random_feature = File.basename(feature_list[0])
-        if !File.exist?(File.expand_path(File.join(run_dir, some_random_feature, 'eplusout.sql')))
+        found_sims = false
+        feature_list.each do |fl|
+          if File.exist?(File.expand_path(File.join(run_dir, File.basename(fl), 'eplusout.sql')))
+            found_sims = true
+            break
+          end
+        end
+        if !found_sims
           abort("ERROR: URBANopt simulations are required before using opendss. Please run and process simulations, then try again.\n")
         end
       rescue Errno::ENOENT # Same abort message if there is no run_dir
@@ -923,29 +936,57 @@ 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"
+        # 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
+          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',
-            run_resilience: @opthash.subopts[:reopt_resilience]
+            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"
+          # 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]
+              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"
@@ -971,11 +1012,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
@@ -1011,11 +1057,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

data/uo_cli.gemspec

@@ -34,15 +34,15 @@ Gem::Specification.new do |spec|
 
   #   use specific versions of urbanopt and openstudio dependencies while under heavy development
   spec.add_runtime_dependency 'optimist', '~> 3'
-  spec.add_runtime_dependency 'urbanopt-geojson', '~> 0.6.5'
-  spec.add_runtime_dependency 'urbanopt-reporting', '~> 0.4.1'
-  spec.add_runtime_dependency 'urbanopt-scenario', '~> 0.6.2'
-  spec.add_runtime_dependency 'urbanopt-reopt', '~> 0.6.1'
-  spec.add_runtime_dependency 'urbanopt-rnm-us', '~> 0.1.0'
+  spec.add_runtime_dependency 'urbanopt-geojson', '~> 0.7.0'
+  spec.add_runtime_dependency 'urbanopt-reporting', '~> 0.5.0'
+  spec.add_runtime_dependency 'urbanopt-scenario', '~> 0.7.0'
+  spec.add_runtime_dependency 'urbanopt-reopt', '~> 0.7.0'
+  spec.add_runtime_dependency 'urbanopt-rnm-us', '~> 0.2.0'
 
   spec.add_development_dependency 'bundler', '>= 2.1.0'
   spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'rspec', '~> 3.7'
+  spec.add_development_dependency 'rspec', '~> 3.9'
   spec.add_development_dependency 'rubocop', '~> 1.15.0'
   spec.add_development_dependency 'rubocop-performance', '~> 1.11.3'
   spec.add_development_dependency 'rubocop-checkstyle_formatter', '~> 0.4.0'