Fabian Neumann
cbeb9834ac
update hydro capacity and generation data
2024-03-14 14:08:58 +01:00
pre-commit-ci[bot]
721c64a5bd
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-03-13 12:43:00 +00:00
Fabian Neumann
955d6837fd
district heating: handle missing GB data for 2020-2021
2024-03-13 13:42:29 +01:00
Fabian Neumann
5b5d308bf7
adapt transport data to multiyear setup with new swiss data
2024-03-13 13:42:03 +01:00
Fabian Neumann
2eb159af7c
idees eurostat rescaling also for period 1990-1999
2024-03-13 13:40:23 +01:00
Fabian Neumann
7fa6811760
Merge branch 'master' into multiyear
2024-03-13 09:13:31 +01:00
Fabian Neumann
06fa9c92da
remove copy_config rule and write config for each solved network
2024-03-13 08:57:57 +01:00
Fabian Neumann
0a0a35e4a4
Merge pull request #952 from koen-vg/transmission-expansion-limit-reached
...
Add check for turning off transmission expnasion if limit reached
2024-03-11 09:06:08 +01:00
Fabian Neumann
c98e5e4b1b
Merge branch 'master' into snakemake-8
2024-03-09 16:09:57 +01:00
Fabian Neumann
887aa53290
build_gas_input_locations: remove unnecessary [0] with new storage plugin
2024-03-09 15:29:39 +01:00
Fabian Neumann
008539d635
add_electricity: fill max_hours also for nan values
2024-03-08 19:29:25 +01:00
Fabian Neumann
ab14c31f55
build_electricity_demand adjustment to reduced function arguments
2024-03-08 19:15:51 +01:00
Fabian Neumann
d983d79ed2
Merge branch 'master' into snakemake-8
2024-03-08 17:50:08 +01:00
Koen van Greevenbroek
3d94e8161b
Adapt disabling transmission expansion to also handle cost limit
2024-03-07 09:26:42 +01:00
pre-commit-ci[bot]
d2968230bb
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-03-06 19:43:32 +00:00
Fabian Neumann
a8682db4fc
build_energy_totals: pre-process data for all years first [incomplete]
2024-03-06 20:42:45 +01:00
Fabian Neumann
7abbb47efd
revert to master version of build_energy_totals
2024-03-06 16:42:33 +01:00
Fabian Neumann
579cd0c756
Merge branch 'master' into multiyear
2024-03-06 16:34:53 +01:00
Micha
d3283f5084
Merge branch 'master' into fix-lifetime
2024-03-06 08:22:25 +01:00
pre-commit-ci[bot]
ca91c02bf7
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-03-05 17:56:41 +00:00
Fabian Neumann
c13e0b83cf
remove remaining references of eurostat report year
2024-03-05 18:55:59 +01:00
Fabian Neumann
bf60da973b
build_energy_totals: revision of eurostat report upgrade
2024-03-05 18:43:24 +01:00
Fabian Neumann
5b513f81db
move eurostat into data/eurostat subdirectory from sector-bundle
2024-03-05 18:42:15 +01:00
Fabian Neumann
41f23f9589
change eurostat year in build_industrial_production_per_country
2024-03-05 18:40:06 +01:00
pre-commit-ci[bot]
8c465dbe3c
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-03-05 12:49:35 +00:00
Fabian Neumann
9d0724566c
Merge remote-tracking branch 'origin/master' into fneum/energy_totals
2024-03-05 13:40:49 +01:00
Michael Lindner
7f5f0ee45e
compute lifetime after grouping DateIn
2024-03-05 12:00:50 +01:00
Fabian Neumann
77ec07d55d
Merge branch 'multiyear' of github.com:PyPSA/pypsa-eur into multiyear
2024-03-04 19:38:02 +01:00
Fabian Neumann
8904943a87
integrate artificial load data supplement into build_electricity_demand
2024-03-04 19:37:52 +01:00
Fabian Neumann
96f71d7e9c
outsource drop_leap_day in temporal aggregation
2024-03-04 19:37:02 +01:00
Fabian Neumann
9d913bcb38
smaller fixes and reduction of diff
2024-03-04 19:36:41 +01:00
pre-commit-ci[bot]
f4f4c1bf37
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-03-04 17:26:41 +00:00
Fabian Neumann
92922728d8
Merge branch 'multiyear' of github.com:PyPSA/pypsa-eur into multiyear
2024-03-04 18:25:05 +01:00
Fabian Neumann
249cfab429
remove remaining {weather_year} wildcard usages
2024-03-04 18:24:01 +01:00
pre-commit-ci[bot]
7b584f16bb
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-03-04 16:56:00 +00:00
Fabian Neumann
1f7d4da3e6
Merge branch 'multiyear' of github.com:PyPSA/pypsa-eur into multiyear
2024-03-04 17:55:32 +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
pre-commit-ci[bot]
9607eb0e6b
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-03-04 16:16:28 +00:00
Koen van Greevenbroek
9a69f88a36
Fix bug bug in time segmentation function signature
2024-03-01 15:49:39 +01:00
Koen van Greevenbroek
75ff4134fb
Select correct snapshots for hourly heating demand
2024-03-01 15:26:47 +01:00
Koen van Greevenbroek
0c7c0a8585
Minor bugfixes in postprocessing code
2024-03-01 14:37:45 +01:00
Koen van Greevenbroek
e891305c9d
Add selection of cutouts for heat to config
2024-03-01 14:37:16 +01:00
Koen van Greevenbroek
d2527ed0ad
Add copyright headers
2024-03-01 13:30:01 +01:00
Koen van Greevenbroek
fa88e411d7
Automatic formatting
2024-03-01 13:25:38 +01:00
Koen van Greevenbroek
f6f98c102c
Use default cutout for ship and nature raster extents
...
This avoids the need to either collect all cutouts for all weather
years or arbitrarily pick all cutouts for a certain weather year.
2024-03-01 11:45:39 +01:00
Koen van Greevenbroek
de0c0cd1f4
Merge remote-tracking branch 'upstream/master' into multiyear
2024-03-01 11:45:31 +01:00
Koen van Greevenbroek
90fb0b13da
Various bugfixes to make multiyear branch run
2024-02-29 12:48:16 +01:00
Adrian Odenweller
06a777d96e
Merge branch 'master' into cplexFix
2024-02-27 14:37:49 +01:00
toniseibold
ae187b8ba3
Merge branch 'energy_totals' of https://github.com/PyPSA/pypsa-eur into energy_totals
2024-02-27 14:32:21 +01:00
toniseibold
bd0880c022
correcting misleading comment
2024-02-27 14:32:09 +01:00
pre-commit-ci[bot]
8dfab45453
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-02-27 12:35:59 +00:00
toniseibold
7616ae31fe
Merge branch 'energy_totals' of https://github.com/PyPSA/pypsa-eur into energy_totals
2024-02-27 13:33:08 +01:00
toniseibold
5bcecc62c6
retrieve eurostat data is now outside of retrieve_sector_databundle
2024-02-27 13:32:07 +01:00
pre-commit-ci[bot]
9182d6d667
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-02-27 12:14:43 +00:00
toniseibold
14d6c3b97f
merge
2024-02-27 13:14:09 +01:00
toniseibold
d363aeb57d
removing old eurostat data reports as an option, cleaning up code
2024-02-27 12:04:07 +01:00
Fabian Hofmann
58bcef4625
cluster_network: update solver_name if clause style
2024-02-27 11:39:26 +01:00
Adrian Odenweller
1db30ae63b
Allow CPELX for MIQP in cluster_network
2024-02-24 12:10:08 +01:00
lisazeyen
6b5ab53f0c
Merge branch 'master' into fix-heatpump-lowvoltage
2024-02-23 15:28:36 +01:00
pre-commit-ci[bot]
60653de9f6
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-02-23 14:27:20 +00:00
lisazeyen
c6ed36df62
adjust AC bus to low voltage
2024-02-23 15:23:55 +01:00
pre-commit-ci[bot]
ace51b9e55
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-02-23 12:56:46 +00:00
toniseibold
3298572ced
new energy totals from eurostat 2023 report scaling JRC IDEES data from 2015
2024-02-23 13:53:28 +01:00
Koen van Greevenbroek
db9f234fad
Fix typo in snakemake input
2024-02-20 18:38:21 +01:00
Koen van Greevenbroek
87088904ee
Merge remote-tracking branch 'upstream/master' into no-offwind-fix
2024-02-20 14:41:24 +01:00
Fabian Neumann
184f3a0e03
Merge branch 'scenario-management'
2024-02-20 14:23:05 +01:00
Fabian Neumann
26b202f463
prepare_sector: automatically interpolate in config get() function
2024-02-20 12:34:19 +01:00
Fabian Neumann
719d4dad23
Merge branch 'master' into scenario-management
2024-02-20 12:08:54 +01:00
pre-commit-ci[bot]
d713e3c52b
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-02-20 09:03:57 +00:00
Tom Brown
4f91c6c43d
bugfix: make sure coal demand is there with regional demand
2024-02-20 09:49:19 +01:00
Koen van Greevenbroek
ccb43a5612
Allow absence of offshore wind from sector-coupled networks
2024-02-19 22:45:17 +01:00
Fabian Neumann
16e2286188
update copyright years to 2024
2024-02-19 16:21:48 +01:00
Fabian Neumann
df0eb38a68
_helpers: generalise regular expression in find_opt
2024-02-17 23:38:59 +01:00
Fabian Neumann
cf7018c8c4
plot_summary: remove leftover references to opts wildcard
2024-02-17 23:38:00 +01:00
Fabian Neumann
770d352652
handle that time_resolution can be float
2024-02-17 23:37:31 +01:00
Fabian Neumann
945180f153
allow_missing in collection rules, fixes for myopic, wildcard constraints without function
2024-02-17 23:37:03 +01:00
Fabian Neumann
9f643ea429
_helpers: add inplace keyword argument to update_config_from_wildcards
2024-02-17 20:45:44 +01:00
Fabian Neumann
e898781fda
use wildcard input functions where applicable
2024-02-17 18:35:26 +01:00
Fabian Neumann
95853bb59d
_helpers: allow specifying dedicated shared_resources folder
2024-02-17 18:27:59 +01:00
Fabian Neumann
84c3852c2e
_helpers: remove resource folder separation by wildcard
...
This was not working reliably as the number of input and output wildcards could vary, which the function did not acknowledge
2024-02-17 18:15:43 +01:00
Fabian Neumann
db7c983950
mock_snakemake: remove dangeours empty list as default argument
2024-02-17 18:14:18 +01:00
Fabian Neumann
709b831e06
further adjustments where config_provider needs to be called
2024-02-17 17:51:26 +01:00
Fabian Neumann
35b2228891
Merge branch 'wc-to-cf' into scenario-management
2024-02-17 17:16:28 +01:00
Fabian Neumann
d2a66879de
Merge branch 'master' into scenario-management
2024-02-17 17:04:36 +01:00
Fabian Neumann
dd2416a59e
handle all {opts} and {sector_opts} wildcard values in config
2024-02-17 11:57:16 +01:00
Fabian Neumann
7f1ff0c324
Fix plotting of retrofitted hydrogen pipelines with pathway optimisation.
2024-02-16 16:41:21 +01:00
Fabian Neumann
27f9fb8cba
add back in to_csv export (accidentally deleted)
2024-02-16 16:18:31 +01:00
Fabian Neumann
77753fff0d
Merge branch 'master' into industry-pathway
2024-02-16 15:31:54 +01:00
Fabian Neumann
8ae0669b33
Revert "add_electricity: set locations and units of electricity buses"
...
This reverts commit 472a099881
2024-02-16 15:31:17 +01:00
Fabian Neumann
e9174d4f14
Merge branch 'master' into industry-pathway
2024-02-16 15:15:27 +01:00
Fabian Neumann
93bb4e5f54
add release note, simplify build_industry_sector_ratios_intermediate script
2024-02-16 15:14:18 +01:00
Fabian Neumann
472a099881
add_electricity: set locations and units of electricity buses
2024-02-16 13:30:52 +01:00
Fabian Neumann
4d4badc519
Merge branch 'master' into industry-pathway
2024-02-16 13:01:40 +01:00
Fabian Neumann
6a8ae68aec
Merge branch 'industry-coal-bug'
2024-02-16 12:47:34 +01:00
Fabian Neumann
6bedca13c4
Merge branch 'master' into cl-meoh-unit
2024-02-16 12:40:29 +01:00
Fabian Neumann
84fc63d7a1
Merge branch 'master' into ammonia
2024-02-16 12:14:00 +01:00
Fabian Neumann
67484f9cf0
remove numpy import, add release ntoe
2024-02-16 12:13:35 +01:00
Fabian Neumann
16e42c8fe6
further progress and bugfixes
2024-02-16 11:17:00 +01:00
pre-commit-ci[bot]
4fa504b0db
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-02-14 17:32:24 +00:00
pre-commit-ci[bot]
b45df1724b
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-02-14 17:31:52 +00:00
Tom Brown
e14bae345b
new script to interpolate industry sector ratios today to tomorrow
...
For each country we gradually switch industry processes from today's
specific energy carrier usage per ton material output to the
best-in-class energy consumption of tomorrow in the
industry_sector_ratios.csv.
This is done on a per-country basis. The ratio of today to tomorrow's
energy consumption is set with the
config["industry"]["sector_ratios_fraction_future"] parameter.
2024-02-14 18:29:56 +01:00
Tom Brown
7f3ad792a9
use production to determine today's energy demand for basic chemicals
...
This uniformises how demand for basic chemicals is calculated.
We also avoid unnecessary use of ammonia production separately.
2024-02-14 18:29:50 +01:00
Tom Brown
cc57952402
industrial prod: use EU28 total for denominator for distribution key
...
This makes sure the distribution key is correct when only subsets of
countries are used. This is then consistent with the HVC, MeOH and Cl
totals being EU28 totals.
Without this change, industry production is overestimated when using
subsets of countries.
Or the user has to adjust the totals for industrial production
themselves.
2024-02-14 18:29:43 +01:00
Tom Brown
cbf7ed0d38
for today's industry energy demand, separate MeOH, Cl and HVC
...
I.e. split basic chemicals (without ammonia) into MeOH, Cl and HVC.
This now agrees with scheme for industrial sectors tomorrow.
2024-02-14 18:29:36 +01:00
Tom Brown
c54626cc1a
bugfix: correct units of subtracted chlorine and methanol
...
in build_industry_sector_ratios.py. In the config the units are Mt/a,
they are multiplied by MWh/t, but what is desired is GWh/a.
2024-02-14 18:29:02 +01:00
Tom Brown
ecedea02d6
bugfix: include all countries in ammonia production resource
...
This is so that the full EU28 ammonia demand can be correctly
subtracted in the build_industry_sector_ratios.py script.
No other downstream scripts are affected by this change.
2024-02-14 18:28:22 +01:00
Martha Frysztacki
234f2f247c
Merge branch 'master' into bus-regions
2024-02-14 17:05:43 +01:00
pre-commit-ci[bot]
78b184ad0f
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-02-12 15:57:49 +00:00
Fabian Neumann
c83db4e84e
add retrieve_cost_data.py script to handle config_provider and move to resources
...
since dependent on config setting
2024-02-12 16:54:33 +01:00
pre-commit-ci[bot]
e0b6ebd174
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-02-12 10:54:15 +00:00
Fabian Neumann
40b27b4107
use set_scenario_config everywhere
2024-02-12 11:53:20 +01:00
Fabian Neumann
bb7b65eebd
move create_scenarios.py to config directory
2024-02-12 11:52:07 +01:00
Fabian Neumann
6b013dbd40
Merge branch 'master' into scenario-management
2024-02-12 10:59:37 +01:00
Fabian Neumann
09ada56bf1
finishing touches and release notes
2024-02-12 10:49:45 +01:00
Fabian Neumann
49171901d7
selective cherry-pick from 91eff472a7
2024-02-12 10:12:03 +01:00
Fabian
94f72d7276
electricity demand: remove powerstastics flag, merge sources in retrieve_electricity_demand
2024-02-12 10:08:39 +01:00
Fabian
2bd8021058
retrieve electricity demand: make online version snakemake params
2024-02-12 09:48:42 +01:00
Fabian
5c7bbcd94d
retrieve electricity demand: use script in order to concat time-series
2024-02-12 09:48:28 +01:00
pre-commit-ci[bot]
17105b8125
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-02-10 18:18:00 +00:00
Tom Brown
8781e69066
bugfix: coal emissions for industry weren't tracked
...
Also allow industrial coal demand to be regional (so we can include
them in regional CO2 constraints).
2024-02-10 19:17:06 +01:00
pre-commit-ci[bot]
e838b63ded
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-02-10 16:22:38 +00:00
Fabian Neumann
6de08bd523
Merge branch 'master' into scenario-management
2024-02-10 17:22:01 +01:00
Fabian Neumann
cbb3ab36a6
Merge pull request #920 from PyPSA/env-versions
...
update version compatibility handling
2024-02-09 17:00:11 +01:00
Fabian Neumann
201d0ddcfe
build_shapes: handle europe_shape multipolygon with shapely>=2 ( closes #852 )
2024-02-09 15:48:54 +01:00
Fabian Neumann
4b6199de42
create a bus for every unique coordinate, not only substations ( closes #699 )
2024-02-09 15:43:27 +01:00
Fabian Neumann
3691f9f4c1
update version compatibility handling
2024-02-09 13:59:15 +01:00
Tom Brown
92d00a0c83
add new default to overdimension heating in individual buildings
...
This allows them to cover heat demand peaks e.g. 10% higher than
those in the data.
The disadvantage of manipulating the costs is that the capacity is
then not quite right. This way at least the costs are right.
Doing it properly would require introducing artificial peaks, but this
creates new problems (e.g. what is going on with wind/solar/other
demand).
2024-02-07 17:18:04 +01:00
Tom Brown
6d94439bbb
for existing heating use new default_heating_lifetime
...
This is because old costs default (25) is longer than all heating
technologies (20). Script was distributing across 25 years, then
throwing out boilers older than 20 years, an inconsistent
behaviour.
Now existing boilers are smoothly distributed across 20 years.
2024-02-07 17:15:37 +01:00
Fabian Neumann
d7f3f16a9b
autoformat
2024-02-07 17:15:08 +01:00
Tom Brown
f38681f134
correctly source the existing heating technologies for buildings
...
The source URL has changed. It represents the year 2012 and is only
for buildings, not district heating. So the capacities for urban
central are now set to zero from this source.
2024-02-07 17:13:53 +01:00
Fabian Neumann
0ded96c405
Merge pull request #916 from koen-vg/pandas-dep-fixes
...
Pandas deprecation fixes
2024-02-07 11:13:28 +01:00
Fabian Neumann
bf07300010
add_electricity: Remove long-deprecated function attach_extendable_generators
2024-02-07 11:03:48 +01:00
Koen van Greevenbroek
c3d3b5f415
Fixes to calculated_weighted_prices
2024-02-07 10:55:44 +01:00
Fabian Neumann
e8df321a24
Merge branch 'fneum/year-specific-techs' of github.com:PyPSA/pypsa-eur into fneum/year-specific-techs
2024-02-06 18:39:06 +01:00
Fabian Neumann
c8e1829880
fix to backwards compatibility with old profile_{tech}.nc files
2024-02-06 18:38:53 +01:00
Fabian Neumann
602375af8c
Merge branch 'master' into fneum/year-specific-techs
2024-02-06 13:56:14 +01:00
Fabian Neumann
ba409c2f1e
backwards compatibility with old profile_{tech}.nc files
2024-02-06 13:55:51 +01:00
Koen van Greevenbroek
1f482f3c92
Revert mistaken deprecation "fix"
2024-02-06 11:45:20 +01:00
Koen van Greevenbroek
73b80ebab3
Address pandas deprecation warnings in prepare_perfect_foresight
2024-02-06 10:50:52 +01:00
Koen van Greevenbroek
7fbb605134
Address FutureWarnings in make_summary_perfect related to groupby
2024-02-06 10:50:29 +01:00
Fabian
2a01ed3d48
prepare_sector: add description of eu bus
2024-02-05 19:15:55 +01:00
Fabian Hofmann
32451f6ca8
Update scripts/prepare_sector_network.py
...
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-02-05 19:13:42 +01:00
Fabian
76872fa0f1
add sanitize_locations function and apply it
...
address some deprecation warnings
2024-02-05 16:16:34 +01:00
Fabian Neumann
7e2ad98011
Merge pull request #901 from PyPSA/dac-location-consistency
...
prepare_sector_network: reorder buses for dac components
2024-02-05 12:19:21 +01:00
Fabian Neumann
f0ec1d6716
Merge branch 'master' into perfect-foresight-fixes
2024-02-05 12:18:53 +01:00
Fabian Neumann
a834ff222a
streamline code for year-dependent technologies (turbines/panels)
2024-02-05 12:10:35 +01:00
Fabian Neumann
bb4eb123e5
Merge branch 'year-specific-techs' of github.com:p-glaum/pypsa-eur into p-glaum-year-specific-techs
2024-02-05 09:06:32 +01:00
Fabian Neumann
5b71979547
Merge branch 'master' into dac-location-consistency
2024-02-05 08:50:33 +01:00
Fabian Neumann
a49ed458ef
Merge branch 'master' into perfect-foresight-fixes
2024-02-05 08:45:25 +01:00
