before replacing sig_param_tech

energy_demand/cli/__init__.py

@@ -10,7 +10,7 @@
 from energy_demand.assumptions import general_assumptions
 from energy_demand.scripts.s_post_installation import post_install_setup
 from energy_demand.scripts.s_write_dummy_data import post_install_setup_minimum
-from energy_demand.scripts.init_scripts import scenario_initalisation
+from energy_demand.scripts.init_scripts import switch_calculations
 from energy_demand.read_write import read_data
 from energy_demand.dwelling_stock import dw_stock
 from energy_demand.plotting import plotting_results

energy_demand/main.py

@@ -42,7 +42,7 @@
 from energy_demand.validation import lad_validation
 from energy_demand.basic import demand_supply_interaction
 from energy_demand.scripts import s_generate_scenario_parameters
-from energy_demand.scripts.init_scripts import scenario_initalisation
+from energy_demand.scripts.init_scripts import switch_calculations
 from energy_demand.scripts.init_scripts import spatial_explicit_modelling_strategy_vars
 from energy_demand.scripts.init_scripts import create_spatial_diffusion_factors
 
@@ -189,6 +189,23 @@ def energy_demand_model(regions, data, assumptions):
     # Read sector assignement lookup values
     data['gva_sector_lu'] = lookup_tables.economic_sectors_regional_MISTRAL()
 
+    # -----------------------------
+    # Create new folders
+    # -----------------------------
+    basic_functions.del_previous_setup(data['data']['result_paths']['data_results'])
+
+    folders_to_create = [
+        data['data']['local_paths']['dir_services'],
+        data['data']['local_paths']['path_sigmoid_data'],
+        data['data']['result_paths']['data_results'],
+        data['data']['result_paths']['data_results_PDF'],
+        data['data']['result_paths']['data_results_model_run_pop'],
+        data['data']['result_paths']['data_results_validation'],
+        data['data']['result_paths']['data_results_model_runs']]
+
+    for folder in folders_to_create:
+        basic_functions.create_folder(folder)
+
     # -----------------------------
     # Assumptions
     # -----------------------------
@@ -293,17 +310,13 @@ def energy_demand_model(regions, data, assumptions):
     # ------------------------------------------------
     # Initialise scenario
     # ------------------------------------------------
-    init_cont = {}
-    init_cont['rs_sig_param_tech'], init_cont['ss_sig_param_tech'], init_cont['is_sig_param_tech'] = scenario_initalisation(
+    data['assumptions']['rs_sig_param_tech'], data['assumptions']['ss_sig_param_tech'], data['assumptions']['is_sig_param_tech'] = switch_calculations(
         data,
         f_reg,
         f_reg_norm,
         f_reg_norm_abs,
         crit_all_the_same)
 
-    for key, value in init_cont.items():
-        setattr(data['assumptions'], key, value)
-
     # ------------------------------------------------
     # Calculate parameter values for every region
     # ------------------------------------------------
@@ -324,7 +337,6 @@ def energy_demand_model(regions, data, assumptions):
         data['assumptions'].strategy_vars,
         simulated_yrs,
         path=local_data_path)
-
     data['assumptions'].update('regional_strategy_vars', regional_strategy_vars)
     data['assumptions'].update('non_regional_strategy_vars', non_regional_strategy_vars)
 

energy_demand/scripts/init_scripts.py

@@ -3,7 +3,6 @@
 """
 import logging
 import numpy as np
-from energy_demand.basic import basic_functions
 from energy_demand.geography import spatial_diffusion
 from energy_demand.read_write import read_data
 from energy_demand.scripts import (s_fuel_to_service, s_generate_sigmoid)
@@ -71,33 +70,37 @@ def create_spatial_diffusion_factors(
 
     return f_reg, f_reg_norm, f_reg_norm_abs, crit_all_the_same
 
-def scenario_initalisation(
+def switch_calculations(
         data,
         f_reg,
         f_reg_norm,
         f_reg_norm_abs,
         crit_all_the_same
     ):
-    """Scripts which need to be run for every different scenario.
-    Only needs to be executed once for each scenario.
-
-    The following calculations are performed:
-        I. Switches calculations
-        II. Spatial explicit diffusion modelling
+    """This function creates sigmoid diffusion values based
+    on defined switches
 
     Arguments
     ----------
-    path_data_ed : str
-        Path to the energy demand data folder
     data : dict
         Data container
+    f_reg, f_reg_norm, f_reg_norm_abs : str
+        Different spatial diffusion values
+    crit_all_the_same : dict
+        Criteria whether the diffusion is spatial explicit or not
+
+    Returns
+    -------
+    rs_sig_param_tech, ss_sig_param_tech, is_sig_param_tech : dict
+        Sigmoid diffusion parameters
     """
