updated realizations

nismod · Feb 11, 2019 · 3e6540d · 3e6540d
1 parent 811deaa
commit 3e6540d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/energy_demand/main.py b/energy_demand/main.py
@@ -6,7 +6,7 @@
 
     Example:
     python energy_demand/energy_demand/main.py C:/Users/cenv0553/ed/energy_demand/local_run_config_file.ini test_run
-
+    python energy_demand/energy_demand/main.py C:/Users/cenv0553/ed/energy_demand/local_run_config_file.ini h_max 0 h_max
 """
 import os
 import sys
@@ -115,12 +115,15 @@ def energy_demand_model(
     print("Configuration path:         " + str(path_config))
     print("Simulated yrs               " + str(sim_yrs))
     print("name_config_path:           " + str(name_config_path))
+    print("weather_realisation:        " + str(weather_realisation))
 
     # Local path configurations
     if config['CRITERIA']['cluster_calc']:
         path_weather_data = "/soge-home/staff/cenv0553/_weather_realisation"
     else:
         path_weather_data = "C:/Users/cenv0553/ED/data/scenarios"
+        path_weather_data = "//linux-filestore.ouce.ox.ac.uk/mistral/nismod/data/energy_demand/J-MARIUS_data/_weather_realisation"
+        path_weather_data = 'L:\_weather_realisation'
         #path_weather_data = "/soge-home/staff/cenv0553/_weather_realisation"
 
     if name_config_path == 'h_max' or name_config_path == 'l_max' or name_config_path in ['test_run', 'h_max_0', 'h_max_10', 'h_max_0_only', 'h_max_10_only']:
@@ -549,7 +552,7 @@ def energy_demand_model(
                 peak_day_electricity, _ = enduse_func.get_peak_day_single_fueltype(national_hourly_demand)
                 selected_hours = date_prop.convert_yearday_to_8760h_selection(peak_day_electricity)
                 print("PEAK electricity: " + str(np.max(national_hourly_demand[selected_hours])))
-                raise Exception
+                raise Exception("PEAK EXCEPTION")
 
                 # PLot only residential total regional annual demand and
                 '''write_data.write_residential_tot_demands(

diff --git a/energy_demand/scripts/init_scripts.py b/energy_demand/scripts/init_scripts.py
@@ -666,7 +666,7 @@ def sig_param_calc_incl_fuel_switch(
             # Iterate over years defined in narrative
             for switch_yr_cnt, switch_yr in enumerate(switch_yrs):
                 sig_param_tech[switch_yr] = {}
-                print("ZZ {}  {}".format(switch_yr_cnt, switch_yrs))
+
                 # -------------------------
                 # Get starting year of narrative
                 # -------------------------

diff --git a/local_run_config_file.ini b/local_run_config_file.ini
@@ -23,7 +23,7 @@ write_txt_additional_results = True
 validation_criteria = True
 plot_crit = False
 crit_plot_enduse_lp = False
-writeYAML_keynames = True
+writeYAML_keynames = False
 writeYAML = False
 crit_temp_min_max = True
 constant_weather = False

diff --git a/local_run_config_file_cluster.ini b/local_run_config_file_cluster.ini
@@ -1,9 +1,8 @@
 [PATHS]
 path_local_data = /soge-home/staff/cenv0553/data
-path_energy_demand_config = /soge-home/staff/cenv0553/data/config_data
 path_processed_data = /soge-home/staff/cenv0553/data/_processed_data
 path_result_data = /soge-home/staff/cenv0553/results
-path_config_data = /soge-home/staff/cenv0553/data/config_data
+path_new_scenario = /soge-home/staff/cenv0553/results
 
 [CONFIG]
 base_yr = 2015