Commit Graph

400 Commits

Author SHA1 Message Date
lisazeyen
e92fc4ff4d merge master 2023-08-22 10:21:42 +02:00
Fabian
e28ae59375 introduce scenario-management 2023-08-15 15:06:59 +02:00
Fabian
8fa3040c38 remove hard config overwrite 2023-08-04 13:57:41 +02:00
Fabian
ad6322bcb3 address review commments 2023-08-04 12:58:31 +02:00
Fabian
f89d61ff07 snakefile: fix path in sync rule 2023-07-26 11:41:24 +02:00
lisazeyen
5c90083e9b merge master 2023-07-21 16:32:11 +02:00
Fabian
86a4b775fd remove hardcoded config overwrite
plot_validation: adjust carrier labels
2023-07-11 14:25:32 +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
9958425a44 complete structure for plotting electricity production 2023-07-05 11:07:36 +02:00
Fabian
879d2925f9 rename "ept" to "Ept"
restructure remote rsync with remote
2023-07-03 17:16:20 +02:00
Fabian
4c9b8a08e5 use differential config changes in config.validation.yaml 2023-06-29 19:45:42 +02:00
Fabian
a6ae03d133 fixup non-clustering of conventional generators 2023-04-27 10:11:35 +02:00
Fabian
9f4f76126b snakefile: use validation config 2023-04-25 15:33:21 +02:00
Fabian
97bdbe636c follow-up: rename configs to config 2023-04-21 11:05:18 +02:00
virio-andreyana
d10ff9bdf1
Update Snakefile 2023-04-11 02:25:21 +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
pre-commit-ci[bot]
3a80ac2027 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-03-09 12:29:15 +00:00
Fabian Neumann
91ea0a3f55 docs: rearrange sections 2023-03-09 13:28:42 +01:00
Fabian Neumann
22846d7b1b sector-coupled: run on subset of selected countries 2023-03-09 11:04:41 +01:00
Fabian Neumann
a1ba3a2c17 new minimum snakemake version is 7.7 2023-03-08 19:28:00 +01: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
d4d517ffab Snakefile: correct indent 2023-03-08 18:45:32 +01:00
Fabian Neumann
6763dbaacc add message for dag rule 2023-03-08 18:45:11 +01:00
Fabian Neumann
76dcf43993 add rule for dag, use shutil to purge outputs 2023-03-08 18:43:52 +01:00
Fabian Neumann
882b79a9ed add a purge rule 2023-03-08 18:15:49 +01:00
Fabian Neumann
4b3372b53b apply snakefmt to rules/ 2023-03-08 17:46:14 +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
Fabian
104fc68fb0 allow to disable progressbar 2023-03-07 20:37:47 +01:00
Fabian
b5e8ee979f reenable snakefmt 2023-03-07 18:24:47 +01:00
Fabian
c8fa61e244 Snakefile: replace else statements by if statement to satisfy snakefmt 2023-03-07 18:22:07 +01:00
Fabian
77291f7d64 snakefile: introduce RESOURCES, RESULTS, BENCHMARKS, LOGS paths 2023-03-07 18:11:59 +01:00
Fabian
2a5acedfee snakefile: fix benchmark path 2023-03-07 12:21:02 +01:00
Fabian Neumann
85f73c0e62 snakefmt to Snakefile 2023-03-06 19:44:57 +01:00
Fabian Neumann
31a7ece669 fix logs and benchmark directories 2023-03-06 17:59:37 +01:00
Fabian Neumann
71932416b3 technology-data not dependent on run 2023-03-06 17:46:29 +01:00
Fabian Neumann
23987f3a82 re-allow 'all' clusters wilcard value 2023-03-06 17:41:48 +01:00
Fabian Neumann
ab501f3eb6 remove plot_p_nom_max 2023-03-06 17:41:09 +01:00
Fabian Neumann
f96e9be75b fix solve_all_elec_networks 2023-03-06 17:31:27 +01:00
Fabian Neumann
561a1d2da8 prepare CI for all three cases 2023-03-06 17:26:41 +01:00
Fabian Neumann
cdc6ac39b0 correct benchmark 2023-03-06 16:59:04 +01:00
Fabian
bffb7cc17c scripts/ remove summary_dir and results_dir references 2023-03-06 16:53:20 +01:00
Fabian Neumann
3e9c07b5e9 add missing cutout input 2023-03-06 16:50:41 +01:00
Fabian Hofmann
9b7e4d3bee
Merge branch 'master' into merge-pypsa-eur-sec 2023-03-06 16:09:42 +01:00
pre-commit-ci[bot]
8db3780fce [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-03-06 14:43:47 +00:00
Fabian
bf969424a2 ci modularization fix cutout retrieval and profile in dag 2023-03-06 15:41:02 +01:00
Fabian Neumann
74032ae193 fix path references in Snakefile 2023-03-06 15:28:09 +01:00
Fabian Neumann
2254297d88 COSTS are data not resources 2023-03-06 15:20:18 +01:00
Fabian Neumann
f83fd9cf1e remove duplicate retrieve_cost_data 2023-03-06 15:18:30 +01:00
Fabian Neumann
7334913e11 add input file handling of pypsa-eur-sec rules using cutout 2023-03-06 15:07:09 +01:00
Fabian Neumann
43f226b2a3 split solve network rules, take summary scripts from Sec 2023-03-06 12:10:23 +01:00
Fabian Neumann
97bbafdd70 Merge remote-tracking branch 'pypsa-eur-sec/master' into merge-pypsa-eur-sec 2023-03-06 11:54:08 +01:00
Fabian Neumann
67d878d1d7 allow disabling max_depth through config overwrite 2023-02-22 19:28:07 +01:00
Fabian Neumann
35b8425b3b cherry-pick from #282
Co-authored-by: Fabian Hofmann <hofmann@fias.uni-frankfurt.de>
2023-02-16 18:42:19 +01:00
Fabian Neumann
ece64a73c1 gas_input: use HTTP remote, rename conversion factors, fix undesired rule removal 2023-02-16 18:27:57 +01:00
Fabian Neumann
963e7cdbcf Merge branch 'master' into update-lng-ports 2023-02-16 17:56:05 +01:00
Fabian Neumann
ccde2e7f93 make sequestration options configurable 2023-02-16 17:21:58 +01:00
virio-andreyana
3dede28aae merging script in retrieve_gas_input_location with build_gas_input_location 2023-02-16 11:57:33 +01:00
Fabian Neumann
93d462831d uncomment shutil 2023-02-16 11:51:39 +01:00
Fabian Neumann
9c1182fe96 prepare release 0.7 2023-02-16 11:50:55 +01:00
Fabian Neumann
6b8e69cf81 Merge branch 'master' into carbon-management 2023-02-15 20:21:12 +01:00
Fabian Neumann
a870b603f4 automatically retrieve technology-data, no git clone 2023-01-28 08:15:43 +01:00
Fabian Neumann
9411cad98b add sequestration potential data link 2023-01-24 18:47:34 +01:00
Fabian Neumann
71e2a4943c carbon management 2023-01-24 18:44:39 +01:00
Fabian Neumann
433514b168 add a collection rule plot_all_networks 2023-01-07 13:23:12 +01:00
Fabian Neumann
6f901f4c50 restore compatibility with latest master version 2022-12-28 15:43:43 +01:00
Fabian Neumann
cac724fee0 merge master 2022-12-28 13:55:36 +01:00
Fabian Neumann
138d151c8b only compute solar thermal profiles if technology is included 2022-12-28 12:48:51 +01:00
Fabian Neumann
d37ffddd4f build_solar_thermal_profiles: parallelize 2022-12-28 12:21:46 +01:00
Fabian Neumann
494d3010eb build_heat_demand: parallelize 2022-12-28 12:21:00 +01:00
Fabian Neumann
097d054f06 build_temperatur_profiles: parallelize 2022-12-28 12:20:34 +01:00
Fabian Neumann
69a33e3698 increase resource requirements of some rules 2022-12-27 12:16:02 +01:00
Fabian Neumann
99343b1221
Merge pull request #277 from PyPSA/int-ports
distribute international shipping by port trade volumes
2022-12-27 10:57:01 +01:00
virio-andreyana
d37cd49f7d add script for retrieving lng terminals 2022-12-14 12:26:16 +01:00
virio-andreyana
01f48a50e7 Replacing the IGGIELNG_LNG data with Europe-Gas-Tracker 2022-12-14 12:26:16 +01:00
Fabian Neumann
e846cea2b7
Merge pull request #279 from PyPSA/fix/subworkflow-paths
Fix relative imports from subworkflow PyPSA-EUR
2022-11-17 15:55:17 +01:00
Fabian Hofmann
e1e18a50e7
Fix input listing in Snakefile 2022-11-16 12:18:58 +01:00
Fabian Neumann
d35d3c3c21
Merge pull request #197 from PyPSA/cp-env
Snakefile: export conda environment
2022-11-15 14:49:52 +01:00
euronion
ae8f601f0a Fix relative imports from subworkflow PyPSA-EUR 2022-11-14 09:38:09 +01:00
Fabian Neumann
84618b3ee1 distribute international shipping by port trade volumes 2022-11-13 13:43:05 +01:00
pre-commit-ci[bot]
92080b1cd2 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-09-19 10:06:40 +00:00
Fabian Hofmann
5833556ea1
Merge branch 'master' into misc/precommit-ci-2 2022-09-19 12:06:23 +02:00
Fabian Neumann
e024ba68c9 build_hydro: fix cutout input 2022-09-17 10:29:35 +02:00
pre-commit-ci[bot]
5d1ef8a640 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-09-16 13:04:06 +00:00
Fabian Hofmann
affa1c2b88
Merge branch 'master' into misc/precommit-ci-2 2022-09-16 14:38:49 +02:00
Fabian
1536cc2787 codespell: fix typos
Snakefile: fix unformattable parst
pre-commit: fix codespell ignore
2022-09-16 14:36:43 +02:00
Fabian
b694337541 scenario management: use "shared_cutouts" instead of "dedicated_cutouts" 2022-09-13 14:54:58 +02:00
Fabian Hofmann
0339ed71ac
Update Snakefile
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2022-09-13 09:47:11 +02:00
Fabian Hofmann
1185983f8f
Update Snakefile
Co-authored-by: Philipp Glaum <95913147+p-glaum@users.noreply.github.com>
2022-09-08 20:32:22 +02:00
Fabian
71ba743e46 enable scneario management for different configs 2022-09-08 10:28:07 +02:00
Ebbe Kyhl Gøtske ekg@mpe.au.dk
e34bd9b7fb Change costs year in snakefile and config file 2022-08-31 13:07:43 +02:00
Ebbe Kyhl Gøtske ekg@mpe.au.dk
98dd2db622 specify memory resources 2022-08-11 10:10:35 +02:00
Fabian Neumann
ca183ba89e add zenodo dataset for download 2022-08-02 15:56:47 +02:00
lisazeyen
f683a93f08 adjust plot_summary to work with myopic, remove update config 2022-08-01 16:04:14 +02:00
lisazeyen
f10628930e move snakemake dependencies out for co2limit cb option to work 2022-08-01 15:21:11 +02:00
Philipp Glaum
ba7a5363e7 update Fabians review comments 2022-07-29 14:56:39 +02:00
Philipp Glaum
4db62fa0c6 place holder in snakefile for path to ship_raster 2022-07-29 11:52:33 +02:00
Philipp Glaum
6d070a19e0 initial ship raster implementation 2022-07-28 10:38:24 +02:00