Commit Graph

149 Commits

Author SHA1 Message Date
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
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
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
1f6f7a2039 replace config.yaml by config/config.yaml in doc and docstrings 2023-04-21 10:41:44 +02: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
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
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 Hofmann
3ba7e2ab90
Merge branch 'master' into technology-data 2022-07-21 15:36:12 +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
1c0975181e add_electricity: fix missing config key 2022-06-10 11:23:35 +02:00
Fabian
13992125bd cluster_network: adjust generator strategy for new columns 2022-06-10 11:23:26 +02:00
Fabian
c68aa028ff add_electricity: fix missing config key 2022-06-10 00:36:07 +02:00
Fabian
f45803ff10 add_electricity: fix missing backwards compat and warnings 2022-06-09 23:40:32 +02:00
Fabian
76cd0751b4 Merge branch 'eu-energy-security' of github.com:PyPSA/pypsa-eur into eu-energy-security 2022-06-09 20:36:35 +02:00
Fabian
0ec3a8638b add_electricity & config:
- refactor attachment of conventional carriers
  - refactor scaling of renewable carriers
2022-06-09 20:31:50 +02:00
Fabian
8b855f0478 add_elecitricity: scale only missing renewable capacities from OPSD 2022-06-07 15:17:49 +02:00
Fabian Hofmann
619b471f72
Merge branch 'master' into eu-energy-security 2022-06-07 10:05:11 +02:00
Fabian
548e955449 add_electriticity: add capital costs for conventionals 2022-04-28 12:30:53 +02:00
Fabian
b1edbd7563 add_electricity: determine p_nom_extendable when adding conventionals 2022-04-27 20:13:36 +02:00