Commit Graph

316 Commits

Author SHA1 Message Date
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
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
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 Neumann
16eb4e644a small fixes to weather_year wildcard handling 2023-07-26 10:52:58 +02:00
pre-commit-ci[bot]
d527797dc3 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-07-26 08:24:03 +00:00
Fabian Neumann
ddd1840981 Merge remote-tracking branch 'origin/master' into multiyear 2023-07-26 10:23:32 +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
Fabian Neumann
ef5320e1b8 merge master 2023-06-02 16:59:06 +02:00
pre-commit-ci[bot]
0f5bb8b893 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-06-02 10:53:11 +00:00
virio-andreyana
83ff639ad5 amend solve_network 2023-06-02 12:52:49 +02:00
virio-andreyana
b67a00903a
using higher keys for industries 2023-05-31 10:54:27 +02:00
pre-commit-ci[bot]
f3e8fe2312 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-05-27 13:51:00 +00:00
virio-andreyana
e581ca930c made params more specific 2023-05-27 15:50:37 +02:00
pre-commit-ci[bot]
ead87afce1 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-05-27 10:23:30 +00:00
virio-andreyana
1c73bb0342 add params for solve_network 2023-05-27 12:22:53 +02:00
lisazeyen
b2730a6d47
fix wrong input path 2023-05-24 10:26:31 +02:00
virio-andreyana
28d39680c6
Merge branch 'master' into post-merge-param 2023-05-19 16:19:58 +02:00
pre-commit-ci[bot]
216a02fba1 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-05-19 13:42:45 +00:00
virio-andreyana
c043100ada
add more params in simplify_network.py 2023-05-19 15:42:07 +02:00
virio-andreyana
d97a543463
missing a coma in build_electricity.smk 2023-05-17 19:37:47 +02:00
virio-andreyana
8af1fe5649
replace the word "config" to "params" in functions 2023-05-17 19:25:45 +02:00
virio-andreyana
8208ac033b
convert param back to config for "logging" and "run", made "enable" more specific 2023-05-17 18:43:30 +02:00
lisazeyen
747bf5d815 add time dependent co2 price 2023-05-17 12:55:17 +02:00
lisazeyen
024da02f8a add monthly prices to network 2023-05-16 16:16:36 +02:00
lisazeyen
dfdd116206 add rule to build monthly prices 2023-05-16 16:16:36 +02:00
virio-andreyana
61893c3c9b
fixing build_electricity.smk and retrieve.smk 2023-05-15 11:26:36 +02:00
virio-andreyana
1fc48d8753
using python algorithm to edit rules and script 2023-05-15 10:33:17 +02:00
Fabian Neumann
e29571535b remove references to memory logfile in *.smk, add release note 2023-05-12 07:11:41 +02:00
virio-andreyana
aa50ea44cc
fix add_electricity mistake 2023-05-11 20:59:37 +02:00
virio-andreyana
1758076815
test param in add_electricity 2023-05-11 20:34:11 +02:00
pre-commit-ci[bot]
e8772c3340 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-04-30 08:54:50 +00:00
pre-commit-ci[bot]
add135fe05 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-04-30 08:53:00 +00:00
Fabian Neumann
6acd5da4d4 Merge branch 'multiyear-sec' into multiyear 2023-04-29 18:49:49 +02:00
Fabian Neumann
e16fa286ec merge master 2023-04-29 12:41:37 +02:00
Fabian Neumann
30beee0959 Merge branch 'master' into multiyear 2023-04-29 12:40:55 +02:00
Fabian
a6ae03d133 fixup non-clustering of conventional generators 2023-04-27 10:11:35 +02:00
Fabian
c2095ec897 fix uc input file name 2023-04-26 15:42:21 +02:00
Fabian
e2119d6229 fix unit_commitment function and file, add it to config.validation 2023-04-26 15:37:46 +02:00
Fabian
8994561569 Merge branch 'master' into validation 2023-04-25 16:58:48 +02:00
Fabian
8ecd0ef580 retrieve.smk: set electricity demand source to latest 2023-04-25 16:51:20 +02:00
Fabian
9b631189c5 retrieve.smk: rename retrieve_load_data -> retrieve_electricity_demand 2023-04-25 16:37:01 +02:00
Fabian
97bdbe636c follow-up: rename configs to config 2023-04-21 11:05:18 +02:00
Fabian
6d7eae8ad2 build_ship_raster: save reduced ship raster as tif file 2023-04-20 19:56:23 +02:00
Ahmad
90d8f0ac3f
rename build_load_data to build_electricity_demand
Signed-off-by: Ahmad <ahmedwahid16101@gmail.com>
2023-04-14 20:58:38 +02:00
pre-commit-ci[bot]
5f554ab28f [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-04-06 13:57:30 +00:00
lisazeyen
1a7e9c241a remove output capital cost 2023-04-05 18:17:52 +02:00
lisazeyen
461ea66185 add eea co2 emissions as input 2023-04-05 15:44:31 +02:00
lisazeyen
87135fd950 remove more / 2023-04-05 15:44:01 +02:00
lisazeyen
b9c58db0ba remove slash 2023-04-05 10:41:21 +02:00
lisazeyen
247c504604 adjust to new pypsa-eur syntax 2023-04-03 17:39:47 +02:00
lisazeyen
e5e7d5f250 add rules for perfect foresight 2023-04-03 16:09:50 +02:00
Fabian Neumann
55395c5465 enhance documentation, with instructions for sector-coupled / electricity-only studies 2023-03-15 17:00:06 +01:00
Fabian
2baf8f5ba4 harmonive solve_network across workflow 2023-03-09 23:56:12 +01:00
Fabian Neumann
483f3e1b82 eliminate manual country code conversion, adjust mock_snakemake to ll wildcard 2023-03-09 08:36:18 +01:00
pre-commit-ci[bot]
f717ce9d3d [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-03-08 18:26:43 +00:00
Fabian Neumann
7405377fd7 snakefmt to Snakefile 2023-03-08 19:22:29 +01:00
Fabian Neumann
bf895de7cc add logfiles to all rules 2023-03-08 19:22:00 +01:00
Fabian Neumann
abbf91ff9e retrieval rules get retries directive for added robustness 2023-03-08 18:09:31 +01:00
Fabian Neumann
701d3a141a data/bundle files may be ancient 2023-03-08 18:03:49 +01:00
Fabian Neumann
37a063554d make cutouts protected
https://snakemake.readthedocs.io/en/stable/snakefiles/rules.html\#protected-and-temporary-files
2023-03-08 17:56:50 +01:00
Fabian Neumann
4b3372b53b apply snakefmt to rules/ 2023-03-08 17:46:14 +01:00
Fabian Neumann
2d648dac40 correct paths to scripts in .smk files 2023-03-08 17:45:25 +01:00
Fabian Neumann
8eb37bc263 add conda directive to all rules for use with --use-conda 2023-03-08 17:44:25 +01:00
Fabian Neumann
6bae022d44 modularise Snakefile using rules/*.smk files 2023-03-08 17:29:01 +01:00