+    '''# --------------------------------------------
+    # Delete results from previous model runs
+    # and initialise folders
     # --------------------------------------------
-    # Delete results from previous model runs and initialise folders
-    # --------------------------------------------
-    basic_functions.del_previous_results(
-        data['local_paths']['data_processed'],
-        data['local_paths']['path_post_installation_data'])
+    #basic_functions.del_previous_results(
+    #    data['local_paths']['data_processed'],
+    #    data['local_paths']['path_post_installation_data'])
 
     basic_functions.del_previous_setup(
         data['result_paths']['data_results'])
@@ -112,7 +115,7 @@ def scenario_initalisation(
         data['result_paths']['data_results_model_runs']]
 
     for folder in folders_to_create:
-        basic_functions.create_folder(folder)
+        basic_functions.create_folder(folder)'''
 
     # ---------------------------------------
     # Convert base year fuel input assumptions to energy service

energy_demand/scripts/s_post_installation.py

@@ -60,16 +60,21 @@ def post_install_setup(args):
     # Delete all previous data from previous model runs
     basic_functions.del_previous_setup(data['local_paths']['data_processed'])
     basic_functions.del_previous_setup(data['result_paths']['data_results'])
+    basic_functions.del_previous_setup(data['result_paths']['path_post_installation_data'])
 
     # Create folders and subfolder for data_processed
-    basic_functions.create_folder(data['local_paths']['data_processed'])
-    basic_functions.create_folder(data['local_paths']['path_post_installation_data'])
-    basic_functions.create_folder(data['local_paths']['dir_raw_weather_data'])
-    basic_functions.create_folder(data['local_paths']['dir_changed_weather_station_data'])
-    basic_functions.create_folder(data['local_paths']['load_profiles'])
-    basic_functions.create_folder(data['local_paths']['rs_load_profile_txt'])
-    basic_functions.create_folder(data['local_paths']['ss_load_profile_txt'])
-    basic_functions.create_folder(data['local_paths']['dir_disaggregated'])
+    folders_to_create = [
+        data['local_paths']['data_processed'],
+        data['local_paths']['path_post_installation_data'],
+        data['local_paths']['dir_raw_weather_data'],
+        data['local_paths']['dir_changed_weather_station_data'],
+        data['local_paths']['load_profiles'],
+        data['local_paths']['rs_load_profile_txt'],
+        data['local_paths']['ss_load_profile_txt'],
+        data['local_paths']['dir_disaggregated']]
+
+    for folder in folders_to_create:
+        basic_functions.create_folder(folder)
 
     print("... Read in residential submodel load profiles", flush=True)
     s_rs_raw_shapes.run(
@@ -86,7 +91,7 @@ def post_install_setup(args):
         data['paths'],
         data['local_paths'],
         data['lookups'])
-    
+
     # Input data preparation
     print("Generate additional data", flush=True)
 
@@ -103,7 +108,6 @@ def post_install_setup(args):
     #"uk_pop_principal_2015_2050_MSOA_england.csv"
     path_geography = os.path.join(local_data_path, "scenarios", "uk_pop_principal_2015_2050_MSOA_england.csv")
 
-    #MSOA: uk_pop_principal_2015_2050_MSOA_england.csv
     script_data_preparation_MISTRAL_pop_gva.run(
         path_to_folder=data_pop,
         path_MSOA_baseline=path_geography,