bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

alpha testing complete vresutils removal

Browse Source
This commit is contained in:
virio-andreyana 2023-05-11 16:58:35 +02:00 committed by GitHub
parent b21965a986
commit 654f46f868
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 30 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
envs/environment.fixed.yaml
View File

@ -226,7 +226,7 @@ dependencies:
- nspr=4.35 - nspr=4.35
- nss=3.88 - nss=3.88
- numexpr=2.8.3 - numexpr=2.8.3
- numpy=1.23.5 - numpy=1.24
- openjdk=17.0.3 - openjdk=17.0.3
- openjpeg=2.5.0 - openjpeg=2.5.0
- openpyxl=3.1.0 - openpyxl=3.1.0
@ -378,4 +378,3 @@ dependencies:
- highspy==1.5.0.dev0 - highspy==1.5.0.dev0
- pybind11==2.10.3 - pybind11==2.10.3
- tsam==2.2.2 - tsam==2.2.2
- vresutils==0.3.1

3
envs/environment.yaml
View File

@ -25,7 +25,7 @@ dependencies:
- pytables - pytables
- lxml - lxml
- powerplantmatching>=0.5.5 - powerplantmatching>=0.5.5
- numpy<1.24 - numpy
- pandas>=1.4 - pandas>=1.4
- geopandas>=0.11.0 - geopandas>=0.11.0
- xarray - xarray
@ -55,5 +55,4 @@ dependencies:
- rasterio!=1.2.10 - rasterio!=1.2.10
- pip: - pip:
- vresutils>=0.3.1
- tsam>=1.1.0 - tsam>=1.1.0

6
scripts/add_electricity.py
View File

@ -218,7 +218,7 @@ def load_powerplants(ppl_fn):
) )
def Shapes2Shapes(orig, dest): def shapes_to_shapes(orig, dest):
""" """
Adopted from vresutils.transfer.Shapes2Shapes() Adopted from vresutils.transfer.Shapes2Shapes()
""" """
@ -249,9 +249,7 @@ def attach_load(n, regions, load, nuts3_shapes, countries, scaling=1.0):
return pd.DataFrame({group.index[0]: l}) return pd.DataFrame({group.index[0]: l})
else: else:
nuts3_cntry = nuts3.loc[nuts3.country == cntry] nuts3_cntry = nuts3.loc[nuts3.country == cntry]
transfer = Shapes2Shapes( transfer = shapes_to_shapes(group, nuts3_cntry.geometry).T.tocsr()
group, nuts3_cntry.geometry, normed=False
).T.tocsr()
gdp_n = pd.Series( gdp_n = pd.Series(
transfer.dot(nuts3_cntry["gdp"].fillna(1.0).values), index=group.index transfer.dot(nuts3_cntry["gdp"].fillna(1.0).values), index=group.index
) )

5
scripts/solve_network.py
View File

@ -38,7 +38,6 @@ from _helpers import (
override_component_attrs, override_component_attrs,
update_config_with_sector_opts, update_config_with_sector_opts,
) )
from vresutils.benchmark import memory_logger
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
pypsa.pf.logger.setLevel(logging.WARNING) pypsa.pf.logger.setLevel(logging.WARNING)
@ -667,8 +666,6 @@ if __name__ == "__main__":
np.random.seed(solve_opts.get("seed", 123)) np.random.seed(solve_opts.get("seed", 123))
fn = getattr(snakemake.log, "memory", None)
with memory_logger(filename=fn, interval=30.0) as mem:
if "overrides" in snakemake.input.keys(): if "overrides" in snakemake.input.keys():
overrides = override_component_attrs(snakemake.input.overrides) overrides = override_component_attrs(snakemake.input.overrides)
n = pypsa.Network( n = pypsa.Network(
@ -685,5 +682,3 @@ if __name__ == "__main__":
n.meta = dict(snakemake.config, **dict(wildcards=dict(snakemake.wildcards))) n.meta = dict(snakemake.config, **dict(wildcards=dict(snakemake.wildcards)))
n.export_to_netcdf(snakemake.output[0]) n.export_to_netcdf(snakemake.output[0])
logger.info("Maximum memory usage: {}".format(mem.mem_usage))

4
scripts/solve_operations_network.py
View File

@ -46,8 +46,6 @@ if __name__ == "__main__":
np.random.seed(solve_opts.get("seed", 123)) np.random.seed(solve_opts.get("seed", 123))
fn = getattr(snakemake.log, "memory", None)
with memory_logger(filename=fn, interval=30.0) as mem:
if "overrides" in snakemake.input: if "overrides" in snakemake.input:
overrides = override_component_attrs(snakemake.input.overrides) overrides = override_component_attrs(snakemake.input.overrides)
n = pypsa.Network( n = pypsa.Network(
@ -64,5 +62,3 @@ if __name__ == "__main__":
n.meta = dict(snakemake.config, **dict(wildcards=dict(snakemake.wildcards))) n.meta = dict(snakemake.config, **dict(wildcards=dict(snakemake.wildcards)))
n.export_to_netcdf(snakemake.output[0]) n.export_to_netcdf(snakemake.output[0])
logger.info("Maximum memory usage: {}".format(mem.mem_usage))