Commit Graph

2428 Commits

Author SHA1 Message Date
lisazeyen
2223e011a0 merge master 2024-05-15 16:14:25 +02:00
lisazeyen
e8de4f308f rename solar-hsat in config 2024-05-15 15:08:52 +02:00
lisazeyen
6723191031 simplify if statement 2024-05-15 15:04:04 +02:00
lisazeyen
541e267a83 replace print with logger.info 2024-05-15 15:00:42 +02:00
lisazeyen
a9be2825ec reforumlate constraint 2024-05-15 14:59:34 +02:00
pre-commit-ci[bot]
985aecb0c4 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-05-13 19:39:02 +00:00
Fabian Neumann
d6f9e5f4a6 Merge branch 'feature/fix-gas-retrofit' of github.com:Climact/pypsa-eur-climact into Climact-feature/fix-gas-retrofit 2024-05-13 18:05:35 +02:00
Fabian Neumann
cadd33431f sanitize_locations: avoid attribute error for electricity-only runs (closes #939) 2024-05-13 17:59:21 +02:00
Fabian Neumann
788e07a0d1 bugfix to avoid duplicated offshore regions (closes #396) 2024-05-13 17:56:28 +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
pre-commit-ci[bot]
c311f7bdf8 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-05-13 15:33:35 +00:00
lisazeyen
da9beaa98f
rename Greece iso-code 2024-05-13 17:33:07 +02:00
pre-commit-ci[bot]
b529ab1d3c [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-05-13 15:14:35 +00:00
Fabian Neumann
614590b98f Merge branch 'landfill_master' of github.com:PyPSA/pypsa-eur into landfill_master 2024-05-13 17:14:04 +02:00
Fabian Neumann
649e277c7d make waste-to-energy work without regional_oil_demand 2024-05-13 17:13:16 +02:00
pre-commit-ci[bot]
a9d0f295fb [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-05-13 13:41:41 +00:00
Michael Lindner
afa5cc5014 add heating output, correct bus ordering 2024-05-13 15:39:48 +02:00
pre-commit-ci[bot]
1d709913ed [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-05-13 15:39:37 +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
pre-commit-ci[bot]
f7dc8a7f22 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-05-13 15:36:43 +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
5b2d4047df Merge branch 'master' of github.com:PyPSA/pypsa-eur 2024-05-13 14:55:07 +02:00
Fabian Neumann
e322e21771 Merge branch 'feature/add-nodal-supply-energy' of github.com:Climact/pypsa-eur-climact into Climact-feature/add-nodal-supply-energy 2024-05-13 14:54:49 +02:00
pre-commit-ci[bot]
5364e7dfcc [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-05-13 12:25:07 +00:00
Fabian Neumann
6321a69870 rearrange config settings under 'run: shared_resources:' 2024-05-13 14:23:09 +02:00
pre-commit-ci[bot]
0fb68d11d8 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-05-13 14:22:05 +02:00
toniseibold
e75e3bd8d7 allow excluding files from shared_resources 2024-05-13 14:21:43 +02:00
pre-commit-ci[bot]
85a2e97f1e [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-05-13 08:51:21 +00:00
Fabian Neumann
e023872d44 stop using wildcard by default 2024-05-13 10:50:24 +02:00
Fabian Neumann
22b16d54e9 Merge branch 'feature/rename-existing-capacities' of github.com:Climact/pypsa-eur-climact into Climact-feature/rename-existing-capacities 2024-05-13 10:09:21 +02:00
Fabian Neumann
84d6634af0
Merge branch 'master' into implement-floating 2024-05-13 10:04:42 +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
Fabian Neumann
ff99db5cb5
Update scripts/build_hydro_profile.py 2024-05-07 10:53:07 +02:00
Johannes Schmidt
3b77b4a370
Fix that code works if either ES or PT is present 2024-05-06 18:46:04 +02:00
Johannes Schmidt
9d36d2bc9b
Fix copy_timeslice
copy timeslice would add data although country not present in load
2024-05-06 13:37:32 +02:00
Johannes Schmidt
97035092ac
Fix approximate_missing_eia_stats
Function crasehd when 'ET' or 'PT' not present in list of countries.
2024-05-06 13:20:53 +02:00
Fabian Neumann
c05cfff765
Merge pull request #1045 from Climact/feature/fix-typo
Fix typo
2024-05-06 10:33:19 +02:00
Koen van Greevenbroek
303b526bf1 Fix formatting of link in base_network documentation 2024-05-06 09:09:23 +02:00
Koen van Greevenbroek
ca6f803e28 Update documentation to reflect removal of build_bus_regions rule 2024-05-06 08:52:42 +02:00
Koen van Greevenbroek
76c201ef7d Integrate build_bus_regions into base_network
Fixes a problem with the `build_bus_regions` writing to base.nc
without declaring base.nc as an output.
2024-05-03 14:53:18 +02:00
Thomas Gilon
a139bb604a
Merge branch 'master' into feature/add-nodal-supply-energy 2024-05-02 14:28:20 +02:00
Thomas Gilon
45aa714bdc Add calculate_nodal_supply_energy in make summary 2024-05-02 14:27:30 +02:00
Thomas Gilon
3752929cbb
Merge branch 'master' into feature/fix-typo 2024-05-02 14:22:50 +02:00
Thomas Gilon
54e3d2bb1b Fix typo 2024-05-02 14:19:58 +02:00
pre-commit-ci[bot]
2d2b0338cc [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-04-29 13:59:11 +00:00
Parisra
ea0e2f66ce
Fix empty array error
In case there are no extendable solar generators in the network, the constraint is not implemented. Without this condition, an 'empty array' error will arise.
2024-04-29 15:58:42 +02:00
pre-commit-ci[bot]
c66549c577 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-04-29 12:34:11 +00:00