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
Fabian Neumann
9c592d9f73
add config/config.yaml to .gitignore
2024-02-14 10:49:40 +01:00
Fabian Neumann
dbbfbaf1f3
Merge branch 'master' into scenario-management
2024-02-14 10:45:43 +01:00
Fabian Neumann
44d0859640
Merge pull request #925 from PyPSA/default-config
...
use default config as base configuration
2024-02-13 07:39:56 +01:00
Fabian Neumann
a13da7bab7
Merge pull request #926 from PyPSA/efficient-helper-source-path
...
remove inefficient _helper.py file search
2024-02-13 07:38:39 +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
c3feb0e283
handle complicated config-dependent inputs using unpack() with input functions
2024-02-12 16:56:00 +01: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
Fabian Neumann
f024412301
simplify test cases
2024-02-12 16:49:15 +01:00
Fabian Neumann
b725a754cc
Merge branch 'default-config' of github.com:PyPSA/pypsa-eur into default-config
2024-02-12 13:57:04 +01:00
Fabian Neumann
69e20e3448
need at least one entry for config/config.yaml to read as yaml
2024-02-12 13:55:32 +01:00
Fabian Neumann
fa931cc2b1
alternative approach 2
2024-02-12 13:54:28 +01:00
Fabian Neumann
1e5163b66b
alternative approach
2024-02-12 13:45:42 +01:00
Fabian Neumann
5840a9aa11
remove inefficient _helper.py file search
2024-02-12 12:17:13 +01:00
pre-commit-ci[bot]
abe06a68fb
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-02-12 11:11:04 +00:00
Fabian Neumann
fe143ff8fe
use default config as base configuration
2024-02-12 12:10:05 +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
87f5a11bbe
Merge branch 'scenario-management' of github.com:PyPSA/pypsa-eur into scenario-management
2024-02-12 11:53:49 +01:00
Fabian Neumann
9400b6dd75
do not use config_provider outside rule definitions
2024-02-12 11:53:37 +01: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
pre-commit-ci[bot]
1a883debb5
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-02-12 10:00:05 +00:00
Fabian Neumann
6b013dbd40
Merge branch 'master' into scenario-management
2024-02-12 10:59:37 +01:00
Fabian Neumann
e8c8d72b3f
Merge pull request #924 from PyPSA/merged-electricity-demand
...
Merged electricity demand sources (powerstatistics, OPSD)
2024-02-12 10:56:13 +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]
4ff06046fc
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-02-10 17:09:49 +00:00
Fabian Neumann
a9dad3f34e
add new resources(), logs(), benchmarks(), config_providers()
2024-02-10 18:09:23 +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
