Fabian Neumann
ddd1840981
Merge remote-tracking branch 'origin/master' into multiyear
2023-07-26 10:23:32 +02:00
Fabian Neumann
7575dd0351
handling of natural gas in add_existing_baseyear and add_electricity
2023-07-26 07:24:12 +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
6af92fcf67
Merge branch 'master' into fneum/line-rating
2023-07-11 14:37:17 +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
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
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
1f6764d32a
add_electicity: minor fix regarding missing carriers
2023-07-03 15:45:19 +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
c5fe195fed
add_electricity: fix set operation
2023-06-30 11:37:53 +02:00
Fabian
4c9b8a08e5
use differential config changes in config.validation.yaml
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 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
00ec36a12e
add_electricity: filter out nan geocoords in kdtree
2023-06-29 16:38:56 +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
Fabian Hofmann
cf06204e4f
Update scripts/add_electricity.py
2023-06-29 16:02:09 +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
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
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
ef5320e1b8
merge master
2023-06-02 16:59:06 +02:00
virio-andreyana
e581ca930c
made params more specific
2023-05-27 15:50:37 +02:00
virio-andreyana
28d39680c6
Merge branch 'master' into post-merge-param
2023-05-19 16:19:58 +02: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
lisazeyen
024da02f8a
add monthly prices to network
2023-05-16 16:16:36 +02: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
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
virio-andreyana
1758076815
test param in add_electricity
2023-05-11 20:34:11 +02: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
5c2e3c9fc1
add Shape2Shapes in add_electricit.py
2023-05-10 09:58:25 +02:00
Fabian
4e8bbd67b4
use sanitize_carriers to harmonize carrier adjustments
2023-05-03 13:24:57 +02:00
Fabian Neumann
6acd5da4d4
Merge branch 'multiyear-sec' into multiyear
2023-04-29 18:49:49 +02: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
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
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
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
Fabian
1f6f7a2039
replace config.yaml by config/config.yaml in doc and docstrings
2023-04-21 10:41:44 +02:00
Fabian Neumann
6444640c1f
Merge branch 'master' into ukraine_hackathon
2023-03-11 14:28:10 +01:00
Fabian Neumann
91ea0a3f55
docs: rearrange sections
2023-03-09 13:28:42 +01:00
Fabian
5cf2b8174a
scripts: apply linting fixes
2023-03-07 17:21:00 +01:00
Fabian
bf969424a2
ci modularization fix cutout retrieval and profile in dag
2023-03-06 15:41:02 +01:00
Fabian Neumann
9c1182fe96
prepare release 0.7
2023-02-16 11:50:55 +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
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
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
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
Fabian Neumann
1ebe53cdac
merge master
2023-01-06 18:45:36 +01:00
Fabian
e2a4140663
add_electricity: calculate marginal costs from plant efficiency
2022-09-19 13:08:03 +02:00
pre-commit-ci[bot]
5d1ef8a640
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2022-09-16 13:04:06 +00:00
Fabian
1536cc2787
codespell: fix typos
...
Snakefile: fix unformattable parst
pre-commit: fix codespell ignore
2022-09-16 14:36:43 +02:00
Fabian
a59e54e659
follow up: fix extendable carriers
2022-09-14 15:17:42 +02:00
Fabian
59b76d8a99
add_electricity
2022-09-12 11:13:41 +02:00
Philipp Glaum
a4c5fbfa28
add_elec: add variable voltage angle input
2022-09-07 11:58:44 +02:00
Fabian
454ffa7068
line-rating: remove wildcard from opts
2022-09-06 17:43:22 +02:00
Fabian
8798b3e203
line-rating: adjust config keys
2022-09-06 16:40:00 +02:00
Fabian Neumann
31bc87adba
Merge branch 'master' into meta
2022-07-26 14:02:26 +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
Julio Pascual
ce3b193a88
Update add_electricity.py
2022-07-04 18:42:22 +02:00
Fabian Neumann
217780263d
store config and wildcards in n.meta
2022-06-30 08:39:03 +02:00
Fabian
67ac464b6a
add_electricity: use conventional_inputs from snakemake.input for attach_conventional_generators
2022-06-28 16:33:46 +02:00
Fabian Hofmann
82013fd081
Update scripts/add_electricity.py
...
Co-authored-by: Martha Frysztacki <martha.frysztacki@kit.edu>
2022-06-28 13:16:55 +02:00
Fabian
9d997fbd79
generalize conventional attr handling through config
2022-06-28 10:14:26 +02:00
Fabian Hofmann
8349e85252
Apply suggestions from code review
...
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2022-06-27 11:48:45 +02:00
Fabian Neumann
9c6c6d243f
Adaptations to match current PyPSA-Eur version
2022-06-27 10:21:08 +02:00
Fabian Neumann
520f7e440e
Merge branch 'master' into technology-data
2022-06-25 11:05:41 +02:00
Fabian
3dbd8d1492
add_electricity: fix read_csv
2022-06-24 18:31:39 +02:00
Fabian
2c5643a5f8
add_electricity: fix conventional config
2022-06-23 16:36:22 +02:00
Fabian
441d7d56f9
fix eafs and conventional setttings
2022-06-23 16:04:49 +02:00
Fabian Hofmann
db78f9cd2a
Update scripts/add_electricity.py
...
Co-authored-by: Martha Frysztacki <martha.frysztacki@kit.edu>
2022-06-23 15:54:22 +02:00
Fabian Neumann
173ab7b318
add_electricity: make drop_leap_year own function
2022-06-16 09:00:33 +02:00
Fabian Neumann
6713317bbe
add_electricity: fix missing variable assignment
2022-06-16 08:46:47 +02:00
