Commit Graph

184 Commits

Author SHA1 Message Date
Fabian
8bf6238785 Merge branch 'master' into ci-review 2023-02-21 17:57:27 +01:00
Fabian Neumann
b14d657042 minor fixes and address deprecation warnings 2023-02-16 20:13:26 +01:00
Fabian Neumann
82939ca546 resolve merge conflicts 2023-02-16 18:34:24 +01:00
Fabian Neumann
ccde2e7f93 make sequestration options configurable 2023-02-16 17:21:58 +01:00
Fabian Neumann
6b8e69cf81 Merge branch 'master' into carbon-management 2023-02-15 20:21:12 +01:00
Fabian Neumann
809b07be86
Merge pull request #303 from PyPSA/electrolysis-wasteheat
add option to use electrolysis waste heat in district heating
2023-02-15 19:06:12 +01:00
Fabian Neumann
b1b289fc45 add option to use electrolysis waste heat in district heating 2023-02-15 14:01:00 +01:00
Fabian Neumann
5d08dfc2ec add min part load for FT and methanolisation via p_min_pu 2023-02-15 13:47:57 +01:00
Fabian Neumann
9be7afffcd Merge branch 'master' of github.com:pypsa/pypsa-eur-sec 2023-02-11 09:37:17 +01:00
Fabian Neumann
d54894eecc pandas update: closed to inclusive 2023-02-11 09:37:09 +01:00
Fabian Neumann
01db4f4408 compatibility with technology-data v0.5 2023-02-10 07:49:45 +01:00
Fabian
3f98ccb9e2 update technology data version 2023-02-08 22:59:25 +01:00
Fabian Hofmann
77449e951f
Merge branch 'master' into ci-review 2023-02-08 19:18:00 +01:00
Fabian Hofmann
e8cc671f72
Merge pull request #297 from PyPSA/no-sw-technology-data
automatically retrieve technology-data, no git clone
2023-02-08 19:08:32 +01:00
Fabian
faa95c500c config: modularize solver_options 2023-02-08 15:24:17 +01:00
Fabian
6c57b81a4a config: move solver options in dedicated section
test configs: reduce to relative changes
CI: use snakemake --configfile options
2023-02-08 15:24:17 +01:00
Fabian Neumann
7982a37b6d
Update config.default.yaml 2023-01-30 11:56:01 +01:00
Fabian Neumann
6996748d9b
Merge branch 'master' into cluster_heat_nodes 2023-01-30 11:53:00 +01:00
Fabian Neumann
a870b603f4 automatically retrieve technology-data, no git clone 2023-01-28 08:15:43 +01:00
Fabian Neumann
71e2a4943c carbon management 2023-01-24 18:44:39 +01:00
Fabian Neumann
27414ac010 new config options for demand in aviation + HVC, control of ICE shares in land transport and agriculture 2022-12-29 11:46:57 +01:00
Fabian Neumann
cac724fee0 merge master 2022-12-28 13:55:36 +01:00
Fabian Neumann
c471785448 add colors for methanolisation 2022-12-28 13:45:57 +01:00
Fabian Neumann
3999afdb5a fixes to methanol implementation 2022-12-28 12:19:20 +01:00
Fabian Neumann
0c62bfc9ee complete methanol for shipping 2022-12-03 12:22:05 +01:00
Fabian Neumann
7208d96039
Update config.default.yaml
Co-authored-by: euronion <42553970+euronion@users.noreply.github.com>
2022-12-01 17:18:48 +01:00
Fabian Neumann
16a92477f0 methanol in shipping 2022-11-13 18:25:32 +01:00
Fabian Neumann
1611d63a8a
Merge branch 'master' into nh3 2022-10-01 16:01:39 +02:00
lisazeyen
9a74e3d699 set co2seq to limit of sequestration potential 2022-09-29 09:12:36 +02:00
lisazeyen
7606562449 update sector opt for co2 seq potential 2022-09-28 16:09:53 +02:00
lisazeyen
77dfca76e0 uncommented annual dictionaries, set reference year to 2050 2022-09-14 16:44:53 +02:00
Ebbe Kyhl Gøtske ekg@mpe.au.dk
e34bd9b7fb Change costs year in snakefile and config file 2022-08-31 13:07:43 +02:00
lisazeyen
3daff49c99
Merge pull request #256 from PyPSA/fix-bug-myopic-co2
Fix bug myopic co2
2022-08-09 21:33:31 +02:00
lisazeyen
b42e76040d small clean up 2022-08-09 21:30:45 +02:00
lisazeyen
9752b4b4e6
Merge branch 'master' into pellet-boiler 2022-08-05 12:25:01 +02:00
lisazeyen
cfd8759684 small clean up 2022-08-05 11:27:14 +02:00
lisazeyen
8c62fb1b56
Merge branch 'master' into btl 2022-08-04 16:13:09 +02:00
lisazeyen
23539ee219
Update config.default.yaml
set default of biosng to false
2022-08-04 15:34:20 +02:00
lisazeyen
7c3b4b6664 split grouping years for power and heat techs 2022-08-02 09:18:06 +02:00
lisazeyen
6c13974643 add option to cluster heat buses 2022-08-01 18:02:55 +02:00
millingermarkus
65aaa3d188 Added tech color for biomass boiler and minor adaptations to biomass boiler process 2022-08-01 15:28:53 +02:00
millingermarkus
6211823514 Added color for BioSNG and minor adaptations 2022-08-01 15:13:59 +02:00
millingermarkus
4d1dc2db8b Added tech color for biomass to liquid 2022-08-01 15:04:45 +02:00
Markus Millinger
082d655a6c
Added pellet_boiler toggle option in yaml 2022-08-01 13:38:47 +02:00
Markus Millinger
603d1597c4
Added BioSNG toggle to yaml 2022-08-01 13:24:04 +02:00
Markus Millinger
2d06d207be
Added biomass_to_liquid option toggle in yaml 2022-08-01 13:12:27 +02:00
Fabian Neumann
de83a4987b disable co2 vent by default 2022-07-26 15:47:17 +02:00
Fabian Neumann
3986856282 merge master 2022-07-01 10:13:33 +02:00
Ebbe Kyhl
5ae56cca7c
Apply suggestions from code review
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2022-06-27 18:06:59 +02:00
Fabian Neumann
d69efe3d1f add ammonia color to config.default.yaml 2022-06-23 15:22:21 +02:00