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

Resource Classes #1481

Open
wants to merge 29 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
da02898
build_renewable_profiles: implement resource classes dim
fneum Jan 3, 2025
76881b6
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 3, 2025
641853e
add_electricity: add renewable generators per resource class
fneum Jan 4, 2025
3cad80b
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 4, 2025
46ccd6d
add_electricity: for current RES use GEM not OPSD
fneum Jan 4, 2025
c50cd0c
implement resource class split per bus
fneum Jan 6, 2025
fe09657
reorder indicatormatrix calculation
fneum Jan 6, 2025
32fa01a
calculate clustered regions split by resource classes
fneum Jan 6, 2025
d5ffa3e
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 6, 2025
717909c
distinguish between regions for distance and resource calculations
fneum Jan 6, 2025
7c6ef96
Merge branch 'resource-classes' of github.com:pypsa/pypsa-eur into re…
fneum Jan 6, 2025
4ecb495
correct file export
fneum Jan 6, 2025
b9ae6b0
typo correction
fneum Jan 6, 2025
454f473
attach_GEM_renewables: attach to correct resource class
fneum Jan 6, 2025
0eb2683
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 6, 2025
b8f2d21
adjust estimate_renewable_capacities
fneum Jan 6, 2025
e3cb8f7
distinguish offshore/onshore regions for resource class masks
fneum Jan 6, 2025
e00980c
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 6, 2025
e106ad6
class_regions: add shortcut for single resource class
fneum Jan 6, 2025
875c347
prepare_sector: resource classes for rooftop PV and updated offwind c…
fneum Jan 6, 2025
97b9333
build_renewable_profiles: add distance and resource regions as inputs
fneum Jan 6, 2025
85eb183
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 6, 2025
e377c49
build_sector: check config for solar rooftop
fneum Jan 6, 2025
51c45ce
add_existing_baseyear: compat with resource classes
fneum Jan 6, 2025
50be5d6
solve: add_land_use_constraint resource class compat
fneum Jan 6, 2025
bab427d
add_brownfield: compat with resource classes
fneum Jan 6, 2025
fc2c891
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 6, 2025
c8bac30
build_renewable_profiles: update docstring
fneum Jan 6, 2025
2659938
Merge branch 'master' into resource-classes
fneum Jan 6, 2025
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
Prev Previous commit
Next Next commit
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed Jan 6, 2025
commit 85eb1831c68a737c056f514e5c47c4398b03bb1e
10 changes: 8 additions & 2 deletions scripts/build_clustered_solar_rooftop_potentials.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,19 @@
if "snakemake" not in globals():
from _helpers import mock_snakemake

snakemake = mock_snakemake("build_clustered_solar_rooftop_potentials", clusters=5, configfiles="config/test/config.myopic.yaml")
snakemake = mock_snakemake(
"build_clustered_solar_rooftop_potentials",
clusters=5,
configfiles="config/test/config.myopic.yaml",
)

set_scenario_config(snakemake)

cutout = atlite.Cutout(snakemake.input.cutout)

class_regions = gpd.read_file(snakemake.input.class_regions).set_index(["bus", "bin"])
class_regions = gpd.read_file(snakemake.input.class_regions).set_index(
["bus", "bin"]
)

I = cutout.indicatormatrix(class_regions) # noqa: E741

Expand Down
2 changes: 1 addition & 1 deletion scripts/prepare_sector_network.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
)
from add_electricity import (
calculate_annuity,
flatten,
sanitize_carriers,
sanitize_locations,
flatten,
)
from build_energy_totals import (
build_co2_totals,
Expand Down
Loading