diff --git a/src/Analysis/preprocessing_dag.pdf b/src/Analysis/preprocessing_dag.pdf index 2e30460..ec8f663 100644 Binary files a/src/Analysis/preprocessing_dag.pdf and b/src/Analysis/preprocessing_dag.pdf differ diff --git a/src/Modules/heat_profiles.py b/src/Modules/heat_profiles.py index 241583c..c9ec29f 100644 --- a/src/Modules/heat_profiles.py +++ b/src/Modules/heat_profiles.py @@ -52,7 +52,7 @@ def CLI(ctx, dark_style: bool, plot_ext: str): @click.argument('cutout', type=str) @click.option('--weather-year', type=int, required=False, default=2012, help="The weather year") @click.option('--plot', is_flag=True, required=False, help="Plot the average temperatures on a map?") -def cmd1(ctx, cutout: str, weather_year: int, plot: bool): +def generate(ctx, cutout: str, weather_year: int, plot: bool): "A command in the CLI" # Get files diff --git a/src/preprocessing b/src/preprocessing index 65e5382..dec3652 100644 --- a/src/preprocessing +++ b/src/preprocessing @@ -81,13 +81,11 @@ rule format_dkstat_industry_data: rule heat_profiles: input: [ - f"{modules_path}heat_profiles_func.py", - f"{data_path}BalmorelData/muni_input_data.gdx" + f"{modules_path}heat_profiles.py", + f"M:/Project/RQII/DK+Surrounding2012.nc" ] params: - model_path=config["balmorel_input"]["model_path"], - scenario=config["balmorel_input"]["scenario"], - load_again=config["balmorel_input"]["load_again"] + weather_year=config["timeseries"]["weather_year"] output: [ f"{out_path}DH_VAR_T.inc", @@ -95,7 +93,7 @@ rule heat_profiles: ] shell: """ - python {modules_path}format_balmorel_data.py --model-path={params.model_path} --scenario={params.scenario} --load-again={params.load_again} heat-profiles + python {modules_path}heat_profiles.py generate {input[1]} --weather-year={params.weather_year} --plot """ rule exo_heat_demand: