Commit Graph

170 Commits

Author SHA1 Message Date
Fabian Neumann
86708838da
Merge branch 'master' into linemaxext-config 2023-06-30 14:51:29 +02:00
Fabian Hofmann
934879d94e
Merge branch 'master' into validation 2023-06-29 19:45:17 +02:00
Fabian
519a4f2a2a move uc assigment to add_electricity
make code backwards-compatible
2023-06-29 14:50:41 +02:00
Fabian Hofmann
07224751e5
Merge branch 'master' into validation 2023-06-29 08:10:52 +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
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
546d9b0610 adjust new rules to merged format 2023-06-02 17:27:24 +02:00
Fabian Neumann
8a6b2667b5 fix unresolved merge conflict in config.default.yaml 2023-06-02 17:13:12 +02: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
Fabian Hofmann
824e6bb18c
Merge branch 'master' into complete-carrier-set 2023-05-15 15:01:57 +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
virio-andreyana
5603951946
fixed little things remaining 2023-05-05 11:32:16 +02:00
virio-andreyana
a28f2c1811
add tech_colors for previously missing carrier 2023-05-05 00:40:34 +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
c29da02653 add switch for UC and linearized UC 2023-04-25 14:57:56 +02:00
Fabian Neumann
f2e53b59bf add plain hydrogen turbine option for re-electrification 2023-04-22 09:44:13 +02:00
Fabian
7b42a2251a renamem configs to config 2023-04-21 10:28:49 +02:00