bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
3,894 Commits 1 Branch 0 Tags 133 MiB
e8c8d72b3f
Commit Graph

359 Commits

Author SHA1 Message Date
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
Fabian Neumann
8fc0c57ed6 update copyright years 2022-07-26 15:05:59 +02:00
Fabian Hofmann
3ba7e2ab90
Merge branch 'master' into technology-data 2022-07-21 15:36:12 +02:00
Fabian Neumann
b3dac6d3c4 subworkflow flags amend 2022-07-20 15:53:57 +02:00
Fabian Neumann
10243398e7 do not use subworkflow flags for pure data# 
causes problems when config retrieve_databundle is disabled
 2022-07-20 15:47:47 +02:00
Fabian Neumann
3986856282 merge master 2022-07-01 10:13:33 +02:00
Fabian Neumann
a8171ec9f3 color adaptations, new features 2022-06-28 18:03:29 +02:00
Fabian
67ac464b6a add_electricity: use conventional_inputs from snakemake.input for attach_conventional_generators 2022-06-28 16:33:46 +02:00
Fabian Hofmann
e175d1aa0e
Merge branch 'eu-energy-security' into eu-energy-security-conventional-attrs 2022-06-28 13:22:39 +02:00
Fabian
522f218eed Snakefile: rename attrs to attr in add_electricity input function 2022-06-28 13:15:37 +02:00
Fabian Hofmann
917f41ef21
Update Snakefile 
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
 2022-06-28 13:11:08 +02:00
Fabian
9d997fbd79 generalize conventional attr handling through config 2022-06-28 10:14:26 +02:00
Fabian Neumann
74f8ca1c7f
Merge branch 'master' into eu-energy-security 2022-06-28 08:09:39 +02:00
Fabian Neumann
51de606aab
Revert "remove build/retrieve natura raster, directly use shapefile" 2022-06-27 19:00:41 +02:00
Fabian
b56d1f6f4d conventional config section: update to more general attribute assignment scheme 2022-06-27 17:35:19 +02:00
Fabian Neumann
fa43038564 remove params from input as they are not exposed to input 2022-06-27 10:35:39 +02:00
Fabian Neumann
9c6c6d243f
Adaptations to match current PyPSA-Eur version 2022-06-27 10:21:08 +02:00
Fabian Neumann
5ca231824e
Merge branch 'master' into eu-energy-security 2022-06-27 08:58:37 +02:00
Fabian Neumann
520f7e440e
Merge branch 'master' into technology-data 2022-06-25 11:05:41 +02:00
Fabian
eb59e68f35 Snakefile: remove RDIR selection 2022-06-09 20:24:28 +02:00
Fabian Neumann
d4fd472762
Merge branch 'master' into transport 2022-04-12 14:48:57 +02:00
Fabian Neumann
6ed92475c9
Add basic CI for overnight and myopic (#234) 
* Snakefile: add missing folders that are retrieved

* Snakefile: fix syntax error

* Add basic CI

* fix datafiles list to work with directories

* prepare: only add new gas pipes if augmentation not empty

* prepare: handle case where salt caverns dataframe is empty

* prepare: handle case where underwater faction not in link columns

* build_biomass: handle case where Balkan not in country list

* refer correct environment path

* fix Snakemake call

* make subworkflow dependency explicit again

* hashing pypsa-eur environment file does not seem to work

* change solver to glpk

* add data cache

* glpk without options

* try cbc

* alternative snakemake test workflow

* test: add exogenous pathways to config
 2022-04-11 17:08:25 +02:00
Fabian Neumann
f0d0edcf54 Snakefile: add powerplants to results-dir 2022-04-08 13:21:29 +02:00
Fabian Neumann
f474f8bce4 finetuning of results dir 2022-04-07 22:07:18 +02:00
Fabian Neumann
64424ed208 add results dir to simplify multiple configs (like PyPSA-Eur-Sec) 2022-04-07 21:13:48 +02:00
Fabian Neumann
7a52b6bc45 resolve cherry merge conflict 1 2022-04-05 16:22:31 +02:00
Fabian Neumann
b112da0565 prepare: separate code for transport demand and nodal energy totals 2022-04-03 18:49:35 +02:00
Fabian Neumann
7fee2944d8
Merge branch 'master' into rm-raster-natura 2022-03-28 12:07:33 +02:00
Fabian Neumann
832cc8e5e8 Windows compatibility through request string 2022-03-28 10:56:52 +02:00
Fabian Neumann
35f8b54a46 switch to Belgium for CI and tutorial 2022-03-24 15:51:36 +01:00
Fabian Neumann
855a176c51
Merge branch 'master' into rm-raster-natura 2022-03-24 14:40:14 +01:00
Fabian Neumann
f90bb92e1a automatically download NATURA2000 gpkg and use it 2022-03-24 13:37:21 +01:00
euronion
e2e98120b1 Update Snakefile 2022-03-21 10:01:34 +01:00
euronion
30cb861ca2 Update Snakefile 2022-03-21 09:37:50 +01:00
Fabian Neumann
31f9864daf omit NATURA from testing and tutorial due to file size# 2022-03-20 21:01:07 +01:00
Fabian Neumann
5a7c0d7967 remove build/retrieve natura raster, directly use shapefile 2022-03-20 10:03:17 +01:00
euronion
da72f5487d Update Snakefile 2022-03-18 14:29:50 +01:00
euronion
65e35135e1 Update Snakefile 2022-03-18 11:13:58 +01:00
Fabian
49ec143b0a Snakefile: fix memory function for clusters == 'all' 2022-03-02 14:22:16 +01:00
Fabian Neumann
3eec027db6
no more 'mv' command in Snakefile for Windows (#316) 2022-02-22 19:34:47 +01:00
Fabian Neumann
090b4908a4 Snakefile: use standard resource mem_mb rather than mem 2022-01-27 21:04:50 +01:00
Fabian Neumann
e1aae5a98e minor adjustment to memory requirements of add_electricity, cluster_network 2022-01-13 15:36:13 +01:00