Commit Graph

2391 Commits

Author SHA1 Message Date
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]
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
Fabian Neumann
33dddbf1ef
Merge branch 'master' into existing-caps-from-pm 2024-04-26 08:39:44 +02:00
Koen van Greevenbroek
a4a2af5404 Fix double space in existing capacities
The `name_suffix` variable already includes a space after the bus name.
2024-04-25 18:05:41 +02:00
Fabian Neumann
d101b8a95a
Merge branch 'master' into existing-caps-from-pm 2024-04-25 17:33:48 +02:00
Fabian Neumann
95805a8d72
Merge pull request #1031 from PyPSA/remove_connection_costs
Remove connection costs output
2024-04-18 09:34:32 +02:00
Fabian Hofmann
b993e6affb
Merge branch 'master' into store-network-shapes 2024-04-17 12:37:47 +02:00
martacki
48f199f936 remove UA from countries list for synthetic load data 2024-04-16 15:46:36 +02:00
martacki
feb564506a remove connection_costs as snakemake output from simplify_network 2024-04-16 15:41:01 +02:00
cpschau
6ea8d52a81 no directory change before mock_snakemake 2024-04-16 10:43:07 +02:00
cpschau
3cf2d0c059 no addition of straight lines 2024-04-16 10:24:16 +02:00
lisazeyen
e3ccbc0e3f
Merge branch 'master' into Climact-feature/fix-add-land-use-constraint-m 2024-04-16 09:59:56 +02:00
pre-commit-ci[bot]
da15ab3ac2 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-04-16 09:43:50 +02:00
lisazeyen
ec96a73baf define active assets consitently 2024-04-16 09:43:50 +02:00
lisazeyen
dd874e0ed8 rename _intervals to _years, shorten definition 2024-04-16 09:43:50 +02:00
lisazeyen
442c8a8c74 adjust valid_grouping_years
change sign, split up conditions for better readibility
2024-04-16 09:43:50 +02:00
lisazeyen
17d44d7f64 add check if minimum grouping year< min build year 2024-04-16 09:43:50 +02:00
Michael Lindner
380884e9ab group existing capacities to the earlier grouping_year for consistency with optimized capacities 2024-04-16 09:43:50 +02:00
Fabian Neumann
15345ff1cf skip heat bus for CHPs in places where no central heating 2024-04-16 09:43:50 +02:00
Fabian Neumann
29adeb2267 add missing atlite import 2024-04-15 15:28:02 +02:00
Fabian Neumann
a1e42db58b change in zenodo urls from record to records 2024-04-15 15:14:02 +02:00
Fabian Neumann
991eef6d97 update and reduce databundle size 2024-04-15 14:48:34 +02:00
Fabian Neumann
a4d58b70f5
Merge pull request #1020 from PyPSA/cleanup_data_structure
Cleaning up data and resources
2024-04-15 11:24:43 +02:00
Sermisha
7a0ca73f3a Update to BAU constraint formulation in function add_BAU_constraints
Constraint formulation was not taking into account the ordering of the carriers
2024-04-14 14:24:01 +05:30
Thomas Gilon
98d2c4dd91 Fix p_nom_min of renewables generators for myopic approach and add check of existing capacities in add_land_use_constraint_m 2024-04-12 16:52:59 +02:00
toniseibold
3b31b99dd2 removing the output file eia_hydro_stats.csv 2024-04-12 10:01:09 +02:00
lisazeyen
da1ff3be25
Merge branch 'master' into brownfield-chp 2024-04-12 09:32:44 +02:00
Fabian Neumann
038575dfc0 skip heat bus for CHPs in places where no central heating 2024-04-11 19:14:45 +02:00
cpschau
1867e510e2 remove redundant line 2024-04-11 17:14:17 +02:00