2276 Commits

Author	SHA1	Message	Date
Michael Lindner	4cfb06c55f	group storage with duplicate labels	2024-01-17 17:07:19 +01:00
pre-commit-ci[bot]	aaa587d34f	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2024-01-17 13:51:05 +00:00
Thomas Kouroughli	228ff44f75	♻️ address pandas FutureWarning	2024-01-17 13:50:32 +00:00
pre-commit-ci[bot]	446b0b3722	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2024-01-17 10:36:15 +00:00
JulianGeis	ec4e9aa548	wasserstoff kernnetz	2024-01-17 11:23:29 +01:00
Fabian Neumann	5faab62a1e	Merge branch 'master' of github.com:PyPSA/pypsa-eur	2024-01-17 10:07:42 +01:00
Fabian Neumann	59a92f686b	Merge branch 'feature/warning-bev-profile' of github.com:Climact/pypsa-eur-climact into Climact-feature/warning-bev-profile	2024-01-17 10:07:21 +01:00
Fabian Neumann	c1877fa213	Merge pull request #868 from PyPSA/clip-links-p_max_pu ... add clipping for links	2024-01-17 10:05:38 +01:00
martacki	55eddb6e1d	Norway currently ignored when building energy totals	2024-01-17 10:01:10 +01:00
pre-commit-ci[bot]	21a223262f	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2024-01-16 15:53:18 +00:00
Michael Lindner	3f8a55992c	locate project dir if pypsa-eur is a submodule	2024-01-16 16:50:54 +01:00
lisazeyen	e51e405d6e	add clipping for links	2024-01-16 11:51:55 +01:00
pre-commit-ci[bot]	0bac08934a	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2024-01-12 20:34:57 +00:00
lisazeyen	0a789a22dc	change type of co2 constraint	2024-01-12 21:33:38 +01:00
lisazeyen	f042c77926	add new constraint on co2 atmoshpere store	2024-01-12 21:33:14 +01:00
Philipp Glaum	8565c124c0	fix bus filter for buses without countries	2024-01-12 16:50:17 +01:00
Philipp Glaum	e9873e7471	Merge remote-tracking branch 'upstream/master' into year-specific-techs	2024-01-11 17:25:50 +01:00
Philipp Glaum	a4802b7018	initial implementation tech specific renewable profiles	2024-01-11 17:23:25 +01:00
Thomas Gilon	cd8001116d	Add warning when negative bev availability profile values	2024-01-11 14:11:25 +01:00
Fabian Neumann	a6edce58fb	remove wave energy generator	2024-01-11 09:47:09 +01:00
Fabian Neumann	725a0ef8c0	maybe_adjust_cost_and_potentials: cover all flags	2024-01-10 16:17:16 +01:00
pre-commit-ci[bot]	dc90398b12	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2024-01-08 12:57:36 +00:00
euronion	c284223a38	Fix error for multi-horizon models	2024-01-08 13:56:02 +01:00
euronion	962517d559	Fix variable names	2024-01-08 09:49:44 +01:00
euronion	61211eb87b	Fix variable name	2024-01-08 09:45:14 +01:00
pre-commit-ci[bot]	6e630a85e1	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2024-01-08 08:33:52 +00:00
euronion	01f201743d	Implement everywhere_powerplants	2024-01-08 09:30:21 +01:00
pre-commit-ci[bot]	bf5c323c27	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2024-01-05 16:34:22 +00:00
Fabian Neumann	66c9513fbd	prepare release notes and amend documentation	2024-01-05 17:20:52 +01:00
Fabian Neumann	6dd9d6a9c1	Merge branch 'fneum/services_heat'	2024-01-05 14:39:29 +01:00
Fabian Neumann	b6cba0388c	do not skip gas generator	2024-01-05 14:34:48 +01:00
Fabian Neumann	f68e8d3d61	Merge branch 'master' into wildcard-opts-config	2024-01-05 12:02:11 +01:00
Fabian Neumann	43a502f2ec	Merge pull request #844 from PyPSA/cm ... Distinguish sequestered and stored CO2	2024-01-05 11:59:34 +01:00
pre-commit-ci[bot]	29cda7042b	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2024-01-04 19:30:31 +00:00
Fabian Neumann	e594f34e00	fix sequestration buses string replacement with pd.Index	2024-01-04 20:30:00 +01:00
pre-commit-ci[bot]	0534f574e9	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2024-01-04 19:18:10 +00:00
Fabian Neumann	95c696594e	Merge branch 'cm' of github.com:PyPSA/pypsa-eur into cm	2024-01-04 20:15:07 +01:00
pre-commit-ci[bot]	4883287417	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2024-01-04 19:10:07 +00:00
Fabian Neumann	6078b46262	remove duplicate marginal_cost for methanolisation from merge	2024-01-04 20:04:56 +01:00
Fabian	4e03e5a7ec	prepare_sector: add VOM for FT and methanolization, always use .at accessor for costs	2024-01-04 19:57:42 +01:00
Fabian	be5331c89c	formulate sequestration limit constraint as operational_limit constraint	2024-01-04 19:56:01 +01:00
Fabian	c71c4e7567	add biomass constraint for biomass spatial enabled	2024-01-04 19:54:48 +01:00
Fabian	2d027e80c3	fix capital costs of co2 tanks	2024-01-04 19:54:25 +01:00
Fabian	254d50b1b4	prepare sectors: allow for updating co2 network costs	2024-01-04 19:49:59 +01:00
Fabian Neumann	c1f527b663	build_ship_raster: adjust imports	2024-01-04 19:44:29 +01:00
Fabian Neumann	b135a0cc01	build_ship_raster: performance improvement	2024-01-04 19:42:22 +01:00
Fabian	608a12fed2	prepare_sector: allow planning_horizons wc to be a scalar value	2024-01-04 19:30:20 +01:00
Fabian Neumann	1e5f9e867d	build_industrial_distribution_key.py: add dropna to EPRTR emissions	2024-01-04 19:17:49 +01:00
Fabian Neumann	f9fec1a4be	more precise restrictive handling of opts cost adjustment flags	2024-01-04 18:58:04 +01:00
Fabian Neumann	9530d63e55	cluster_heat_buses: performance boost and tidy code	2024-01-04 18:57:09 +01:00
Fabian Neumann	cf5f3cbd88	segmentation_clustering: log distribution of snapshot durations (fix)	2024-01-04 18:54:49 +01:00
Fabian Neumann	29b24b1b41	segmentation_clustering: log distribution of snapshot durations	2024-01-04 18:42:47 +01:00
Fabian Neumann	73abb61967	add_brownfield: fix lv_limit reached	2024-01-04 17:05:54 +01:00
pre-commit-ci[bot]	817995c8a2	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2024-01-04 14:39:30 +00:00
martacki	d6137f8e93	merge branch 'master' into services_heat	2024-01-04 15:38:10 +01:00
Fabian Neumann	34535bcbff	custom_extra_functionality: assume same function name as file name	2024-01-04 13:08:14 +01:00
Fabian Neumann	cfd689bbec	add snakemake object to custom_extra_functionality arguments	2024-01-04 13:03:03 +01:00
Fabian Neumann	8054ad382c	prepare_sector_network: simplify process emissions with outsourced feedstock emissions	2024-01-04 12:47:26 +01:00
Fabian Neumann	593995675e	gurobi: avoid double-logging to console	2024-01-04 12:44:47 +01:00
Fabian Neumann	8316861722	Merge branch 'master' into fneum/ariadne	2024-01-04 09:54:27 +01:00
Fabian Neumann	2096131b03	Merge pull request #842 from PyPSA/luisa-2 ... add option to use LUISA land coverage data	2024-01-04 09:32:55 +01:00
Fabian Neumann	ab1d93279a	move LUISA resolution info to a later point	2024-01-04 09:19:29 +01:00
Fabian Neumann	d145758fb7	gracefully handle absent extra_functionality file; add file to path	2024-01-04 09:00:31 +01:00
Fabian Neumann	b4fb395158	Merge branch 'master' into custom-extra-functionality	2024-01-04 08:32:29 +01:00
Fabian Neumann	cd3eddcc3a	Merge pull request #739 from PyPSA/complete-losses ... Lossy bidirectional links	2024-01-03 16:54:02 +01:00
Fabian Neumann	94f4383e02	distinguish dataset name and dataset settings	2024-01-03 15:22:13 +01:00
Fabian Neumann	c3bb41c900	Merge branch 'master' into multiyear	2024-01-03 15:14:27 +01:00
pre-commit-ci[bot]	045eeba4cf	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2024-01-03 14:02:26 +00:00
Fabian Neumann	ecd85d23d3	add option to use LUISA land coverage data	2024-01-03 15:01:43 +01:00
Fabian Neumann	c237862c02	Merge pull request #840 from PyPSA/disable-lvlimit-if-hit ... Disable power grid expansion if line volume limit already hit	2024-01-03 13:50:04 +01:00
Fabian Neumann	257b16efd8	print IIS if solver returns status infeasible	2024-01-03 13:47:13 +01:00
Fabian Neumann	deba2a4ed5	tidy code	2024-01-03 13:41:42 +01:00
Fabian Neumann	42f11752ca	standardise formatting	2024-01-03 13:35:11 +01:00
Tom Brown	00aa07242a	add_brownfield: disable grid expansion if LV already hit ... Numerical problems were causing infeasibilities otherwise	2024-01-03 13:33:41 +01:00
Fabian Neumann	b786337d33	Merge pull request #839 from PyPSA/one-node-one-country ... compatibility for config with single node in single country	2024-01-03 13:25:39 +01:00
Fabian Neumann	6242675c27	Merge pull request #836 from PyPSA/remove-helmeth ... remove helmeth option	2024-01-03 13:24:43 +01:00
Fabian Neumann	8e158d45a8	Merge branch 'master' into improve-build-profiles-logging	2024-01-03 13:24:23 +01:00
Fabian Neumann	c283a3c89c	Merge pull request #838 from PyPSA/remove-conservative-potential-method ... renewable_profiles: remove conservative potential estimation method	2024-01-03 13:23:01 +01:00
pre-commit-ci[bot]	d7051e7f66	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2024-01-03 12:16:45 +00:00
Fabian Neumann	bcafbb1e54	compatibility for config with single node in single country	2024-01-03 13:15:43 +01:00
Fabian Neumann	83ecaac4de	Merge branch 'master' into wildcard-opts-config	2024-01-03 13:08:21 +01:00
Fabian Neumann	80f9259bac	handle gas pipeline retrofitting with lossy links	2024-01-03 12:57:22 +01:00
Fabian Neumann	72e6c208ef	Merge branch 'complete-losses' of github.com:PyPSA/pypsa-eur into complete-losses	2024-01-03 12:47:46 +01:00
Fabian Neumann	05495ce484	fix lossy bidirectional link coupling countraint for myopic	2024-01-03 12:46:42 +01:00
pre-commit-ci[bot]	4606cb131b	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2024-01-03 10:44:16 +00:00
Fabian Neumann	29afffb4ca	fix potential duplicate renaming of length_original	2024-01-03 11:31:56 +01:00
Fabian Neumann	b937cd7784	Merge branch 'master' into complete-losses	2024-01-03 10:56:37 +01:00
Fabian Neumann	e423945e7d	gas_input: ensure all columns exist even if column empty	2024-01-03 10:54:53 +01:00
pre-commit-ci[bot]	38d587944b	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2024-01-03 09:35:07 +00:00
Fabian Neumann	6b344c9901	renewable_profiles: remove conservative potential estimation method	2024-01-03 10:33:33 +01:00
pre-commit-ci[bot]	fdb63bc6ca	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2024-01-03 09:29:11 +00:00
Fabian Neumann	92df7bbb9c	build_renewable_profiles: improve logging of time passed	2024-01-03 10:27:42 +01:00
Fabian Neumann	9d939fa635	remove helmeth option	2024-01-03 10:12:43 +01:00
Fabian Neumann	1245c93264	Merge branch 'master' into complete-losses	2024-01-03 09:29:55 +01:00
Fabian Neumann	4db59eddc2	Merge branch 'master' into complete-losses	2024-01-03 09:29:14 +01:00
pre-commit-ci[bot]	2b2bad392f	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2024-01-03 08:08:23 +00:00
Fabian Neumann	0d03d384cc	lossy_bidirectional_links: use original length for loss calculation	2024-01-03 09:07:48 +01:00
Fabian Neumann	838ee4d913	Merge pull request #835 from PyPSA/gas-storage ... add locations, capacities and costs of existing gas storage	2024-01-03 09:05:19 +01:00
Fabian Neumann	b5ad0f11ee	Merge pull request #834 from PyPSA/all-waste-heat-min-part-load ... extended waste heat from PtX, revised minimum part loads	2024-01-03 08:21:57 +01:00
Fabian Neumann	00a8ff5e4a	Merge pull request #833 from PyPSA/biomass-boiler-pelletizing ... add biomass boiler pelletizing cost	2024-01-03 08:21:11 +01:00
Fabian Neumann	252f6d2c15	pre-commit formatting	2024-01-03 08:13:01 +01:00
Fabian Neumann	7c058f1ed3	add locations, capacities and costs of existing gas storage	2024-01-03 07:57:45 +01:00
Fabian Neumann	fa03c61187	gas_input: switch production data from scigrid to gem	2024-01-03 07:56:26 +01:00
pre-commit-ci[bot]	fb5b107805	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2024-01-02 18:59:38 +00:00
Fabian Neumann	71b27b524e	prevent failure if potential waste heat technologies not present	2024-01-02 19:57:40 +01:00
pre-commit-ci[bot]	777899f686	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2024-01-02 18:45:58 +00:00
Fabian Neumann	872c92d1c0	extended waste heat from PtX, revised minimum part loads	2024-01-02 19:45:02 +01:00
Fabian Neumann	37df47110c	biomass_boiler: add pelletizing cost	2024-01-02 19:32:02 +01:00
pre-commit-ci[bot]	815b828311	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2024-01-02 18:11:45 +00:00
Fabian Neumann	631c794cda	Merge branch 'master' into haber-bosch-h2-input	2024-01-02 19:11:23 +01:00
Fabian Neumann	438b40cdb1	haber-bosch: use DECHEMA source for electricity input	2024-01-02 19:09:46 +01:00
Fabian Neumann	5e4a81f828	haber-bosch: use DECHEMA source for hydrogen input	2024-01-02 19:04:34 +01:00
Fabian Neumann	861e7b5fe5	Merge branch 'master' into biogas-upgrade-cc	2024-01-02 18:55:29 +01:00
Fabian Neumann	a10a60b951	rename setting from biomass_upgrading_cc to biogas_upgrading_cc	2024-01-02 18:52:22 +01:00
Fabian Neumann	c5bd95d124	Merge branch 'biogas-upgrade-cc' of github.com:PyPSA/pypsa-eur into biogas-upgrade-cc	2024-01-02 18:49:26 +01:00
Fabian Neumann	9884dee7a0	remove biogas upgrading CC in normal link	2024-01-02 18:48:52 +01:00
pre-commit-ci[bot]	6714858e17	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2024-01-02 17:47:49 +00:00
Fabian Neumann	4b178a7fa1	Merge branch 'master' into biogas-upgrade-cc	2024-01-02 18:46:54 +01:00
Fabian Neumann	fd81058008	add VOM of PtX processes (closes #747)	2024-01-02 18:35:10 +01:00
pre-commit-ci[bot]	2678fdef99	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2024-01-02 17:13:37 +00:00
Fabian Neumann	f2a636c62c	bugfix: correct unit of capital_cost of Haber-Bosch	2024-01-02 18:12:49 +01:00
Fabian Neumann	fac257ca97	Merge pull request #821 from PyPSA/md5-checksums ... validate checksums for zenodo downloads	2024-01-02 17:23:06 +01:00
pre-commit-ci[bot]	e580ac85d9	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2024-01-02 15:33:11 +00:00
Fabian Neumann	30c1a1c857	address deprecation warnings	2024-01-02 16:31:48 +01:00
Fabian Neumann	e3539b0e69	heat vent: add bus	2024-01-02 16:31:16 +01:00
pre-commit-ci[bot]	f494dd85b9	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2024-01-02 15:21:51 +00:00
Tom Brown	1b569dde1b	move code for national CO2 budgets out of extra_functionality ... This can be added by derived workflows like PyPSA-Eur via additional_functionality. Changed additional_functionality to pass snakemake rather than wildcards and config separately. This gives maximal flexibility.	2024-01-02 16:02:10 +01:00
Fabian Neumann	98e47eab3c	mock_snakemake: adjust to snakemake version 8	2023-12-31 13:00:21 +01:00
Fabian Neumann	fa13eae277	Merge branch 'custom-extra-functionality' of github.com:PyPSA/pypsa-eur into custom-extra-functionality	2023-12-29 17:23:24 +01:00
Fabian Neumann	4b6dd29083	add dummy file and assert path exists	2023-12-29 17:23:11 +01:00
pre-commit-ci[bot]	fba320bfa7	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2023-12-29 16:20:26 +00:00
Fabian Neumann	8a11bdb4b1	solve_network: option to inject custom extra functionalities from source file	2023-12-29 17:19:19 +01:00
pre-commit-ci[bot]	74cf849ac4	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2023-12-29 12:40:47 +00:00
martacki	715aa25698	build_energy_totals: avoid deprecation warnings	2023-12-29 13:40:00 +01:00
pre-commit-ci[bot]	de3b6c9573	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2023-12-29 11:38:43 +00:00
Fabian Neumann	71985d5e3a	validate checksums for zenodo downloads	2023-12-29 12:34:14 +01:00
Fabian Neumann	e097aa48ae	Merge branch 'master' into misc/deprecations	2023-12-29 11:36:19 +01:00
Fabian Neumann	396fdee6f1	Merge pull request #812 from Climact/fix/typo-prepare-sector-network ... Fix typo in buses definition for oil boilers in add_industry in prepare_sectors_networks	2023-12-29 10:47:41 +01:00
Fabian Neumann	57b4724ebe	Merge pull request #803 from millingermarkus/master ... Added co2 storage shadow price output to csv	2023-12-29 10:41:41 +01:00
Martha Frysztacki	ba928bf839	Merge pull request #814 from yerbol-akhmetov/no_gas_gen ... No gas generators	2023-12-28 10:11:45 +01:00
pre-commit-ci[bot]	125c406013	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2023-12-23 08:55:59 +00:00
yerbol-akhmetov	1bee34d57f	remove gas generators	2023-12-23 14:51:01 +06:00
Tom Brown	8a55a55d20	copperplate oil/methanol supply; allow demand to be regional ... Force a single supply bus for oil/methanol (until we allow oil/methanol transport). Introduce new config switches "regional_oil/methanol_demand" that allow demand to be regionalised. This is important if regional CO2 budgets need to be enforced.	2023-12-21 16:08:43 +01:00
yerbol-akhmetov	17e9b4d1df	make resistive heaters separate of boilers	2023-12-21 20:59:35 +06:00
yerbol-akhmetov	25cfcaf97b	fix add_waste_heat	2023-12-21 20:54:17 +06:00
Martha Frysztacki	81041aa10e	Merge pull request #809 from yerbol-akhmetov/fix_f_weighting ... fix f weighting for retro cost	2023-12-21 15:04:06 +01:00
pre-commit-ci[bot]	20b847c627	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2023-12-21 13:35:00 +00:00
martacki	7d64a73382	simplify node_name formulation	2023-12-21 11:12:54 +01:00
pre-commit-ci[bot]	5ab9d149ba	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2023-12-21 10:07:58 +00:00
martacki	e8eb9df73f	generalize bus name to allow higher spatial resolution	2023-12-21 11:07:23 +01:00
pre-commit-ci[bot]	146fb170d8	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2023-12-21 09:41:15 +00:00
martacki	bb160d78b1	fix more deprecation warnings	2023-12-21 10:40:10 +01:00
pre-commit-ci[bot]	dfc2f06033	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2023-12-21 08:41:19 +00:00
martacki	4d63a3f21b	fix deprecation warnings	2023-12-21 09:37:13 +01:00
pre-commit-ci[bot]	f77f84af6a	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2023-12-20 19:27:58 +00:00
martacki	a292308c53	select correct sector name in endogeneous retrofitting	2023-12-20 20:11:37 +01:00
yerbol-akhmetov	79f443ecbd	fix f weighting for retro cost	2023-12-20 22:41:11 +06:00
Tom Brown	b3753d73d7	undo addition of script to allow cost modifications ... This undoes commit 830019a6e5. Reason: this was introduced for the PyPSA-Ariadne derivative, but can be handled more elegantly within the derivative repository.	2023-12-20 09:22:40 +01:00
Fabian	d39b579346	build_biomass_potentials: fix groupby and transpose	2023-12-18 12:56:08 +01:00
Fabian	cc08dff280	simplify_network: revert fillna	2023-12-18 12:44:21 +01:00
martacki	22acdd03a0	omit future deprecation	2023-12-18 11:49:53 +01:00
martacki	ea42b3797d	simplify_network&pandas21: nans not supported	2023-12-18 11:43:04 +01:00
pre-commit-ci[bot]	ea3fdb6c15	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2023-12-18 08:58:15 +00:00
martacki	7e543ad0cc	base_network: fix pandas 2.1 issue	2023-12-18 09:57:05 +01:00
Tom Brown	1a7f093e03	solve: pass wildcards and config to additional_functionality	2023-12-15 17:18:36 +01:00
Tom Brown	c5a123b4f4	allow additional functionality for solving to be added by file ... To add this, overwrite the rule with a new argument: snakemake.input.additional_functionality	2023-12-15 14:57:03 +01:00
Tom Brown	830019a6e5	add rule that allows cost data to be modified	2023-12-15 09:50:47 +01:00
Fabian Neumann	43674bcee8	Revert "Add option for carbon capture in integrated steelworks"	2023-12-14 16:30:30 +01:00
pre-commit-ci[bot]	f0eae99a07	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2023-12-14 12:51:51 +00:00
Markus Millinger	0721a29a02	Merge branch 'PyPSA:master' into master	2023-12-14 13:48:16 +01:00
Fabian Neumann	c304738ea5	fix to restore compatibility with PyPSA v0.26.0	2023-12-12 18:18:03 +01:00
Fabian Neumann	dffe784704	address pandas 2.1.4 deprecation warnings on applymap and fillna(method='bfill')	2023-12-12 17:07:33 +01:00
Fabian Neumann	e0ca38be6e	Merge pull request #719 from PyPSA/blast-furnace-with-cc ... Add option for carbon capture in integrated steelworks	2023-12-11 20:12:26 +01:00
Fabian Neumann	ea7a66b873	Merge pull request #794 from PyPSA/mv-focus-weights ... move focus_weights into clustering configuration segment	2023-12-11 20:10:46 +01:00
pre-commit-ci[bot]	aae5ffb6fd	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2023-12-11 17:25:24 +00:00
Fabian Neumann	0f3fb540ef	finalise ukraine_hackathon branch for merge	2023-12-11 18:24:57 +01:00
Thomas Gilon	889a5dd5a2	Fix typo in buses definition for oil boilers in add_industry in prepare_sector_network	2023-12-11 17:18:31 +01:00
Fabian Neumann	df40fdf904	Merge branch 'master' into ukraine_hackathon	2023-12-11 16:24:40 +01:00
Fabian Neumann	4ed59eb4b4	Merge pull request #798 from tgi-climact/fix/distributed-generators ... Fix nodal fraction with distributed generators	2023-12-11 14:02:16 +01:00
Fabian Neumann	8d509f4606	Merge pull request #796 from PyPSA/district_heating_share_0 ... district heating bugfix when no progress is assumed	2023-12-11 14:01:57 +01:00
millingermarkus	d6a11c28c9	Added co2 storage shadow price output to csv	2023-12-11 10:49:44 +01:00
Tom Brown	326ed63329	add_brownfield: disable grid expansion if LV already hit ... Numerical problems were causing infeasibilities otherwise	2023-12-08 17:53:28 +01:00
Tom Brown	00e86e6435	bug fix: route process emissions from steam cracker to correct bus ... Now naphtha demand causes process emissions from steak crackers to route to process emissions bus, then rest of CO2 goes to atmosphere.	2023-12-08 13:28:08 +01:00
Tom Brown	2d323d1b87	bug fix: ICE efficiency for land transport was applied twice ... This was overestimating ICE oil demand by factor 1/0.3.	2023-12-08 12:27:07 +01:00
Tom Brown	bbf9ca2d9b	bug fix: naming of p_set when co2_national is True ... Without this naming fix, the p_set is a NaN once added	2023-12-08 11:58:28 +01:00
pre-commit-ci[bot]	e3ba0e50a7	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2023-12-08 09:35:15 +00:00
Thomas Gilon	1352f6c30e	Fix nodal fraction with distributed generators	2023-12-08 10:32:35 +01:00
pre-commit-ci[bot]	429b4ca680	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2023-12-06 16:01:04 +00:00
martacki	fd789932dd	district heating bugfix when no progress is assumed	2023-12-06 07:58:20 -08:00
Fabian Neumann	a59eb821ff	for clustering fall back to ipopt when highs is solver	2023-12-06 11:07:04 +01:00
Fabian Neumann	e5bdb4796a	move focus_weights into clustering configuration segment (backward compatible)	2023-12-06 10:09:17 +01:00
Tom Brown	66178a5a27	solve_network: fix sign for country CO2 when bus0=atmosphere ... So that DAC extracts CO2 rather than pumping into air; for p>0, link withdraws from bus0, but injects into bus1/2/3, so you have to take account of this sign difference-	2023-12-04 16:46:45 +01:00
Tom Brown	cea62de438	solve_network: quick fix so duals can be read from CO2 constrain	2023-12-04 16:46:11 +01:00
Fabian Neumann	3b20b5c642	Merge branch 'master' of github.com:PyPSA/pypsa-eur	2023-12-04 14:39:33 +01:00
Fabian Neumann	4df6370198	update environment: matplotlib, xarray, pypsa	2023-12-04 14:39:23 +01:00
lisazeyen	b8e72683cb	improve style ... Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>	2023-12-04 12:28:54 +01:00
pre-commit-ci[bot]	92ccb517f3	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2023-12-04 11:20:40 +00:00
lisazeyen	53b9e23dd8	fixes for new package versions	2023-12-04 12:18:03 +01:00
pre-commit-ci[bot]	71dbe2aaf2	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2023-12-04 09:53:03 +00:00
lisazeyen	54c2128419	add heat vent	2023-12-04 10:47:41 +01:00
Fabian Neumann	98797e2e30	follow-up to 7ca769bc	2023-11-29 13:46:28 +01:00
Fabian Neumann	803b860923	move load_raw.csv to resources since it's config file dependent	2023-11-29 13:41:26 +01:00
lisazeyen	3ff925e797	add load shedding for all energy carriers	2023-11-24 10:00:07 +01:00
lisazeyen	e8324b9c27	fix bug when oil copper plated	2023-11-24 09:58:24 +01:00
lisazeyen	afcf5e7d2e	add load shedding for all carriers	2023-11-24 09:53:22 +01:00
pre-commit-ci[bot]	4c66908b74	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2023-11-23 11:11:49 +00:00
Fabian Neumann	5d6d01f8c0	make CC in blast furnaces optional	2023-11-23 12:11:12 +01:00
chrstphtrs	d9ec127f99	Add process emissions to country emissions constraint, fix snapshot weighting	2023-11-21 14:55:32 +01:00
Fabian Neumann	dfecf35bae	add focus_weights to documentation	2023-11-20 19:45:10 +01:00
Fabian Neumann	014a4cd62e	fix for losses with multi-period investment	2023-11-12 18:42:53 +01:00
Fabian Neumann	065a49c2d7	Merge pull request #772 from PyPSA/land-transport-oil ... madd oil generator to bus EU oil	2023-11-12 18:23:07 +01:00
Fabian Neumann	c7a4ff7a4d	use existing add_carrier_buses function	2023-11-12 18:22:22 +01:00
chrstphtrs	82ac430fd9	fix spatial resolution for solid biomass links and naphtha oil loads under 'co2_spatial: true' flag	2023-11-08 09:58:02 +01:00
pre-commit-ci[bot]	4779d076dc	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2023-11-03 13:16:13 +00:00
Irieo	cb2c782dba	scripts: annotate selected functions	2023-11-03 12:51:44 +01:00
Irieo	e61da8618e	bug fix: add_electricity breaks in specific cases	2023-11-03 12:36:40 +01:00
pre-commit-ci[bot]	b9128002bb	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2023-10-31 16:14:33 +00:00
martacki	5b45fa303c	madd oil generator to bus EU oil	2023-10-31 17:11:06 +01:00
Fabian	75e66be571	helpers: adjust mock_snakemake to be callable with different root dirs	2023-10-31 12:09:39 +01:00
chrstphtrs	2ad9ca8f7b	add regionalised oil load for process emissions from naphtha as feedstock	2023-10-26 11:17:57 +02:00
pre-commit-ci[bot]	a31b421c12	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2023-10-25 17:35:12 +00:00
ekatef	c1150dfab3	Merge remote-tracking branch 'origin/retrofit_data_fixes' into retrofit_data_fixes	2023-10-25 20:34:43 +03:00
ekatef	8ec0664253	Move column fix for u-values for Poland	2023-10-25 20:33:59 +03:00
martacki	55807898a0	update solar global radiation according to TABULA project	2023-10-25 16:23:41 +02:00
pre-commit-ci[bot]	f24bd46173	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2023-10-25 14:11:51 +00:00
ekatef	2952d99dfa	Fix column with total values	2023-10-25 16:42:05 +03:00
ekatef	1ad7035ec4	Fix a column for Poland	2023-10-25 16:28:38 +03:00
chrstphtrs	e2b2eafbc1	add geographical resolution to oil and methanol for options['co2_budget_national'] to include all necessary links in national co2 budget constraints	2023-10-24 16:46:58 +02:00
chrstphtrs	7cb677d0e6	clean up function add_co2limit_country	2023-10-24 16:39:58 +02:00
chrstphtrs	a35f5479ae	add links instead of equal-and-opposite fuel/emissions load pairs for land transport oil (ICEs), naphtha for industry and kerosene for aviation (before summed as 'oil'), shipping oil, shipping methanol, agriculture machinery oil	2023-10-24 14:06:17 +02:00
chrstphtrs	9b9090c76c	add option for additional national carbon budget constraints	2023-10-18 16:59:49 +02:00
Fabian Neumann	7884392326	Merge pull request #748 from PyPSA/follow-up-637 ... follow-up to #637: remove duplicate code and update tsam version	2023-10-18 10:27:29 +02:00
Fabian Neumann	df5b9e9943	Merge pull request #759 from ekatef/fix_retrofit ... Update calculations of retrofit costs	2023-10-18 10:26:32 +02:00
pre-commit-ci[bot]	21148e3cc5	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2023-10-13 10:36:50 +00:00
Ekaterina	b0a95aefaa	Merge branch 'PyPSA:master' into fix_retrofit	2023-10-13 13:30:04 +03:00
ekatef	460fa00b28	Fix file name	2023-10-11 21:43:51 +03:00
Thomas Gilon	4c5ea9e207	Specify input files required to retrieve irena data ... Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>	2023-10-11 16:27:08 +02:00
Fabian Neumann	97a5be1e84	Merge branch 'master' into feature/retrieve-irena	2023-10-11 16:17:15 +02:00
Thomas Gilon	124177b6db	Add option for SMR CC	2023-10-11 14:32:47 +02:00
pre-commit-ci[bot]	230c1a327c	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2023-10-11 12:27:29 +00:00
Thomas Gilon	43e20a26e6	Add rule to update IRENA data for existing infrastructure	2023-10-11 14:26:04 +02:00
ekatef	fcef194566	Reference to a multiindex level by number instead of name	2023-10-11 12:29:38 +03:00
ekatef	7ad60cb7f9	Fix calculation of averages	2023-10-11 12:28:34 +03:00
ekatef	5ee9df000b	Make an argument of pd.concat to a list	2023-10-11 12:28:08 +03:00
ekatef	b51d908bfa	Fix computation of the mean	2023-10-11 12:27:31 +03:00
ekatef	5ec00c5d9d	Fix type definition for a call of difference function	2023-10-11 12:27:10 +03:00
ekatef	f825544c3b	Remove duplication in column names	2023-10-11 12:26:30 +03:00
ekatef	4294248518	Re-map country codes to account for "GB"	2023-10-11 12:26:10 +03:00
pre-commit-ci[bot]	326aeb682b	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2023-10-09 14:28:08 +00:00
Fabian Neumann	ce609b6ebe	Merge branch 'master' into ukraine_hackathon	2023-10-09 16:25:49 +02:00
Fabian Neumann	42692c3ca5	UA-MD availability matrix: plot shape_availability	2023-10-09 16:21:04 +02:00
Fabian Neumann	27ebbaba24	UA-MD availability matrix: consider WDPA protection areas as substitute for Natura	2023-10-09 16:20:23 +02:00
Fabian Neumann	9d7b250230	UA-MD availability matrix: consider ship density	2023-10-09 16:19:31 +02:00
Fabian Neumann	9a13748d34	UA-MD availability matrix: adjust corine/copernicus code selection	2023-10-09 16:18:58 +02:00
Fabian Neumann	725cece814	disable multiprocesing for MD-UA availability matrix	2023-10-09 16:18:16 +02:00
Fabian Neumann	a15157c788	add optional function to restore transmission connections to Crimea	2023-10-09 16:16:53 +02:00
Fabian Neumann	b94a797fed	do not remove large unconnected subnetworks	2023-10-09 10:00:10 +02:00
Fabian Neumann	ea99f3c43e	Merge branch 'master' into ukraine_hackathon	2023-10-09 09:53:42 +02:00
Fabian Neumann	7cb4742c75	Merge pull request #750 from PyPSA/sourcery/master ... Sourcery refactored master branch	2023-10-08 17:52:45 +02:00
Fabian Neumann	8f5a57a278	Merge branch 'master' into blast-furnace-with-cc	2023-10-08 12:01:45 +02:00
Fabian Neumann	2bab27e2f3	Merge pull request #718 from PyPSA/coke ... add coal and coke demand for integrated steelworks	2023-10-08 11:58:48 +02:00
Fabian Neumann	85c8812702	Merge branch 'master' into complete-losses	2023-10-08 11:58:03 +02:00
Fabian Neumann	b8fee80919	Merge branch 'master' into multiyear	2023-10-08 11:55:11 +02:00
pre-commit-ci[bot]	f054180a62	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2023-10-08 09:20:59 +00:00
Sourcery AI	3c36c60bdd	'Refactored by Sourcery'	2023-10-08 09:20:36 +00:00
Fabian Neumann	679d09c170	follow-up to #637: remove duplicate code and update tsam version	2023-10-08 11:10:09 +02:00
lisazeyen	1eed747bde	remove spelling mistakes	2023-10-05 12:03:06 +02:00
Fabian Hofmann	51a90b3433	Merge branch 'master' into multi-horizon	2023-10-05 10:59:14 +02:00
Fabian	f5fb307f89	fix type, expand codespell ignore list	2023-10-04 17:31:46 +02:00
Fabian Neumann	a751d78ecd	Merge branch 'master' into complete-losses	2023-10-04 10:15:45 +02:00
lisazeyen	08f1a0f313	remove comments for newer data version	2023-09-30 08:22:41 +02:00
lisazeyen	22fe2448a4	Update scripts/solve_network.py ... Co-authored-by: Fabian Hofmann <fab.hof@gmx.de>	2023-09-30 08:14:54 +02:00
pre-commit-ci[bot]	d2f8dc25fd	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2023-09-29 19:24:57 +00:00
virio-andreyana	4ac664b871	use .replace to fix type error	2023-09-29 21:24:29 +02:00
lisazeyen	21d1109853	Merge branch 'master' into multi-horizon	2023-09-29 08:40:05 +02:00
virio-andreyana	3f112534a5	Merge branch 'master' into wildcard-opts-config	2023-09-28 21:12:10 +02:00
pre-commit-ci[bot]	d75b0ae8ab	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2023-09-28 19:11:54 +00:00
virio-andreyana	a3a7e19b07	add finishing touches	2023-09-28 21:11:22 +02:00
ekatef	ce8b89d1e2	Fix structure of the grouped dataframe	2023-09-27 14:41:00 +03:00
ekatef	89d140cd7a	Fix a column name in buildings data	2023-09-27 12:51:38 +03:00
ekatef	36fe57938c	Replace pandas.append()	2023-09-27 12:47:23 +03:00
pre-commit-ci[bot]	1e87cf0eeb	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2023-09-27 06:22:57 +00:00
virio-andreyana	0d1339b1d3	add wildcard options in config for solve network	2023-09-27 08:22:28 +02:00
Fabian Neumann	5006bc4877	build_biomass_potentials: link to planning_horizons wildcard, interpolate missing years	2023-09-26 15:12:39 +02:00
virio-andreyana	01cd1bbb74	add Fabians suggestion	2023-09-23 18:39:11 +02:00
Fabian	f96c2d0589	update solve smk files to properly consider scenanrios	2023-09-22 13:58:08 +02:00
pre-commit-ci[bot]	b2c19eda40	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2023-09-15 10:18:03 +00:00
virio-andreyana	502b3a61ba	Merge branch 'wildcard-opts-config' of github.com:PyPSA/pypsa-eur into wildcard-opts-config	2023-09-15 12:17:14 +02:00
virio-andreyana	a14e751ed8	fix snapshot bugs	2023-09-15 12:16:53 +02:00
pre-commit-ci[bot]	668ec9efad	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2023-09-15 09:56:18 +00:00
virio-andreyana	7be8cc0773	undo changes in sector networks and simplify config	2023-09-15 11:55:52 +02:00
Fabian Neumann	bde04eeac9	lossy_bidirectional_links: set length of reversed lines to 0 to avoid double counting in line volume limit	2023-09-12 17:29:03 +02:00
Fabian Neumann	666e79e2fd	improve logging for lossy bidirectional links	2023-09-12 17:28:50 +02:00
Fabian Neumann	592bc4eee7	cherry-pick	2023-09-12 17:28:42 +02:00
Fabian Neumann	118cabe8a6	add option to consider compression losses in pipelines as electricity demand	2023-09-12 17:28:00 +02:00
Fabian Neumann	d7cb13246b	link losses: exponential rather than linear model	2023-09-12 17:27:27 +02:00
Fabian Neumann	e4eff27e50	fix capacity synchronisation between forward and backward lossy links	2023-09-12 17:27:09 +02:00
Fabian Neumann	cc162a9e02	option for losses on bidirectional links via link splitting	2023-09-12 17:25:51 +02:00
pre-commit-ci[bot]	3eed341044	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2023-09-11 21:04:00 +00:00
virio-andreyana	823df52309	add backward compatible config in wildcards	2023-09-11 22:51:31 +02:00