Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revise structure snakemake #462

Merged
merged 4 commits into from
Sep 28, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions Snakefile
Original file line number Diff line number Diff line change
Expand Up @@ -410,8 +410,8 @@ rule simplify_network:
network="networks/elec_s{simpl}.nc",
regions_onshore="resources/bus_regions/regions_onshore_elec_s{simpl}.geojson",
regions_offshore="resources/bus_regions/regions_offshore_elec_s{simpl}.geojson",
busmap="resources/busmap_elec_s{simpl}.csv",
connection_costs="resources/connection_costs_s{simpl}.csv",
busmap="resources/bus_regions/busmap_elec_s{simpl}.csv",
connection_costs="resources/bus_regions/connection_costs_s{simpl}.csv",
log:
"logs/simplify_network/elec_s{simpl}.log",
benchmark:
Expand All @@ -436,16 +436,16 @@ if config["augmented_line_connection"].get("add_to_snakefile", False) == True:
#To use: downlaod file from the google drive and place it in resources/shapes/
#Link: https://drive.google.com/drive/u/1/folders/1dkW1wKBWvSY4i-XEuQFFBj242p0VdUlM
gadm_shapes="resources/shapes/gadm_shapes.geojson",
# busmap=ancient('resources/busmap_elec_s{simpl}.csv'),
# busmap=ancient('resources/bus_regions/busmap_elec_s{simpl}.csv'),
# custom_busmap=("data/custom_busmap_elec_s{simpl}_{clusters}.csv"
# if config["enable"].get("custom_busmap", False) else []),
tech_costs=COSTS,
output:
network="networks/elec_s{simpl}_{clusters}_pre_augmentation.nc",
regions_onshore="resources/bus_regions/regions_onshore_elec_s{simpl}_{clusters}.geojson",
regions_offshore="resources/bus_regions/regions_offshore_elec_s{simpl}_{clusters}.geojson",
busmap="resources/busmap_elec_s{simpl}_{clusters}.csv",
linemap="resources/linemap_elec_s{simpl}_{clusters}.csv",
busmap="resources/bus_regions/busmap_elec_s{simpl}_{clusters}.csv",
linemap="resources/bus_regions/linemap_elec_s{simpl}_{clusters}.csv",
log:
"logs/cluster_network/elec_s{simpl}_{clusters}.log",
benchmark:
Expand Down Expand Up @@ -488,16 +488,16 @@ if config["augmented_line_connection"].get("add_to_snakefile", False) == False:
#To use: downlaod file from the google drive and place it in resources/shapes/
#Link: https://drive.google.com/drive/u/1/folders/1dkW1wKBWvSY4i-XEuQFFBj242p0VdUlM
gadm_shapes="resources/shapes/gadm_shapes.geojson",
# busmap=ancient('resources/busmap_elec_s{simpl}.csv'),
# busmap=ancient('resources/bus_regions/busmap_elec_s{simpl}.csv'),
# custom_busmap=("data/custom_busmap_elec_s{simpl}_{clusters}.csv"
# if config["enable"].get("custom_busmap", False) else []),
tech_costs=COSTS,
output:
network="networks/elec_s{simpl}_{clusters}.nc",
regions_onshore="resources/bus_regions/regions_onshore_elec_s{simpl}_{clusters}.geojson",
regions_offshore="resources/bus_regions/regions_offshore_elec_s{simpl}_{clusters}.geojson",
busmap="resources/busmap_elec_s{simpl}_{clusters}.csv",
linemap="resources/linemap_elec_s{simpl}_{clusters}.csv",
busmap="resources/bus_regions/busmap_elec_s{simpl}_{clusters}.csv",
linemap="resources/bus_regions/linemap_elec_s{simpl}_{clusters}.csv",
log:
"logs/cluster_network/elec_s{simpl}_{clusters}.log",
benchmark:
Expand Down
4 changes: 4 additions & 0 deletions doc/release_notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,12 @@ Upcoming Release
================

**New Features and major Changes**

* Finalize package restructuring `PR #462 <https://github.com/pypsa-meets-earth/pypsa-earth/pull/462>`__

* Fix made in config.default and config.tutorial changing Monte-Carlo from true to false `PR #463 <https://github.com/pypsa-meets-earth/pypsa-earth/pull/463>`__


PyPSA-Africa 0.1.0 (10th September 2022)
=====================================

Expand Down
4 changes: 2 additions & 2 deletions scripts/retrieve_databundle_light.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# Copyright 2019-2020 Fabian Hofmann (FIAS)
# SPDX-FileCopyrightText: : 2021-2022 PyPSA-Africa, 2017-2020 The PyPSA-Eur Authors
# SPDX-FileCopyrightText: : 2022 PyPSA-Earth, 2021-2022 PyPSA-Africa, 2017-2020 The PyPSA-Eur Authors
#
# SPDX-License-Identifier: GPL-3.0-or-later
"""
Expand Down Expand Up @@ -571,7 +571,7 @@ def get_best_bundles(country_list, category, config_bundles, tutorial, config_en
)

logger.warning(
"DISCLAIMER LICENSES: the use of PyPSA-Africa is conditioned \
"DISCLAIMER LICENSES: the use of PyPSA-Earth is conditioned \
to the acceptance of its multiple licenses.\n \
The use of the code automatically implies that you accept all the licenses.\n \
See our documentation for more information. \n \
Expand Down