From 55d111e7afe4589d66003787b3c35c1f1f373716 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Fri, 31 Mar 2023 12:06:10 +0200 Subject: [PATCH] fix land eligibility calculation for UA and MD --- Snakefile | 1 + .../determine_availability_matrix_MD_UA.py | 22 +++++-------------- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/Snakefile b/Snakefile index 1c9f11ec..be7a3acb 100644 --- a/Snakefile +++ b/Snakefile @@ -412,6 +412,7 @@ rule build_renewable_profiles: + CDIR + config["renewable"][w.technology]["cutout"] + ".nc", + **opt output: profile="resources/" + RDIR + "profile_{technology}.nc", log: diff --git a/scripts/determine_availability_matrix_MD_UA.py b/scripts/determine_availability_matrix_MD_UA.py index fd86e6c4..037ee196 100644 --- a/scripts/determine_availability_matrix_MD_UA.py +++ b/scripts/determine_availability_matrix_MD_UA.py @@ -1,19 +1,14 @@ -#!/usr/bin/env python -# coding: utf-8 +# -*- coding: utf-8 -*- +# SPDX-FileCopyrightText: : 2017-2023 The PyPSA-Eur Authors +# +# SPDX-License-Identifier: MIT -# In[ ]: - - -import progressbar as pgb import geopandas as gpd -import xarray as xr import numpy as np import functools import atlite import logging import time -import matplotlib.pyplot as plt -from _helpers import mock_snakemake from _helpers import configure_logging @@ -27,13 +22,12 @@ if __name__ == "__main__": "determine_availability_matrix_MD_UA", technology="solar" ) configure_logging(snakemake) - pgb.streams.wrap_stderr() nprocesses = snakemake.config["atlite"].get("nprocesses") noprogress = not snakemake.config["atlite"].get("show_progress", True) config = snakemake.config["renewable"][snakemake.wildcards.technology] - cutout = atlite.Cutout(snakemake.input["cutout"]) + cutout = atlite.Cutout(snakemake.input.cutout) regions = ( gpd.read_file(snakemake.input.regions).set_index("name").rename_axis("bus") ) @@ -120,8 +114,4 @@ if __name__ == "__main__": availability = availability.sel(bus=buses) # Save and plot for verification - availability.to_netcdf(snakemake.output["availability_matrix"]) - # availability.sum(dim="bus").plot() - # plt.title(technology) - # plt.show() - + availability.to_netcdf(snakemake.output.availability_matrix)