Commit Graph

144 Commits

Author SHA1 Message Date
Fabian Neumann
6b013dbd40 Merge branch 'master' into scenario-management 2024-02-12 10:59:37 +01:00
Fabian Neumann
09ada56bf1 finishing touches and release notes 2024-02-12 10:49:45 +01:00
Fabian
94f72d7276 electricity demand: remove powerstastics flag, merge sources in retrieve_electricity_demand 2024-02-12 10:08:39 +01:00
pre-commit-ci[bot]
4ff06046fc [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-02-10 17:09:49 +00:00
Fabian Neumann
a9dad3f34e add new resources(), logs(), benchmarks(), config_providers() 2024-02-10 18:09:23 +01:00
pre-commit-ci[bot]
e838b63ded [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-02-10 16:22:38 +00:00
Fabian Neumann
6de08bd523 Merge branch 'master' into scenario-management 2024-02-10 17:22:01 +01:00
pre-commit-ci[bot]
39890630ef [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-02-05 18:23:51 +00: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
Fabian Neumann
f68e8d3d61
Merge branch 'master' into wildcard-opts-config 2024-01-05 12:02:11 +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
83ecaac4de
Merge branch 'master' into wildcard-opts-config 2024-01-03 13:08:21 +01:00
Fabian Neumann
4f815a9cd7 move wdpa and glc datasets to data directory and protect 2023-12-29 11:29:01 +01:00
Fabian Neumann
accffe7bc2 wdpa time-invariant filenames in build_electricity.smk 2023-12-29 11:21:24 +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
df40fdf904 Merge branch 'master' into ukraine_hackathon 2023-12-11 16:24:40 +01:00
pre-commit-ci[bot]
01c5e11f9f [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-12-06 09:10:07 +00:00
Fabian Neumann
e5bdb4796a move focus_weights into clustering configuration segment (backward compatible) 2023-12-06 10:09:17 +01:00
Fabian Neumann
803b860923 move load_raw.csv to resources since it's config file dependent 2023-11-29 13:41:26 +01:00
Fabian Neumann
7ca769bcf0 option to skip ship_raster download if not added as exclusion zone 2023-11-29 12:09:39 +01:00
pre-commit-ci[bot]
4f28dfd4fd [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-11-06 15:38:05 +00:00
Philipp Glaum
786a2461e2 Merge commit '1bade22' into implement-floating 2023-11-06 14:08:53 +01:00
pre-commit-ci[bot]
326aeb682b [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-10-09 14:28:08 +00:00
Fabian Neumann
42692c3ca5 UA-MD availability matrix: plot shape_availability 2023-10-09 16:21:04 +02:00
Fabian Neumann
27ebbaba24 UA-MD availability matrix: consider WDPA protection areas as substitute for Natura 2023-10-09 16:20:23 +02:00
Fabian Neumann
9d7b250230 UA-MD availability matrix: consider ship density 2023-10-09 16:19:31 +02:00
Fabian Neumann
ea99f3c43e Merge branch 'master' into ukraine_hackathon 2023-10-09 09:53:42 +02:00
Fabian Neumann
b8fee80919 Merge branch 'master' into multiyear 2023-10-08 11:55:11 +02:00
virio-andreyana
01cd1bbb74 add Fabians suggestion 2023-09-23 18:39:11 +02:00
pre-commit-ci[bot]
668ec9efad [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-09-15 09:56:18 +00:00
virio-andreyana
7be8cc0773 undo changes in sector networks and simplify config 2023-09-15 11:55:52 +02:00
pre-commit-ci[bot]
3eed341044 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-09-11 21:04:00 +00:00
virio-andreyana
823df52309 add backward compatible config in wildcards 2023-09-11 22:51:31 +02:00
pre-commit-ci[bot]
b8dee184a9 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-08-24 09:12:07 +00:00
Fabian Neumann
d0f2d52853 apply protected() to zenodo downloads; only retrieve monthly fuel/CO2 prices when necessary 2023-08-24 11:11:33 +02:00
Fabian
62c6143863 scenario-management: reenable shared resources, make shared resources wildcards dependent 2023-08-23 17:14:57 +02:00
Fabian
91eff472a7 scenario-management: fix set_scenario_config function; apply config_provider to some direct inputs 2023-08-17 12:31:07 +02:00
Fabian
9d4ce430cc electricity demand: remove powerstastics flag, merge sources in retrieve_electricity_demand 2023-08-17 10:17:12 +02:00
Fabian
750b74db46 build_electricity: optionally download dynamic fuel prices 2023-08-16 10:51:03 +02:00
Fabian
e28ae59375 introduce scenario-management 2023-08-15 15:06:59 +02:00
Fabian Hofmann
6e7bbe1e08
Merge branch 'master' into validation 2023-08-03 18:28:10 +02:00
Fabian Hofmann
7fa577c3a8
simplify network: increase mem requirement 2023-08-03 18:21:36 +02:00
Fabian
3361ca66c5 build_elec: move monthly prices to resources 2023-08-02 10:54:07 +02: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
Fabian Hofmann
1ea8cf47d8
Merge branch 'master' into validation 2023-07-31 11:20:11 +02:00
Fabian
d7ab7db243 build_electricity.smk: add lines/links/transformer config to params 2023-07-31 11:15:50 +02:00
Fabian Neumann
16eb4e644a small fixes to weather_year wildcard handling 2023-07-26 10:52:58 +02:00
pre-commit-ci[bot]
d527797dc3 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-07-26 08:24:03 +00: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
9958425a44 complete structure for plotting electricity production 2023-07-05 11:07:36 +02:00
Fabian Neumann
f0b44a91ec
Merge branch 'master' into fneum/line-rating 2023-07-03 19:27:05 +02:00
Fabian Hofmann
6004e04354
Merge branch 'master' into validation 2023-06-30 12:07:04 +02:00
Fabian
701231fdca build_renewable_profile: fix execution for one thread 2023-06-30 11:34:41 +02:00
Fabian
519a4f2a2a move uc assigment to add_electricity
make code backwards-compatible
2023-06-29 14:50:41 +02:00
Fabian Neumann
907382e83a Merge branch 'fneum/line-rating' of github.com:PyPSA/pypsa-eur into fneum/line-rating 2023-06-29 11:42:15 +02:00
Fabian Neumann
c5c30bcc32 Merge branch 'master' into fneum/line-rating 2023-06-29 11:42:07 +02:00
pre-commit-ci[bot]
c0088b7923 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-06-29 09:42:03 +00:00
Fabian Neumann
43c47be2ec fix syntax errors 2023-06-29 11:41:38 +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
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 Neumann
546d9b0610 adjust new rules to merged format 2023-06-02 17:27:24 +02:00
Fabian Neumann
ef5320e1b8 merge master 2023-06-02 16:59:06 +02:00
virio-andreyana
b67a00903a
using higher keys for industries 2023-05-31 10:54:27 +02:00
virio-andreyana
e581ca930c made params more specific 2023-05-27 15:50:37 +02:00
lisazeyen
b2730a6d47
fix wrong input path 2023-05-24 10:26:31 +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
virio-andreyana
d97a543463
missing a coma in build_electricity.smk 2023-05-17 19:37:47 +02: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
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
virio-andreyana
61893c3c9b
fixing build_electricity.smk and retrieve.smk 2023-05-15 11:26:36 +02:00
virio-andreyana
1fc48d8753
using python algorithm to edit rules and script 2023-05-15 10:33:17 +02:00
virio-andreyana
aa50ea44cc
fix add_electricity mistake 2023-05-11 20:59:37 +02:00
virio-andreyana
1758076815
test param in add_electricity 2023-05-11 20:34:11 +02:00
pre-commit-ci[bot]
e8772c3340 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-04-30 08:54:50 +00:00
Fabian Neumann
30beee0959 Merge branch 'master' into multiyear 2023-04-29 12:40:55 +02:00
Fabian
6d7eae8ad2 build_ship_raster: save reduced ship raster as tif file 2023-04-20 19:56:23 +02: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
pre-commit-ci[bot]
f717ce9d3d [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-03-08 18:26:43 +00:00
Fabian Neumann
701d3a141a data/bundle files may be ancient 2023-03-08 18:03:49 +01:00
Fabian Neumann
37a063554d make cutouts protected
https://snakemake.readthedocs.io/en/stable/snakefiles/rules.html\#protected-and-temporary-files
2023-03-08 17:56:50 +01:00
Fabian Neumann
8eb37bc263 add conda directive to all rules for use with --use-conda 2023-03-08 17:44:25 +01:00
Fabian Neumann
6bae022d44 modularise Snakefile using rules/*.smk files 2023-03-08 17:29:01 +01:00