Commit Graph

301 Commits

Author SHA1 Message Date
Fabian Neumann
95853bb59d _helpers: allow specifying dedicated shared_resources folder 2024-02-17 18:27:59 +01:00
Fabian Neumann
35b2228891 Merge branch 'wc-to-cf' into scenario-management 2024-02-17 17:16:28 +01:00
Fabian Neumann
d2a66879de Merge branch 'master' into scenario-management 2024-02-17 17:04:36 +01:00
Fabian Neumann
dd2416a59e handle all {opts} and {sector_opts} wildcard values in config 2024-02-17 11:57:16 +01:00
Fabian Neumann
93bb4e5f54 add release note, simplify build_industry_sector_ratios_intermediate script 2024-02-16 15:14:18 +01:00
Fabian Neumann
c3feb0e283 handle complicated config-dependent inputs using unpack() with input functions 2024-02-12 16:56:00 +01:00
Fabian Neumann
c83db4e84e add retrieve_cost_data.py script to handle config_provider and move to resources
since dependent on config setting
2024-02-12 16:54:33 +01:00
Fabian Neumann
bb7b65eebd move create_scenarios.py to config directory 2024-02-12 11:52:07 +01:00
Fabian
94f72d7276 electricity demand: remove powerstastics flag, merge sources in retrieve_electricity_demand 2024-02-12 10:08:39 +01:00
Fabian Neumann
6de08bd523 Merge branch 'master' into scenario-management 2024-02-10 17:22:01 +01:00
Fabian Neumann
7ad5dcc3ee add release notes and documentation 2024-02-07 17:25:09 +01:00
Tom Brown
f38681f134 correctly source the existing heating technologies for buildings
The source URL has changed. It represents the year 2012 and is only
for buildings, not district heating. So the capacities for urban
central are now set to zero from this source.
2024-02-07 17:13:53 +01:00
Fabian Neumann
a834ff222a streamline code for year-dependent technologies (turbines/panels) 2024-02-05 12:10:35 +01:00
Fabian Neumann
987930c250 document that resolution and segmentation config options are only for electricity-only 2024-01-25 16:43:08 +01:00
Koen van Greevenbroek
03c914bef1 Make projection selection flexible by reading directly from config 2024-01-25 14:34:03 +01:00
Koen van Greevenbroek
9aa154bd04 Add several map projection options 2024-01-25 10:44:24 +01:00
pre-commit-ci[bot]
9843397b5a [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-01-24 10:48:55 +00:00
Koen van Greevenbroek
3e32dbccb5 Add support for the linopy io_api option 2024-01-24 11:23:56 +01:00
Fabian Neumann
a6edce58fb remove wave energy generator 2024-01-11 09:47:09 +01:00
Philipp Glaum
1903c51f36 Merge remote-tracking branch 'upstream/master' into implement-floating 2024-01-09 14:44:21 +01:00
euronion
01f201743d Implement everywhere_powerplants 2024-01-08 09:30:21 +01:00
pre-commit-ci[bot]
bf5c323c27 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-01-05 16:34:22 +00:00
Fabian Neumann
66c9513fbd prepare release notes and amend documentation 2024-01-05 17:20:52 +01:00
Fabian Neumann
6dd9d6a9c1 Merge branch 'fneum/services_heat' 2024-01-05 14:39:29 +01:00
Fabian Neumann
f68e8d3d61
Merge branch 'master' into wildcard-opts-config 2024-01-05 12:02:11 +01:00
Fabian Neumann
af7c1b15e6 add documentation 2024-01-04 20:10:05 +01:00
martacki
d6137f8e93 merge branch 'master' into services_heat 2024-01-04 15:38:10 +01:00
Fabian Neumann
f451e28f58 add release notes and documentation 2024-01-04 11:42:24 +01:00
Fabian Neumann
2096131b03
Merge pull request #842 from PyPSA/luisa-2
add option to use LUISA land coverage data
2024-01-04 09:32:55 +01:00
Fabian Neumann
b4fb395158 Merge branch 'master' into custom-extra-functionality 2024-01-04 08:32:29 +01:00
Fabian Neumann
cd3eddcc3a
Merge pull request #739 from PyPSA/complete-losses
Lossy bidirectional links
2024-01-03 16:54:02 +01:00
Fabian Neumann
c3bb41c900 Merge branch 'master' into multiyear 2024-01-03 15:14:27 +01:00
Fabian Neumann
ecd85d23d3 add option to use LUISA land coverage data 2024-01-03 15:01:43 +01:00
Fabian Neumann
6242675c27
Merge pull request #836 from PyPSA/remove-helmeth
remove helmeth option
2024-01-03 13:24:43 +01:00
Fabian Neumann
83ecaac4de
Merge branch 'master' into wildcard-opts-config 2024-01-03 13:08:21 +01:00
Fabian Neumann
6b344c9901 renewable_profiles: remove conservative potential estimation method 2024-01-03 10:33:33 +01:00
Fabian Neumann
9d939fa635 remove helmeth option 2024-01-03 10:12:43 +01:00
Fabian Neumann
4db59eddc2 Merge branch 'master' into complete-losses 2024-01-03 09:29:14 +01:00
Fabian Neumann
d829d6fd3d add release notes and documentation 2024-01-03 09:28:24 +01:00
Fabian Neumann
a10a60b951 rename setting from biomass_upgrading_cc to biogas_upgrading_cc 2024-01-02 18:52:22 +01:00
Fabian Neumann
b0cca00b70 add documentation and release note for biogas upgrading CC 2024-01-02 18:51:03 +01:00
Fabian Neumann
340bf77849 clarify that source_path is relative to directory 2024-01-02 16:01:28 +01:00
Fabian Neumann
8a11bdb4b1 solve_network: option to inject custom extra functionalities from source file 2023-12-29 17:19:19 +01:00
yerbol-akhmetov
0f41ff79cf update configtable for resistive_heaters 2023-12-28 13:53:15 +06:00
yerbol-akhmetov
640a4b1b2e update boilers description in confitables 2023-12-28 13:51:30 +06:00
yerbol-akhmetov
12096d1f2f update configtable by adding resistive_heaters 2023-12-23 12:55:50 +06:00
Fabian Neumann
43674bcee8
Revert "Add option for carbon capture in integrated steelworks" 2023-12-14 16:30:30 +01:00
Fabian Neumann
e0ca38be6e
Merge pull request #719 from PyPSA/blast-furnace-with-cc
Add option for carbon capture in integrated steelworks
2023-12-11 20:12:26 +01:00
Fabian Neumann
ea7a66b873
Merge pull request #794 from PyPSA/mv-focus-weights
move focus_weights into clustering configuration segment
2023-12-11 20:10:46 +01:00
Fabian Neumann
9b2edd076b ensure just a single focus_weights definition 2023-12-11 20:08:27 +01:00
Fabian Neumann
0f3fb540ef finalise ukraine_hackathon branch for merge 2023-12-11 18:24:57 +01:00
Fabian Neumann
e5bdb4796a move focus_weights into clustering configuration segment (backward compatible) 2023-12-06 10:09:17 +01:00
Fabian Neumann
5d6d01f8c0 make CC in blast furnaces optional 2023-11-23 12:11:12 +01:00
Fabian Neumann
dfecf35bae add focus_weights to documentation 2023-11-20 19:45:10 +01:00
Philipp Glaum
728d74caa8 update floating wind settings 2023-11-06 15:46:46 +01:00
Fabian Neumann
97a5be1e84
Merge branch 'master' into feature/retrieve-irena 2023-10-11 16:17:15 +02:00
Thomas Gilon
124177b6db Add option for SMR CC 2023-10-11 14:32:47 +02:00
Thomas Gilon
43e20a26e6 Add rule to update IRENA data for existing infrastructure 2023-10-11 14:26:04 +02:00
pre-commit-ci[bot]
7e290d3e52 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-10-08 09:55:38 +00:00
Fabian Neumann
b8fee80919 Merge branch 'master' into multiyear 2023-10-08 11:55:11 +02:00
virio-andreyana
a3a7e19b07 add finishing touches 2023-09-28 21:11:22 +02:00
virio-andreyana
0d1339b1d3 add wildcard options in config for solve network 2023-09-27 08:22:28 +02:00
virio-andreyana
0553559034 add documentations 2023-09-23 19:00:01 +02:00
Fabian
c7e6d36014 fix separators in run.csv 2023-08-24 13:33:26 +02:00
Fabian
04a2bea176 scenario-management: use list for including wildcards with shared resource 2023-08-24 13:20:11 +02:00
Fabian
62c6143863 scenario-management: reenable shared resources, make shared resources wildcards dependent 2023-08-23 17:14:57 +02:00
Fabian
9d4ce430cc electricity demand: remove powerstastics flag, merge sources in retrieve_electricity_demand 2023-08-17 10:17:12 +02:00
Fabian
e28ae59375 introduce scenario-management 2023-08-15 15:06:59 +02:00
Fabian
ad6322bcb3 address review commments 2023-08-04 12:58:31 +02:00
virio-andreyana
657dd08b53 edit configtables and accept Fneum suggestion 2023-08-02 11:11:41 +02:00
Fabian Hofmann
1ea8cf47d8
Merge branch 'master' into validation 2023-07-31 11:20:11 +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
Fabian Neumann
ddd1840981 Merge remote-tracking branch 'origin/master' into multiyear 2023-07-26 10:23:32 +02:00
Fabian
491345d504 config: move cutout specification to line-rating section
test/config: use be-cutout for testing line-rating
2023-07-25 15:08:44 +02:00
Fabian Neumann
56e93fe821
Merge branch 'master' into fneum/line-rating 2023-07-18 14:06:11 +02:00
Fabian Neumann
f39d737aa1
Merge pull request #694 from PyPSA/misc/autoretrieve
Add test and option to disable online retrieve rules
2023-07-17 21:44:40 +02:00
euronion
7437f32c0f Update enable.csv 2023-07-14 13:41:25 +02:00
Fabian Hofmann
9f4c227def
Merge branch 'master' into describe-config 2023-07-14 13:34:20 +02:00
pre-commit-ci[bot]
5482c27e8b [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-07-14 10:26:10 +00:00
virio-andreyana
23b154de36 adjust config table spacing 2023-07-14 12:25:23 +02:00
pre-commit-ci[bot]
a03574ba14 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-07-13 10:55:58 +00:00
Win_Surface_virio_andreyana
551e068136 Merge branch 'describe-config' of github.com:PyPSA/pypsa-eur into describe-config 2023-07-13 12:53:00 +02:00
Win_Surface_virio_andreyana
604e4f2a83 add description on technology_mapping 2023-07-13 12:52:18 +02:00
virio-andreyana
56fd99a10e
Apply three Fabian Neumann suggestions from code review
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2023-07-13 11:45:46 +02:00
virio-andreyana
8c4299ee10
Delete .~lock.sector.csv# 2023-07-12 12:42:54 +02:00
pre-commit-ci[bot]
4ecc7ae439 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-07-12 10:42:48 +00:00
virio-andreyana
d734529031
Apply Fabian Neumann suggestions from code review
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2023-07-12 12:42:31 +02:00
Fabian Neumann
6af92fcf67
Merge branch 'master' into fneum/line-rating 2023-07-11 14:37:17 +02:00
Fabian
9c6e5e0ed0 config: remove unneeded plotting entries 2023-07-05 11:34:07 +02:00
pre-commit-ci[bot]
0664f1050f [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-07-04 23:58:07 +00:00
virio-andreyana
1639014b40 Merge remote-tracking branch 'refs/remotes/origin/describe-config' into describe-config 2023-07-05 01:56:30 +02:00
virio-andreyana
55add4c785 finalized config documentation 2023-07-05 01:51:50 +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
191eba2009 dlr: add documentation of settings to lines.csv 2023-07-03 19:25:01 +02:00
pre-commit-ci[bot]
ac264282da [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-07-03 01:38:04 +00:00
virio-andreyana
9138901e5d add table for biomass, energy, existing capacities, solar thermal, plotting (need suggestion) 2023-07-03 03:37:41 +02:00
pre-commit-ci[bot]
febd293374 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-06-28 08:05:18 +00:00
virio-andreyana
d943e3bb68 add sector and industry table. In progress 2023-06-27 23:16:15 +02:00
virio-andreyana
678792009a preparing sector config data 2023-06-22 10:23:54 +02:00
Fabian Neumann
86e5f08fbf
Merge branch 'master' into linemaxext-config 2023-06-20 13:33:18 +02:00
virio-andreyana
0bf693c585 general update of .rst files 2023-06-16 01:31:59 +02:00
Fabian Neumann
ef5320e1b8 merge master 2023-06-02 16:59:06 +02: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
pre-commit-ci[bot]
add135fe05 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-04-30 08:53:00 +00:00
Fabian Neumann
e16fa286ec merge master 2023-04-29 12:41:37 +02:00
Fabian Neumann
30beee0959 Merge branch 'master' into multiyear 2023-04-29 12:40:55 +02:00
Fabian Neumann
e20e7bf844 fix addition of load shedding 2023-04-24 12:33:55 +02:00
Fabian Neumann
beae5e5111 doc: fix number of columns for sector-oprt 2023-03-16 16:02:02 +01:00
lisazeyen
07568b3464 add more sector_opts wildcards 2023-03-16 15:09:23 +01:00
pre-commit-ci[bot]
4357320218 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-03-16 11:06:17 +00:00
Fabian Neumann
17f9496f9b Merge branch 'merge-pypsa-eur-sec' of github.com:PyPSA/pypsa-eur into merge-pypsa-eur-sec 2023-03-16 12:05:43 +01:00
Fabian Neumann
2586969995 docs: add missing configuration options 2023-03-16 12:05:36 +01:00
pre-commit-ci[bot]
c24b119928 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-03-16 10:42:46 +00:00
Fabian Neumann
12d38bd867 docs: add release notes and document new config options 2023-03-16 11:41:50 +01:00
pre-commit-ci[bot]
23c92ca436 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-03-15 16:01:11 +00:00
Fabian Neumann
55395c5465 enhance documentation, with instructions for sector-coupled / electricity-only studies 2023-03-15 17:00:06 +01:00
Fabian Neumann
9c1182fe96 prepare release 0.7 2023-02-16 11:50:55 +01:00
Fabian Hofmann
62ca32b274
Merge branch 'master' into fix/deprecation-warning-pandas-1.4 2022-09-26 12:33:13 +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
Philipp Glaum
c8b67776fa Merge branch 'master' into exclude_carrier_clustering 2022-09-19 16:34:21 +02:00
Philipp Glaum
d51ca8695b update Fabians comments 2022-09-19 11:46:58 +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
Philipp Glaum
ebf54a7c9d update configtables in the documentation 2022-07-29 12:11:46 +02:00
Fabian Neumann
3c64ecf057 doc: fix syntax of electricity.csv 2022-07-27 11:55:37 +02:00
Fabian Neumann
8d132464bd
Merge branch 'release-v0.5' into introduce_modularity_clustering 2022-07-27 09:04:39 +02:00
Fabian Neumann
e523cb4cb5 doc: minor updates 2022-07-26 15:01:21 +02:00
Fabian Neumann
239dcfdd1e
Merge branch 'master' into introduce_modularity_clustering 2022-07-26 14:04:56 +02:00
Fabian Neumann
5bb432141d hydro: add documentation for eia approximation/correction options 2022-07-22 18:34:16 +02:00
Fabian Neumann
f52c8cd974 merge master 2022-07-22 18:30:16 +02:00
Fabian Hofmann
3ba7e2ab90
Merge branch 'master' into technology-data 2022-07-21 15:36:12 +02:00
Fabian Neumann
b04a55a248 merge former countries hydro profiles 2022-07-20 15:03:48 +02:00
martacki
90ffc35f05 documentation 2022-07-13 15:39:46 +02:00
Fabian Neumann
27e5dec4e6 documentation fixes 2022-06-30 09:01:49 +02:00
martacki
e9e00291c5 update configtables/opts to include CH4L option 2022-06-28 13:40:14 +02:00
Fabian Neumann
74f8ca1c7f
Merge branch 'master' into eu-energy-security 2022-06-28 08:09:39 +02:00
Martha Frysztacki
50a518a155
Merge branch 'master' into introduce_hac_clustering 2022-06-27 20:45:40 +02:00
Fabian Neumann
51de606aab
Revert "remove build/retrieve natura raster, directly use shapefile" 2022-06-27 19:00:41 +02:00
Martha Frysztacki
5587327be3
Merge branch 'master' into harmonize_clustering_strategies 2022-06-27 14:02:45 +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 Hofmann
17d7403f20
build_powerplants: apply suggestions from code review
Co-authored-by: Martha Frysztacki <martha.frysztacki@kit.edu>
2022-06-24 15:34:26 +02:00
martacki
8dba48c412 clustering strats to configurables: documentation and testing 2022-06-21 19:08:22 +02:00
Fabian Neumann
5cc6e9e18a doc: add reference to new config settings 2022-06-15 14:07:48 +02:00
Fabian Neumann
9a37fe6572 merge master 2022-06-15 09:22:51 +02:00
Fabian
8cbe4e4f9d update release notes and doc 2022-06-10 00:33:09 +02:00
Fabian Neumann
5a7c0d7967 remove build/retrieve natura raster, directly use shapefile 2022-03-20 10:03:17 +01:00
Martha Frysztacki
69c0341145
Merge branch 'master' into introduce_hac_clustering 2022-03-17 17:40:46 +01:00
Seth
323fdc651a
update toplevel.csv to include quotation marks in focus_weights
fixes #328
2022-03-11 15:52:34 +01:00
martacki
f02d5fe821 fix clustering setup for hac according to fneum suggestions 2022-03-07 11:43:04 +01:00