Philipp Glaum
|
e9873e7471
|
Merge remote-tracking branch 'upstream/master' into year-specific-techs
|
2024-01-11 17:25:50 +01:00 |
|
Philipp Glaum
|
a4802b7018
|
initial implementation tech specific renewable profiles
|
2024-01-11 17:23:25 +01:00 |
|
euronion
|
01f201743d
|
Implement everywhere_powerplants
|
2024-01-08 09:30: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
|
9d0040912b
|
retrieve.smk: simplify gas infrastructure retrieve rules
|
2024-01-04 19:14:11 +01:00 |
|
Fabian Neumann
|
62bcded800
|
build_sector.smk: simplify gas infrastructure rules
|
2024-01-04 19:12:04 +01:00 |
|
Fabian Neumann
|
c3bcaee1a2
|
common.smk: find _helpers.py also if pypsa-eur is used as module
|
2024-01-04 13:37:35 +01:00 |
|
Fabian Neumann
|
2096131b03
|
Merge pull request #842 from PyPSA/luisa-2
add option to use LUISA land coverage data
|
2024-01-04 09:32:55 +01:00 |
|
pre-commit-ci[bot]
|
60493fc558
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2024-01-04 08:01:03 +00:00 |
|
Fabian Neumann
|
d145758fb7
|
gracefully handle absent extra_functionality file; add file to path
|
2024-01-04 09:00:31 +01:00 |
|
Fabian Neumann
|
b4fb395158
|
Merge branch 'master' into custom-extra-functionality
|
2024-01-04 08:32:29 +01:00 |
|
pre-commit-ci[bot]
|
045eeba4cf
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2024-01-03 14:02:26 +00:00 |
|
Fabian Neumann
|
ecd85d23d3
|
add option to use LUISA land coverage data
|
2024-01-03 15:01:43 +01:00 |
|
Fabian Neumann
|
83ecaac4de
|
Merge branch 'master' into wildcard-opts-config
|
2024-01-03 13:08:21 +01:00 |
|
Fabian Neumann
|
19b503d758
|
retrieve.smk: add scigrid storages to files of interest
|
2024-01-03 08:35:00 +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
|
fac257ca97
|
Merge pull request #821 from PyPSA/md5-checksums
validate checksums for zenodo downloads
|
2024-01-02 17:23:06 +01:00 |
|
Fabian Neumann
|
f28e9b47d2
|
add custom_extra_functionality param to solve_electricity rule
|
2024-01-02 16:00:41 +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
|
a5ba2565a0
|
correct config location
|
2023-12-29 17:30:03 +01:00 |
|
Fabian Neumann
|
8a11bdb4b1
|
solve_network: option to inject custom extra functionalities from source file
|
2023-12-29 17:19:19 +01:00 |
|
pre-commit-ci[bot]
|
de3b6c9573
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-12-29 11:38:43 +00:00 |
|
Fabian Neumann
|
71985d5e3a
|
validate checksums for zenodo downloads
|
2023-12-29 12:34:14 +01:00 |
|
Fabian Neumann
|
02b0996dac
|
remove write-protection on resources/natura.tiff
|
2023-12-29 11:29:19 +01:00 |
|
Fabian Neumann
|
4f815a9cd7
|
move wdpa and glc datasets to data directory and protect
|
2023-12-29 11:29:01 +01:00 |
|
Fabian Neumann
|
accffe7bc2
|
wdpa time-invariant filenames in build_electricity.smk
|
2023-12-29 11:21:24 +01:00 |
|
Fabian Neumann
|
c5f48f957d
|
wdpa: give snakemake appearance of time-invariant wdpa files
|
2023-12-29 11:20:40 +01:00 |
|
Fabian Neumann
|
471c97d499
|
wdpa: correct _shp url
|
2023-12-29 11:20:14 +01:00 |
|
pre-commit-ci[bot]
|
fec641ce0a
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-12-22 13:41:25 +00:00 |
|
euronion
|
d817212896
|
Fix missing bYYYY
|
2023-12-22 14:40:30 +01:00 |
|
pre-commit-ci[bot]
|
3a474af71f
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-12-21 17:40:48 +00:00 |
|
euronion
|
25c5751565
|
Check WDPA url also a month forward
|
2023-12-21 18:39:06 +01:00 |
|
Fabian
|
4f67160993
|
fix snake format
|
2023-12-18 11:57:21 +01:00 |
|
Fabian Neumann
|
ea7a66b873
|
Merge pull request #794 from PyPSA/mv-focus-weights
move focus_weights into clustering configuration segment
|
2023-12-11 20:10:46 +01:00 |
|
Fabian Neumann
|
938637013b
|
Merge pull request #801 from PyPSA/enspreso-zenodo
change JRC-ENSPRESO biomass data link to zenodo for enhanced reliability
|
2023-12-11 20:05:13 +01:00 |
|
Fabian Neumann
|
df40fdf904
|
Merge branch 'master' into ukraine_hackathon
|
2023-12-11 16:24:40 +01:00 |
|
Fabian Neumann
|
67438f3292
|
change JRC-ENSPRESO biomass data link to zenodo for enhanced reliability
|
2023-12-11 16:03:45 +01:00 |
|
pre-commit-ci[bot]
|
01c5e11f9f
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-12-06 09:10:07 +00:00 |
|
Fabian Neumann
|
e5bdb4796a
|
move focus_weights into clustering configuration segment (backward compatible)
|
2023-12-06 10:09:17 +01:00 |
|
Fabian Neumann
|
4df6370198
|
update environment: matplotlib, xarray, pypsa
|
2023-12-04 14:39:23 +01:00 |
|
Fabian Neumann
|
803b860923
|
move load_raw.csv to resources since it's config file dependent
|
2023-11-29 13:41:26 +01:00 |
|
Fabian Neumann
|
7ca769bcf0
|
option to skip ship_raster download if not added as exclusion zone
|
2023-11-29 12:09:39 +01:00 |
|
Irieo
|
75f8a1b313
|
scripts: remove redundant rule reference
|
2023-11-16 17:47:48 +01:00 |
|
Irieo
|
d2c1f9ec32
|
data: solve floating url problem for WDPA data retrieval
|
2023-11-03 14:14:01 +01:00 |
|
Fabian Neumann
|
df5b9e9943
|
Merge pull request #759 from ekatef/fix_retrofit
Update calculations of retrofit costs
|
2023-10-18 10:26:32 +02:00 |
|
ekatef
|
f88ce0ea07
|
Adjust data structure
|
2023-10-13 14:51:25 +03:00 |
|
pre-commit-ci[bot]
|
d10779ca34
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-10-11 14:27:25 +00:00 |
|
Thomas Gilon
|
4c5ea9e207
|
Specify input files required to retrieve irena data
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
|
2023-10-11 16:27:08 +02:00 |
|
Thomas Gilon
|
c8fcbaad6e
|
Update default value in retrieve.smk
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
|
2023-10-11 16:24:52 +02:00 |
|
pre-commit-ci[bot]
|
230c1a327c
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-10-11 12:27:29 +00:00 |
|
Thomas Gilon
|
43e20a26e6
|
Add rule to update IRENA data for existing infrastructure
|
2023-10-11 14:26:04 +02:00 |
|
pre-commit-ci[bot]
|
326aeb682b
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-10-09 14:28:08 +00:00 |
|
Fabian Neumann
|
091584bb0d
|
add download rules for WDPA land and marine
|
2023-10-09 16:22:27 +02:00 |
|
Fabian Neumann
|
42692c3ca5
|
UA-MD availability matrix: plot shape_availability
|
2023-10-09 16:21:04 +02:00 |
|
Fabian Neumann
|
27ebbaba24
|
UA-MD availability matrix: consider WDPA protection areas as substitute for Natura
|
2023-10-09 16:20:23 +02:00 |
|
Fabian Neumann
|
9d7b250230
|
UA-MD availability matrix: consider ship density
|
2023-10-09 16:19:31 +02:00 |
|
Fabian Neumann
|
ea99f3c43e
|
Merge branch 'master' into ukraine_hackathon
|
2023-10-09 09:53:42 +02:00 |
|
lisazeyen
|
21d1109853
|
Merge branch 'master' into multi-horizon
|
2023-09-29 08:40:05 +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 |
|
Fabian Neumann
|
5006bc4877
|
build_biomass_potentials: link to planning_horizons wildcard, interpolate missing years
|
2023-09-26 15:12:39 +02:00 |
|
virio-andreyana
|
5cbc420775
|
Merge branch 'master' into wildcard-opts-config
|
2023-09-23 19:00:14 +02:00 |
|
virio-andreyana
|
01cd1bbb74
|
add Fabians suggestion
|
2023-09-23 18:39:11 +02:00 |
|
Fabian
|
f96c2d0589
|
update solve smk files to properly consider scenanrios
|
2023-09-22 13:58:08 +02:00 |
|
chrstphtrs
|
8b5476e273
|
Move all rule to main Snakefile
|
2023-09-20 19:33:44 +02:00 |
|
pre-commit-ci[bot]
|
668ec9efad
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-09-15 09:56:18 +00:00 |
|
virio-andreyana
|
7be8cc0773
|
undo changes in sector networks and simplify config
|
2023-09-15 11:55:52 +02:00 |
|
pre-commit-ci[bot]
|
3eed341044
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-09-11 21:04:00 +00:00 |
|
virio-andreyana
|
823df52309
|
add backward compatible config in wildcards
|
2023-09-11 22:51:31 +02:00 |
|
lisazeyen
|
c0152c25a4
|
first fixes for CI
|
2023-08-30 15:57:47 +02:00 |
|
pre-commit-ci[bot]
|
bdaa646ed6
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-08-30 10:05:18 +00:00 |
|
lisazeyen
|
9ec7442c69
|
merge master
|
2023-08-30 12:03:49 +02:00 |
|
lisazeyen
|
be23b5c56a
|
add network plot for perfect
|
2023-08-24 15:32:23 +02:00 |
|
lisazeyen
|
f2b01fbbe0
|
plot summary with usual script
|
2023-08-24 14:43:36 +02:00 |
|
Fabian
|
04a2bea176
|
scenario-management: use list for including wildcards with shared resource
|
2023-08-24 13:20:11 +02:00 |
|
pre-commit-ci[bot]
|
b8dee184a9
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-08-24 09:12:07 +00:00 |
|
Fabian Neumann
|
d0f2d52853
|
apply protected() to zenodo downloads; only retrieve monthly fuel/CO2 prices when necessary
|
2023-08-24 11:11:33 +02:00 |
|
Fabian Hofmann
|
3f3f752e8f
|
Merge branch 'master' into scenario-management
|
2023-08-24 10:19:14 +02:00 |
|
Fabian
|
62c6143863
|
scenario-management: reenable shared resources, make shared resources wildcards dependent
|
2023-08-23 17:14:57 +02:00 |
|
lisazeyen
|
a21b1f2d10
|
add params
|
2023-08-23 13:23:27 +02:00 |
|
lisazeyen
|
c629476721
|
adapt to new config path
|
2023-08-22 11:01:51 +02:00 |
|
lisazeyen
|
e5673731ab
|
make plot_network conditional
|
2023-08-22 11:01:00 +02:00 |
|
lisazeyen
|
e92fc4ff4d
|
merge master
|
2023-08-22 10:21:42 +02:00 |
|
Fabian
|
ebb5da655e
|
scenarios: add collect function plot_elec_networks
|
2023-08-17 12:56:34 +02:00 |
|
Fabian
|
91eff472a7
|
scenario-management: fix set_scenario_config function; apply config_provider to some direct inputs
|
2023-08-17 12:31:07 +02:00 |
|
Fabian
|
9d4ce430cc
|
electricity demand: remove powerstastics flag, merge sources in retrieve_electricity_demand
|
2023-08-17 10:17:12 +02:00 |
|
Fabian
|
32eb114b61
|
retrieve electricity demand: make online version snakemake params
|
2023-08-16 13:05:22 +02:00 |
|
Fabian
|
9cd449cf3c
|
retrieve electricity demand: use script in order to concat time-series
|
2023-08-16 11:41:48 +02:00 |
|
Fabian
|
750b74db46
|
build_electricity: optionally download dynamic fuel prices
|
2023-08-16 10:51:03 +02:00 |
|
Fabian
|
b3a6e2c281
|
common: make cache config_getter, use partial functions
|
2023-08-16 10:50:09 +02:00 |
|
Fabian
|
3462080b89
|
ci: adjust scenario test run
|
2023-08-15 15:46:59 +02:00 |
|
Fabian
|
e28ae59375
|
introduce scenario-management
|
2023-08-15 15:06:59 +02:00 |
|
daniel.rdt
|
e304efbf3c
|
fix in co2_emissions_year function and correspondigly in plot_summary and snakemake rule. Also changes to historical_emissions in plot_summary since some countries are not in eea dataset.
|
2023-08-09 14:49:36 +02:00 |
|
Fabian Neumann
|
8d19043205
|
handle monthly fuel price download through script
|
2023-08-06 09:01:56 +02:00 |
|
Fabian
|
18297a6f13
|
retrieve: fix data path
|
2023-08-05 16:41:16 +02:00 |
|
Fabian
|
62cb6fbdd8
|
validation: download input data files instead
|
2023-08-04 17:38:21 +02:00 |
|
Fabian
|
ad6322bcb3
|
address review commments
|
2023-08-04 12:58:31 +02:00 |
|
Fabian Hofmann
|
8622398ceb
|
Apply suggestions from code review
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
|
2023-08-04 12:23:02 +02:00 |
|
Fabian Hofmann
|
6e7bbe1e08
|
Merge branch 'master' into validation
|
2023-08-03 18:28:10 +02:00 |
|
Fabian Hofmann
|
7fa577c3a8
|
simplify network: increase mem requirement
|
2023-08-03 18:21:36 +02:00 |
|
Fabian Neumann
|
8ae568d852
|
Merge pull request #712 from PyPSA/harmonize-result-stucture
harmonize output of solving rules
|
2023-08-03 11:39:53 +02:00 |
|
Fabian
|
1bf6ea1532
|
only copy active configuration to results folder
use copy config for all solve rules
remove copying of environment
|
2023-08-02 14:49:32 +02:00 |
|
Fabian
|
f205ff9536
|
prepare_sectors: make biomass transport costs conditional again
|
2023-08-02 14:05:05 +02:00 |
|
Fabian
|
03e3278f89
|
prepare_sector: add biomass transport costs for networks wo biomass network
|
2023-08-02 13:12:08 +02:00 |
|
Fabian
|
bc6cc6c983
|
retrieve: update opsd electricity demand url to fixed date
|
2023-08-02 11:00:21 +02:00 |
|
Fabian
|
3361ca66c5
|
build_elec: move monthly prices to resources
|
2023-08-02 10:54:07 +02:00 |
|
Fabian
|
667baaa1b4
|
validate: store figures as pdfs
|
2023-08-01 12:11:42 +02:00 |
|
Fabian Neumann
|
ef05d7576c
|
bugfixes and allow build_renewable_profiles on subset of cutout time scope
|
2023-08-01 09:45:14 +02:00 |
|
pre-commit-ci[bot]
|
7530c42fbe
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-08-01 06:43:48 +00:00 |
|
Fabian Neumann
|
23eb3548c5
|
Merge branch 'master' into ukraine_hackathon
|
2023-08-01 08:42:47 +02:00 |
|
Fabian Hofmann
|
1ea8cf47d8
|
Merge branch 'master' into validation
|
2023-07-31 11:20:11 +02:00 |
|
Fabian
|
d7ab7db243
|
build_electricity.smk: add lines/links/transformer config to params
|
2023-07-31 11:15:50 +02:00 |
|
Fabian Neumann
|
2c586e76e0
|
update global energy monitor LNG terminal data
|
2023-07-31 09:07:10 +02:00 |
|
Fabian Hofmann
|
1d5c8c7242
|
Merge branch 'master' into fneum/line-rating
|
2023-07-26 14:56:35 +02:00 |
|
Fabian
|
d60be3fece
|
Merge branch 'master' into validation
|
2023-07-26 13:01:34 +02:00 |
|
Fabian
|
491345d504
|
config: move cutout specification to line-rating section
test/config: use be-cutout for testing line-rating
|
2023-07-25 15:08:44 +02:00 |
|
Fabian
|
6a50de143c
|
retrieve: fix load data version
|
2023-07-25 12:10:42 +02:00 |
|
pre-commit-ci[bot]
|
615684d124
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-07-22 11:26:42 +00:00 |
|
virio-andreyana
|
56cbcfa672
|
complete plot_validation_cross_border_flows script
|
2023-07-22 13:24:35 +02:00 |
|
lisazeyen
|
5c90083e9b
|
merge master
|
2023-07-21 16:32:11 +02:00 |
|
Fabian
|
793573f655
|
validate: add line plot for price comparison
|
2023-07-20 14:36:22 +02:00 |
|
pre-commit-ci[bot]
|
54e813ffef
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-07-19 09:38:07 +00:00 |
|
Fabian Hofmann
|
844a495180
|
Merge branch 'master' into validation
|
2023-07-19 11:37:47 +02:00 |
|
Fabian Neumann
|
56e93fe821
|
Merge branch 'master' into fneum/line-rating
|
2023-07-18 14:06:11 +02:00 |
|
Fabian Neumann
|
a0366fb2bc
|
Merge branch 'master' into multilinks-default
|
2023-07-18 14:05:57 +02:00 |
|
euronion
|
730b320596
|
Move logic to retrieve.smk
|
2023-07-14 08:53:39 +02:00 |
|
Fabian Neumann
|
b110810669
|
no more override_component_attrs for multilinks
|
2023-07-13 22:31:55 +02:00 |
|
euronion
|
30a81a559f
|
Add test and option to disable online retrieve rules
|
2023-07-13 08:22:22 +02:00 |
|
Fabian
|
c7f67f0641
|
make fuel prices flexible over years
fix marginal cost issue (on pypsa)
minor fixes
|
2023-07-06 19:14:01 +02:00 |
|
Fabian
|
406ce3d77e
|
validation: add structure for price and crossborder comparison
|
2023-07-05 15:51:36 +02:00 |
|
Fabian
|
9958425a44
|
complete structure for plotting electricity production
|
2023-07-05 11:07:36 +02:00 |
|
Fabian Neumann
|
f0b44a91ec
|
Merge branch 'master' into fneum/line-rating
|
2023-07-03 19:27:05 +02:00 |
|
Fabian
|
f903eba061
|
draf validate rule & plot statistics rule
|
2023-07-03 17:13:16 +02:00 |
|
Fabian
|
6137a634d4
|
build_electricity_demand: make data source snapshot dependent
|
2023-07-03 12:51:26 +02:00 |
|
Fabian Hofmann
|
6004e04354
|
Merge branch 'master' into validation
|
2023-06-30 12:07:04 +02:00 |
|
Fabian
|
701231fdca
|
build_renewable_profile: fix execution for one thread
|
2023-06-30 11:34:41 +02:00 |
|
Fabian
|
519a4f2a2a
|
move uc assigment to add_electricity
make code backwards-compatible
|
2023-06-29 14:50:41 +02:00 |
|
Fabian Neumann
|
907382e83a
|
Merge branch 'fneum/line-rating' of github.com:PyPSA/pypsa-eur into fneum/line-rating
|
2023-06-29 11:42:15 +02:00 |
|
Fabian Neumann
|
c5c30bcc32
|
Merge branch 'master' into fneum/line-rating
|
2023-06-29 11:42:07 +02:00 |
|
pre-commit-ci[bot]
|
c0088b7923
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-06-29 09:42:03 +00:00 |
|
Fabian Neumann
|
43c47be2ec
|
fix syntax errors
|
2023-06-29 11:41:38 +02:00 |
|
pre-commit-ci[bot]
|
cc6bae282f
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-06-29 06:11:13 +00:00 |
|
Fabian Hofmann
|
07224751e5
|
Merge branch 'master' into validation
|
2023-06-29 08:10:52 +02:00 |
|
Fabian
|
27eea273bd
|
harmonize params names
|
2023-06-15 19:12:30 +02:00 |
|
Fabian
|
1d10073514
|
review params implementation; reproduce objective values in CI
|
2023-06-15 18:52:25 +02:00 |
|
Fabian
|
45cac01ea3
|
adjust param accessing in cluster, simplify and build_elec script
|
2023-06-14 14:39:53 +02:00 |
|
Fabian Neumann
|
546d9b0610
|
adjust new rules to merged format
|
2023-06-02 17:27:24 +02:00 |
|