From 9c6c89dfadebc25532cc79fd3c1709a5c2aa9ba6 Mon Sep 17 00:00:00 2001 From: Jonas Hoersch Date: Mon, 31 Dec 2018 14:10:55 +0100 Subject: [PATCH] build_*_profile(s): Make caps on p_nom_max and inflow optional --- scripts/build_hydro_profile.py | 3 ++- scripts/build_renewable_profiles.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/build_hydro_profile.py b/scripts/build_hydro_profile.py index e8ecab9b..d7e9797e 100644 --- a/scripts/build_hydro_profile.py +++ b/scripts/build_hydro_profile.py @@ -23,6 +23,7 @@ inflow = cutout.runoff(shapes=country_shapes, lower_threshold_quantile=True, normalize_using_yearly=eia_stats) -inflow.values[inflow.values < config.get('min_inflow', 1.)] = 0. +if 'clip_min_inflow' in config: + inflow.values[inflow.values < config['clip_min_inflow']] = 0. inflow.to_netcdf(snakemake.output[0]) diff --git a/scripts/build_renewable_profiles.py b/scripts/build_renewable_profiles.py index 29235df4..62ab9550 100644 --- a/scripts/build_renewable_profiles.py +++ b/scripts/build_renewable_profiles.py @@ -183,6 +183,7 @@ if __name__ == '__main__': ds = ds.sel(bus=((ds['profile'].mean('time') > config.get('min_p_max_pu', 0.)) & (ds['p_nom_max'] > config.get('min_p_nom_max', 0.)))) - ds['profile'].values[ds['profile'].values < config.get('clip_p_max_pu')] = 0. + if 'clip_p_max_pu' in config: + ds['profile'].values[ds['profile'].values < config['clip_p_max_pu']] = 0. ds.to_netcdf(snakemake.output.profile)