added plotting of meadian of peak day

nismod · Mar 7, 2019 · 354a01a · 354a01a
1 parent 9918984
commit 354a01a
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 6 deletions.
diff --git a/energy_demand/main.py b/energy_demand/main.py
@@ -159,12 +159,10 @@ def energy_demand_model(
     # ----------------------------------------------------------------------
     # Load data
     # ----------------------------------------------------------------------
-    print("a " + str(name_region_set))
     data['scenario_data'] = defaultdict(dict)
     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)
     data['reg_coord'] = basic_functions.get_long_lat_decimal_degrees(read_data.get_region_centroids(name_region_set))
-    print("AA " + str(name_gva_dataset))
     data['scenario_data']['population'] = data_loader.read_scenario_data(name_population_dataset, region_name='lad_uk_2016', value_name='population')
     data['scenario_data']['gva_industry'] = data_loader.read_scenario_data_gva(name_gva_dataset, region_name='lad_uk_2016', value_name='gva_per_head', all_dummy_data=False)
     data['scenario_data']['gva_per_head'] = data_loader.read_scenario_data(name_gva_dataset_per_head, region_name='lad_uk_2016', value_name='gva_per_head')

diff --git a/energy_demand/read_write/read_weather_results.py b/energy_demand/read_write/read_weather_results.py
@@ -51,6 +51,7 @@ def read_in_weather_results(
     results_container['pp_peak_abs'] = {}
     results_container['regional_peak'] = {}
     results_container['national_all_fueltypes'] = {}
+    results_container['mean_peak_day_demand'] = {}
 
     for year in results_container['ed_reg_peakday']:
 
@@ -82,7 +83,10 @@ def read_in_weather_results(
         #print(results_container['ed_reg_tot_y'][year].shape)
         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)

diff --git a/energy_demand/result_processing/p3_weather_plots.py b/energy_demand/result_processing/p3_weather_plots.py
@@ -113,7 +113,8 @@ def main(
             national_gas = pd.DataFrame()
             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 = {}
@@ -243,8 +244,14 @@ def main(
 
                     regional_share_national_peak_pp = regional_share_national_peak_pp.append(realisation_data)
 
+                    # Mean demand of peak day
+                    simulation_yrs_result = [results_container['mean_peak_day_demand'][year][fueltype_elec_int] for year in simulation_yrs_to_plot]
+                    realisation_data = pd.DataFrame(
+                        [simulation_yrs_result],
+                        columns=data['assumptions']['sim_yrs'])
+                    daily_mean_peak_day = daily_mean_peak_day.append(realisation_data)
                 except:
-                    raise Exception("The run '{}' is corrupted".format(path_result_folder), flush=True) 
+                    raise Exception("The run '{}' is corrupted".format(path_result_folder))
 
             # Add to scenario container
             result_entry = {
@@ -258,7 +265,8 @@ def main(
                 'total_regional_demand_electricity': total_regional_demand_electricity,
                 'national_electricity': national_electricity,
                 'national_gas': national_gas,
-                'national_hydrogen': national_hydrogen}
+                'national_hydrogen': national_hydrogen,
+                'daily_mean_peak_day': daily_mean_peak_day}
 
             scenario_result_container.append(result_entry)
 
@@ -321,6 +329,23 @@ def main(
             raise Exception("FAILED")
             pass
 
+        # ------------------------------
+        # plot PEAK DAY mean
+        # ------------------------------
+        try:
+            fig_3_plot_over_time.scenario_over_time(
+                scenario_result_container=scenario_result_container,
+                field_name='daily_mean_peak_day',
+                sim_yrs=data['assumptions']['sim_yrs'],
+                fig_name="mean_demand_of_peak_day{}__{}.pdf".format(simulation_yr_to_plot, fueltype_str),
+                plot_points=True,
+                result_path=result_path,
+                crit_smooth_line=crit_smooth_line,
+                seperate_legend=seperate_legend)
+        except:
+            raise Exception("FAILED")
+            pass
+
     ## ------------------------------
     ## Plotting x-chart
     ## ------------------------------