merged pull request from will

nismod · Dec 7, 2018 · 09ca5af · 09ca5af
1 parent 9f43007
commit 09ca5af
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/energy_demand/basic/basic_functions.py b/energy_demand/basic/basic_functions.py
@@ -23,7 +23,6 @@ def convert_config_to_correct_type(config):
         else:
             out_dict['CRITERIA'][criteria] = config.getboolean('CRITERIA', criteria)
 
-
     return dict(out_dict)
 
 def dict_depth(dictionary):

diff --git a/energy_demand/main.py b/energy_demand/main.py
@@ -120,6 +120,8 @@ def energy_demand_model(
     print("-------------------------------------")
     print("weather_yr_scenario:        " + str(weather_yr_scenario))
     print("weather_realisation:        " + str(weather_realisation))
+    print("local_data_path:            " + str(local_data_path))
+    print("path_main:                  " + str(path_main))
 
     # Local path configurations
     path_weather_data = "X:/nismod/data/energy_demand/J-MARIUS_data/_weather_realisation"
@@ -162,7 +164,7 @@ def energy_demand_model(
     # Load data
     # ----------------------------------------------------------------------
     data['scenario_data'] = defaultdict(dict)
-
+    print(data['paths'])
     data['enduses'], data['sectors'], data['fuels'], lookup_enduses, lookup_sector_enduses = data_loader.load_fuels(data['paths'])
 
     data['regions'] = read_data.get_region_names(name_region_set)