AmosSchledorn
3fac27ff27
use module structure
2024-07-24 15:03:44 +02:00
Fabian Neumann
eab315291e
remove {scope} wildcard ( #1171 )
...
* remove {scope} wildcard
* do not create removed files
2024-07-24 13:19:57 +02:00
pre-commit-ci[bot]
5361facbb7
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-07-22 13:39:06 +00:00
AmosSchledorn
0c7e7cb46b
fix naming, udpate docs
2024-07-19 18:54:19 +02:00
AmosSchledorn
052394fa88
change naming from individual/district heating to denctral/central heating
2024-07-19 15:57:53 +02:00
AmosSchledorn
f3c898f43d
build district heating heat pump COPs using approximation from Jensen et al. and values from Pieper et al.
2024-07-19 15:39:16 +02:00
AmosSchledorn
167b056def
remove obsolete rural/urban COPs and rename cop_..._total to cop_..._individual_heating
2024-07-19 15:22:50 +02:00
lisazeyen
957176a20d
adjustment to build_energy_totals
2024-07-18 15:39:52 +02:00
LukasFrankenQ
2f1d6d20b1
final corrections, improved docs
2024-06-01 00:20:31 +01:00
LukasFrankenQ
2801b00100
Merge https://github.com/pypsa/pypsa-eur
2024-05-26 22:38:03 +01:00
Fabian Neumann
31e41f5f5d
time_aggregation: optional rule inputs need [] not None
2024-05-23 21:52:09 +02:00
Fabian Neumann
4e85ddc5c9
Merge branch 'update_households_energy' of github.com:yerbol-akhmetov/pypsa-eur into yerbol-akhmetov-update_households_energy
2024-05-21 19:02:18 +02:00
Fabian Neumann
eb4381be4d
update energy balances April 2023 link
2024-05-21 15:59:46 +02:00
Koen van Greevenbroek
354fffe6f0
Split time agg into own rule; same agg for all planning horizons
2024-05-15 13:26:03 +02:00
Fabian Neumann
84d6634af0
Merge branch 'master' into implement-floating
2024-05-13 10:04:42 +02:00
Fabian Neumann
4dc350cbde
use raw not blob github link
2024-05-12 16:10:02 +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
991eef6d97
update and reduce databundle size
2024-04-15 14:48:34 +02:00
yerbol-akhmetov
d2584d37b1
update energy totals from Eurostat residential data
2024-04-14 16:28:50 +05:00
LukasFrankenQ
0396828e3a
Merge https://github.com/pypsa/pypsa-eur
2024-03-27 00:09:02 +01:00
LukasFrankenQ
46cd9a8274
changed implementation to always use 2020 cost
2024-03-26 23:54:25 +01:00
LukasFrankenQ
97acf2f12e
included Lisas PR suggestions
2024-03-19 19:30:23 +01:00
Fabian Neumann
4fbb3c81c4
fix build_district_heat_share and build_transport_demand for multiyear
2024-03-14 16:48:32 +01:00
Fabian Neumann
f695b63732
add more documentation
2024-03-14 14:31:18 +01:00
LukasFrankenQ
09765ad060
Merged https://github.com/pypsa/pypsa-eur
2024-03-14 12:03:56 +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
7fa6811760
Merge branch 'master' into multiyear
2024-03-13 09:13:31 +01:00
Fabian Neumann
45e955a0d8
add https:// prefix for all storage() calls
2024-03-09 12:07:47 +01:00
Fabian Neumann
105dc6470a
replace remaining instances of HTTP.remote
2024-03-08 17:51:02 +01:00
Fabian Neumann
d983d79ed2
Merge branch 'master' into snakemake-8
2024-03-08 17:50:08 +01:00
Fabian Neumann
579cd0c756
Merge branch 'master' into multiyear
2024-03-06 16:34:53 +01:00
Fabian Neumann
c13e0b83cf
remove remaining references of eurostat report year
2024-03-05 18:55:59 +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
Fabian Neumann
9d913bcb38
smaller fixes and reduction of diff
2024-03-04 19:36:41 +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
c2011bce49
remove {weather_year} wildcard
2024-03-04 17:48:56 +01:00
Koen van Greevenbroek
75ff4134fb
Select correct snapshots for hourly heating demand
2024-03-01 15:26:47 +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
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
toniseibold
d363aeb57d
removing old eurostat data reports as an option, cleaning up code
2024-02-27 12:04:07 +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
945180f153
allow_missing in collection rules, fixes for myopic, wildcard constraints without function
2024-02-17 23:37:03 +01: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
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
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
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
pre-commit-ci[bot]
39890630ef
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-02-05 18:23:51 +00:00
Koen van Greevenbroek
4c0491341c
Move build_existing_heating_distribution rule
2024-02-02 08:49:29 +01:00
Fabian Neumann
6c593a551b
build_hourly_heat_demand: only pass subset of snapshot config
2024-01-22 18:07:33 +01:00
Fabian Neumann
9865a97089
apply automated formatting
2024-01-22 09:29:32 +01:00
Tom Brown
1a477d6b32
move calculation of district heating share to its own script
...
Now the script build_district_heat_share.py does what the old function
create_nodes_for_heating() in prepare_sector_networks.py did.
There is no need to build nodes lists for each heating sector, since
all nodes have district heating now.
2024-01-22 08:01:31 +01:00
Tom Brown
bd8a5ecf2b
build_energy_totals: output district heat share to separate file
2024-01-22 08:01:31 +01:00
Tom Brown
6c20ce83d7
move building of daily heat profile to its own script
...
Previously this was handled inside prepare_sector_network.py.
2024-01-22 08:01:31 +01:00
Philipp Glaum
1903c51f36
Merge remote-tracking branch 'upstream/master' into implement-floating
2024-01-09 14:44:21 +01:00
Fabian Neumann
f68e8d3d61
Merge branch 'master' into wildcard-opts-config
2024-01-05 12:02:11 +01:00
pre-commit-ci[bot]
7b1600164f
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-01-04 19:19:02 +00:00
Fabian Neumann
62bcded800
build_sector.smk: simplify gas infrastructure rules
2024-01-04 19:12:04 +01:00
Fabian Neumann
c3bb41c900
Merge branch 'master' into multiyear
2024-01-03 15:14:27 +01:00
Fabian Neumann
83ecaac4de
Merge branch 'master' into wildcard-opts-config
2024-01-03 13:08:21 +01:00
Fabian Neumann
7c058f1ed3
add locations, capacities and costs of existing gas storage
2024-01-03 07:57:45 +01:00
Fabian Neumann
fa03c61187
gas_input: switch production data from scigrid to gem
2024-01-03 07:56:26 +01:00
Fabian Neumann
19a50fb8c5
rules: add keep_local=True back in for storage providers
2023-12-31 14:07:45 +01:00
Fabian Neumann
48850431fb
Snakefile: switch to new storage providers
2023-12-30 14:37:45 +01:00
Fabian Neumann
67438f3292
change JRC-ENSPRESO biomass data link to zenodo for enhanced reliability
2023-12-11 16:03:45 +01:00
LukasFrankenQ
52041fc656
reverted unintended change in thermal rule
2023-11-15 14:00:26 +00:00
LukasFrankenQ
928c73138f
fixed bug, first functional version
2023-11-14 01:35:37 +00:00
LukasFrankenQ
d1243daf4b
Merge branch 'master' of https://github.com/LukasFrankenQ/pypsa-eur
2023-11-12 00:35:30 +00:00
LukasFrankenQ
24c3d28b35
towards adding district heating, included spatial
2023-11-12 00:35:10 +00:00
pre-commit-ci[bot]
ff209bbd76
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-11-11 23:16:04 +00:00
LukasFrankenQ
6cd46bf261
added option for hourly egs capacity factors
2023-11-11 23:15:41 +00:00
LukasFrankenQ
11ecbf3fba
Merge https://github.com/pypsa/pypsa-eur
2023-11-09 22:28:09 +00:00
Philipp Glaum
728d74caa8
update floating wind settings
2023-11-06 15:46:46 +01:00
ekatef
f88ce0ea07
Adjust data structure
2023-10-13 14:51:25 +03:00
pre-commit-ci[bot]
7e290d3e52
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-10-08 09:55:38 +00:00
Fabian Neumann
b8fee80919
Merge branch 'master' into multiyear
2023-10-08 11:55:11 +02:00
virio-andreyana
3f112534a5
Merge branch 'master' into wildcard-opts-config
2023-09-28 21:12:10 +02:00
pre-commit-ci[bot]
9424ec1bb8
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-09-26 13:13:25 +00:00
