before branching off for weather branch

nismod · Mar 11, 2019 · 11913c8 · 11913c8
1 parent 354a01a
commit 11913c8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/energy_demand/plotting/fig_3_plot_over_time.py b/energy_demand/plotting/fig_3_plot_over_time.py
@@ -130,16 +130,18 @@ def scenario_over_time(
         two_std_line_neg = mean_national_peak - (nr_of_sigma * std_dev)
 
         # Maximum and minium values
-        max_values = np.max(national_peak)
-        min_values = np.min(national_peak)
+        max_values = national_peak.max()
+        min_values = national_peak.min()
+        median_values = national_peak.median()
 
         statistics_to_print.append("scenario: {} two_sigma_pos: {}".format(scenario_name, two_std_line_pos))
         statistics_to_print.append("scenario: {} two_sigma_neg: {}".format(scenario_name, two_std_line_neg))
         statistics_to_print.append("--------min-------------- {}".format(scenario_name))
-        statistics_to_print.append("{}".format(np.min(national_peak))) #Get minimum value for every simulation year of all realizations
+        statistics_to_print.append("{}".format(min_values)) #Get minimum value for every simulation year of all realizations
         statistics_to_print.append("--------max-------------- {}".format(scenario_name))
-        statistics_to_print.append("{}".format(np.max(national_peak)))
-
+        statistics_to_print.append("{}".format(max_values))
+        statistics_to_print.append("--------median_-------------- {}".format(scenario_name))
+        statistics_to_print.append("{}".format(median_values))
         # --------------------
         # Try to smooth lines
         # --------------------

diff --git a/energy_demand/read_write/read_weather_results.py b/energy_demand/read_write/read_weather_results.py
@@ -79,20 +79,15 @@ def read_in_weather_results(
         results_container['regional_share_national_peak'][year] = (100 / national_peak) * regional_peak #1 = 1 %
         results_container['regional_share_national_peak_pp'][year] = ((100 / national_peak) * regional_peak) /  reg_pop_yr #1 = 1 %
 
-        # Sum all regions for each fueltypes
-        #print(results_container['ed_reg_tot_y'][year].shape)
+        # Calculate mean of peak day demand of peak day
         results_container['national_all_fueltypes'][year] = np.sum(results_container['ed_reg_tot_y'][year], axis=1)
-        #print(results_container['national_all_fueltypes'][year].shape)
-
         results_container['mean_peak_day_demand'][year] = np.mean(national_demand_per_hour, axis=1)
-        #np.mean(results_container['ed_reg_peakday'][year][fueltype_int], axis=1)
 
         # Calculate contribution per person towards national peak (reg_peak / people) [abs]
         #print(results_container['ed_reg_peakday'][year].shape)
         #print(reg_pop_yr.shape)
         # results_container['pp_peak_abs'][year] = (
         #    results_container['ed_reg_peakday'][year][:,:, max_hour] / reg_pop_yr)
-
         #(cpp = (regional peak / national peak) / people [%]
 
     logging.info("... Reading in results finished")

diff --git a/energy_demand/result_processing/p3_weather_plots.py b/energy_demand/result_processing/p3_weather_plots.py
@@ -114,7 +114,7 @@ def main(
             national_hydrogen = pd.DataFrame()
             national_heating_peak = pd.DataFrame()
             daily_mean_peak_day = pd.DataFrame()
-    
+
             for path_result_folder in paths_folders_result:
                 print("... path_result_folder: {}".format(path_result_folder), flush=True)
                 data = {}
@@ -278,9 +278,10 @@ def main(
         # ------------------------------
         # Plot national sum over time per fueltype and scenario
         # ------------------------------
+        crit_smooth_line = True
+        seperate_legend = True
+
         try:
-            crit_smooth_line = True
-            seperate_legend = True
             print("... plotting national sum of fueltype over time ")
             fig_3_plot_over_time.fueltypes_over_time(
                 scenario_result_container=scenario_result_container,