Fabian Neumann
2521dd49b0
Merge branch 'scenario-management' of github.com:PyPSA/pypsa-eur into scenario-management
2024-02-17 18:16:51 +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
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
a3c0ffac44
Merge pull request #937 from PyPSA/h2-myopic-plot
...
Fix plotting of retrofitted hydrogen pipelines with pathway optimisat…
2024-02-16 16:42:21 +01:00
Fabian Neumann
7f1ff0c324
Fix plotting of retrofitted hydrogen pipelines with pathway optimisation.
2024-02-16 16:41:21 +01:00
Fabian Neumann
f59ede8af4
Merge pull request #929 from PyPSA/industry-pathway
...
Industry pathway
2024-02-16 16:28:34 +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
60406f1bc4
Merge pull request #933 from PyPSA/h2-pipe-losses
...
update h2 pipe losses
2024-02-16 13:32:30 +01:00
Fabian Neumann
9e8ed7394d
Update config/config.default.yaml
2024-02-16 13:32:24 +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
6d80b332e6
add release note
2024-02-16 12:47:01 +01:00
Fabian Neumann
3f6f17cef6
Merge pull request #930 from PyPSA/cl-meoh-unit
...
bugfix: correct units of subtracted chlorine and methanol
2024-02-16 12:40:37 +01:00
Fabian Neumann
6bedca13c4
Merge branch 'master' into cl-meoh-unit
2024-02-16 12:40:29 +01:00
Fabian Neumann
7e66c1428d
add release note
2024-02-16 12:40:05 +01:00
Fabian Neumann
be3472dee9
Merge pull request #931 from PyPSA/ammonia
...
bugfix: include all countries in ammonia production resource
2024-02-16 12:14:07 +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
dc14082985
Merge pull request #922 from PyPSA/bus-regions
...
create a bus for every unique coordinate, not only substations
2024-02-16 12:07:53 +01:00
Fabian Neumann
c22e47cd58
add release note
2024-02-16 12:07:37 +01:00
Fabian Neumann
abc4538251
Merge pull request #934 from PyPSA/swiss_all_years
...
Change default energy totals year to 2013
2024-02-16 11:45:15 +01:00
Fabian Neumann
16e42c8fe6
further progress and bugfixes
2024-02-16 11:17:00 +01:00
martacki
ccbf835976
fix typo to make pre-commit.ci happy
2024-02-16 09:49:00 +01:00
martacki
6196fd6892
change default energy totals year to 2013 to comply with default weather year
2024-02-15 16:29:29 +01:00
martacki
a22b19dcc4
use new swiss data for building energy totals
2024-02-15 16:28:24 +01:00
martacki
16955d24ab
data: upload swiss energy totals data for all years
2024-02-15 16:27:44 +01:00
lisazeyen
8464415b35
update for 70 bars instead of 140
2024-02-15 15:14:32 +01:00
lisazeyen
87ab0a5575
update h2 pipe losses
2024-02-15 14:58:53 +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
