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

1792 Commits

Author SHA1 Message Date
Fabian
d60be3fece Merge branch 'master' into validation 2023-07-26 13:01:34 +02:00
Fabian Neumann
d17430d000
Merge branch 'master' into multilinks-default 2023-07-26 08:48:21 +02:00
pre-commit-ci[bot]
f970ba0fd0 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-07-26 06:48:10 +00:00
Fabian Neumann
5231135d5f make_summary: explicitly typecast default values 2023-07-26 08:47:49 +02:00
pre-commit-ci[bot]
74be5261fc [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-07-26 05:24:33 +00:00
Fabian Neumann
7575dd0351 handling of natural gas in add_existing_baseyear and add_electricity 2023-07-26 07:24:12 +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 Neumann
93c14dcda1 Merge branch 'master' into ppl-fueltype-fix 2023-07-25 13:10:59 +02:00
Fabian Hofmann
269a08006f
Merge branch 'master' into validation 2023-07-25 12:30:32 +02:00
Fabian
01aaeb730d cluster_network: introduce efficiency classes for clustering 2023-07-25 12:29:39 +02:00
Fabian Hofmann
3eac0c1127
Merge branch 'master' into multilinks-default 2023-07-24 13:42:50 +02:00
Fabian Hofmann
f0057614b3
Merge branch 'master' into fneum/line-rating 2023-07-24 10:49:15 +02:00
Fabian
474321c638 add_electricity: enable flattening hydro dispatch 
config.validation: reduce crossborder caps
 2023-07-24 10:47:16 +02:00
Fabian Neumann
1541877fdc Merge branch 'ppl-fueltype-fix' of github.com:PyPSA/pypsa-eur into ppl-fueltype-fix 2023-07-23 15:00:22 +02:00
Fabian Neumann
6110fe784d wrap comparisons in brackets 2023-07-23 14:59:28 +02:00
pre-commit-ci[bot]
3f3e73a0ec [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-07-23 09:08:29 +00:00
Fabian Neumann
d45cb71b7a match build_powerplants FuelType (closes #754) 2023-07-23 11:07:45 +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
d36bdaf6bb clean plot_validation_cross_border_flows script 2023-07-22 13:26:11 +02: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
c7ef8e8c64 solve network: update mock snakemake 2023-07-20 14:36:22 +02:00
Fabian
793573f655 validate: add line plot for price comparison 2023-07-20 14:36:22 +02:00
Fabian Neumann
268391e204
Merge branch 'master' into master 2023-07-18 14:07:27 +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
Fabian Hofmann
40b87cac04
Merge branch 'master' into validation 2023-07-17 19:24:13 +02:00
Fabian
23b156d2c1 build_monthly_prices: use 2020 as base year for scaling 2023-07-17 17:35:23 +02:00
Fabian Hofmann
dc4286d3e3
Merge branch 'master' into describe-config 2023-07-17 17:33:55 +02:00
Fabian
fcce233a2e Merge branch 'master' into validation 2023-07-17 16:22:39 +02:00
Fabian
d22c87419b update enviromnent yaml to install pypsa from master 
cluster: allow custom strategies for all components
 2023-07-17 14:03:16 +02:00
Fabian
8e568cee03 cluster network: remove bus strategies as already handled internally 2023-07-14 16:00:21 +02:00
Fabian
f566142d38 cluster network: update to new clustering module (pypsa v0.25) 2023-07-14 15:47:41 +02:00
Fabian Hofmann
9f4c227def
Merge branch 'master' into describe-config 2023-07-14 13:34:20 +02:00
pre-commit-ci[bot]
fc36efaebe [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-07-13 20:35:05 +00:00
Fabian Neumann
b110810669 no more override_component_attrs for multilinks 2023-07-13 22:31:55 +02:00
Fabian
f020cfa969 validation: plot elec production fix typo 2023-07-13 18:36:14 +02:00
Fabian Hofmann
f90ef3bb73
Merge branch 'master' into validation 2023-07-12 12:32:35 +02:00
Fabian
723350c8ef solve_network: enable rolling horizon 2023-07-11 17:48:35 +02:00
Fabian
4bb0716414 prepare_network: fix addition of dynamic co2 prices 2023-07-11 16:15:27 +02:00
Fabian Neumann
6af92fcf67
Merge branch 'master' into fneum/line-rating 2023-07-11 14:37:17 +02:00
Fabian
86a4b775fd remove hardcoded config overwrite 
plot_validation: adjust carrier labels
 2023-07-11 14:25:32 +02:00
Fabian
9fbc626862 adjustments to new due to clustering module 2023-07-11 14:24:57 +02:00
pre-commit-ci[bot]
6492b1a195 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-07-10 23:02:57 +00:00
lisazeyen
26156943cf
remove TODO comment 
the clipping of the p_min_pu value cannot be removed since it is used for the retrofitting generators which have to follow the heat demand profile. Otherwise the network becomes infeasibe.
 2023-07-10 16:15:27 +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 Hofmann
3ea8b26ae0
fix carrier assignment 2023-07-06 15:01:00 +02:00
Fabian
3e64599c4c plot_electricity_prices: fix header spec 2023-07-05 19:06:32 +02:00
Fabian
406ce3d77e validation: add structure for price and crossborder comparison 2023-07-05 15:51:36 +02:00
Fabian
9c6e5e0ed0 config: remove unneeded plotting entries 2023-07-05 11:34:07 +02:00
pre-commit-ci[bot]
07add5a10d [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-07-05 09:22:20 +00:00
Fabian Hofmann
9c3f89160a
Merge branch 'master' into validation 2023-07-05 11:21:09 +02:00
Fabian
9958425a44 complete structure for plotting electricity production 2023-07-05 11:07:36 +02:00
Fabian Neumann
19a99f6e03 build_line_rating: fix doc typos 2023-07-03 19:31:34 +02:00
pre-commit-ci[bot]
39c963dd38 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-07-03 17:27:25 +00:00
Fabian Neumann
f0b44a91ec
Merge branch 'master' into fneum/line-rating 2023-07-03 19:27:05 +02:00
Fabian Neumann
d751f4694d
Update scripts/prepare_network.py 2023-07-03 18:58:15 +02:00
Fabian
879d2925f9 rename "ept" to "Ept" 
restructure remote rsync with remote
 2023-07-03 17:16:20 +02:00
Fabian
f903eba061 draf validate rule & plot statistics rule 2023-07-03 17:13:16 +02:00
Fabian
1f6764d32a add_electicity: minor fix regarding missing carriers 2023-07-03 15:45:19 +02:00
Fabian
6137a634d4 build_electricity_demand: make data source snapshot dependent 2023-07-03 12:51:26 +02:00
Fabian Neumann
86708838da
Merge branch 'master' into linemaxext-config 2023-06-30 14:51:29 +02:00
pre-commit-ci[bot]
e4651ce711 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-06-30 11:28:56 +00:00
euronion
16dcad0176 Prevent attempt to re-add existing carriers. 2023-06-30 13:25:20 +02:00
Fabian Hofmann
6004e04354
Merge branch 'master' into validation 2023-06-30 12:07:04 +02:00
Fabian
c5fe195fed add_electricity: fix set operation 2023-06-30 11:37:53 +02:00
Fabian
701231fdca build_renewable_profile: fix execution for one thread 2023-06-30 11:34:41 +02:00
Fabian
4c9b8a08e5 use differential config changes in config.validation.yaml 2023-06-29 19:45:42 +02:00
Fabian
3879df7a09 build_monthly_prices: adress warnings 2023-06-29 19:45:42 +02:00
Fabian Hofmann
934879d94e
Merge branch 'master' into validation 2023-06-29 19:45:17 +02:00
Fabian
9e143345bd follow up on #686 2023-06-29 19:24:38 +02:00
Fabian Hofmann
ebe6c1f1e1
Merge branch 'master' into validation 2023-06-29 17:49:02 +02:00
Fabian Hofmann
e2270ea580
Merge branch 'master' into complete-carrier-set 2023-06-29 16:50:22 +02:00
Fabian
aac339ef0b Merge branch 'cll-constraint-groupby' into update-clustering-namespace 2023-06-29 16:39:53 +02:00
Fabian
00ec36a12e add_electricity: filter out nan geocoords in kdtree 2023-06-29 16:38:56 +02:00
Fabian
0dd1933057 solve_network: fix argument for linopy groupby 2023-06-29 16:21:45 +02:00
pre-commit-ci[bot]
d84c7ebf6a [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-06-29 14:02:56 +00:00
Fabian Hofmann
3f946dd83d
Update scripts/add_electricity.py 2023-06-29 16:02:31 +02:00
pre-commit-ci[bot]
a9b0d349f2 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-06-29 14:02:21 +00:00
Fabian Hofmann
cf06204e4f
Update scripts/add_electricity.py 2023-06-29 16:02:09 +02:00
Fabian Hofmann
8c7c586b0c
Update scripts/add_extra_components.py 2023-06-29 16:02:03 +02:00
Fabian
2f3005e555 use pypsa.clustering.spatial namespace 2023-06-29 15:37:29 +02:00
pre-commit-ci[bot]
a8f69821dc [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-06-29 12:51:43 +00:00
Fabian
519a4f2a2a move uc assigment to add_electricity 
make code backwards-compatible
 2023-06-29 14:50:41 +02:00
Fabian Neumann
c5c30bcc32 Merge branch 'master' into fneum/line-rating 2023-06-29 11:42:07 +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
LukasFrankenQ
a36b5c51c7 fixed bug in monthly gas prices 2023-06-28 17:42:17 +01:00
Fabian Hofmann
ab0963540f
Merge branch 'master' into complete-carrier-set 2023-06-21 09:53:19 +02:00
Fabian Neumann
86e5f08fbf
Merge branch 'master' into linemaxext-config 2023-06-20 13:33:18 +02:00
Fabian
a17647a07e add_electricity: fix cost ref 2023-06-15 19:35:41 +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 Hofmann
862e54770f
Merge branch 'master' into post-merge-param 2023-06-14 10:11:26 +02:00
Ricardo
b7aa122fda Fixed issue (most likely) introduced when merging PyPSA-Eur with PyPSA-Eur-Sec 2023-06-12 20:40:51 +02:00
Davide Fioriti
176bebdef0
Update cluster_network to avoid adding deleted links in clustered network 2023-06-09 17:18:25 +02:00
pre-commit-ci[bot]
d6057cb92b [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-06-03 10:10:08 +00:00
virio-andreyana
8dbcca560c
minor fixes in solve_network.py 2023-06-03 12:09:51 +02:00
pre-commit-ci[bot]
286b836c3f [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-06-02 15:18:48 +00:00
Fabian Neumann
ff6f3a1b7e resolve remaining merge conflicts 2023-06-02 17:12:05 +02:00
Fabian Neumann
59f24122e2 cherry-pick line rating code 2023-06-02 17:08:40 +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
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
Koen van Greevenbroek
312dd81f21 Fix bug with underground H2 storage creation 
For some small model regions, none of the H2 cavern types specified in
the configuration might actually be available, in which case the line
`h2_caverns = h2_caverns[cavern_types].sum(axis=1)` throws an error.
 2023-05-24 11:13:37 +02:00
lisazeyen
ab8ee639f9
update average annual prices 2023-05-24 10:53:40 +02:00
lisazeyen
6e358097c9
change natural gas index to import price 2023-05-24 10:51:16 +02:00
pre-commit-ci[bot]
0f09545d96 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-05-22 21:56:31 +00: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
pre-commit-ci[bot]
6366dc4c55 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-05-17 17:26:02 +00: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
e9348b8e23 uncomment ship raster, since otherwise not computing 2023-05-17 12:48:45 +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
pre-commit-ci[bot]
7d4dacf8bd [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-05-16 11:35:00 +00:00
Fabian Neumann
875fcdd0e2 address geopandas future warning 2023-05-16 13:34:23 +02:00
pre-commit-ci[bot]
e431a9675c [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-05-15 13:02:41 +00:00
Fabian Hofmann
824e6bb18c
Merge branch 'master' into complete-carrier-set 2023-05-15 15:01:57 +02:00
virio-andreyana
1fc48d8753
using python algorithm to edit rules and script 2023-05-15 10:33:17 +02:00
Fabian Neumann
14a34697aa
Merge pull request #666 from PyPSA/fit-for-module 
retrieve*: handle extraction path via snakemake.output
 2023-05-15 08:41:13 +02:00
pre-commit-ci[bot]
38bae672da [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-05-12 12:51:41 +00:00
Fabian Neumann
8f91963e76 properly reference p_max_pu files 2023-05-12 14:50:58 +02:00
Fabian Neumann
b2216355f1 retrieve_sector_data: add another .parent 2023-05-12 14:10:04 +02:00
Fabian Neumann
67ef38b35e retrieve*: handle extraction path via snakemake.output 2023-05-12 13:59:41 +02:00
Fabian Neumann
e88b57f422 prepare_network: fix typo 2023-05-12 10:42:06 +02:00
pre-commit-ci[bot]
3343394c65 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-05-12 07:30:12 +00:00
Fabian Neumann
99963edaaf add option to limit maximum extension per line/link; linemaxext 2023-05-12 09:29:38 +02:00
Fabian Neumann
5be21dfc5a add option for piecewise linear transmission loss approximation 2023-05-12 09:07:16 +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
1758076815
test param in add_electricity 2023-05-11 20:34:11 +02:00
pre-commit-ci[bot]
7d6d6d2805 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-05-11 14:59:12 +00:00
virio-andreyana
654f46f868
alpha testing complete vresutils removal 2023-05-11 16:58:35 +02:00
pre-commit-ci[bot]
b21965a986 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-05-10 08:09:47 +00:00
virio-andreyana
e91068196b
replace vresutils annuity function with add_electricity.py calculate_annuity 2023-05-10 10:02:41 +02:00
virio-andreyana
5c2e3c9fc1
add Shape2Shapes in add_electricit.py 2023-05-10 09:58:25 +02:00
Fabian Hofmann
de16f19bce
Merge branch 'master' into complete-carrier-set 2023-05-03 17:42:29 +02:00
Fabian
13b4327e01 add_extra_components: revert carrier addition 2023-05-03 14:00:10 +02:00
Fabian
4e8bbd67b4 use sanitize_carriers to harmonize carrier adjustments 2023-05-03 13:24:57 +02:00
pre-commit-ci[bot]
f6a40d3696 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-05-01 22:14:45 +00:00
Fabian Neumann
67303deedd
Merge pull request #647 from PyPSA/hydrogen-turbine 
add plain hydrogen turbine option for re-electrification
 2023-04-30 10:44:30 +02:00
pre-commit-ci[bot]
bdeab82b49 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-04-30 08:44:07 +00:00
Fabian Neumann
51e09f5e61
Address review comments 2023-04-30 10:43:49 +02:00
pre-commit-ci[bot]
699a4bd2e8 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-04-28 01:43:41 +00:00
virio-andreyana
72b75fd9fe
merge add_nice_carrier_names with add_missing_carrier to become add_missing_carrier_with_nice_names(n, config) 2023-04-28 03:43:20 +02:00
virio-andreyana
e24ca89a05
Update scripts/add_electricity.py 
Co-authored-by: Fabian Hofmann <fab.hof@gmx.de>
 2023-04-27 17:29:20 +02:00
Fabian
2ea394b681 solve_network: disable mem logger 2023-04-27 13:59:15 +02:00
Fabian
9913522e09 reinsert co2 price 2023-04-27 12:11:12 +02:00
lisazeyen
05d9331deb not cluster conventionals 2023-04-27 10:25:53 +02:00
Fabian
a6ae03d133 fixup non-clustering of conventional generators 2023-04-27 10:11:35 +02:00
pre-commit-ci[bot]
9ae7a93ccb [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-04-26 16:07:28 +00:00
lisazeyen
e6f0d8a990 fix bug load shedding constraint 2023-04-26 18:07:02 +02:00
lisazeyen
a2e3e91630
fix bug in load shedding constraint 2023-04-26 18:05:56 +02:00
Fabian
d962969519 solve_network: solve network fix kwargs 2023-04-26 17:47:49 +02:00
Fabian
dcc7b4cebb solve_network: fix UC 2023-04-26 17:19:32 +02:00
lisazeyen
956079765c bug fix uc constraint 2023-04-26 16:19:16 +02:00
Fabian
1a42b0c928 update uc attributes 2023-04-26 15:44:45 +02:00
Fabian
e2119d6229 fix unit_commitment function and file, add it to config.validation 2023-04-26 15:37:46 +02:00
Fabian
9c37eccaec build_electricity_demand: add BA for 2019 2023-04-26 15:33:25 +02:00
Fabian
630800fdab determine_cutout_xXyY: add docstring 2023-04-26 15:03:34 +02:00
virio-andreyana
e38a0a9d34
Merge branch 'master' into complete-carrier-set 2023-04-26 09:21:49 +02:00
virio-andreyana
df38edab0a
fix bug in prepare_network.py 2023-04-26 04:28:36 +02:00
Fabian
5fd1b8a8b1 build_elec_demand: fix LU demand for 2019 2023-04-25 17:41:44 +02:00
pre-commit-ci[bot]
74e9d56adb [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-04-25 15:26:28 +00:00
virio-andreyana
756a814c63
Update prepare_sector_network.py 2023-04-25 17:17:32 +02:00
virio-andreyana
d9f9d4853a
Update add_extra_components.py 2023-04-25 17:06:17 +02:00
virio-andreyana
56b6718ba6
Update add_existing_baseyear.py 2023-04-25 17:04:28 +02:00
pre-commit-ci[bot]
2433c00dcb [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-04-25 13:52:57 +00:00
lisazeyen
9fc9476c6b add UC function 2023-04-25 14:57:56 +02:00
virio-andreyana
71c1a7fbef
add the function add_missing_carrier 
add_missing_carrier() are applied on python script where new components are added. The function runs ideally after all of the new components are added and before add_nice_carrier_names()
 2023-04-25 14:43:04 +02:00
pre-commit-ci[bot]
3625d401c6 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-04-24 22:09:09 +00:00
virio-andreyana
e550ba915d
Update add_extra_components.py 
Note: 
- battery charger and battery discharger has no nice name nor plot_color
- H2 electrolysis is similar to H2 Electrolysis in the tech_color
- H2 fuel cell is similar to H2 Fuel cell in the tech_color
- H2 pipeline do have have nice name and tech_color, but the addition of it depends on the link being true in config
 2023-04-24 14:08:25 +02:00
Fabian Neumann
e20e7bf844 fix addition of load shedding 2023-04-24 12:33:55 +02:00
virio-andreyana
ad9a67509f
Add carrier "AC" and "DC" in base_network.py 2023-04-24 05:05:43 +02:00
euronion
54346b071e Address pandas deprecation of date_parser for pandas.read_csv 2023-04-22 20:33:38 +02:00
pre-commit-ci[bot]
0a3c177f4b [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-04-22 07:44:59 +00:00
Fabian Neumann
f2e53b59bf add plain hydrogen turbine option for re-electrification 2023-04-22 09:44:13 +02:00
Fabian
97bdbe636c follow-up: rename configs to config 2023-04-21 11:05:18 +02:00
Fabian
1f6f7a2039 replace config.yaml by config/config.yaml in doc and docstrings 2023-04-21 10:41:44 +02:00
Fabian
e40011cb3c Merge branch 'master' into configs-in-one-folder 2023-04-21 10:26:45 +02:00
Fabian
5c8e0080c8 pre-commit: update docformatter version 2023-04-21 10:11:44 +02:00
Fabian Neumann
92895ec378
Merge branch 'master' into fix-reserve-constraint 2023-04-21 10:06:29 +02:00
Fabian
79501b5741 build_biomass: fix geopandas compat with pandas v2.0 2023-04-20 20:37:27 +02:00
Fabian
6d7eae8ad2 build_ship_raster: save reduced ship raster as tif file 2023-04-20 19:56:23 +02:00
Fabian Hofmann
691e0dbb9d
Merge branch 'master' into rioxarray-to-envs 2023-04-20 18:36:31 +02:00
lisazeyen
1cd658c03f
rename constraint 
rename constraint to fit to other syntax

Co-authored-by: Fabian Hofmann <fab.hof@gmx.de>
 2023-04-20 09:55:50 +02:00
pre-commit-ci[bot]
51785524a3 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-04-20 07:39:18 +00:00
lisazeyen
27dc9cedfd fix bugs in reserve constraint 2023-04-20 09:35:53 +02:00
pre-commit-ci[bot]
05b0a81808 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-04-16 13:32:24 +00:00
virio-andreyana
eca0a89152
Merge branch 'master' into configs-in-one-folder 2023-04-16 15:32:07 +02:00
Ahmad
b877b41019
- incorporated the remaining changes 
- added a released note about the renaming of build_load_data to build_electricity_demand
 2023-04-16 02:28:56 +02:00
pre-commit-ci[bot]
763d77d19d [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-04-14 19:05:46 +00: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
virio-andreyana
f3872c9433
Update copy_config.py 
insert the new path for config for the copying process, solve the error in rule copy_config
 2023-04-12 02:45:28 +02:00
pre-commit-ci[bot]
460bbd080f [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-04-10 22:02:35 +00: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
a72a620a60 add global constraints in concat, adjust bio stores 2023-04-05 18:19:35 +02:00
lisazeyen
91d2a4a052 adjust plotting 2023-04-05 18:18:53 +02:00
lisazeyen
f0d6d2be07 add multi-deacde 2023-04-05 15:47:03 +02:00
lisazeyen
5989c287c4 adjust summary functions 2023-04-05 15:45:35 +02:00
lisazeyen
f2ff8beae8 fix plot bugs 2023-04-05 15:45:07 +02:00
lisazeyen
b50954aee4 remove snakemake from function 2023-04-05 15:43:02 +02:00
lisazeyen
d836970004 always add load shedding with 1e2 2023-04-05 10:39:16 +02:00
lisazeyen
57ef5cd259 Merge remote-tracking branch 'origin' into perfect 2023-04-05 10:14:50 +02:00
lisazeyen
247c504604 adjust to new pypsa-eur syntax 2023-04-03 17:39:47 +02:00
lisazeyen
952a6ba1b5 add scripts for perfect foresight 2023-04-03 16:41:15 +02:00
lisazeyen
00544ee6f9 add lifetimes for perfect 2023-04-03 16:39:59 +02:00
Fabian Neumann
55d111e7af fix land eligibility calculation for UA and MD 2023-03-31 12:06:10 +02:00
Fabian Neumann
eddde8fb3a convert ipynb to py 2023-03-31 10:43:47 +02:00
pre-commit-ci[bot]
423c3d6999 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-03-17 11:40:05 +00:00
Fabian Neumann
f8830fcf69 doc: implement review feedback (amend) 2023-03-17 12:39:43 +01:00
pre-commit-ci[bot]
e83b1b0291 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-03-16 14:56:46 +00:00
Fabian Neumann
6dbfd798b9 encapsulate imports in helpers to minimise requirements for docs 2023-03-16 15:54:52 +01: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]
36fbc53289 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-03-11 13:28:30 +00:00
Fabian Neumann
6444640c1f Merge branch 'master' into ukraine_hackathon 2023-03-11 14:28:10 +01:00
Fabian
8ff4685531 follow up 2023-03-10 17:30:51 +01:00
Fabian
373c64a592 solve_network: check if sector_opts is in wildcard 2023-03-10 17:14:01 +01:00
Fabian
6034cc1669 build_sequestration: fix url with docformatter 2023-03-10 16:56:32 +01:00
Fabian
ebc5a99338 follow up: fix img path 2023-03-10 16:12:02 +01:00
Fabian
e9bf639f2d solve_network: add line breaks in docstring 2023-03-10 16:10:01 +01:00
Fabian
5fe4032e47 solve_network: reinsert docstring 2023-03-10 16:07:21 +01:00
Fabian Hofmann
30b8bb3c94
Update scripts/solve_network.py 
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
 2023-03-10 16:00:52 +01:00
Fabian
99a9ea8beb adress review comments 2023-03-10 15:58:53 +01:00
Fabian
f8d178c714 prepare_sector: revert taking mean 
config.overnight: revert hourly resolution
 2023-03-10 14:26:31 +01:00
Fabian
4f0ddf2e95 fix Nyears scaling 2023-03-10 14:12:22 +01:00
Fabian
2baf8f5ba4 harmonive solve_network across workflow 2023-03-09 23:56:12 +01:00
pre-commit-ci[bot]
a9b09e4ae4 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-03-09 13:27:08 +00:00
Max Parzen
4cb21f05ec add Linopy to PyPSA 2023-03-09 13:24:25 +00: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
3f74b6bec7 Merge branch 'merge-pypsa-eur-sec' of github.com:PyPSA/pypsa-eur into merge-pypsa-eur-sec 2023-03-09 13:28:50 +01:00
Fabian Neumann
91ea0a3f55 docs: rearrange sections 2023-03-09 13:28:42 +01:00
pre-commit-ci[bot]
ce6df71399 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-03-09 11:48:04 +00:00
Fabian
5356feab49 helpers: allow to overwrite config in mock_snakemake and allow mock_snakemake to be called from repo root 2023-03-09 12:46:40 +01:00
Fabian Neumann
abe4df543e add minimal description of all scripts 2023-03-09 12:45:43 +01:00
pre-commit-ci[bot]
3402908834 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-03-09 10:39:59 +00:00
Fabian Neumann
f5edafd00d speed-up CI, just a week rather than a month, 4 nodes, 40H 2023-03-09 11:37:34 +01:00
Fabian Neumann
8f5775d9cc Merge branch 'merge-pypsa-eur-sec' into sec-subset-countries 2023-03-09 11:28:07 +01:00
Fabian Neumann
89a3570c18 sort countries 2023-03-09 11:24:10 +01:00
Fabian Neumann
22846d7b1b sector-coupled: run on subset of selected countries 2023-03-09 11:04:41 +01:00
pre-commit-ci[bot]
f128cc3e3c [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-03-09 07:36:43 +00:00
Fabian Neumann
483f3e1b82 eliminate manual country code conversion, adjust mock_snakemake to ll wildcard 2023-03-09 08:36:18 +01:00
Fabian
104fc68fb0 allow to disable progressbar 2023-03-07 20:37:47 +01:00
pre-commit-ci[bot]
d45bee628e [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-03-07 17:25:45 +00:00
Fabian
5cf2b8174a scripts: apply linting fixes 2023-03-07 17:21:00 +01:00
pre-commit-ci[bot]
54f0cde490 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-03-07 11:22:08 +00:00
Fabian
5260e0c71f build industrial demand/production: ensure compat with multiprocesses on win/mac 2023-03-07 12:21:47 +01:00
pre-commit-ci[bot]
0b57626387 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-03-07 09:36:26 +00:00
Fabian
6761c50782 build industrial production: fix partial function in imap 2023-03-07 10:35:21 +01:00
Fabian
ba6e0c2e4a move snakemake object out of imap process functions 2023-03-07 08:59:01 +01:00
pre-commit-ci[bot]
27c0d3a2d2 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-03-06 18:18:20 +00:00
Fabian Neumann
265fa098ae Merge branch 'merge-pypsa-eur-sec' of github.com:PyPSA/pypsa-eur into merge-pypsa-eur-sec 2023-03-06 19:16:45 +01:00
Fabian Neumann
541b83b049 merge helper.py into _helpers.py 2023-03-06 19:16:37 +01:00
pre-commit-ci[bot]
8fa29865b6 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-03-06 18:13:35 +00:00
Fabian Neumann
939f23f5a4 remove unused function in _helpers 2023-03-06 19:13:15 +01:00
Fabian Neumann
bd16f01397 use progress_retrieve from single source 2023-03-06 19:11:29 +01:00
Fabian Neumann
3bdf3b6f5e use mock_snakemake from pypsa-eur 2023-03-06 19:09:45 +01:00
Fabian Neumann
93d9e13f52 add spdx identifiers to scripts 2023-03-06 18:49:23 +01:00
Fabian
504e5b0b9c delete unnecessary log files 
fix make_summary for myopic
 2023-03-06 18:23:31 +01:00
Fabian Neumann
ab501f3eb6 remove plot_p_nom_max 2023-03-06 17:41:09 +01:00
pre-commit-ci[bot]
b7c58883b7 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-03-06 16:19:25 +00:00
Fabian Neumann
76d57731ec fix all lv references to ll, pickup right location of default lifetime 2023-03-06 17:18:07 +01:00
pre-commit-ci[bot]
9026e0920d [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-03-06 15:54:38 +00:00
Fabian
bffb7cc17c scripts/ remove summary_dir and results_dir references 2023-03-06 16:53:20 +01:00
Fabian Hofmann
9b7e4d3bee
Merge branch 'master' into merge-pypsa-eur-sec 2023-03-06 16:09:42 +01:00
Fabian Hofmann
4e259c1c6e
Merge branch 'master' into ci-config 2023-03-06 15:44:24 +01:00
Fabian
bf969424a2 ci modularization fix cutout retrieval and profile in dag 2023-03-06 15:41:02 +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
d27fee7e77 align cost fill values to pypsa-eur implementation 2023-03-06 14:47:46 +01:00
Fabian Neumann
b30ff67458 remove unneeded currency conversion USD to EUR 2023-03-06 14:38:04 +01:00
Fabian Neumann
0673430eec use line length factor from single config source 2023-03-06 14:33:56 +01:00
Fabian Neumann
ee5a0c4e73 conform to pypsa-eur logging level definition 2023-03-06 14:27:15 +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
604d086016 resolve merge conflict 2023-03-06 09:46:56 +01:00
Fabian Neumann
9dbeea17ec fix: handle overlooked merge conflict 2023-03-06 09:45:28 +01:00
pre-commit-ci[bot]
d0e0880b19 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-03-06 08:43:17 +00:00
pre-commit-ci[bot]
5ab10eae37 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-03-06 08:40:21 +00:00
Fabian Neumann
ad6a490f57 resolve merge conflict 2023-03-06 09:39:10 +01:00
Fabian Neumann
5f61bc4bae fix isort compatibility 2023-03-06 09:35:40 +01:00
Fabian
3bbd321b82 config: separate solver_options 
solve_network: adjust code to new solver_options config
 2023-03-06 09:35:11 +01:00
pre-commit-ci[bot]
13769f90af [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-03-06 08:27:46 +00:00
Fabian Neumann
2f39280f14 spelling corrections 2023-03-06 09:23:30 +01:00
Fabian Neumann
b2295278f3
Merge branch 'master' into ci-config 2023-03-05 16:01:57 +01:00
pre-commit-ci[bot]
36003c9627 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2023-03-05 14:12:39 +00:00
Fabian Neumann
8837ba6a5f allow false for max_depth 2023-03-05 15:12:20 +01:00
Fabian Neumann
6d98edb320
Merge pull request #314 from PyPSA/loggin-replace-print 
Replacing print statement with logging
 2023-03-05 15:07:10 +01:00
virio-andreyana
0985aa17b3
fix SettingwithCopyWarning in plot_network.py 
Fix SettingwithCopyWarning in plot_network.py by using pandas clip and replace.
 2023-03-01 12:35:51 +01:00
virio-andreyana
f75cec93d6
lower log level in plot_summary.py and fix warning 
reduce the level of "Dropping technology energy balance smaller than {snakemake.config['plotting']['energy_threshold']/10} {units}" and "Total energy balance for {v} of {round(df.sum()[0],2)} {units}" from INFO-> DEBUG. 

Extra warning fix
Add `plt.cla()` in the `for k, v in balances.items()` and take out fig, ax = plt.subplots(figsize=(12,8)) from that for loop to fix RuntimeWarning: More than 20 figures have been opened. Figures created through the pyplot interface (`matplotlib.pyplot.figure`) are retained until explicitly closed and may consume too much memory. (To control this warning, see the rcParam `figure.max_open_warning`).
 2023-03-01 12:29:36 +01:00
virio-andreyana
379ed0da93 Sentence capitalized 2023-02-24 14:42:51 +01:00
virio-andreyana
d237e60b25 Replacing print statement with logging 2023-02-23 10:30:32 +01:00
Fabian Neumann
e74e5d9864
Merge pull request #312 from PyPSA/myopic-p_nom_max 
myopic: adjust p_nom_max if existing larger
 2023-02-22 19:14:20 +01:00