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
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
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
030e5b15ad
remove rule build_cutout_year
2024-03-04 17:51: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
Koen van Greevenbroek
1ff8321c5e
Remove erroneous automatic snakefmt formatting
2024-03-01 15:56:09 +01:00
Koen van Greevenbroek
75ff4134fb
Select correct snapshots for hourly heating demand
2024-03-01 15:26:47 +01:00
Koen van Greevenbroek
61d565ec09
Correct formatting in build_electricity.smk
2024-03-01 15:26:16 +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
c2e7c125c7
Automatic formatting of snakemake rules
2024-03-01 13:24:02 +01:00
Koen van Greevenbroek
3c31caf993
Fix typos in rule inputs
2024-03-01 11:59:04 +01:00
Koen van Greevenbroek
0debf66169
Fix summary plot output
2024-03-01 11:51:34 +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
Koen van Greevenbroek
1c9845afff
Adapt offwind solution to new config management
2024-02-20 17:52:57 +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
719d4dad23
Merge branch 'master' into scenario-management
2024-02-20 12:08:54 +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
38c90155f1
add release notes
2024-02-18 11:48:55 +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
b543bf37c9
retrieve.smk: do not protect gas network data
2024-02-17 20:48:46 +01:00
Fabian Neumann
68f2e086c5
postprocess.smk: add missing wildcard call
2024-02-17 20:48:17 +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
388ea65847
common.smk: use update_config to simplify merge_configs
2024-02-17 20:44:22 +01:00
Fabian Neumann
d335275e0f
build_electricity: add missing wildcard call
2024-02-17 20:43:11 +01:00
pre-commit-ci[bot]
cc3d7a4cbb
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-02-17 17:35:54 +00:00
Fabian Neumann
e898781fda
use wildcard input functions where applicable
2024-02-17 18:35:26 +01:00
pre-commit-ci[bot]
de244414df
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-02-17 16:56:03 +00:00
Fabian Neumann
b14d84eb39
Merge branch 'scenario-management' of github.com:PyPSA/pypsa-eur into scenario-management
2024-02-17 17:55:35 +01:00
Fabian Neumann
709b831e06
further adjustments where config_provider needs to be called
2024-02-17 17:51:26 +01:00
pre-commit-ci[bot]
b8d57a6566
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-02-17 16:39:13 +00:00
Fabian Neumann
89d0fa24b6
further adjustments to latest master branch commits
2024-02-17 17:38:46 +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
4d4badc519
Merge branch 'master' into industry-pathway
2024-02-16 13:01:40 +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
martacki
a22b19dcc4
use new swiss data for building energy totals
2024-02-15 16:28:24 +01: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
Fabian Neumann
dbbfbaf1f3
Merge branch 'master' into scenario-management
2024-02-14 10:45:43 +01:00
