lisazeyen
bab392f378
remove not needed function
2024-08-07 14:14:19 +02:00
AmosSchledorn
80603fda6e
update config and script
2024-08-07 13:33:59 +02:00
lisazeyen
95903eeca7
Merge branch 'master' into jrc-idees-2020
2024-08-07 11:58:22 +02:00
lisazeyen
5bf36c218c
add ch data as csv
2024-08-07 11:49:33 +02:00
Fabian Neumann
6e8ea1b329
Merge branch 'master' into update-district-heating-cops
2024-08-07 10:17:27 +02:00
Fabian Neumann
59574211a4
retrieve.smk: consistently use conda directive
2024-08-07 10:15:35 +02:00
lisazeyen
682d53d1b5
remove /bundle
2024-08-07 10:07:52 +02:00
pre-commit-ci[bot]
3c528b7b0a
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-08-06 15:52:01 +00:00
lisazeyen
2c7e30bb17
remove ammonia demand script
2024-08-06 17:46:23 +02:00
lisazeyen
0ec367ed7a
save idees directly in data not in bundle
...
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-08-06 17:37:36 +02:00
AmosSchledorn
93d60a2927
remove obsolote cop inputs from solve_perfect.add_existing_baseyear
2024-08-05 12:26:26 +02:00
AmosSchledorn
ea7fc92546
update solve_perfect.add_existing_baseyear input/params
2024-08-05 12:19:43 +02:00
AmosSchledorn
5362c37696
update myopic mode to heat system declarations
2024-08-05 11:27:52 +02:00
pre-commit-ci[bot]
6b924ecfb0
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-08-02 15:15:11 +00:00
pre-commit-ci[bot]
89906cfdb4
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-08-02 07:55:00 +00:00
Fabian Neumann
311c82d65e
naturalearth: automatically download and remove from data bundle
2024-08-02 09:53:34 +02:00
AmosSchledorn
b0150bd65d
refactor prepare_sector_network.add_heat using Enums
2024-08-01 11:59:26 +02:00
lisazeyen
52c8037a3e
merge master
2024-07-31 16:09:33 +02:00
lisazeyen
b92f0d0c30
update industry sector ratios to new JRC data
2024-07-30 15:26:28 +02:00
pre-commit-ci[bot]
1fe54513cd
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-07-29 16:33:52 +00:00
AmosSchledorn
29479c50d0
pass heat source/system type to prepare_sector_network and add_existing_baseyear
2024-07-29 18:29:27 +02:00
lisazeyen
2f3fde26d0
update ammonia demand data to 2022
2024-07-29 16:09:38 +02:00
lisazeyen
314f6c6f0f
retrieve ammonia demand data
2024-07-29 16:00:13 +02:00
lisazeyen
fb2ab4c50b
update ammonia data
2024-07-29 15:44:30 +02:00
lisazeyen
201889424c
update industry to new JRC-idees
2024-07-29 15:39:01 +02:00
Philipp Glaum
5c1d8178f1
Merge branch 'methanol_to_master' into bio_methanol
2024-07-29 14:51:50 +02:00
Philipp Glaum
d142717563
add methanol techs for master to branch
2024-07-29 14:49:57 +02:00
AmosSchledorn
0edf566e3f
attempt to handle heat_pump_sources dynamically
2024-07-29 14:36:30 +02:00
AmosSchledorn
da201e1b9a
udpate add_brownfield COPs
2024-07-25 15:08:42 +02:00
AmosSchledorn
d297f84ea7
update inputs for add_existing_baseyear
2024-07-25 14:50:27 +02:00
AmosSchledorn
368971f2a6
remove cop_total input from prepare_sector_network
2024-07-24 17:19:42 +02:00
AmosSchledorn
0c2f9b5daa
remove rural/urban temperature
2024-07-24 17:05:04 +02:00
AmosSchledorn
b720bd9eca
Merge remote-tracking branch 'origin/master' into update-district-heating-cops
2024-07-24 15:43:34 +02:00
AmosSchledorn
a4847a10ce
update build_sector.smk
2024-07-24 15:40:21 +02:00
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
Fabian Neumann
8b1b1144d5
cutouts: update zenodo repository version ( #1176 )
2024-07-24 11:01:00 +02:00
AmosSchledorn
de10492e10
Merge remote-tracking branch 'origin/master' into update-district-heating-cops
2024-07-23 17:30:51 +02:00
lisazeyen
8f2cea4d93
Merge branch 'master' into jrc-idees-2020
2024-07-22 21:43:03 +02:00
Fabian Neumann
b8b92ace64
common.smk: make solver_threads also look for capitalised 'Threads'
2024-07-22 17:35:50 +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
Fabian Neumann
745df4d2c1
fix typo
2024-07-22 15:22:32 +02:00
AmosSchledorn
46f9c7b520
Merge remote-tracking branch 'origin/master' into update-district-heating-cops
2024-07-22 14:45:38 +02:00
Fabian Neumann
b49895a041
determine_availability_matrix_MD_UA: enable parallelism & remove plots ( #1170 )
...
* determine_availability_matrix_MD_UA: enable parallelism through temp files and remove plots
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
---------
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-07-19 17:43:11 +00:00
Iegor Riepin
ba55971c23
Compatibility of data processing for Ukraine ( #1146 )
...
* data: retrieve gdp and pop raw data for UA,MD
* Updated retrieval code.
* add_electricity script for UA and MD using updated, endogenised GDP and PPP data.
* Outsourced building of gdp and ppp. Only called when UA and/or MD are in country list.
* Accepted suggestion by @fneum in retrieve rule.
* Cleaned determine_availability_matrix_MD_UA.py, removed redundant code
* Updated build_gdp_pop_non_nuts3 script to use the mean to distribute GDP p.c. Added release notes. Bug fixes.
* Bug fixes --> 'ppp' to 'pop'
* Bug fix: only distribute load to buses with substation.
* Updated to download GDP and population raster via PyPSA-Eur zenodo databundle. Removal of dedicated retrieve function. Updated release notes.
* Updated release notes.
* correct input file paths
* update zenodo url for databundle release v0.3.0
* doc: update release_notes
* minor adjustments: benchmark, increase mem_mb, remove plots, handling of optional inputs
---------
Co-authored-by: bobbyxng <bobbyxng@gmail.com>
Co-authored-by: Bobby Xiong <36541459+bobbyxng@users.noreply.github.com>
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-07-19 19:23:35 +02: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
lisazeyen
ecccc1429f
add rule to retrieve JRC IDEES 2021
2024-07-18 15:39:27 +02:00
Fabian Neumann
54009e7af8
increase mem_mb for build_powerplants rule
2024-07-01 13:33:29 +01:00
Fabian Neumann
450f75a989
bugfix: correctly read threshold capacity in add_brownfield
2024-06-19 15:54:23 +02:00
Bobby Xiong
0db78a93e6
Fixed bug which generated empty pdfs when calling plot_summary from CI or snakemake. Using .svg exports instead.
2024-06-11 15:10:12 +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
5397f3fe85
avoid duplicate existing RES capacities ( closes #1016 )
2024-05-24 09:47:23 +02:00
Fabian Neumann
31e41f5f5d
time_aggregation: optional rule inputs need [] not None
2024-05-23 21:52:09 +02:00
Fabian Neumann
703b206e1f
tidy up update_residential_from_eurostat
2024-05-21 20:16:57 +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
Fabian Neumann
3d5d56acf3
only use ancient for inputs not outputs
2024-05-21 14:19:28 +02:00
Fabian Neumann
d32feb3aae
mark downloaded files as ancient rather than protected
2024-05-20 22:37:16 +02:00
Fabian Neumann
9527f4cf77
Merge branch 'split-out-time-agg' of github.com:koen-vg/pypsa-eur into koen-vg-split-out-time-agg
2024-05-20 11:38:02 +02:00
lisazeyen
2223e011a0
merge master
2024-05-15 16:14:25 +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
pre-commit-ci[bot]
985aecb0c4
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-05-13 19:39:02 +00:00
Fabian Neumann
e322e21771
Merge branch 'feature/add-nodal-supply-energy' of github.com:Climact/pypsa-eur-climact into Climact-feature/add-nodal-supply-energy
2024-05-13 14:54:49 +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
Fabian Neumann
0d9e0f34fd
Merge branch 'master' into reduced-data-bundle
2024-05-12 15:53:08 +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
Koen van Greevenbroek
76c201ef7d
Integrate build_bus_regions into base_network
...
Fixes a problem with the `build_bus_regions` writing to base.nc
without declaring base.nc as an output.
2024-05-03 14:53:18 +02:00
Thomas Gilon
a139bb604a
Merge branch 'master' into feature/add-nodal-supply-energy
2024-05-02 14:28:20 +02:00
Thomas Gilon
45aa714bdc
Add calculate_nodal_supply_energy in make summary
2024-05-02 14:27:30 +02:00
Parisra
17b3e1677d
Merge branch 'PyPSA:master' into adding_solar_tracking_single_axis
2024-04-29 14:27:26 +02:00
pre-commit-ci[bot]
105cadaf7b
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-04-25 16:08:48 +00:00
pre-commit-ci[bot]
29f6c9507f
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-04-25 15:36:33 +00:00
Fabian Neumann
d101b8a95a
Merge branch 'master' into existing-caps-from-pm
2024-04-25 17:33:48 +02:00
Parisra
b9cb82cc3b
Update build_renewable_profiles
...
Add solar-hsat to Onshore technologies
2024-04-25 11:30:42 +02:00
Parisra
91de7a891d
Update rule: determine_availability_matrix
...
Add solar-hsat as an Onshore technology
2024-04-25 11:28:33 +02:00
Yerbol Akhmetov
b4e322e61e
Merge branch 'master' into update_households_energy
2024-04-18 20:15:02 +05:00
Yerbol Akhmetov
0125975246
Merge branch 'master' into update_households_energy
2024-04-17 16:10:52 +05:00
martacki
feb564506a
remove connection_costs as snakemake output from simplify_network
2024-04-16 15:41:01 +02:00
Fabian Neumann
a1e42db58b
change in zenodo urls from record to records
2024-04-15 15:14:02 +02:00
Fabian Neumann
fe1199e981
update shipdensity_global.zip link [no ci]
2024-04-15 15:03:23 +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
yerbol-akhmetov
8b28f34f14
retrieve eurostat disagregated energy balances for household
2024-04-14 13:19:42 +05:00
toniseibold
3b31b99dd2
removing the output file eia_hydro_stats.csv
2024-04-12 10:01:09 +02:00
Koen van Greevenbroek
859212b21f
Use powerplantmatching IRENASTAT for add_existing_baseyear
2024-04-11 12:47:13 +02:00
lisazeyen
f715285682
adjust resources perfect foresight
2024-04-02 16:48:37 +02: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
Fabian Hofmann
be7dc0d0bb
postprocess: fix typo in benchmark folder
2024-03-26 13:28:06 +01:00
Fabian Hofmann
7611b28d16
Merge branch 'master' into refactor-copy-config-get-rdir
2024-03-20 09:57:31 +01:00
LukasFrankenQ
97acf2f12e
included Lisas PR suggestions
2024-03-19 19:30:23 +01:00
Fabian
86a6c3223d
perfect foresight: store configs in results dir
2024-03-19 11:26:36 +01:00
Fabian Hofmann
2728bd4780
Merge branch 'master' into fix-snakemake-bug
2024-03-19 11:09:53 +01:00
Koen van Greevenbroek
fcf773c003
Copy, don't move natura.tiff to resources
...
Preventing problems when parallel processes attempt to move the same
file to different resources directories.
2024-03-19 09:30:37 +01:00
