Commit Graph

421 Commits

Author SHA1 Message Date
Amos Schledorn
da3ad1725e
Merge branch 'master' into update-district-heating-cops 2024-07-29 10:33:39 +02:00
Micha
f5fe0d062c
Rename ev battery master (#1116)
* rename EV battery

* add release note

* adjust tech colors

* fix for battery renaming in plot_summary

---------

Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-07-29 09:50:02 +02:00
pre-commit-ci[bot]
9d485a2185 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-07-26 18:12:21 +00:00
AmosSchledorn
08c30d8b2e ensure correct dimensions in forward/return temperature arayx and change naming from "generic" to "default" 2024-07-26 20:08:06 +02:00
AmosSchledorn
f096592b7f add option to make central heating forward/return temperatures country-specific 2024-07-26 19:45:45 +02:00
AmosSchledorn
b720bd9eca Merge remote-tracking branch 'origin/master' into update-district-heating-cops 2024-07-24 15:43:34 +02:00
AmosSchledorn
a9f4c6375d change default DH return temperature to 50C 2024-07-24 15:04:14 +02:00
Fabian Neumann
8b1b1144d5
cutouts: update zenodo repository version (#1176) 2024-07-24 11:01:00 +02:00
Fabian Neumann
d142d5a50b
aggregate curtailment into single curtailment generator per bus (#1177)
* add curtailment generator mode

* add documentation
2024-07-24 10:54:15 +02:00
AmosSchledorn
de10492e10 Merge remote-tracking branch 'origin/master' into update-district-heating-cops 2024-07-23 17:30:51 +02:00
Fabian Neumann
f11f8d8613 solver settings: add copt-gpu setings for pdlp solver 2024-07-22 21:51:52 +02:00
AmosSchledorn
f3c898f43d build district heating heat pump COPs using approximation from Jensen et al. and values from Pieper et al. 2024-07-19 15:39:16 +02:00
Micha
d3b24face6
revert to old config keys (#1152)
* revert to old config keys

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-07-12 16:22:53 +02:00
cpschau
f19279e7e0 Add other waste heat technologies, and adjust share 2024-07-09 14:02:45 +02:00
cpschau
e932466b05 FT and electrolyis waste heat for DH as float 2024-07-09 12:05:50 +02:00
millingermarkus
fbacb76e9c Minor edits to MSW 2024-07-04 13:34:05 +02:00
millingermarkus
5c7bb2bf51 Add option to exclude fossil fuels 2024-07-04 11:16:00 +02:00
millingermarkus
c71fa78bfa Added biomass imports to prepare sector network 2024-07-04 10:18:19 +02:00
millingermarkus
84ddfea91e Added electrobiofuels 2024-07-03 12:38:16 +02:00
Micha
37bbbc6225 Fix grouping logic again 2024-06-13 15:03:08 +02:00
LukasFrankenQ
7eba0ba36d adjusted and added colours for EGS 2024-06-02 13:14:31 +01:00
LukasFrankenQ
2801b00100 Merge https://github.com/pypsa/pypsa-eur 2024-05-26 22:38:03 +01:00
Fabian Neumann
1da76dd1ae
prepare release v0.11.0 (#1081)
* prepare release notes v0.11.0

* streamline release notes

* update envs/environment.fixed.yaml

* doc: update workflow DAGs

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* pre-commit formatting [no ci]

* update envs/environment.fixed.yaml

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-05-25 22:47:04 +02:00
Fabian Neumann
8b0600b02c disable everywhere_powerplants by default (closes #1072) 2024-05-24 10:40:57 +02:00
Fabian Neumann
c9a0b9c1ae move example configuration files to config/examples 2024-05-24 10:09:34 +02:00
Fabian Neumann
a0e968e573 test myopic: do not estimate renewable capacities before add_existing_baseyear 2024-05-24 09:14:48 +02:00
Fabian Neumann
0ad3489d3a Merge branch 'feature/methanol-production' of github.com:Climact/pypsa-eur-climact into Climact-feature/methanol-production 2024-05-20 22:06:15 +02:00
Fabian Neumann
65b05e92a1 Merge branch 'feature/enhance-agg-p-nom-limits' of github.com:Climact/pypsa-eur-climact into Climact-feature/enhance-agg-p-nom-limits 2024-05-20 15:49:14 +02:00
Fabian Neumann
c89ce9f045 bugfix: correctly distinguish existing OCGT and CCGT 2024-05-20 15:00:46 +02:00
Fabian Neumann
7ce15931e5 add simplified power distribution grid losses 2024-05-20 12:41:54 +02:00
Thomas Gilon
c3dcff8a35 Define methanol energy demand for industry 2024-05-17 16:04:48 +02:00
Fabian Neumann
e4d70fdf4a remove exogenous rooftop_share 2024-05-15 18:13:49 +02:00
Fabian Neumann
e8779fa5a4 small follow-up to #1066 solar-hsat 2024-05-15 18:02:15 +02:00
Fabian Neumann
44fb8cad1f
Merge pull request #957 from PyPSA/land-transport-fix
Land transport fix
2024-05-15 17:13:56 +02:00
Fabian Neumann
5b5be71341 use loads instead of links where possible 2024-05-15 16:41:49 +02:00
pre-commit-ci[bot]
a352cc346b [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-05-15 14:18:18 +00:00
lisazeyen
96118ab1f4
Merge branch 'master' into adding_solar_tracking_single_axis 2024-05-15 16:18:13 +02:00
lisazeyen
2223e011a0 merge master 2024-05-15 16:14:25 +02:00
Fabian Neumann
ff603f2c14 Merge branch 'master' into land-transport-fix 2024-05-15 15:25:56 +02:00
Fabian Neumann
ea8fc31a30 link_thresholds as dictionary, not float, more logging messages 2024-05-15 15:15:09 +02:00
lisazeyen
e8de4f308f rename solar-hsat in config 2024-05-15 15:08:52 +02:00
lisazeyen
e4bc92592c add solar-hsat to tests 2024-05-15 15:06:32 +02:00
Fabian Neumann
9b50c846a0 solve: add option for post-discretization of lines and links 2024-05-15 14:56:50 +02:00
Fabian Neumann
6f84b68c49 bump technology-data version to 0.9.0 2024-05-14 11:51:41 +02:00
Fabian Neumann
e42ccc2345 keep lines under_construction to avoid num_parallel=0 (closes #444) 2024-05-13 17:57:45 +02:00
Fabian Neumann
ef395cadf9
Merge pull request #1060 from PyPSA/landfill_master
Improve handling of plastics (for `master`)
2024-05-13 17:44:46 +02:00
Fabian Neumann
8fbd60883d
Merge branch 'master' into exclude_shared_resources_master 2024-05-13 17:42:40 +02:00
Fabian Neumann
a9333458b3 handle potentially diverging spatial resolutions of HVC 2024-05-13 17:40:10 +02:00
Fabian Neumann
649e277c7d make waste-to-energy work without regional_oil_demand 2024-05-13 17:13:16 +02:00
Tom Brown
2055fe68ef add extra bus for HVC, which can either go to air or waste CHP
Here we explicitly add the option to generate energy and/or capture
the CO2 from HVC (i.e. plastics). NB: Since waste CHP is expensive,
it's not built.
2024-05-13 15:39:01 +02:00
Tom Brown
ac0d52e1c3 Allow some plastics sequestered in landfill or built environment
I.e. assume some fraction of plastics don't end up being burned or
decaying into air.
2024-05-13 15:36:14 +02:00
Fabian Neumann
27a6f619cd reduce min_part_load_fischer_tropsch to 50% 2024-05-13 15:24:33 +02:00
Fabian Neumann
16b1895011 revert further unintended changes 2024-05-13 14:40:43 +02:00
Fabian Neumann
8706f0411e revert use of co2limit_enable for sector-coupled networks 2024-05-13 14:37:07 +02:00
Fabian Neumann
6321a69870 rearrange config settings under 'run: shared_resources:' 2024-05-13 14:23:09 +02:00
toniseibold
e75e3bd8d7 allow excluding files from shared_resources 2024-05-13 14:21:43 +02:00
Fabian Neumann
e023872d44 stop using wildcard by default 2024-05-13 10:50:24 +02:00
Fabian Neumann
84d6634af0
Merge branch 'master' into implement-floating 2024-05-13 10:04:42 +02:00
Fabian Neumann
a16b74f68a
Update config/config.default.yaml 2024-05-13 10:04:05 +02:00
Fabian Neumann
0d9e0f34fd Merge branch 'master' into reduced-data-bundle 2024-05-12 15:53:08 +02:00
Philipp Glaum
da617be276 Merge branch 'master' of github.com:PyPSA/pypsa-eur into implement-floating 2024-05-10 13:29:58 +02:00
pre-commit-ci[bot]
3e93c14dd4 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-04-29 11:32:24 +00:00
Fabian Neumann
d101b8a95a
Merge branch 'master' into existing-caps-from-pm 2024-04-25 17:33:48 +02:00
Parisra
94e45168f8
Add solar-hsat to config
1. Solar PV with single-axis tracking is added as 'solar-hast' to carriers. 2. Capacity factors are taken from atlite. Land-use is 15% higher acc. to NREL (Land-Use Requirements for Solar Power Plants in the United States). 3. The option for adding solar-hast to the network is set to 'True' as default. 4. A color is added for solar-hsat
2024-04-25 11:26:09 +02:00
Fabian Neumann
c505ea174e doc: update solver requirements [skip ci] 2024-04-24 16:23:43 +02:00
Thomas Gilon
3fe427a0cd
Merge branch 'master' into feature/enhance-agg-p-nom-limits 2024-04-19 17:52:01 +02:00
Thomas Gilon
e90b37e6d7 Improve agg_p_nom_minmax file management 2024-04-19 17:47:40 +02:00
Fabian Neumann
991eef6d97 update and reduce databundle size 2024-04-15 14:48:34 +02:00
lisazeyen
618ecdddeb
Merge branch 'master' into land-transport-fix 2024-04-15 09:13:28 +02:00
Thomas Gilon
ed83f1fb4a Add aggregated constraints for wind and possibility to take existing into account in solve_network
# Conflicts:
#	scripts/solve_network.py
2024-04-12 17:14:31 +02:00
lisazeyen
a424bd2e40 rename efficiencies in config.yaml 2024-04-12 14:37:11 +02:00
lisazeyen
53a6b91b06 clear up units 2024-04-12 14:28:52 +02:00
Michael Lindner
700b0e912a add more grouping years to avoid errors 2024-04-11 14:11:42 +02:00
Michael Lindner
7c30a2835f group existing capacities to the earlier grouping_year for consistency with optimized capacities 2024-04-11 14:11:22 +02:00
Koen van Greevenbroek
859212b21f Use powerplantmatching IRENASTAT for add_existing_baseyear 2024-04-11 12:47:13 +02:00
Fabian Neumann
5ecd56d53c
Merge pull request #1010 from PyPSA/correct-co2-seq-potentials
Correct co2 potentials
2024-04-10 17:15:03 +02:00
pre-commit-ci[bot]
f3ad1a36c7 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-04-10 15:14:29 +00:00
Fabian Neumann
6bc1363080 allow sequestration potential attributes to be string 2024-04-10 17:13:58 +02:00
lisazeyen
9d9ab98279 add other co2 potentials 2024-04-10 12:06:53 +02:00
Philipp Glaum
74185560e0 initial implementation 2024-04-10 12:04:45 +02:00
lisazeyen
3819e64377
remove solver name 2024-04-02 16:50:09 +02:00
LukasFrankenQ
08ccd4d233 moved docs from config file to docs 2024-03-27 11:16:23 +01:00
LukasFrankenQ
0396828e3a Merge https://github.com/pypsa/pypsa-eur 2024-03-27 00:09:02 +01:00
lisazeyen
d7fedc6235
Merge branch 'master' into land-transport-fix 2024-03-26 16:25:27 +01:00
LukasFrankenQ
97acf2f12e included Lisas PR suggestions 2024-03-19 19:30:23 +01:00
Fabian Neumann
e459c3c89d add release notes; rename artificial to synthetic 2024-03-15 14:28:01 +01:00
lisazeyen
fd82664292
Merge branch 'master' into land-transport-fix 2024-03-14 20:14:08 +01:00
Fabian Neumann
f695b63732 add more documentation 2024-03-14 14:31:18 +01:00
LukasFrankenQ
09765ad060 Merged https://github.com/pypsa/pypsa-eur 2024-03-14 12:03:56 +01:00
Fabian Neumann
7fa6811760 Merge branch 'master' into multiyear 2024-03-13 09:13:31 +01:00
Fabian Neumann
ed71978b92 use humanfriendly walltime specifications 2024-03-09 14:47:01 +01:00
Fabian Neumann
579cd0c756 Merge branch 'master' into multiyear 2024-03-06 16:34:53 +01:00
lisazeyen
5bfc64a658
Merge branch 'master' into land-transport-fix 2024-03-06 09:25:08 +01:00
Micha
d3283f5084
Merge branch 'master' into fix-lifetime 2024-03-06 08:22:25 +01:00
Michael Lindner
1e25f3adaf add grouping years 1960-1975 2024-03-05 14:07:46 +01:00
Fabian Neumann
9d0724566c Merge remote-tracking branch 'origin/master' into fneum/energy_totals 2024-03-05 13:40:49 +01:00
Fabian Neumann
3af878d69c remove power statistics references 2024-03-05 10:33:41 +01:00
Fabian Neumann
8904943a87 integrate artificial load data supplement into build_electricity_demand 2024-03-04 19:37:52 +01:00
Fabian Neumann
c2011bce49 remove {weather_year} wildcard 2024-03-04 17:48:56 +01:00
Fabian Neumann
e6347621f9 remove operations rules to reduce amount of simultaneous changes 2024-03-04 17:42:35 +01:00