From 76173e0fb081960a6f232f9c4bdc3c2f8698cb2d Mon Sep 17 00:00:00 2001 From: "adnan.alakori@rl-institut.de" Date: Wed, 30 Mar 2022 15:15:50 +0200 Subject: [PATCH] Define function: update_demand_profile --- src/D0_process_input.py | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/src/D0_process_input.py b/src/D0_process_input.py index 7ac9fa1..263b282 100644 --- a/src/D0_process_input.py +++ b/src/D0_process_input.py @@ -31,6 +31,7 @@ DATE_TIME_INDEX, TIME_FREQUENCY, FILE_INDEX, + DEMAND_PROFILE, DEMAND_PROFILE_AC, DEMAND_PROFILE_AC_CRITICAL, DEMAND_PROFILE_DC, @@ -238,8 +239,19 @@ def economic_values(experiment): return experiment +def update_demand_profile(experiment_s, experiment, demand_type): + index = experiment_s[experiment][DATE_TIME_INDEX] + experiment_s[experiment].update( + { + demand_type: pd.Series( + experiment_s[experiment][demand_type][0: len(index)].values, + index=index, + ) + } + ) + return -def add_timeseries(experiment_s): +def add_timeseries(experiment_s) -> object: """ Update experiments and add longest date_time_index to settings @@ -356,19 +368,10 @@ def add_timeseries(experiment_s): pass elif experiment_s[experiment][FILE_INDEX] == None: - # limit based on index - - def update_demand_profile(experiment_s, experiment, demand_profile, demand_type): - experiment_s[experiment].update( - { - demand_profile: pd.Series( - experiment_s[experiment][demand_type][0: len(index)].values, - index=index, - ) - } - ) - return - + # limit based on index + #import ipdb;ipdb.set_trace() + for demand_type in [DEMAND_AC, DEMAND_AC_CRITICAL, DEMAND_DC_CRITICAL, DEMAND_DC]: + update_demand_profile(experiment_s, experiment, demand_type) experiment_s[experiment].update( { @@ -381,7 +384,6 @@ def update_demand_profile(experiment_s, experiment, demand_profile, demand_type) } ) - experiment_s[experiment].update( { WIND_GENERATION_PER_KW: pd.Series( @@ -470,7 +472,8 @@ def update_demand_profile(experiment_s, experiment, demand_profile, demand_type) ] } ) - + import ipdb; + ipdb.set_trace() experiment_s[experiment].update( { ACCUMULATED_PROFILE_AC_SIDE: experiment_s[experiment][DEMAND_PROFILE_AC] @@ -482,7 +485,6 @@ def update_demand_profile(experiment_s, experiment, demand_profile, demand_type) { ACCUMULATED_PROFILE_DC_SIDE: experiment_s[experiment][DEMAND_PROFILE_AC] / experiment_s[experiment][INVERTER_DC_AC_EFFICIENCY] - + experiment_s[experiment][DEMAND_PROFILE_DC] } ) @@ -497,7 +499,7 @@ def update_demand_profile(experiment_s, experiment, demand_profile, demand_type) TOTAL_DEMAND_DC: sum(experiment_s[experiment][DEMAND_PROFILE_DC]), TOTAL_DEMAND_DC_CRITICAL: sum(experiment_s[experiment][DEMAND_PROFILE_DC_CRITICAL]), PEAK_DEMAND_DC: max(experiment_s[experiment][DEMAND_PROFILE_DC]), - PEAK_DEMAND_DC: max(experiment_s[experiment][DEMAND_PROFILE_DC_CRITICAL]), + PEAK_DEMAND_DC_CRITICAL: max(experiment_s[experiment][DEMAND_PROFILE_DC_CRITICAL]), PEAK_PV_GENERATION_PER_KWP: max( experiment_s[experiment][PV_GENERATION_PER_KWP] ),