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
5b057575df
prepare_sector_network: make use of biomass transport file optional
2023-08-02 14:39:20 +02:00
Fabian Hofmann
b2ab4bbe56
Merge branch 'master' into biomass-transport-costs
2023-08-02 13:14:13 +02:00
Fabian
03e3278f89
prepare_sector: add biomass transport costs for networks wo biomass network
2023-08-02 13:12:08 +02:00
virio-andreyana
657dd08b53
edit configtables and accept Fneum suggestion
2023-08-02 11:11:41 +02:00
Fabian Hofmann
e6ba640ba3
Merge branch 'master' into validation
2023-08-01 12:24:58 +02:00
Fabian
3417f61f50
monthly prices: adjust manual cost assumptions
2023-08-01 12:11:42 +02:00
Fabian Neumann
9808943f23
build_renewable_profiles considers subsets of cutout time scope; handle client shutdown
2023-08-01 09:54:48 +02:00
pre-commit-ci[bot]
5a31b6f5b5
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-08-01 07:45:40 +00: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
pre-commit-ci[bot]
ade7e17d57
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-07-31 09:20:35 +00:00
Fabian Hofmann
1ea8cf47d8
Merge branch 'master' into validation
2023-07-31 11:20:11 +02:00
Fabian
9579198162
validation: further fine-tuning
2023-07-31 11:15:50 +02:00
virio-andreyana
c771f3fac0
Merge branch 'validation' of github.com:PyPSA/pypsa-eur into validation
2023-07-31 01:27:36 +02:00
virio-andreyana
6bf6ec603c
fix cross border flow coloring, country color are more contrasted, and update the config documentations
2023-07-31 01:27:15 +02:00
pre-commit-ci[bot]
7c00f9d451
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-07-28 13:14:42 +00:00
daniel.rdt
407037a799
fix in add_heating_capacities_installed_before_baseyear to account for case when there is no rural heating demand for some nodes in network
2023-07-28 15:09:13 +02:00
Fabian Neumann
8e6a70b468
prepare release 0.8.1
2023-07-27 11:23:02 +02:00
Fabian Hofmann
6a96931833
Merge branch 'master' into misc/deprecations
2023-07-26 15:04:24 +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
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
Fabian Neumann
8512129f2c
Merge branch 'master' into cluster-m
2023-02-22 18:57:21 +01:00
Fabian Neumann
846049770e
cluster option 'm' only aggregates conventional carriers not excluded
2023-02-22 18:55:05 +01:00
lisazeyen
332936bcec
adjust p_nom_max if existing larger
2023-02-22 17:44:05 +01:00
Fabian
3642d5c834
build_renewable_profiles: remove progressbar import
2023-02-22 15:07:57 +01:00
pre-commit-ci[bot]
b134a395b4
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-02-22 13:40:37 +00:00
Fabian
44bb81af46
helpers: undo position fixing in tqdm
2023-02-22 14:40:02 +01:00
pre-commit-ci[bot]
64745e7ec2
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-02-22 13:21:28 +00:00
Fabian
825d3e84d2
replace progressbar by tqdm
2023-02-22 14:20:18 +01:00
Fabian
dad7d2050e
build_population_layouts: replace vresutils area calculation
2023-02-22 13:26:17 +01:00
virio-andreyana
e80cab63ca
Update build_biomass_potentials.py
...
Maybe something in the middle? swiss is a list, while pop was a panda series.
2023-02-22 13:00:06 +01:00
virio-andreyana
74d31c4554
fixing some warnings in build_biomass_potentials.py, build_gas_input_locations.py, scripts/build_population_layouts.py
2023-02-22 12:17:30 +01:00
Fabian Hofmann
8215510f09
Merge pull request #282 from PyPSA/ci-review
...
Transition to `linopy` implementation
2023-02-22 09:18:29 +01:00
Fabian
19c35f8a6a
use muting of excel read with context manager
2023-02-21 23:20:02 +01:00
Fabian
7e87044424
solve_network: warn if network is not optimal
2023-02-21 21:58:42 +01:00
Fabian
8bf6238785
Merge branch 'master' into ci-review
2023-02-21 17:57:27 +01:00
virio-andreyana
f276b130bd
Hide uninformative text caused by subprocess outputs
2023-02-18 13:47:34 +01:00
Fabian Neumann
b14d657042
minor fixes and address deprecation warnings
2023-02-16 20:13:26 +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
82939ca546
resolve merge conflicts
2023-02-16 18:34:24 +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
Fabian Neumann
03ac301238
build_shapes: crs
2023-02-16 14:04:13 +01:00
Fabian Neumann
b6732bf6c4
documentation updates
2023-02-16 12:37:30 +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
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
809b07be86
Merge pull request #303 from PyPSA/electrolysis-wasteheat
...
add option to use electrolysis waste heat in district heating
2023-02-15 19:06:12 +01:00
Fabian Neumann
b1b289fc45
add option to use electrolysis waste heat in district heating
2023-02-15 14:01:00 +01:00
Fabian Neumann
5d08dfc2ec
add min part load for FT and methanolisation via p_min_pu
2023-02-15 13:47:57 +01:00
Fabian
7d5d48ac26
solve network: fix sequestration constraint
2023-02-10 18:58:30 +01:00
Fabian Neumann
01db4f4408
compatibility with technology-data v0.5
2023-02-10 07:49:45 +01:00
Fabian
38a58b62f7
prepare sector: fix logger percentage info
2023-02-09 17:53:27 +01:00
Fabian
a0c1d321cc
plot_network: fix empty h2 retrofit for myopic
2023-02-08 23:58:56 +01:00
Fabian
d36629a836
add_brownfield: remove basename import
2023-02-08 23:58:24 +01:00
Fabian
46e3b16959
prepare sector: harmonize logger infos
2023-02-08 23:20:52 +01:00
Fabian
98e3c7ab2c
solve_network: fix kwargs in solve_network
2023-02-08 22:59:36 +01:00
Fabian
3f98ccb9e2
update technology data version
2023-02-08 22:59:25 +01:00
Fabian
94fb6c646c
prepare sector: add allam cycle
...
build sequestration: fix input for new snakemake versions
2023-02-08 22:57:01 +01:00
Fabian
f4d0415cf0
solve_network: activate co2 seq constraint
...
Snakefile: retrieve data bundle from pypsaeur function
2023-02-08 18:19:31 +01:00
Fabian Hofmann
d144547d87
Merge branch 'ci-review' into linopy-integration
2023-02-08 15:37:00 +01:00
Fabian
faa95c500c
config: modularize solver_options
2023-02-08 15:24:17 +01:00
Fabian
69dabc367f
ci: fix test configs
2023-02-08 15:24:17 +01:00
Fabian
6c57b81a4a
config: move solver options in dedicated section
...
test configs: reduce to relative changes
CI: use snakemake --configfile options
2023-02-08 15:24:17 +01:00
Fabian
c25091ce34
solve_network.py: switch to linopy interface
2023-02-08 15:19:32 +01:00
Fabian
c8f601edf8
solve.py: start converting extra_funcionalities
2023-02-08 15:19:32 +01:00
virio-andreyana
d33547efba
importing rioxarray instead of xarray to open rasterio file
2023-02-08 11:45:18 +01:00
pre-commit-ci[bot]
9f87099dbb
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-02-07 13:12:55 +00:00
Fabian
efedfa945b
build_shapes: replace unary union from shapely by geopandas equivalent
2023-02-07 14:08:59 +01:00
pre-commit-ci[bot]
cb94e5974e
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-02-07 12:20:09 +00:00
Fabian Hofmann
0375359c82
Merge branch 'master' into fix-storage-volumes
2023-02-07 13:19:27 +01:00
pre-commit-ci[bot]
e6ecbc95d7
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-02-06 22:28:32 +00:00
Fabian Neumann
ad8ccf3b25
fix process emission localisation with co2 (not) spatially resolved
2023-02-06 09:52:35 +01:00
Fabian Neumann
a0b18a8fcd
manage process emissions in spatial
2023-02-06 09:46:24 +01:00
thomgeo
1f9d64c5d5
fixed bug that set max_hours for many plants to 6
2023-02-02 14:59:50 +01:00
Fabian Neumann
5bb35d188e
Merge branch 'master' into ukraine_hackathon
2023-01-30 18:58:55 +01:00
Fabian Neumann
4a2da0a5f4
Update scripts/add_existing_baseyear.py
2023-01-30 11:55:40 +01:00
Fabian Neumann
984ab9350c
Update scripts/prepare_sector_network.py
2023-01-30 11:54:19 +01:00
Fabian Neumann
6996748d9b
Merge branch 'master' into cluster_heat_nodes
2023-01-30 11:53:00 +01:00
Fabian Neumann
27e6039379
Merge branch 'master' into pz-max-patch-2
2023-01-28 08:26:28 +01:00
Fabian Neumann
0681cf93ab
fix hydrogen network plotting without retrofitting
2023-01-25 09:08:51 +01:00
Fabian Neumann
697be2d9e3
fix capacities of biomass transport
...
The biomass transport links are split into either direction
because they have a marginal cost associated with the
transport. With p_nom_extendable, many decision variables
are created. This commit tries another way where
capacities are non-extendable and set to sufficiently high
values.
2023-01-25 08:41:08 +01:00
Fabian Neumann
71e2a4943c
carbon management
2023-01-24 18:44:39 +01:00
pre-commit-ci[bot]
8bdba5653a
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-01-23 21:27:20 +00:00
virio-andreyana
da6469b80c
Update scripts/build_gas_input_locations.py
...
Co-authored-by: Fabian Hofmann <hofmann@fias.uni-frankfurt.de>
2023-01-11 10:08:10 +01:00
pre-commit-ci[bot]
0cf6d47afb
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-01-10 21:56:42 +00:00
Max Parzen
9633ab9836
Merge branch 'master' into pz-max-patch-2
2023-01-10 21:56:24 +00:00
Fabian Neumann
8bafaf25f7
plot_network: adjust limits and thresholds
2023-01-07 13:23:33 +01:00
pre-commit-ci[bot]
3c099095dc
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-01-06 20:51:51 +00:00
Fabian Neumann
3d4af04d88
update eia hydro data, fix missing merge conflict
2023-01-06 21:51:33 +01:00
pre-commit-ci[bot]
acc6ee6bfe
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-01-06 17:46:06 +00:00
Fabian Neumann
1ebe53cdac
merge master
2023-01-06 18:45:36 +01:00
Fabian Neumann
527c77824c
allow carbon capture in biogas upgrading ( closes #49 )
2023-01-05 16:41:49 +01:00
Fabian Neumann
64969c2dee
add methanol store
2023-01-05 13:42:01 +01:00
Fabian Neumann
ddcaff0b5b
plot_network: do not plot very small pipelines
2023-01-03 13:14:16 +01:00
Fabian Neumann
383aef7e1c
rename shipping_average_efficiency to shipping_oil_efficiency
2023-01-03 08:38:10 +01:00
virio-andreyana
0cb0ad528a
Appending comments for gas_input_locations
2022-12-29 12:14:26 +01:00
Fabian Neumann
27414ac010
new config options for demand in aviation + HVC, control of ICE shares in land transport and agriculture
2022-12-29 11:46:57 +01:00
Fabian Neumann
6f901f4c50
restore compatibility with latest master version
2022-12-28 15:43:43 +01:00
Fabian Neumann
520cad53a2
address sum(level) deprecation
2022-12-28 14:11:47 +01:00
Fabian Neumann
cac724fee0
merge master
2022-12-28 13:55:36 +01:00
Fabian Neumann
b9c1fdb65e
include methanolisation in PtL
2022-12-28 13:46:31 +01:00
Fabian Neumann
292ec9d5a1
fix computation of shipping demands
2022-12-28 13:45:42 +01:00
Fabian Neumann
f645d13743
Merge branch 'master' into methanol
2022-12-28 12:51:59 +01:00
Fabian Neumann
138d151c8b
only compute solar thermal profiles if technology is included
2022-12-28 12:48:51 +01:00
Fabian Neumann
38fd51fca9
Merge branch 'master' into methanol
2022-12-28 12:22:01 +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
3999afdb5a
fixes to methanol implementation
2022-12-28 12:19:20 +01:00
Fabian Neumann
5360eb0a2e
Merge branch 'master' of https://github.com/pypsa/pypsa-eur
2022-12-28 09:35:15 +01:00
Fabian Neumann
a08c20d7c8
build_shapes: cleanup shape union of RS and KV
2022-12-28 09:35:11 +01:00
Fabian Neumann
bb5c5bd143
simplify_networks: add control for removing stubs II
2022-12-28 09:34:28 +01:00
Fabian Neumann
e9f3d20432
simplify_networks: add control for removing stubs
2022-12-28 09:33:08 +01:00
Fabian Neumann
bb1b37e8ef
address pandas iteritems deprecation
2022-12-27 13:16:05 +01:00
Fabian Neumann
70d07d561f
address pandas deprecations
2022-12-27 11:42:32 +01:00
Fabian Neumann
3d7c354d2b
merge master
2022-12-27 11:16:39 +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
Max Parzen
545a734b7b
Merge branch 'master' into pz-max-patch-2
2022-12-16 12:20:58 +00:00
Max Parzen
9e61e30ff4
Fix EQ constraint in case no hydro exist
2022-12-16 11:00:39 +00:00
Max Parzen
b7899787cf
Fix load variable in reserve constraint
2022-12-16 10:50:20 +00:00
virio-andreyana
e1776518c0
Merge remote-tracking branch 'origin/update-lng-ports' into update-lng-ports
2022-12-15 12:20:05 +01:00
virio-andreyana
55ff725e3b
Final edit to update LNG ports. Remove unused files
2022-12-15 11:42:21 +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
virio-andreyana
4f3510e3cc
Replacing the IGGIELNG_LNG data with Europe-Gas-Tracker
2022-12-07 10:36:54 +01:00
Fabian Neumann
0c62bfc9ee
complete methanol for shipping
2022-12-03 12:22:05 +01:00
lisazeyen
5b256bfa5d
take VOM for RES from existing
2022-11-28 16:56:42 +01:00
Fabian Neumann
c44f1d61c7
remove hard-coded methanol efficiency
2022-11-27 18:28:57 +01:00
pre-commit-ci[bot]
94e5f160b0
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2022-11-25 10:16:23 +00:00
martacki
643a62049b
solve_network: move extra_functionality to args
2022-11-25 11:08:35 +01:00
Fabian
df4eb85a19
fix typos
2022-11-18 09:08:07 +01:00
Fabian
727688749c
build_bus_regions: fix shapely deprecation
2022-11-15 07:45:13 +01:00
Fabian Neumann
16a92477f0
methanol in shipping
2022-11-13 18:25:32 +01:00
Fabian Neumann
84618b3ee1
distribute international shipping by port trade volumes
2022-11-13 13:43:05 +01:00
Fabian
a73eea9379
update solve_network
2022-11-09 17:14:44 +01:00
Fabian
6d972600b1
clustering: remove old dependency
2022-11-09 17:04:31 +01:00
Fabian
992efcaa91
solve_network: fix net vres share
2022-11-09 16:50:05 +01:00
Huang, Jiangyi
80868e5f0f
Update make_summary.py
...
The value for `na_action` needs to be "ignore" or "None".
2022-11-03 13:46:20 +01:00
Fabian
0b2989c987
build_natura_raster: fix out_shapes
2022-10-31 11:47:21 +01:00
pre-commit-ci[bot]
dcd16e32a8
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2022-10-25 13:23:20 +00:00
Adrian Odenweller
73b0645c13
Fix network directory path in make_summary
2022-10-25 14:29:07 +02:00
Fabian Neumann
1611d63a8a
Merge branch 'master' into nh3
2022-10-01 16:01:39 +02:00
lisazeyen
9a74e3d699
set co2seq to limit of sequestration potential
2022-09-29 09:12:36 +02:00
nnhjy
d29441d871
update deprecated syntax
2022-09-28 20:33:50 +02:00
lisazeyen
7606562449
update sector opt for co2 seq potential
2022-09-28 16:09:53 +02:00
pre-commit-ci[bot]
85d01bceb0
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2022-09-19 14:34:48 +00:00
