update

cea/default.config

@@ -609,13 +609,17 @@ streets-csv-to-shp = false
 streets-csv-to-shp.type = BooleanParameter
 streets-csv-to-shp.help = True if converting streets.csv(xlsx) to zone.shp. Ensure streets.csv(xlsx) is stored under Folder >inputs>networks. Ensure the reference shapefile is linked under the respective tool tab and Save to Config. This tool facilitates linking Rhino/Grasshopper to CEA - user may output Rhino/Grasshopper geometries to streets.csv(xlsx) file and convert it streets.shp.
 
-demand-forecasting = true
-demand-forecasting.type = BooleanParameter
-demand-forecasting.help = True if executing CEA demand-forecasting. Change default parameters under the respective tool tabs (i.e. radiation, building schedules, and building energy demand) and Save to Config.
+radiation = true
+radiation.type = BooleanParameter
+radiation.help = True if executing CEA building radiation analysis using Daysim. Ensure radiation analysis results are in place before executing demand-forecasting and solar-potential analysis.
 
 radiation-simplified = false
 radiation-simplified.type = BooleanParameter
-radiation-simplified.help = True if executing CEA demand-forecasting using radiation-simplified for faster radiation simulations yet reduced accuracy. Consider setting to True for scenarios with more than 1000 buildings. Ensure demand-forecasting is set to True.
+radiation-simplified.help = True for faster radiation simulations yet reduced accuracy. Consider setting to True for scenarios with more than 1000 buildings.
+
+demand-forecasting = true
+demand-forecasting.type = BooleanParameter
+demand-forecasting.help = True if executing CEA demand-forecasting. Change default parameters under the respective tool tabs (i.e. building schedules and building energy demand) and Save to Config.
 
 emissions = true
 emissions.type = BooleanParameter

cea/scripts.yml

@@ -346,8 +346,11 @@ Utilities:
                   'batch-process-workflow:data-initializer', 'batch-process-workflow:archetypes-mapper',
                   'batch-process-workflow:weather-helper', 'batch-process-workflow:surroundings-helper',
                   'batch-process-workflow:terrain-helper', 'batch-process-workflow:streets-helper',
-                  'batch-process-workflow:streets-csv-to-shp', 'batch-process-workflow:demand-forecasting',
-                  'batch-process-workflow:radiation-simplified', 'batch-process-workflow:emissions', 'batch-process-workflow:system-costs',
+                  'batch-process-workflow:streets-csv-to-shp',
+                  'batch-process-workflow:radiation',
+                  'batch-process-workflow:radiation-simplified',
+                  'batch-process-workflow:demand-forecasting',
+                  'batch-process-workflow:emissions', 'batch-process-workflow:system-costs',
                   'batch-process-workflow:solar-potential-pv', 'batch-process-workflow:solar-potential-other', 'batch-process-workflow:shallow-geothermal-potential',
                   'batch-process-workflow:water-body-potential', 'batch-process-workflow:sewage-heat-potential', 'batch-process-workflow:thermal-network-layout',
                   'batch-process-workflow:thermal-network-operation', 'batch-process-workflow:optimization'

cea/utilities/batch_process_workflow.py

@@ -39,8 +39,9 @@ def exec_cea_commands(config, cea_scenario):
     terrain_helper = config.batch_process_workflow.terrain_helper
     streets_helper = config.batch_process_workflow.streets_helper
 
-    demand_forecasting = config.batch_process_workflow.demand_forecasting
+    radiation = config.batch_process_workflow.radiation
     radiation_simplified = config.batch_process_workflow.radiation_simplified
+    demand_forecasting = config.batch_process_workflow.demand_forecasting
 
     emissions = config.batch_process_workflow.emissions
     system_costs = config.batch_process_workflow.system_costs
@@ -112,12 +113,11 @@ def exec_cea_commands(config, cea_scenario):
                         '--polygon', 'false',
                         ], env=my_env)
 
-    if demand_forecasting and not radiation_simplified:
+    if radiation and not radiation_simplified:
         subprocess.run(['cea', 'radiation', '--scenario', '{cea_scenario}'.format(cea_scenario=cea_scenario)], env=my_env)
-        subprocess.run(['cea', 'schedule-maker', '--scenario', '{cea_scenario}'.format(cea_scenario=cea_scenario)], env=my_env)
-        subprocess.run(['cea', 'demand', '--scenario', '{cea_scenario}'.format(cea_scenario=cea_scenario)], env=my_env)
-    if demand_forecasting and radiation_simplified:
+    if radiation and radiation_simplified:
         subprocess.run(['cea', 'radiation-simplified', '--scenario', '{cea_scenario}'.format(cea_scenario=cea_scenario)], env=my_env)
+    if demand_forecasting:
         subprocess.run(['cea', 'schedule-maker', '--scenario', '{cea_scenario}'.format(cea_scenario=cea_scenario)], env=my_env)
         subprocess.run(['cea', 'demand', '--scenario', '{cea_scenario}'.format(cea_scenario=cea_scenario)], env=my_env)