1727 Commits

Author	SHA1	Message	Date
Fabian	8bf6238785	Merge branch 'master' into ci-review	2023-02-21 17:57:27 +01:00
virio-andreyana	f276b130bd	Hide uninformative text caused by subprocess outputs	2023-02-18 13:47:34 +01:00
Fabian Neumann	b14d657042	minor fixes and address deprecation warnings	2023-02-16 20:13:26 +01:00
Fabian Neumann	35b8425b3b	cherry-pick from #282 ... Co-authored-by: Fabian Hofmann <hofmann@fias.uni-frankfurt.de>	2023-02-16 18:42:19 +01:00
Fabian Neumann	82939ca546	resolve merge conflicts	2023-02-16 18:34:24 +01:00
Fabian Neumann	ece64a73c1	gas_input: use HTTP remote, rename conversion factors, fix undesired rule removal	2023-02-16 18:27:57 +01:00
Fabian Neumann	963e7cdbcf	Merge branch 'master' into update-lng-ports	2023-02-16 17:56:05 +01:00
Fabian Neumann	ccde2e7f93	make sequestration options configurable	2023-02-16 17:21:58 +01:00
Fabian Neumann	03ac301238	build_shapes: crs	2023-02-16 14:04:13 +01:00
Fabian Neumann	b6732bf6c4	documentation updates	2023-02-16 12:37:30 +01:00
virio-andreyana	3dede28aae	merging script in retrieve_gas_input_location with build_gas_input_location	2023-02-16 11:57:33 +01:00
Fabian Neumann	9c1182fe96	prepare release 0.7	2023-02-16 11:50:55 +01:00
Fabian Neumann	6b8e69cf81	Merge branch 'master' into carbon-management	2023-02-15 20:21:12 +01:00
Fabian Neumann	809b07be86	Merge pull request #303 from PyPSA/electrolysis-wasteheat ... add option to use electrolysis waste heat in district heating	2023-02-15 19:06:12 +01:00
Fabian Neumann	b1b289fc45	add option to use electrolysis waste heat in district heating	2023-02-15 14:01:00 +01:00
Fabian Neumann	5d08dfc2ec	add min part load for FT and methanolisation via p_min_pu	2023-02-15 13:47:57 +01:00
Fabian	7d5d48ac26	solve network: fix sequestration constraint	2023-02-10 18:58:30 +01:00
Fabian Neumann	01db4f4408	compatibility with technology-data v0.5	2023-02-10 07:49:45 +01:00
Fabian	38a58b62f7	prepare sector: fix logger percentage info	2023-02-09 17:53:27 +01:00
Fabian	a0c1d321cc	plot_network: fix empty h2 retrofit for myopic	2023-02-08 23:58:56 +01:00
Fabian	d36629a836	add_brownfield: remove basename import	2023-02-08 23:58:24 +01:00
Fabian	46e3b16959	prepare sector: harmonize logger infos	2023-02-08 23:20:52 +01:00
Fabian	98e3c7ab2c	solve_network: fix kwargs in solve_network	2023-02-08 22:59:36 +01:00
Fabian	3f98ccb9e2	update technology data version	2023-02-08 22:59:25 +01:00
Fabian	94fb6c646c	prepare sector: add allam cycle ... build sequestration: fix input for new snakemake versions	2023-02-08 22:57:01 +01:00
Fabian	f4d0415cf0	solve_network: activate co2 seq constraint ... Snakefile: retrieve data bundle from pypsaeur function	2023-02-08 18:19:31 +01:00
Fabian Hofmann	d144547d87	Merge branch 'ci-review' into linopy-integration	2023-02-08 15:37:00 +01:00
Fabian	faa95c500c	config: modularize solver_options	2023-02-08 15:24:17 +01:00
Fabian	69dabc367f	ci: fix test configs	2023-02-08 15:24:17 +01:00
Fabian	6c57b81a4a	config: move solver options in dedicated section ... test configs: reduce to relative changes CI: use snakemake --configfile options	2023-02-08 15:24:17 +01:00
Fabian	c25091ce34	solve_network.py: switch to linopy interface	2023-02-08 15:19:32 +01:00
Fabian	c8f601edf8	solve.py: start converting extra_funcionalities	2023-02-08 15:19:32 +01:00
virio-andreyana	d33547efba	importing rioxarray instead of xarray to open rasterio file	2023-02-08 11:45:18 +01:00
pre-commit-ci[bot]	9f87099dbb	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2023-02-07 13:12:55 +00:00
Fabian	efedfa945b	build_shapes: replace unary union from shapely by geopandas equivalent	2023-02-07 14:08:59 +01:00
pre-commit-ci[bot]	cb94e5974e	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2023-02-07 12:20:09 +00:00
Fabian Hofmann	0375359c82	Merge branch 'master' into fix-storage-volumes	2023-02-07 13:19:27 +01:00
pre-commit-ci[bot]	e6ecbc95d7	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2023-02-06 22:28:32 +00:00
Fabian Neumann	ad8ccf3b25	fix process emission localisation with co2 (not) spatially resolved	2023-02-06 09:52:35 +01:00
Fabian Neumann	a0b18a8fcd	manage process emissions in spatial	2023-02-06 09:46:24 +01:00
thomgeo	1f9d64c5d5	fixed bug that set max_hours for many plants to 6	2023-02-02 14:59:50 +01:00
Fabian Neumann	5bb35d188e	Merge branch 'master' into ukraine_hackathon	2023-01-30 18:58:55 +01:00
Fabian Neumann	4a2da0a5f4	Update scripts/add_existing_baseyear.py	2023-01-30 11:55:40 +01:00
Fabian Neumann	984ab9350c	Update scripts/prepare_sector_network.py	2023-01-30 11:54:19 +01:00
Fabian Neumann	6996748d9b	Merge branch 'master' into cluster_heat_nodes	2023-01-30 11:53:00 +01:00
Fabian Neumann	27e6039379	Merge branch 'master' into pz-max-patch-2	2023-01-28 08:26:28 +01:00
Fabian Neumann	0681cf93ab	fix hydrogen network plotting without retrofitting	2023-01-25 09:08:51 +01:00
Fabian Neumann	697be2d9e3	fix capacities of biomass transport ... The biomass transport links are split into either direction because they have a marginal cost associated with the transport. With p_nom_extendable, many decision variables are created. This commit tries another way where capacities are non-extendable and set to sufficiently high values.	2023-01-25 08:41:08 +01:00
Fabian Neumann	71e2a4943c	carbon management	2023-01-24 18:44:39 +01:00
pre-commit-ci[bot]	8bdba5653a	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2023-01-23 21:27:20 +00:00
virio-andreyana	da6469b80c	Update scripts/build_gas_input_locations.py ... Co-authored-by: Fabian Hofmann <hofmann@fias.uni-frankfurt.de>	2023-01-11 10:08:10 +01:00
pre-commit-ci[bot]	0cf6d47afb	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2023-01-10 21:56:42 +00:00
Max Parzen	9633ab9836	Merge branch 'master' into pz-max-patch-2	2023-01-10 21:56:24 +00:00
Fabian Neumann	8bafaf25f7	plot_network: adjust limits and thresholds	2023-01-07 13:23:33 +01:00
pre-commit-ci[bot]	3c099095dc	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2023-01-06 20:51:51 +00:00
Fabian Neumann	3d4af04d88	update eia hydro data, fix missing merge conflict	2023-01-06 21:51:33 +01:00
pre-commit-ci[bot]	acc6ee6bfe	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2023-01-06 17:46:06 +00:00
Fabian Neumann	1ebe53cdac	merge master	2023-01-06 18:45:36 +01:00
Fabian Neumann	64969c2dee	add methanol store	2023-01-05 13:42:01 +01:00
Fabian Neumann	ddcaff0b5b	plot_network: do not plot very small pipelines	2023-01-03 13:14:16 +01:00
Fabian Neumann	383aef7e1c	rename shipping_average_efficiency to shipping_oil_efficiency	2023-01-03 08:38:10 +01:00
virio-andreyana	0cb0ad528a	Appending comments for gas_input_locations	2022-12-29 12:14:26 +01:00
Fabian Neumann	27414ac010	new config options for demand in aviation + HVC, control of ICE shares in land transport and agriculture	2022-12-29 11:46:57 +01:00
Fabian Neumann	6f901f4c50	restore compatibility with latest master version	2022-12-28 15:43:43 +01:00
Fabian Neumann	520cad53a2	address sum(level) deprecation	2022-12-28 14:11:47 +01:00
Fabian Neumann	cac724fee0	merge master	2022-12-28 13:55:36 +01:00
Fabian Neumann	b9c1fdb65e	include methanolisation in PtL	2022-12-28 13:46:31 +01:00
Fabian Neumann	292ec9d5a1	fix computation of shipping demands	2022-12-28 13:45:42 +01:00
Fabian Neumann	f645d13743	Merge branch 'master' into methanol	2022-12-28 12:51:59 +01:00
Fabian Neumann	138d151c8b	only compute solar thermal profiles if technology is included	2022-12-28 12:48:51 +01:00
Fabian Neumann	38fd51fca9	Merge branch 'master' into methanol	2022-12-28 12:22:01 +01:00
Fabian Neumann	d37ffddd4f	build_solar_thermal_profiles: parallelize	2022-12-28 12:21:46 +01:00
Fabian Neumann	494d3010eb	build_heat_demand: parallelize	2022-12-28 12:21:00 +01:00
Fabian Neumann	097d054f06	build_temperatur_profiles: parallelize	2022-12-28 12:20:34 +01:00
Fabian Neumann	3999afdb5a	fixes to methanol implementation	2022-12-28 12:19:20 +01:00
Fabian Neumann	5360eb0a2e	Merge branch 'master' of https://github.com/pypsa/pypsa-eur	2022-12-28 09:35:15 +01:00
Fabian Neumann	a08c20d7c8	build_shapes: cleanup shape union of RS and KV	2022-12-28 09:35:11 +01:00
Fabian Neumann	bb5c5bd143	simplify_networks: add control for removing stubs II	2022-12-28 09:34:28 +01:00
Fabian Neumann	e9f3d20432	simplify_networks: add control for removing stubs	2022-12-28 09:33:08 +01:00
Fabian Neumann	bb1b37e8ef	address pandas iteritems deprecation	2022-12-27 13:16:05 +01:00
Fabian Neumann	70d07d561f	address pandas deprecations	2022-12-27 11:42:32 +01:00
Fabian Neumann	3d7c354d2b	merge master	2022-12-27 11:16:39 +01:00
Fabian Neumann	99343b1221	Merge pull request #277 from PyPSA/int-ports ... distribute international shipping by port trade volumes	2022-12-27 10:57:01 +01:00
Max Parzen	545a734b7b	Merge branch 'master' into pz-max-patch-2	2022-12-16 12:20:58 +00:00
Max Parzen	9e61e30ff4	Fix EQ constraint in case no hydro exist	2022-12-16 11:00:39 +00:00
Max Parzen	b7899787cf	Fix load variable in reserve constraint	2022-12-16 10:50:20 +00:00
virio-andreyana	e1776518c0	Merge remote-tracking branch 'origin/update-lng-ports' into update-lng-ports	2022-12-15 12:20:05 +01:00
virio-andreyana	55ff725e3b	Final edit to update LNG ports. Remove unused files	2022-12-15 11:42:21 +01:00
virio-andreyana	d37cd49f7d	add script for retrieving lng terminals	2022-12-14 12:26:16 +01:00
virio-andreyana	01f48a50e7	Replacing the IGGIELNG_LNG data with Europe-Gas-Tracker	2022-12-14 12:26:16 +01:00
virio-andreyana	4f3510e3cc	Replacing the IGGIELNG_LNG data with Europe-Gas-Tracker	2022-12-07 10:36:54 +01:00
Fabian Neumann	0c62bfc9ee	complete methanol for shipping	2022-12-03 12:22:05 +01:00
lisazeyen	5b256bfa5d	take VOM for RES from existing	2022-11-28 16:56:42 +01:00
Fabian Neumann	c44f1d61c7	remove hard-coded methanol efficiency	2022-11-27 18:28:57 +01:00
pre-commit-ci[bot]	94e5f160b0	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2022-11-25 10:16:23 +00:00
martacki	643a62049b	solve_network: move extra_functionality to args	2022-11-25 11:08:35 +01:00
Fabian	df4eb85a19	fix typos	2022-11-18 09:08:07 +01:00
Fabian	727688749c	build_bus_regions: fix shapely deprecation	2022-11-15 07:45:13 +01:00
Fabian Neumann	16a92477f0	methanol in shipping	2022-11-13 18:25:32 +01:00
Fabian Neumann	84618b3ee1	distribute international shipping by port trade volumes	2022-11-13 13:43:05 +01:00
Fabian	a73eea9379	update solve_network	2022-11-09 17:14:44 +01:00
Fabian	6d972600b1	clustering: remove old dependency	2022-11-09 17:04:31 +01:00
Fabian	992efcaa91	solve_network: fix net vres share	2022-11-09 16:50:05 +01:00
Huang, Jiangyi	80868e5f0f	Update make_summary.py ... The value for `na_action` needs to be "ignore" or "None".	2022-11-03 13:46:20 +01:00
Fabian	0b2989c987	build_natura_raster: fix out_shapes	2022-10-31 11:47:21 +01:00
pre-commit-ci[bot]	dcd16e32a8	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2022-10-25 13:23:20 +00:00
Adrian Odenweller	73b0645c13	Fix network directory path in make_summary	2022-10-25 14:29:07 +02:00
Fabian Neumann	1611d63a8a	Merge branch 'master' into nh3	2022-10-01 16:01:39 +02:00
lisazeyen	9a74e3d699	set co2seq to limit of sequestration potential	2022-09-29 09:12:36 +02:00
nnhjy	d29441d871	update deprecated syntax	2022-09-28 20:33:50 +02:00
lisazeyen	7606562449	update sector opt for co2 seq potential	2022-09-28 16:09:53 +02:00
pre-commit-ci[bot]	85d01bceb0	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2022-09-19 14:34:48 +00:00
Philipp Glaum	c8b67776fa	Merge branch 'master' into exclude_carrier_clustering	2022-09-19 16:34:21 +02:00
Fabian	e2a4140663	add_electricity: calculate marginal costs from plant efficiency	2022-09-19 13:08:03 +02:00
Philipp Glaum	d51ca8695b	update Fabians comments	2022-09-19 11:46:58 +02:00
Fabian	9b570a53b4	tiny doc formatting fixes	2022-09-16 15:20:10 +02:00
pre-commit-ci[bot]	5d1ef8a640	[pre-commit.ci] auto fixes from pre-commit.com hooks ... for more information, see https://pre-commit.ci	2022-09-16 13:04:06 +00:00
Fabian	1536cc2787	codespell: fix typos ... Snakefile: fix unformattable parst pre-commit: fix codespell ignore	2022-09-16 14:36:43 +02:00
Philipp Glaum	24e008a98e	add feature: aggregate carrier exclusion	2022-09-16 14:25:15 +02:00
lisazeyen	14ad15da91	Merge pull request #261 from PyPSA/temporal_aggregation ... Add more options for temporal aggregation	2022-09-14 16:28:05 +02:00
lisazeyen	ed8f783096	include code review	2022-09-14 16:16:50 +02:00
Fabian	a59e54e659	follow up: fix extendable carriers	2022-09-14 15:17:42 +02:00
Fabian	59b76d8a99	add_electricity	2022-09-12 11:13:41 +02:00
Philipp Glaum	a4c5fbfa28	add_elec: add variable voltage angle input	2022-09-07 11:58:44 +02:00
Fabian	454ffa7068	line-rating: remove wildcard from opts	2022-09-06 17:43:22 +02:00
Fabian	8798b3e203	line-rating: adjust config keys	2022-09-06 16:40:00 +02:00
Fabian	2eb26f7334	address #314	2022-09-05 12:55:46 +02:00
lisazeyen	3daff49c99	Merge pull request #256 from PyPSA/fix-bug-myopic-co2 ... Fix bug myopic co2	2022-08-09 21:33:31 +02:00
lisazeyen	b42e76040d	small clean up	2022-08-09 21:30:45 +02:00
Fabian Hofmann	10b909e691	Merge branch 'master' into patch-1	2022-08-09 16:52:04 +02:00
Irieo	1920c2bae1	temporary fix of DateIn and DateOut	2022-08-09 15:30:58 +02:00
Zoltán Marić	07ff021a6e	Use geomap=True for plotting existing lines ... Since https://github.com/PyPSA/PyPSA/commit/e754928e#diff-1ffb543f39b9a9c1d00adfc3fb2c1a89c905c56e00b9ede9178787a8148dc0eeR210 PyPSA raises an exception for plots that have geo axes but use `geomap=False`.	2022-08-09 12:09:07 +02:00
lisazeyen	2994c91173	add bioenergy to add_existing	2022-08-08 15:28:04 +02:00
lisazeyen	58b018e624	drop powerplants which are already decommissioned	2022-08-08 13:52:41 +02:00
lisazeyen	ce6b92dd6d	add options to aggregate snapshots temporally	2022-08-08 08:53:07 +02:00
lisazeyen	8dd143f369	bug fixes for missing bracket	2022-08-05 15:55:41 +02:00
lisazeyen	9752b4b4e6	Merge branch 'master' into pellet-boiler	2022-08-05 12:25:01 +02:00
lisazeyen	ff3d171bd7	move biomass boilers to add_biomass	2022-08-05 12:19:47 +02:00
lisazeyen	14f54304a8	Merge branch 'master' into pellet-boiler	2022-08-05 11:27:28 +02:00
lisazeyen	289c252688	remove link to co2 atmosphere	2022-08-04 17:42:57 +02:00
Fabian Hofmann	e0862c6f23	Merge branch 'master' into fix_pm_no_techtype	2022-08-04 16:16:34 +02:00
lisazeyen	8c62fb1b56	Merge branch 'master' into btl	2022-08-04 16:13:09 +02:00
lisazeyen	ee458eeafb	change names of buses	2022-08-04 16:03:16 +02:00
lisazeyen	2d625f5a80	Merge pull request #254 from millingermarkus/biosng ... BioSNG (methane from solid biomass) with and without CC	2022-08-04 15:39:55 +02:00
Irieo	f20203e623	fix NaN techtype & fix wrong tech for Nuclear	2022-08-04 15:25:00 +02:00
Fabian Neumann	9cf5be84fd	bugfix: solve_network should look for wildcard sector_opts	2022-08-03 17:07:19 +02:00
Fabian Neumann	286520f396	compatibility: fix plotting for new pypsa version	2022-08-03 17:06:41 +02:00
Philipp Glaum	29cc8021b9	build_ship_raster: make file deletion windows compatible	2022-08-03 16:13:27 +02:00
Fabian Neumann	d569d3782c	fix windows for build_ship_raster 2	2022-08-02 18:25:24 +02:00
Fabian Neumann	adbfe8b5dc	fix windows for build_ship_raster	2022-08-02 16:44:24 +02:00
Fabian Neumann	09d126706e	Merge branch 'master' into shipping_raster	2022-08-02 15:01:05 +02:00
lisazeyen	34a3d9aaad	remove depreciated distutils.version	2022-08-02 09:27:37 +02:00
lisazeyen	7c3b4b6664	split grouping years for power and heat techs	2022-08-02 09:18:06 +02:00
lisazeyen	339ccc6026	remove snakemake dependencies	2022-08-02 09:16:25 +02:00
lisazeyen	a11f7bc245	remove not needed pop_layout from plot_summary	2022-08-02 08:47:46 +02:00
Fabian Neumann	2857691367	Merge pull request #246 from PyPSA/meta ... store config and wildcards in n.meta	2022-08-01 21:01:06 +02:00
lisazeyen	cbab86c4bc	add heat buses clustering to myopic	2022-08-01 18:15:35 +02:00
lisazeyen	973074de21	add function to cluster heat buses	2022-08-01 18:03:11 +02:00
lisazeyen	f683a93f08	adjust plot_summary to work with myopic, remove update config	2022-08-01 16:04:14 +02:00
millingermarkus	65aaa3d188	Added tech color for biomass boiler and minor adaptations to biomass boiler process	2022-08-01 15:28:53 +02:00
lisazeyen	18f4eac351	adjust script to new grouping years	2022-08-01 15:24:07 +02:00
lisazeyen	f10628930e	move snakemake dependencies out for co2limit cb option to work	2022-08-01 15:21:11 +02:00
millingermarkus	6211823514	Added color for BioSNG and minor adaptations	2022-08-01 15:13:59 +02:00
millingermarkus	46310f0a30	Minor correction to prepare_sector_network	2022-08-01 15:00:27 +02:00
Markus Millinger	5b61d2f777	Added pellet boiler process	2022-08-01 13:38:01 +02:00
Markus Millinger	0019723262	Updated spatial nodes for biomass to liquid	2022-08-01 13:26:51 +02:00
Markus Millinger	abba2a4f3e	Added BioSNG process with and w/o CC	2022-08-01 13:22:58 +02:00
Markus Millinger	4bff921cf2	Adapted biomass_to_liquid toggle reference	2022-08-01 13:13:18 +02:00
Markus Millinger	46413dd88c	Added biomass to liquid process with an w/o CC	2022-08-01 13:07:59 +02:00
Philipp Glaum	ba7a5363e7	update Fabians review comments	2022-07-29 14:56:39 +02:00
Philipp Glaum	8af09d9bec	fix raster format error due to import	2022-07-28 15:21:21 +02:00
Philipp Glaum	6d070a19e0	initial ship raster implementation	2022-07-28 10:38:24 +02:00
Fabian Neumann	bfcc08665d	make resolution of exclusion calculation a configurable option	2022-07-27 13:40:41 +02:00
Fabian Neumann	d2b8e3c3d2	Merge pull request #389 from PyPSA/meta ... store config and wildcards in n.meta	2022-07-27 10:01:51 +02:00
Fabian Neumann	a1507124f6	Merge branch 'release-v0.5' into meta	2022-07-27 09:43:36 +02:00
Fabian Neumann	060bc49223	helpers: make copy of snakemake.config to avoid non-serializable JSON	2022-07-27 09:26:21 +02:00
Fabian Neumann	8d132464bd	Merge branch 'release-v0.5' into introduce_modularity_clustering	2022-07-27 09:04:39 +02:00
Fabian Neumann	cdd063d3b0	scripts: remove deprecated clustering methods, remove unused imports	2022-07-27 09:02:34 +02:00
lisazeyen	530e453eba	Merge pull request #251 from PyPSA/cf-sector-opts ... option to specify any config through sector opts with CF+<label>+<value>	2022-07-26 15:53:49 +02:00
Fabian Neumann	87388d4b4a	update author affiliations	2022-07-26 15:32:48 +02:00
Fabian Neumann	8fc0c57ed6	update copyright years	2022-07-26 15:05:59 +02:00
Fabian Neumann	239dcfdd1e	Merge branch 'master' into introduce_modularity_clustering	2022-07-26 14:04:56 +02:00
Fabian Neumann	31bc87adba	Merge branch 'master' into meta	2022-07-26 14:02:26 +02:00
Fabian Neumann	2791e7bdc2	use packaging.version instead of deprecated distutils.StrictVersion	2022-07-25 14:27:31 +02:00
Fabian Neumann	503ecd2907	use + separator instead of :	2022-07-24 21:27:12 +02:00
Fabian Neumann	a65dd4e6c2	use snakemake.utils.update_config instead of mergedeep	2022-07-24 21:26:19 +02:00
Fabian Hofmann	b5308fa72b	Merge branch 'master' into technology-data	2022-07-21 17:03:36 +02:00
Fabian Hofmann	3ba7e2ab90	Merge branch 'master' into technology-data	2022-07-21 15:36:12 +02:00
Fabian Neumann	4ec95fa90e	hydro: distribute eia data for former countries to successor states by ratio	2022-07-20 13:01:14 +02:00
Fabian Neumann	cb00ba58ce	add option to specify any config through sector opts with CF:<label>:...:value	2022-07-20 11:35:12 +02:00
Martha Frysztacki	b63385444c	Merge branch 'master' into introduce_modularity_clustering	2022-07-19 09:51:06 +02:00
Fabian Neumann	a860643dd8	reduce number of columns for simplified and clustered regions	2022-07-18 17:28:09 +02:00
martacki	387271b03b	new spatial clustering method: modularity	2022-07-13 14:51:48 +02:00
Fabian Neumann	adc0dd1e0c	fix unit conversion for thermal energy storage (closes #247)	2022-07-11 15:46:21 +02:00
Julio Pascual	5d98cc7e97	Update build_load_data.py	2022-07-04 18:53:41 +02:00
Julio Pascual	433f0af409	Update build_load_data.py	2022-07-04 18:51:49 +02:00
Julio Pascual	ce3b193a88	Update add_electricity.py	2022-07-04 18:42:22 +02:00
Julio Pascual	0d9ffdcee3	Update build_load_data.py	2022-07-04 18:41:08 +02:00
Julio Pascual	44f793be91	Changed doc info in retrieve_databundle.py ... Simply changed the text regarding the output directory. It said 'cutouts/bundle' but I think it should be 'data/bundle'. It only affects the documentation.	2022-07-04 11:49:55 +02:00
Fabian Neumann	3986856282	merge master	2022-07-01 10:13:33 +02:00
Fabian Neumann	5082c8761b	Merge pull request #245 from PyPSA/bus_units ... Document units of bus carriers	2022-06-30 17:43:14 +02:00
Irieo	5d60e8c6e6	Label oil and biomass buses also as MWh_LHV	2022-06-30 17:37:40 +02:00
Iegor Riepin	53ad90095a	Update scripts/prepare_sector_network.py ... sync it up to Fabian's feeling of useful things Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>	2022-06-30 17:17:12 +02:00
Iegor Riepin	eddeb227a7	Update scripts/prepare_sector_network.py ... code style update Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>	2022-06-30 17:15:41 +02:00
Fabian Neumann	27e5dec4e6	documentation fixes	2022-06-30 09:01:49 +02:00
Fabian Neumann	3134bbb5c5	remove accidental file additions	2022-06-30 08:43:46 +02:00
Fabian Neumann	b96207c73e	store config and wildcards in n.meta	2022-06-30 08:42:18 +02:00
Fabian Neumann	217780263d	store config and wildcards in n.meta	2022-06-30 08:39:03 +02:00
lisazeyen	b4d0a8404c	change unit from carrier gas from MWh_th -> MWh_LHV	2022-06-29 08:57:08 +02:00
Irieo	7604bb1654	Document units of bus carriers	2022-06-28 18:31:45 +02:00
Fabian Neumann	a8171ec9f3	color adaptations, new features	2022-06-28 18:03:29 +02:00
Fabian Neumann	20e1fb40fb	update mock_snakemake for new snakemake versions	2022-06-28 17:18:09 +02:00
Fabian	67ac464b6a	add_electricity: use conventional_inputs from snakemake.input for attach_conventional_generators	2022-06-28 16:33:46 +02:00
Fabian Neumann	8b134405dd	Merge pull request #243 from ebbekyhl/Coal-carbon-capture ... Add coal with carbon capture	2022-06-28 14:04:31 +02:00
Ebbe Kyhl	e9f2d65cda	Indent by two layers	2022-06-28 13:35:44 +02:00
Fabian Hofmann	e175d1aa0e	Merge branch 'eu-energy-security' into eu-energy-security-conventional-attrs	2022-06-28 13:22:39 +02:00
Fabian Hofmann	82013fd081	Update scripts/add_electricity.py ... Co-authored-by: Martha Frysztacki <martha.frysztacki@kit.edu>	2022-06-28 13:16:55 +02:00
Fabian Hofmann	3294ad92eb	Update scripts/solve_network.py ... Co-authored-by: Martha Frysztacki <martha.frysztacki@kit.edu>	2022-06-28 13:14:47 +02:00
Fabian	9d997fbd79	generalize conventional attr handling through config	2022-06-28 10:14:26 +02:00
Fabian Neumann	74f8ca1c7f	Merge branch 'master' into eu-energy-security	2022-06-28 08:09:39 +02:00
Fabian Neumann	971e970250	Merge branch 'master' into landlock-fix-alterative	2022-06-28 07:47:13 +02:00
martacki	29fe0fb7fb	hierarchical clustering: account for changes from merging master	2022-06-27 21:02:45 +02:00
Martha Frysztacki	50a518a155	Merge branch 'master' into introduce_hac_clustering	2022-06-27 20:45:40 +02:00
Fabian Neumann	51de606aab	Revert "remove build/retrieve natura raster, directly use shapefile"	2022-06-27 19:00:41 +02:00
Ebbe Kyhl	5ae56cca7c	Apply suggestions from code review ... Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>	2022-06-27 18:06:59 +02:00
Fabian	b56d1f6f4d	conventional config section: update to more general attribute assignment scheme	2022-06-27 17:35:19 +02:00
martacki	a3af137b74	clustering strats to configurables: move duplicate code to _helpers script & import	2022-06-27 14:18:47 +02:00
Martha Frysztacki	5587327be3	Merge branch 'master' into harmonize_clustering_strategies	2022-06-27 14:02:45 +02:00
Fabian Hofmann	8349e85252	Apply suggestions from code review ... Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>	2022-06-27 11:48:45 +02:00
Fabian Neumann	4d79a0dc96	Apply suggestions from code review	2022-06-27 10:23:22 +02:00
Fabian Neumann	9c6c6d243f	Adaptations to match current PyPSA-Eur version	2022-06-27 10:21:08 +02:00
Fabian Neumann	8e57d68b73	Merge branch 'master' into landlock-fix-alterative	2022-06-27 09:44:42 +02:00
Fabian Neumann	5ca231824e	Merge branch 'master' into eu-energy-security	2022-06-27 08:58:37 +02:00
Fabian Neumann	520f7e440e	Merge branch 'master' into technology-data	2022-06-25 11:05:41 +02:00
Fabian Neumann	4e8d510332	Merge branch 'master' into rm-raster-natura	2022-06-24 23:12:39 +02:00
martacki	c9c738e96b	clustering strats to configurables: set defaults for yaml-incompatible strats + include in stubaggregation	2022-06-24 20:57:53 +02:00
Fabian Neumann	4c5ec8e5f1	Merge branch 'master' into introduce_hac_clustering	2022-06-24 20:22:47 +02:00
Fabian Neumann	2a55ad2162	Merge branch 'master' into load-shedding-carrier	2022-06-24 20:19:37 +02:00
Fabian Neumann	d321b2b762	resolve merge conflicts	2022-06-24 20:15:32 +02:00
Martha Frysztacki	4722099a7b	Merge branch 'master' into harmonize_clustering_strategies	2022-06-24 20:10:05 +02:00
Fabian Neumann	ac966c0a99	Merge branch 'master' into bugfixes_manual_load	2022-06-24 19:57:16 +02:00
Fabian Neumann	34c75fc59e	Merge branch 'master' into harmonize_clustering_strategies	2022-06-24 19:49:26 +02:00
Fabian	3dbd8d1492	add_electricity: fix read_csv	2022-06-24 18:31:39 +02:00
Fabian Hofmann	17d7403f20	build_powerplants: apply suggestions from code review ... Co-authored-by: Martha Frysztacki <martha.frysztacki@kit.edu>	2022-06-24 15:34:26 +02:00
Fabian	a019034f80	Merge branch 'master' into eu-energy-security	2022-06-24 15:28:07 +02:00
Fabian	c42d2bd97d	refactor save to geojson file functionality to allow import/export of empty geodfs	2022-06-24 15:11:21 +02:00
Fabian	75f9719076	build_renewable_profiles: use LocalCluster instance	2022-06-24 14:07:51 +02:00
Fabian	d18867ce61	build_renewable_profiles: use dask client instead of kwargs	2022-06-23 21:27:18 +02:00
Fabian	b581e7afc6	build_hydro_profiles: revert changes	2022-06-23 21:19:41 +02:00
Fabian	0fd7d689a1	Merge branch 'master' into eu-energy-security	2022-06-23 20:53:43 +02:00
Fabian Neumann	2d2f5ba409	Merge pull request #238 from PyPSA/config-export ... copy_config: copy actual snakemake.config	2022-06-23 17:19:08 +02:00
Fabian	2c5643a5f8	add_electricity: fix conventional config	2022-06-23 16:36:22 +02:00
Fabian Hofmann	348b14b052	Update scripts/build_hydro_profile.py ... Co-authored-by: Martha Frysztacki <martha.frysztacki@kit.edu>	2022-06-23 16:15:37 +02:00
Fabian Hofmann	d6930b878a	Update scripts/cluster_network.py ... Co-authored-by: Martha Frysztacki <martha.frysztacki@kit.edu>	2022-06-23 16:14:20 +02:00
Fabian	441d7d56f9	fix eafs and conventional setttings	2022-06-23 16:04:49 +02:00
Fabian Hofmann	db78f9cd2a	Update scripts/add_electricity.py ... Co-authored-by: Martha Frysztacki <martha.frysztacki@kit.edu>	2022-06-23 15:54:22 +02:00
Fabian Neumann	2037534557	prepare: only add ammonia to spatial if config selected	2022-06-23 15:24:44 +02:00
Fabian Neumann	9f91af28e7	fix syntax errors	2022-06-23 15:17:41 +02:00
Fabian Neumann	37c052667a	handle absent ammonia config flag	2022-06-22 15:50:32 +02:00
Martha Frysztacki	e004b27f40	Merge branch 'master' into harmonize_clustering_strategies	2022-06-21 18:44:28 +02:00
martacki	bdd0cc3aa1	clustering strats to configurables: review suggestions	2022-06-21 18:42:49 +02:00
Fabian Neumann	fe5467e4e4	Merge branch 'master' into fix_snakemake_error	2022-06-21 16:21:32 +02:00
Fabian Neumann	cc657b7628	Update scripts/_helpers.py	2022-06-21 16:21:21 +02:00
Philipp Glaum	51ff3f02bb	helpers: check snakemake version for bug fix	2022-06-21 16:13:16 +02:00
Fabian Hofmann	6fb3520fc1	Merge branch 'master' into eu-energy-security	2022-06-21 14:12:43 +02:00
martacki	bef4967e84	clustering strategies moved to configurables	2022-06-20 18:58:23 +02:00
Fabian Hofmann	8c704c024e	Merge branch 'master' into cluster-strategy-conventionals	2022-06-20 18:23:02 +02:00
Fabian	c2413aeef4	cluster-network: add strategies for conventionals	2022-06-20 18:20:28 +02:00
Philipp Glaum	5df588ccb8	fix snakemake error introduced after v7.7.0	2022-06-20 12:45:28 +02:00
Fabian Hofmann	bebbb003e5	Merge branch 'master' into eu-energy-security	2022-06-15 15:02:21 +02:00
Fabian Hofmann	6b9932f5e8	build_renewable_profiles: set show progress default to False	2022-06-14 15:24:10 +02:00
Ebbe Kyhl	2a3b576cbd	Add coal with carbon capture	2022-06-14 15:00:53 +02:00
Fabian Neumann	4ecfccea6c	handle ammonia demand both regionalised and copperplated	2022-06-10 17:07:48 +02:00
Fabian Neumann	27ac40d2ea	use spatial namespace to manage ammonia resolution	2022-06-10 16:56:00 +02:00
Fabian Neumann	a2a4cf7c02	use config to manage conversion efficiencies	2022-06-10 16:43:29 +02:00
Fabian Neumann	2d562c1349	add coloring for ammonia	2022-06-10 14:57:03 +02:00
Fabian Neumann	6cfee1f98a	add ammonia as carrier: with Haber-Bosch, crackers, store, load	2022-06-10 14:46:39 +02:00
Fabian	1c0975181e	add_electricity: fix missing config key	2022-06-10 11:23:35 +02:00
Fabian	13992125bd	cluster_network: adjust generator strategy for new columns	2022-06-10 11:23:26 +02:00
Fabian	f5a9a27a5d	Merge branch 'eu-energy-security' of github.com:PyPSA/pypsa-eur into eu-energy-security	2022-06-10 00:36:55 +02:00
Fabian	c68aa028ff	add_electricity: fix missing config key	2022-06-10 00:36:07 +02:00
Fabian Hofmann	12bed0745d	Merge branch 'master' into eu-energy-security	2022-06-09 23:41:48 +02:00
Fabian	f45803ff10	add_electricity: fix missing backwards compat and warnings	2022-06-09 23:40:32 +02:00
Fabian	76cd0751b4	Merge branch 'eu-energy-security' of github.com:PyPSA/pypsa-eur into eu-energy-security	2022-06-09 20:36:35 +02:00
Fabian	0ec3a8638b	add_electricity & config: ... - refactor attachment of conventional carriers - refactor scaling of renewable carriers	2022-06-09 20:31:50 +02:00
zoltanmaric	1a7b439f2d	Remove usages of retrieve_snakemake_keys	2022-06-08 17:32:33 +02:00
martacki	cd92d8092b	plot_summary: remove deprecated retrieve_snakemake_keys function	2022-06-08 15:49:06 +02:00
Fabian Neumann	a2f39abee2	Merge branch 'master' into voronoi	2022-06-07 15:23:30 +02:00
Fabian	8b855f0478	add_elecitricity: scale only missing renewable capacities from OPSD	2022-06-07 15:17:49 +02:00
Fabian Hofmann	bdd094d796	Update scripts/build_bus_regions.py	2022-06-07 15:01:40 +02:00
Fabian Hofmann	97fbf77ff8	Update scripts/build_bus_regions.py	2022-06-07 15:01:18 +02:00
Fabian Hofmann	aa867cb704	Update scripts/build_bus_regions.py ... Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>	2022-06-07 15:00:57 +02:00
Fabian Neumann	d5db3b8d80	Update scripts/build_bus_regions.py ... Co-authored-by: Fabian Hofmann <fab.hof@gmx.de>	2022-06-07 10:57:01 +02:00
Fabian Hofmann	619b471f72	Merge branch 'master' into eu-energy-security	2022-06-07 10:05:11 +02:00
Fabian Neumann	b025622edf	fix agriculture machinery oil load with spatial.oil.nodes	2022-06-03 14:29:23 +02:00
Max Parzen	b6032fb891	fix crs bug	2022-05-28 14:48:32 +01:00
lisazeyen	dc997c6ff2	Update build_population_weighted_energy_totals.py ... adjust mocksnakemake	2022-05-02 18:19:59 +02:00
Fabian Neumann	361100bfab	Merge branch 'master' into transport	2022-05-02 10:28:43 +02:00
martacki	2e4c30e28e	abbreviate	2022-04-29 15:18:22 +02:00
martacki	8a49697a51	bugfixes for manual load adjustments	2022-04-29 15:09:10 +02:00
martacki	ac7c94337e	respect stores for supply.csv	2022-04-29 13:51:54 +02:00
martacki	d12405d848	respect stores for energy_supply.csv	2022-04-29 13:48:58 +02:00
martacki	dcac3ea6e1	respect stores in make_summary script	2022-04-28 12:59:25 +02:00
Fabian	548e955449	add_electriticity: add capital costs for conventionals	2022-04-28 12:30:53 +02:00
Fabian	b1edbd7563	add_electricity: determine p_nom_extendable when adding conventionals	2022-04-27 20:13:36 +02:00
Philipp Glaum	da5a5141f8	solve_network.py: fix filter bug	2022-04-21 09:54:52 +02:00
Fabian	175a030a9f	refactor add_minRenew_constraints	2022-04-20 16:18:15 +02:00
Fabian	70cfe4bbe5	cluster_network: replace np.sum/np.min by pandas.Series.sum/min	2022-04-20 15:47:50 +02:00
Fabian Neumann	49f1c0f629	Merge pull request #348 from PyPSA/annuity ... add_electricity: remove vresutils.costdata.annuity dependency	2022-04-15 18:36:37 +02:00
Fabian Neumann	cdd56288ff	fix EU bus location with new config setting	2022-04-12 16:21:09 +02:00
Fabian Neumann	c5ca8f4c20	fix: squeeze IDEES dataframe at correct location	2022-04-12 16:11:06 +02:00
Fabian Neumann	c54b4f9920	copy_config: copy actual snakemake.config	2022-04-12 15:16:05 +02:00
Fabian Neumann	d4fd472762	Merge branch 'master' into transport	2022-04-12 14:48:57 +02:00
Fabian Neumann	d4a82a2a41	Merge pull request #217 from PyPSA/myopic-fix ... Myopic fix	2022-04-12 14:47:22 +02:00
Fabian Neumann	1625d9db75	address recent deprecations (#235) ... * address recent deprecations * address recent deprecations in pd.read_csv	2022-04-12 14:37:05 +02:00
lisazeyen	408b494612	bug fix with augmentation object	2022-04-12 10:45:11 +02:00
lisazeyen	9322f90318	add minimum capacity for AC and DC lines depending on previous year	2022-04-12 10:04:27 +02:00
lisazeyen	cfdec7e56d	simplify pipe retrofitting constraint	2022-04-12 10:04:27 +02:00
Fabian	a9b4ca8370	build_powerplants: use index numbering only for biomass gens	2022-04-11 21:28:54 +02:00
Fabian	dad065f22f	hard pull build_powerplants from eu-security branch	2022-04-11 21:24:49 +02:00
Fabian	61ccaa495a	add_electricity: enable scaling existing capacities, enable scaling to config entries	2022-04-11 21:11:24 +02:00
Fabian Neumann	a4dab4306b	merge master	2022-04-11 17:10:17 +02:00
Fabian Neumann	6ed92475c9	Add basic CI for overnight and myopic (#234) ... * Snakefile: add missing folders that are retrieved * Snakefile: fix syntax error * Add basic CI * fix datafiles list to work with directories * prepare: only add new gas pipes if augmentation not empty * prepare: handle case where salt caverns dataframe is empty * prepare: handle case where underwater faction not in link columns * build_biomass: handle case where Balkan not in country list * refer correct environment path * fix Snakemake call * make subworkflow dependency explicit again * hashing pypsa-eur environment file does not seem to work * change solver to glpk * add data cache * glpk without options * try cbc * alternative snakemake test workflow * test: add exogenous pathways to config	2022-04-11 17:08:25 +02:00
Fabian Neumann	a3d6e296e8	Merge branch 'master' into eu-energy-security	2022-04-08 19:56:26 +02:00
Fabian Neumann	4712bfc893	fix nuclear EAF processing code	2022-04-08 19:55:40 +02:00
Fabian Neumann	8af21f3355	Merge remote-tracking branch 'origin/eu-energy-security' into results-dir	2022-04-08 15:46:37 +02:00
euronion	c412a61013	Add country-specific EAF restriction for NPPs. (#361) ... * Add country-specific EAF restriction for NPPs. Based on historic figures from IAEA. * Update release_notes.rst	2022-04-08 15:41:23 +02:00
Fabian Neumann	6aefcee030	Merge branch 'eu-energy-security' into results-dir	2022-04-08 15:28:57 +02:00
Fabian	40425a7767	build powerplants: use map_country bus function for bus attachement	2022-04-08 15:25:05 +02:00
Fabian Neumann	50ca0d0ddc	Merge branch 'eu-energy-security' into results-dir	2022-04-08 14:51:10 +02:00
Fabian	65790cd065	build_powerplants: remove non-assigned ppls	2022-04-08 14:34:52 +02:00
Fabian	d53487f822	build_powerplants: fix duplicated names per bus	2022-04-08 14:23:33 +02:00
Fabian Neumann	40c882f0e9	solve: allow to parse load shedding cost in config	2022-04-08 13:19:25 +02:00
Fabian Neumann	4a18d59789	Merge branch 'eu-energy-security' into results-dir	2022-04-08 12:34:11 +02:00
Fabian	e37a3f57ab	adjust biomass capacities	2022-04-08 12:23:24 +02:00
Fabian Neumann	2403650be2	prepare: allow varying emission prices in opts wc: e.g. Ep80.5	2022-04-08 10:27:55 +02:00
Fabian Neumann	02c06017d3	prepare: add gas consumption limit through wildcard: CH4L	2022-04-08 10:27:23 +02:00
Fabian Neumann	bd75953674	add logging to co2limit2	2022-04-08 10:26:38 +02:00
Fabian Neumann	f9ede37a02	allow varying marginal cost of carrier in opts wc: CCGT+m2.0	2022-04-08 10:26:16 +02:00
Fabian Neumann	e6fec5b3c8	scripts: fix bug and add estimate renewable from IRENA	2022-04-08 09:53:11 +02:00
Fabian Neumann	630fb9783f	fix to operational reserve margin to work without any extendable gens	2022-04-07 17:20:56 +02:00
Fabian Neumann	84e146834c	Apply suggestion from code review to add switch	2022-04-07 15:22:10 +02:00
Fabian Neumann	3678e5c523	Add operational reserve margin constraint analogous to GenX ... Co-authored-by: FabianHofmann <hofmann@fias.uni-frankfurt.de>	2022-04-07 14:39:34 +02:00
Fabian Neumann	4862dcf865	Merge pull request #357 from PyPSA/hvdc-links ... Hvdc links	2022-04-05 17:13:15 +02:00
Fabian Neumann	bfcc20aa13	Revert "update TYNDP links which are already built"	2022-04-05 17:10:12 +02:00
Fabian Neumann	51dffbefa3	add gas usage limit constraint	2022-04-05 16:59:51 +02:00
Fabian Neumann	9812e64e82	resolve cherry merge conflict 2	2022-04-05 16:34:02 +02:00
Fabian Neumann	7a52b6bc45	resolve cherry merge conflict 1	2022-04-05 16:22:31 +02:00
Fabian Neumann	aa6e98a563	label built TYNDP links as not under_construction	2022-04-05 16:11:02 +02:00
Fabian Neumann	eca4a017db	implement TYNDP link overriding for link_id not oid	2022-04-05 16:07:30 +02:00
Fabian	1fd6a685ab	powerplants: filter out powerplants with shut down date < 2021	2022-04-05 15:12:01 +02:00
Fabian	f878faac73	add_electricity: allow estimate_renewable_capacities to be commented out	2022-04-05 08:02:44 +02:00
Fabian Neumann	cb9730118b	Merge branch 'eu-energy-security' into renewable-caps	2022-04-04 19:04:44 +02:00
Fabian Neumann	ade22bf4f0	add existing wind and solar capacities based on IRENASTATS	2022-04-04 19:03:09 +02:00
Fabian	7bc9b8012c	powerplants: update to ppm >= v0.5.1	2022-04-04 18:07:48 +02:00
Fabian Neumann	95d5d8f889	prepare: move build_heat_demand closer to add_heat	2022-04-03 18:55:53 +02:00
Fabian Neumann	b112da0565	prepare: separate code for transport demand and nodal energy totals	2022-04-03 18:49:35 +02:00
Philipp Glaum	17337070f1	solve_network script and config: add base load constraint	2022-03-31 16:29:52 +02:00
Fabian Neumann	a7e407944c	Merge branch 'master' into issue-301	2022-03-29 09:24:40 +02:00
Fabian Neumann	621520a7b2	Merge branch 'master' into rm-raster-natura	2022-03-29 09:18:43 +02:00
Fabian Neumann	a4132919a0	Merge branch 'master' into voronoi	2022-03-29 09:08:35 +02:00
Fabian Neumann	a05881479c	build_bus_regions: move voronoi partition from vresutils to script	2022-03-28 15:17:55 +02:00
Seth	c37171b01d	feedback code review (opts argument and unpacking)	2022-03-28 13:42:55 +02:00
Seth	e45c7a65ff	Apply suggestions from Martha's code review ... Co-authored-by: Martha Frysztacki <martha.frysztacki@kit.edu>	2022-03-28 12:10:51 +02:00
Fabian Neumann	7fee2944d8	Merge branch 'master' into rm-raster-natura	2022-03-28 12:07:33 +02:00
Seth	3c5212826e	Merge branch 'PyPSA:master' into fix-plotnetworkrule	2022-03-28 11:54:47 +02:00
Philipp Glaum	0aace90b9d	Merge branch 'master' into line-rating	2022-03-25 14:44:20 +01:00
Fabian Neumann	03e6764a9d	Merge branch 'master' into issue-301	2022-03-25 13:46:46 +01:00
Fabian Neumann	c54ddab4a3	remove unused simple_hvdc_costs	2022-03-24 14:47:00 +01:00
Fabian Neumann	1a82b87587	skip iterations if no lines are expandable	2022-03-24 14:30:28 +01:00
Fabian Neumann	7f6a00cfce	Merge branch 'master' into rm-raster-natura	2022-03-24 14:19:14 +01:00
martacki	7f29c31abe	.copy() shortcut	2022-03-24 13:17:01 +01:00
martacki	8cb4c17930	unify vre treatment for hac clustering for simplify_network and cluster_network	2022-03-22 16:53:05 +01:00
lisazeyen	03fca360ff	style improvement	2022-03-21 09:14:15 +01:00
Fabian Neumann	7ba1f26eb8	must read NATURA shape before add_geometry	2022-03-20 20:56:38 +01:00
Fabian Neumann	5a7c0d7967	remove build/retrieve natura raster, directly use shapefile	2022-03-20 10:03:17 +01:00
Fabian Neumann	ca94709ed3	use snakemake.threads in build_renewable_profiles	2022-03-20 09:50:38 +01:00
Philipp Glaum	e46ddb3985	solve_network: add constraint for min renewable capacities	2022-03-18 14:48:34 +01:00
lisazeyen	71a8bc6c96	use define spatial for all conventionals, add lifetime for H2 storage	2022-03-18 13:46:40 +01:00
Philipp Glaum	b4c31f8889	add renewable share constraint	2022-03-18 12:44:57 +01:00
lisazeyen	cfb5a797cb	start to extend define_spatial for conventional carriers	2022-03-18 10:22:00 +01:00
lisazeyen	08cef37e7e	improve code style	2022-03-18 10:22:00 +01:00
euronion	acd436ab07	Merge branch 'ukraine_hackathon' of https://github.com/PyPSA/pypsa-eur into ukraine_hackathon	2022-03-18 08:58:11 +01:00
euronion	28d02a8d37	Update build_renewable_profiles.py	2022-03-18 08:58:04 +01:00
Fabian	eda9212dfd	build_load_data: fix UA and MD time series for subset of year	2022-03-17 18:36:46 +01:00
lisazeyen	5502943301	scripts/solve_network.py: Style improvement ... Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>	2022-03-17 18:15:59 +01:00
lisazeyen	aed81940b3	add_existing_baseyear.py: Style improvement ... Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>	2022-03-17 18:15:14 +01:00
euronion	3e14156709	Add land cover analysis for MD, UA (Quick & Dirty).	2022-03-17 17:56:13 +01:00
Martha Frysztacki	69c0341145	Merge branch 'master' into introduce_hac_clustering	2022-03-17 17:40:46 +01:00
martacki	4c1c5e3a4e	suggestions by coroa and fneum	2022-03-17 17:38:30 +01:00
Fabian Neumann	d6f4b3b254	powerplants: assume 'natural gas' is OCGT	2022-03-17 16:43:23 +01:00
Fabian Neumann	b23b3ff1a7	Merge branch 'master' into ukraine_hackathon	2022-03-17 08:48:58 +01:00
Fabian	1f788e0d5b	cluster_network: replace np.sum/np.min by pandas.Series.sum/min	2022-03-16 16:16:15 +01:00
Seth	0384b4ff83	fix the plot_network snakemake rule	2022-03-10 13:55:53 +01:00
martacki	85834ba8e7	remove xagg	2022-03-07 13:48:19 +01:00
Martha Frysztacki	3e07fdfd54	Merge branch 'master' into introduce_hac_clustering	2022-03-07 11:44:29 +01:00
martacki	d2af983378	distribute electricity demand in ua and md based on GDP data	2022-03-05 11:21:37 +01:00
martacki	025dd35878	GDP for UA and MD (draft) - not working yet!	2022-03-04 20:02:27 +01:00
martacki	d1d42213b1	MD load data totals (IEA)	2022-03-04 20:00:52 +01:00
martacki	3fa8f91e73	make_summary followup on snakemake dependencies removal	2022-03-04 16:29:47 +01:00
martacki	f52b252fee	UA load data (entsoe transparency 2018)	2022-03-04 16:04:46 +01:00
Fabian	d16f24fc07	follow up	2022-03-03 23:08:29 +01:00
Fabian	8700f63cdb	solve_network: fix load shedding attributes	2022-03-03 18:13:54 +01:00
martacki	b63271f12f	release_notes, old format of base_network with updated docstrings	2022-03-03 17:16:23 +01:00
Martha Frysztacki	49cd51f463	Merge branch 'master' into update-entsoe-gridextract	2022-03-03 16:38:06 +01:00
Fabian	b7436da57e	Merge branch 'master' of github.com:PyPSA/pypsa-eur into line-rating	2022-03-03 01:13:28 +01:00
Fabian	752ff28538	cluster_network.py: allow cluster wildcard to be 'all'	2022-03-02 14:43:04 +01:00
FabianHofmann	7d7b3d4cf9	Merge branch 'master' of github.com:PyPSA/pypsa-eur into line-rating	2022-03-02 14:14:56 +01:00
Fabian Neumann	8dafb7bc83	fix custom clustering by checking explicitly for series (#318)	2022-02-27 08:07:11 +01:00
Philipp Glaum	caaca688c4	add_electricity: add optional clipping and small changes	2022-02-23 12:06:51 +01:00
Philipp Glaum	7e692f01e3	adjust s_max_pu clipping	2022-02-21 09:18:20 +01:00
Fabian Neumann	c754f253bc	plotting adjustments for pypsa 0.19.1	2022-02-20 16:13:11 +01:00
Fabian Neumann	4b1360c3f0	do not aggregate rooftop and solar PV in plots	2022-02-20 15:59:51 +01:00
Philipp Glaum	86942b0afc	add_electricity: fix minor bug and clip s_max_pu_cap values	2022-02-17 14:50:11 +01:00
Martha Frysztacki	6b6191734c	Merge branch 'master' into update-entsoe-gridextract	2022-02-16 21:41:28 +01:00
Fabian	1d975bb814	build_line_rating: apply black style	2022-02-16 14:32:33 +01:00
Fabian	75b695eed4	line-rating: clip s_max_pu to account for max voltage angle difference	2022-02-16 14:29:44 +01:00
Koen van Greevenbroek	f7ee47238a	Fix random state for kmean clustering ... When the kmeans algorithm is used to cluster networks, this is not deterministic by default. The result is that repeated runs of the `simplify_network` and `cluster_network` rules can and usually do produce different results that vary somewhat randomly. This makes results less reproducible when given only a pypsa-eur configuration file. The fix is to supply a fixed random state to the k-means algorithm.	2022-02-10 15:57:16 +01:00
martacki	82a0338e9f	treatment of outliers and small feature-bugfix	2022-02-04 20:27:18 +01:00
martacki	b5dbf4eb32	overwrite country of isolated buses	2022-02-04 17:19:23 +01:00
martacki	256ac48b47	resolve merging master bugs	2022-02-04 16:45:00 +01:00
Philipp Glaum	246d5f5964	fix operations network infeasibilities	2022-02-04 15:58:29 +01:00
Martha Frysztacki	25b3245923	Merge branch 'master' into introduce_hac_clustering	2022-02-04 14:35:14 +01:00
Fabian Neumann	3323f34896	bugfix: also plot h2 corridors where no retrofit	2022-02-04 12:26:58 +01:00
Fabian Neumann	835bfc0f6a	bugfix: access right config variables in build renewable profiles	2022-02-01 08:51:47 +01:00
Martha Frysztacki	ff29fda618	Merge branch 'master' into update-entsoe-gridextract	2022-01-31 17:08:56 +01:00
martacki	296fb021cf	join skagerrak link	2022-01-31 16:09:42 +01:00
Fabian Neumann	09f1135b51	address pandas 1.4 deprectations	2022-01-29 16:17:46 +01:00
Fabian Neumann	c8c1c3c46e	revert ea96d499e7	2022-01-29 15:02:49 +01:00
Martha Frysztacki	9ae8baf71d	Merge branch 'master' into update-entsoe-gridextract	2022-01-28 15:12:36 +01:00
Fabian	4341827952	Merge branch 'line-rating' of github.com:PyPSA/pypsa-eur into line-rating	2022-01-25 16:02:35 +01:00
Fabian	5ee056bb5c	add_electricity: add_line_rating: move snakemake arg out of function	2022-01-25 15:57:52 +01:00
Philipp Glaum	8421fb13f1	update config location and wildcards for debugging	2022-01-25 15:22:58 +01:00
Fabian Neumann	b6cfcf6364	bugfix: mock_snakemake configfiles	2022-01-25 12:57:04 +01:00
Fabian Neumann	1bcbb1ed19	Merge branch 'master' of github.com:pypsa/pypsa-eur-sec	2022-01-25 12:56:08 +01:00
Fabian Neumann	4e3314acd8	bugfix: remove also retrofitted H2 network	2022-01-25 12:55:57 +01:00
Philipp Glaum	815f9824e9	Merge remote-tracking branch 'origin/master' into line-rating	2022-01-25 08:49:11 +01:00
martacki	6cdf3a2879	use snakemake keywords directly without extracting them beforehand	2022-01-24 19:48:26 +01:00
Martha Frysztacki	c45691d305	Merge branch 'master' into snakemake_dependencies_in_functions	2022-01-24 19:15:06 +01:00
martacki	c4be81eb5e	simplify_network: remove snakemake dependencies	2022-01-24 19:13:48 +01:00
Tim Pedersen	0d7ad643bc	Resolved error whith /tmp (#224)	2022-01-24 14:34:54 +01:00
Fabian Neumann	c273eb7f2c	plot_network: legends, EqualEarth projection, w/wo retrofit compatibility	2022-01-23 14:20:18 +01:00
martacki	61a4108e60	update parameter_corrections for updated entsoe gridextract	2022-01-21 17:37:18 +01:00
Philipp Glaum	2a231464f6	bug fix in temperature calculation	2022-01-19 09:33:11 +01:00
Philipp Glaum	bc70819aef	update formate and resistance calculation	2022-01-17 08:52:25 +01:00
Qui-Rin	9f0515105b	build_load_data: Removed underscore in pattern ... When using the transparency option the pattern used as a filter is created with a double underscore -> removed underscore in '_transparency'	2022-01-14 19:02:44 +01:00
martacki	dc83fd8e09	fix small bugs	2022-01-14 15:13:44 +01:00
martacki	0da77a7600	remove snakemake dependencies in plot_summary	2022-01-14 13:44:33 +01:00
martacki	f28a088ea3	arguments in function calls instead of kwarg-style	2022-01-14 11:30:15 +01:00
martacki	8cb5bd27d5	make_summary: remove snakemake dependencies	2022-01-14 11:29:01 +01:00
Martha Frysztacki	7067d924cc	Merge branch 'master' into snakemake_dependencies_in_functions	2022-01-14 11:05:54 +01:00
martacki	deac9f32e7	move snakemake keys (input, output, config, ...) to own variables	2022-01-14 11:05:15 +01:00
Fabian Neumann	72e277a007	update environment and address deprecations (#291) ... * update environment and address deprecations * check pandas<1.3 * limit snakemake due to ascii encoding error, address review comments * remove version restriction on snakemake	2022-01-14 07:43:21 +00:00
martacki	9b7bb27da1	snakemake dependencies in base_network	2022-01-13 18:54:27 +01:00
martacki	505f093141	fix ordering of kwargs in add_co2limit	2022-01-13 18:00:22 +01:00
Fabian Hofmann	94364cbeeb	Update scripts/cluster_network.py ... Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>	2022-01-11 10:31:49 +01:00
Fabian	281700751a	Merge branch 'snakemake_dependencies_in_functions' of github.com:PyPSA/pypsa-eur into snakemake_dependencies_in_functions	2022-01-11 10:28:11 +01:00
Fabian	ed7fd27adc	build_shapes: use country_list as argument	2022-01-11 10:24:45 +01:00
Fabian	c7a443c969	build_shapes: revise changes	2022-01-11 10:23:22 +01:00
Martha Frysztacki	418ce4be28	Merge branch 'master' into snakemake_dependencies_in_functions	2022-01-11 10:03:32 +01:00
Fabian	d1334c1670	Merge branch 'snakemake_dependencies_in_functions' of github.com:PyPSA/pypsa-eur into snakemake_dependencies_in_functions	2022-01-11 10:00:55 +01:00
Fabian	39a6753ece	build_powerplants: revise changes	2022-01-11 09:59:58 +01:00
Fabian	01e93545f6	add_extra_components: revise changes	2022-01-11 09:59:34 +01:00
Fabian	acd7122aad	add_electricity: revert changes in add_nice_carrier_names	2022-01-11 09:58:59 +01:00
Fabian Hofmann	2c318a247e	Update scripts/prepare_network.py ... Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>	2022-01-11 09:55:22 +01:00
Fabian	66f2d36f0d	add_electricity: revise code and make it leaner	2022-01-11 09:38:34 +01:00
Philipp Glaum	b05cddae77	update calculate_line_rating function	2022-01-10 14:45:46 +01:00
lisazeyen	c40904a727	adjust h2_plot function to work with myopic, since build year is now in links.index	2022-01-07 16:59:48 +01:00
lisazeyen	9f8b54a3ce	adjust pipe retrofitting constraint to work with myopic	2022-01-07 16:59:14 +01:00
lisazeyen	5b30f0ece6	avoid doubling of the existing natural gas grid	2022-01-07 16:53:37 +01:00
lisazeyen	030bf96d32	update mocksnakemake	2022-01-07 12:45:33 +01:00
lisazeyen	c9ce9190a7	adjust to spatital resolved gas nodes	2022-01-07 12:40:17 +01:00
lisazeyen	b5aa4234ef	adjust capital cost of existing renewables to consider e.g. electricity grid connection costs as well	2022-01-07 12:09:02 +01:00
lisazeyen	953e1c883e	adjust functions to new default lifetime np.inf instead of previous NaN	2022-01-07 11:38:25 +01:00
lisazeyen	372473d76c	update mocksnakemake	2022-01-07 11:32:31 +01:00
Fabian Neumann	7535a0d385	update data bundle (#216)	2022-01-06 10:29:59 +01:00
Philipp Glaum	e51d714d55	update line rating(documentation, bundles)	2021-12-28 08:28:07 +01:00
Max Parzen	6249a9b558	Merge branch 'PyPSA:master' into master	2021-12-23 12:35:10 +01:00
Philipp Glaum	fba50492a5	only consider relevant lines for line rating	2021-12-21 07:36:59 +01:00
Philipp Glaum	af4bccfb39	line rating assigned in add_electricity.py	2021-12-15 13:53:38 +01:00
Philipp Glaum	ed83988ed1	hot fix for snakemake bug	2021-12-15 11:02:03 +01:00
Philipp Glaum	7e628f66c5	updated Snakefile and build_line_rating.py	2021-12-15 10:53:55 +01:00
Philipp Glaum	ba767c630d	initial implementation	2021-12-14 10:59:27 +01:00
martacki	6c4ea69e95	clustering: own config for clustering settings	2021-12-10 17:53:40 +01:00
Fabian Neumann	d1762919c5	add option 'seqXXX' to sweep global co2 sequestration potentials (#208) ... * add option 'seqXXX' to sweep global co2 sequestration potentials * add release notes	2021-12-10 12:05:38 +01:00
Fabian Neumann	82096f92e8	fix for GlobalConstraints mu with "co2_sequestration_limit" (#211) ... * fix for GlobalConstraints mu with co2_sequestration_limit * add release notes	2021-12-06 11:31:48 +01:00
Fabian Neumann	90c2c909cd	fix broken prepare_sector_network when running without gas grid (#207) ... Co-authored-by: lisazeyen <lisa.zeyen@web.de> Co-authored-by: lisazeyen <lisa.zeyen@web.de>	2021-12-03 17:22:06 +01:00
Fabian Neumann	a2459881ef	allow H2 retrofitting from CH4 pipelines without endogenous CH4 grid (#204) ... * allow H2 retrofitting from CH4 pipelines without endogenous CH4 grid * add small capital cost to gas pipelines to incentivise decommissioning * add release notes	2021-11-29 12:42:10 +01:00
Fabian Neumann	d04f6c02a7	Merge branch 'master' into retrofit-gas-pipelines	2021-11-29 09:13:51 +01:00
Fabian Neumann	263628fa22	add option to automatically download and extract sector databundle (#198)	2021-11-29 09:12:55 +01:00
Fabian Neumann	3ecb761b57	add regionalised hydrogen salt cavern storage potentials (#191) ... * add regionalised hydrogen salt cavern storage potentials * fix reading in salt-cavern potentials and typo in imports * by default disable nearshore and offshore salt cavern potentials Co-authored-by: lisazeyen <lisa.zeyen@web.de>	2021-11-29 09:12:07 +01:00
Fabian Neumann	ad7dd1aa3f	correct max gas pipeline loading	2021-11-28 12:11:04 +01:00
Max Parzen	f1243c3e0c	Fix distribute clustering with cbc/glpk/ipopt ... Assume you have 10 nodes that need to be distributed between 2 countries. What can happen with some of the open source solvers is that one country gets assigned to 9.01 (float) nodes, and the other one to 0.99. Now using .astype(int) would lead to a node distribution of 0 and 9, as the `astype(int)` function round down by default (0.99 -> 0). This assigned zero value breaks the code in case open source solvers are used. Gurobi somehow does deal with it.	2021-11-24 14:16:24 +01:00
Fabian Neumann	bb9f437855	fix copying pypsa-eur config	2021-11-24 10:54:39 +01:00
Fabian Neumann	7863c269bd	plot_network: gas network show max used capacity	2021-11-24 10:53:54 +01:00
Koen van Greevenbroek	977dbfe933	Remove non-ascii character from source file ... Unfortunately Snakemake for now reads files using the default OS file encoding, which may not be UTF-8. Therefore, it is best to be conservative and only use ascii in source files for now.	2021-11-22 14:02:57 +01:00
martacki	299e71e2b3	introduce hierarchical agglomeratice clustering (hac)	2021-11-17 13:46:33 +01:00
Fabian Neumann	b8a037026d	gas_input: rewrite to not require pygeos via sjoin_nearest()	2021-11-14 16:51:34 +01:00
Fabian Neumann	67ba2fa813	address deprecation warnings	2021-11-14 12:57:46 +01:00
Fabian Neumann	d9902ad978	gas_network: recalculate lengths after clustering	2021-11-13 17:30:54 +01:00
Fabian Neumann	8c5dacbcc8	gas_network: fix bug in haversine distance	2021-11-13 17:03:13 +01:00
Fabian Neumann	4cd964b3bd	gas_network: use IGGIELGN scigrid dataset	2021-11-13 16:48:08 +01:00
Fabian Neumann	b39a852d3b	correct syntax errors	2021-11-12 12:50:46 +01:00
Fabian Neumann	44ea5ef48a	add local gas input capacities (p_nom) and disable p_nom_extendable	2021-11-10 18:24:13 +01:00
Fabian Neumann	12ef1302e6	add planned LNG terminals from gem.wiki and convert units to MW	2021-11-10 18:05:47 +01:00
Fabian Neumann	c0d1656091	build_load_data: separate retrieving and processing load data	2021-11-10 10:37:09 +01:00
Fabian Neumann	646c5011af	Merge branch 'master' into snakemake_dependencies_in_functions	2021-11-10 09:46:57 +01:00
Fabian Neumann	57c0dd29d1	disentangle gas input nodes by lng, prod, entry with mmc/d#	2021-11-09 14:52:08 +01:00
Fabian Neumann	9e4e97690f	gas network plotting adjustments	2021-11-05 10:57:24 +01:00
Fabian Neumann	985705403e	revision gas infrastructure representation 2	2021-11-04 21:48:54 +01:00
Fabian Neumann	6a00d5bfca	revision gas infrastructure representation	2021-11-03 20:34:43 +01:00
Fabian Neumann	37e2e53486	Merge branch 'master' into retrofit-gas-pipelines	2021-11-02 19:03:26 +01:00
Fabian Neumann	d26dbcb7fd	plot: correct h2 map legend overlap, change aggregation of techs	2021-10-23 21:16:05 +02:00
Fabian Neumann	0a9210ed44	copy pypsa-eur config.yaml into results folder	2021-10-07 14:36:34 +02:00
Fabian	23d3216d92	base_network.py: fix scipy spatial import	2021-10-05 17:30:22 +02:00
Fabian Neumann	19d128aafd	bugfix: take district heating progress not potential	2021-10-04 14:28:59 +02:00
lisazeyen	017c188518	fix typo for district heating with capital D	2021-10-04 09:23:23 +02:00
Fabian Neumann	2e6e9c6802	Merge branch 'master' into agriculture-energy-co2	2021-10-02 10:51:28 +02:00
Fabian Neumann	b560d95b6a	merge master	2021-10-02 10:41:56 +02:00
Fabian Neumann	4375083838	create parallel structures for land-use constraints w/wo m	2021-10-02 10:40:49 +02:00
Fabian Neumann	a60f180f61	fix logging	2021-10-02 10:23:27 +02:00
Fabian Neumann	c0adb51454	decapitalize columns in build_energy_totals	2021-10-02 10:03:40 +02:00
lisazeyen	0d999a4991	prepare_sector_network: code formatting ... Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>	2021-10-01 17:10:42 +02:00
Fabian Neumann	18fabd930e	Apply suggestions from code review	2021-09-30 17:46:26 +02:00
Fabian Neumann	ff6d736a89	Merge branch 'master' into myopic-low-clustering-gens	2021-09-30 14:51:45 +02:00
Fabian Neumann	90079248a3	Merge branch 'master' into dh-share	2021-09-30 14:48:26 +02:00
lisazeyen	f6bb498730	include PR review	2021-09-29 16:13:23 +02:00
Fabian Neumann	5fb169c31f	Merge branch 'master' into enspreso-biomass	2021-09-29 15:46:11 +02:00
Fabian Neumann	1e248b314d	compatibility with biomass transport	2021-09-29 15:45:14 +02:00
lisazeyen	9d8827bf59	Merge remote-tracking branch 'origin/master' into dh-share	2021-09-29 15:03:45 +02:00
lisazeyen	854bd80818	rename central_fraction->district heating potential, restructure district heating share implementation	2021-09-29 14:37:36 +02:00
lisazeyen	8322350fee	move calculation of district heating share to build_energy_totals	2021-09-29 14:36:56 +02:00
lisazeyen	e27ec46878	add further comments	2021-09-29 09:23:39 +02:00
lisazeyen	234a32c504	bug fix	2021-09-29 09:23:39 +02:00
Fabian Neumann	8ecc54fbe6	Merge branch 'master' into dh-share	2021-09-28 17:29:29 +02:00
lisazeyen	53eab1ead2	slice biomass potentials with the pop_layout index instead of the country if biomass transport = True	2021-09-28 17:25:04 +02:00
Fabian Neumann	fcc10aa950	Merge branch 'master' into master	2021-09-28 17:15:26 +02:00
Fabian Neumann	2f19814786	Merge branch 'nworbmot-master'	2021-09-28 17:13:30 +02:00
Fabian Neumann	9f4e1f2176	make HVC recycling ready for pathway, minor edits	2021-09-28 17:08:03 +02:00
lisazeyen	dadfa8691b	update mocksnakemake for testing	2021-09-28 16:36:40 +02:00
Fabian Neumann	385779fbbf	Merge branch 'master' into biomass-transport	2021-09-28 11:33:21 +02:00
Fabian Neumann	ec04d7909a	Merge pull request #148 from PyPSA/co2-network ... Add CO2 network	2021-09-28 11:29:20 +02:00
lisazeyen	28264aa114	Small fixes (#167) ... * update mocksnakemake for testing * remove trailing whitespace in n.loads index * add missing color for H2 liquification * adjust to default lifetime 0 instead of NaN	2021-09-27 11:16:12 +02:00
lisazeyen	7ed20aba7a	Update prepare_sector_network.py ... add logger info if CO2 network is added	2021-09-24 15:30:43 +02:00
lisazeyen	b391aa6475	Update build_biomass_transport_costs.py ... change snakemake output file format	2021-09-24 14:59:53 +02:00
Tom Brown	93d4eae1ea	industry: for HVC, add mechanical and chemical recycling	2021-09-24 13:19:48 +02:00
Tom Brown	fbccd5fbc0	industry: separate HVC, methanol and chlorine from basic chemicals	2021-09-24 13:00:58 +02:00
Fabian Neumann	2e02af8b4b	change license	2021-09-14 16:37:41 +02:00
martacki	dfb929f2cf	remove snakemake dependencies in functions, use as kwarg instead	2021-09-14 16:34:02 +02:00
Fabian Neumann	c4d4e88ba2	Merge pull request #161 from PyPSA/fix-build_carbon_budget ... fix-build_carbon_budget	2021-09-09 16:07:11 +02:00