before major model run

nismod · Jan 11, 2019 · 0c9a0f9 · 0c9a0f9
1 parent 3c69b2d
commit 0c9a0f9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/energy_demand/enduse_func.py b/energy_demand/enduse_func.py
@@ -431,7 +431,7 @@ def load_shifting(
         # Load factor improvement parameter in current year
         param_lf_improved_cy = dm_improvement[enduse][curr_yr]
         #param_lf_improved_cy = 0.1
-        print("Loading shifting .. {}  {}  {}".format(enduse, curr_yr, param_lf_improved_cy))
+        #print("Loading shifting .. {}  {}  {}".format(enduse, curr_yr, param_lf_improved_cy))
 
         # Calculate current year load factors
         lf_improved_cy = calc_lf_improvement(

diff --git a/energy_demand/main.py b/energy_demand/main.py
@@ -103,7 +103,7 @@ def energy_demand_model(
         scenario_name = str(sys.argv[2])
         weather_realisation = str(sys.argv[3]) # Weather realisation 
     else:
-        scenario_name = "_dm_0P_"
+        scenario_name = "_dm_10P_"
         weather_realisation = 'NF1'
 
     print("-------------------------------------")
@@ -119,7 +119,7 @@ def energy_demand_model(
     #name_config_path = 'h_min'
     name_config_path = 'h_min_zero'
     #name_config_path = 'h_min_5dm'
-    #name_config_path = 'h_min_10dm'
+    name_config_path = 'h_min_10dm'
     #name_config_path = 'l_max'
     #name_config_path = 'l_min'