From 67cf28b5930c13e31009007fe03e21e40e4a5b86 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Sun, 11 Aug 2019 13:17:36 +0200 Subject: [PATCH] fill in relevant settings sections --- scripts/add_electricity.py | 31 +++++++++++++++++++++++++++++ scripts/base_network.py | 24 ++++++++++++++++++++++ scripts/build_bus_regions.py | 5 +++++ scripts/build_country_flh.py | 10 ++++++++++ scripts/build_cutout.py | 7 +++++++ scripts/build_hydro_profile.py | 9 +++++++++ scripts/build_natura_raster.py | 6 ++++++ scripts/build_powerplants.py | 2 ++ scripts/build_renewable_profiles.py | 25 +++++++++++++++++++++++ scripts/build_shapes.py | 4 ++++ scripts/cluster_network.py | 15 +++++++++++++- scripts/make_summary.py | 11 ++++++++++ scripts/prepare_links_p_nom.py | 2 ++ scripts/prepare_network.py | 13 ++++++++++++ scripts/simplify_network.py | 25 +++++++++++++++++++++++ scripts/solve_network.py | 23 +++++++++++++++++++++ scripts/solve_operations_network.py | 16 +++++++++++++++ scripts/trace_solve_network.py | 16 +++++++++++++++ 18 files changed, 243 insertions(+), 1 deletion(-) diff --git a/scripts/add_electricity.py b/scripts/add_electricity.py index 4afb79d7..b1b5bd2d 100644 --- a/scripts/add_electricity.py +++ b/scripts/add_electricity.py @@ -5,6 +5,37 @@ Adds electrical generators and storage units to base network Relevant Settings ----------------- +.. code:: yaml + + costs: + year: + USD2013_to_EUR2013: + dicountrate: + emission_prices: + + electricity: + max_hours: + marginal_cost: + capital_cost: + conventional_carriers: + co2limit: + extendable_carriers: + Generator: + StorageUnit: + estimate_renewable_capacities_from_capacity_stats: + + load: + scaling_factor: + + renewable: (keys) + hydro: + carriers: + hydro_max_hours: + hydro_capital_cost: + + lines: + length_factor: + Inputs ------ diff --git a/scripts/base_network.py b/scripts/base_network.py index 01bbf54d..db74bf68 100644 --- a/scripts/base_network.py +++ b/scripts/base_network.py @@ -5,6 +5,30 @@ Creates the network topology from ENTSO-E map extracts as a PyPSA network Relevant Settings ----------------- +.. code:: yaml + + snapshots: + + countries: + + electricity: + voltages: + + lines: + types: + s_max_pu: + under_construction: + + links: + p_max_pu: + under_construction: + include_tyndp: + + transformers: + x: + s_nom: + type: + Inputs ------ diff --git a/scripts/build_bus_regions.py b/scripts/build_bus_regions.py index 3e4f0f68..c526a03f 100644 --- a/scripts/build_bus_regions.py +++ b/scripts/build_bus_regions.py @@ -4,6 +4,11 @@ Creates onshore and offshore Voronoi shapes for each bus Relevant Settings ----------------- +.. code:: yaml + + countries: + + Inputs ------ diff --git a/scripts/build_country_flh.py b/scripts/build_country_flh.py index 79644ade..c78f8860 100644 --- a/scripts/build_country_flh.py +++ b/scripts/build_country_flh.py @@ -5,6 +5,16 @@ Create csv files and plots for comparing per country full load hours of renewabl Relevant Settings ----------------- +.. code:: yaml + + snapshots: + + renewable: + {technology}: + cutout: + resource: + correction_factor: + Inputs ------ diff --git a/scripts/build_cutout.py b/scripts/build_cutout.py index 6f97b406..ba6ceb07 100644 --- a/scripts/build_cutout.py +++ b/scripts/build_cutout.py @@ -4,6 +4,13 @@ Create cutouts configured in `atlite` config section Relevant Settings ----------------- +.. code:: yaml + + atlite: + nprocesses: + cutouts: + {cutout}: + Inputs ------ diff --git a/scripts/build_hydro_profile.py b/scripts/build_hydro_profile.py index e5ed3d75..c920d0e4 100644 --- a/scripts/build_hydro_profile.py +++ b/scripts/build_hydro_profile.py @@ -5,6 +5,15 @@ Build hydroelectric inflow time-series for each country Relevant Settings ----------------- +.. code:: yaml + + countries: + + renewable: + hydro: + cutout: + clip_min_inflow: + Inputs ------ diff --git a/scripts/build_natura_raster.py b/scripts/build_natura_raster.py index 2aed9d23..8bcf4d66 100644 --- a/scripts/build_natura_raster.py +++ b/scripts/build_natura_raster.py @@ -4,6 +4,12 @@ Rasters the vector data of the NATURA2000 data onto all cutout regions Relevant Settings ----------------- +.. code:: yaml + + renewable: + {technology}: + cutout: + Inputs ------ diff --git a/scripts/build_powerplants.py b/scripts/build_powerplants.py index a8f05343..c19c47ed 100644 --- a/scripts/build_powerplants.py +++ b/scripts/build_powerplants.py @@ -5,6 +5,8 @@ Get conventional powerplants from `powerplantmatching`, assign to buses and crea Relevant Settings ----------------- +*None* + Inputs ------ diff --git a/scripts/build_renewable_profiles.py b/scripts/build_renewable_profiles.py index 854cfce1..c00b0ce2 100644 --- a/scripts/build_renewable_profiles.py +++ b/scripts/build_renewable_profiles.py @@ -12,6 +12,31 @@ The script ``build_renewable_profiles.py`` calculates for each node several geog Relevant settings ----------------- +.. code:: yaml + + snapshots: + + atlite: + nprocesses: + + renewable: + {technology}: + cutout: + corine: + grid_codes: + distance: + natura: + max_depth: + max_shore_distance: + min_shore_distance: + capacity_per_sqkm: + correction_factor: + potential: + min_p_max_pu: + clip_p_max_pu: + resource: + + config.renewable (describes the parameters for onwind, offwind-ac, offwind-dc and solar) config.snapshots (describes the time dimensions of the selection of snapshots) diff --git a/scripts/build_shapes.py b/scripts/build_shapes.py index 69dd466b..f4b6f231 100644 --- a/scripts/build_shapes.py +++ b/scripts/build_shapes.py @@ -4,6 +4,10 @@ Create GIS shape files for countries on-shore and off-shore, europe and nuts3 re Relevant Settings ----------------- +.. code:: yaml + + countries: + Inputs ------ diff --git a/scripts/cluster_network.py b/scripts/cluster_network.py index 4c3f9b46..cae4eacb 100644 --- a/scripts/cluster_network.py +++ b/scripts/cluster_network.py @@ -5,6 +5,19 @@ Create networks clustered to `cluster` number of zones with aggregated buses, ge Relevant Settings ----------------- +.. code:: yaml + + renewable: (keys) + {technology}: + potential: + + solving: + solver: + name: + + lines: + length_factor: + Inputs ------ @@ -103,7 +116,7 @@ def plot_weighting(n, country, country_shape=None): def distribute_clusters(n, n_clusters, solver_name=None): if solver_name is None: - solver_name = snakemake.config['solver']['solver']['name'] + solver_name = snakemake.config['solving']['solver']['name'] L = (n.loads_t.p_set.mean() .groupby(n.loads.bus).sum() diff --git a/scripts/make_summary.py b/scripts/make_summary.py index 2530ac10..59865b7e 100644 --- a/scripts/make_summary.py +++ b/scripts/make_summary.py @@ -4,6 +4,17 @@ Create summaries of aggregated energy and costs as csv files Relevant Settings ----------------- +.. code:: yaml + + costs: + USD2013_to_EUR2013: + discountrate: + marginal_cost: + capital_cost: + + electricity: + max_hours: + Inputs ------ diff --git a/scripts/prepare_links_p_nom.py b/scripts/prepare_links_p_nom.py index 294eafa7..78d92a92 100644 --- a/scripts/prepare_links_p_nom.py +++ b/scripts/prepare_links_p_nom.py @@ -5,6 +5,8 @@ Extract capacities for HVDC links from wikipedia Relevant Settings ----------------- +*None* + Inputs ------ diff --git a/scripts/prepare_network.py b/scripts/prepare_network.py index 4b91da06..7e93eaad 100644 --- a/scripts/prepare_network.py +++ b/scripts/prepare_network.py @@ -5,6 +5,19 @@ Prepare PyPSA network for solving according to `opts`-wildcard Relevant Settings ----------------- +.. code:: yaml + + costs: + emission_prices: + USD2013_to_EUR2013: + discountrate: + marginal_cost: + capital_cost: + + electricity: + co2limit: + max_hours: + Inputs ------ diff --git a/scripts/simplify_network.py b/scripts/simplify_network.py index 33168ab5..964e995c 100644 --- a/scripts/simplify_network.py +++ b/scripts/simplify_network.py @@ -6,6 +6,31 @@ single link Relevant Settings ----------------- +.. code:: yaml + + costs: + USD2013_to_EUR2013: + discountrate: + marginal_cost: + capital_cost: + + electricity: + max_hours: + + renewables: (keys) + {technology}: + potential: + + lines: + length_factor: + + links: + p_max_pu: + + solving: + solver: + name: + Inputs ------ diff --git a/scripts/solve_network.py b/scripts/solve_network.py index 6670ea6d..163008c1 100644 --- a/scripts/solve_network.py +++ b/scripts/solve_network.py @@ -4,6 +4,29 @@ Solve networks iteratively linear optimal power flow, while updating reactances Relevant Settings ----------------- +.. code:: yaml + + (electricity:) + (BAU_mincapacities:) + (SAFE_reservemargin:) + + solving: + tmpdir: + options: + formulation: + clip_p_max_pu: + load_shedding: + noisy_costs: + nhours: + min_iterations: + max_iterations: + solver: + name: + {solveroptions}: + + (plotting:) + (conv_techs:) + Inputs ------ diff --git a/scripts/solve_operations_network.py b/scripts/solve_operations_network.py index fc250ff1..a7e3254c 100644 --- a/scripts/solve_operations_network.py +++ b/scripts/solve_operations_network.py @@ -5,6 +5,22 @@ capacity expansion Relevant Settings ----------------- +.. code:: yaml + + solving: + tmpdir: + options: + formulation: + clip_p_max_pu: + load_shedding: + noisy_costs: + nhours: + min_iterations: + max_iterations: + solver: + name: + {solveroptions}: + Inputs ------ diff --git a/scripts/trace_solve_network.py b/scripts/trace_solve_network.py index c6881b87..53d5b685 100644 --- a/scripts/trace_solve_network.py +++ b/scripts/trace_solve_network.py @@ -5,6 +5,22 @@ records intermediate branch capacity steps and values of the objective Relevant Settings ----------------- +.. code:: yaml + + solving: + tmpdir: + options: + formulation: + clip_p_max_pu: + load_shedding: + noisy_costs: + nhours: + min_iterations: + max_iterations: + solver: + name: + {solveroptions}: + Inputs ------