Commit Graph

250 Commits

Author SHA1 Message Date
lisazeyen
14ad15da91
Merge pull request #261 from PyPSA/temporal_aggregation
Add more options for temporal aggregation
2022-09-14 16:28:05 +02:00
lisazeyen
ed8f783096 include code review 2022-09-14 16:16:50 +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
ce6b92dd6d add options to aggregate snapshots temporally 2022-08-08 08:53:07 +02:00
lisazeyen
8dd143f369 bug fixes for missing bracket 2022-08-05 15:55:41 +02:00
lisazeyen
9752b4b4e6
Merge branch 'master' into pellet-boiler 2022-08-05 12:25:01 +02:00
lisazeyen
ff3d171bd7 move biomass boilers to add_biomass 2022-08-05 12:19:47 +02:00
lisazeyen
14f54304a8 Merge branch 'master' into pellet-boiler 2022-08-05 11:27:28 +02:00
lisazeyen
289c252688 remove link to co2 atmosphere 2022-08-04 17:42:57 +02:00
lisazeyen
8c62fb1b56
Merge branch 'master' into btl 2022-08-04 16:13:09 +02:00
lisazeyen
ee458eeafb change names of buses 2022-08-04 16:03:16 +02:00
lisazeyen
2d625f5a80
Merge pull request #254 from millingermarkus/biosng
BioSNG (methane from solid biomass) with and without CC
2022-08-04 15:39:55 +02:00
lisazeyen
339ccc6026 remove snakemake dependencies 2022-08-02 09:16:25 +02:00
Fabian Neumann
2857691367
Merge pull request #246 from PyPSA/meta
store config and wildcards in n.meta
2022-08-01 21:01:06 +02:00
lisazeyen
f683a93f08 adjust plot_summary to work with myopic, remove update config 2022-08-01 16:04:14 +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
lisazeyen
f10628930e move snakemake dependencies out for co2limit cb option to work 2022-08-01 15:21:11 +02:00
millingermarkus
6211823514 Added color for BioSNG and minor adaptations 2022-08-01 15:13:59 +02:00
millingermarkus
46310f0a30 Minor correction to prepare_sector_network 2022-08-01 15:00:27 +02:00
Markus Millinger
5b61d2f777
Added pellet boiler process 2022-08-01 13:38:01 +02:00
Markus Millinger
0019723262
Updated spatial nodes for biomass to liquid 2022-08-01 13:26:51 +02:00
Markus Millinger
abba2a4f3e
Added BioSNG process with and w/o CC 2022-08-01 13:22:58 +02:00
Markus Millinger
4bff921cf2
Adapted biomass_to_liquid toggle reference 2022-08-01 13:13:18 +02:00
Markus Millinger
46413dd88c
Added biomass to liquid process with an w/o CC 2022-08-01 13:07:59 +02:00
Fabian Neumann
cb00ba58ce add option to specify any config through sector opts with CF:<label>:...:value 2022-07-20 11:35:12 +02:00
Fabian Neumann
adc0dd1e0c fix unit conversion for thermal energy storage (closes #247) 2022-07-11 15:46:21 +02:00
Irieo
5d60e8c6e6 Label oil and biomass buses also as MWh_LHV 2022-06-30 17:37:40 +02:00
Iegor Riepin
53ad90095a
Update scripts/prepare_sector_network.py
sync it up to Fabian's feeling of useful things

Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2022-06-30 17:17:12 +02:00
Iegor Riepin
eddeb227a7
Update scripts/prepare_sector_network.py
code style update

Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2022-06-30 17:15:41 +02:00
Fabian Neumann
b96207c73e store config and wildcards in n.meta 2022-06-30 08:42:18 +02:00
lisazeyen
b4d0a8404c change unit from carrier gas from MWh_th -> MWh_LHV 2022-06-29 08:57:08 +02:00
Irieo
7604bb1654 Document units of bus carriers 2022-06-28 18:31:45 +02:00
Ebbe Kyhl
e9f2d65cda
Indent by two layers 2022-06-28 13:35:44 +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
Ebbe Kyhl
2a3b576cbd Add coal with carbon capture 2022-06-14 15:00:53 +02:00
Fabian Neumann
b025622edf fix agriculture machinery oil load with spatial.oil.nodes 2022-06-03 14:29:23 +02:00
Fabian Neumann
d4fd472762
Merge branch 'master' into transport 2022-04-12 14:48:57 +02:00
Fabian Neumann
d4a82a2a41
Merge pull request #217 from PyPSA/myopic-fix
Myopic fix
2022-04-12 14:47:22 +02:00
Fabian Neumann
1625d9db75
address recent deprecations (#235)
* address recent deprecations

* address recent deprecations in pd.read_csv
2022-04-12 14:37:05 +02:00
lisazeyen
408b494612 bug fix with augmentation object 2022-04-12 10:45:11 +02:00
Fabian Neumann
a4dab4306b merge master 2022-04-11 17:10:17 +02:00
Fabian Neumann
6ed92475c9
Add basic CI for overnight and myopic (#234)
* Snakefile: add missing folders that are retrieved

* Snakefile: fix syntax error

* Add basic CI

* fix datafiles list to work with directories

* prepare: only add new gas pipes if augmentation not empty

* prepare: handle case where salt caverns dataframe is empty

* prepare: handle case where underwater faction not in link columns

* build_biomass: handle case where Balkan not in country list

* refer correct environment path

* fix Snakemake call

* make subworkflow dependency explicit again

* hashing pypsa-eur environment file does not seem to work

* change solver to glpk

* add data cache

* glpk without options

* try cbc

* alternative snakemake test workflow

* test: add exogenous pathways to config
2022-04-11 17:08:25 +02:00
Fabian Neumann
95d5d8f889 prepare: move build_heat_demand closer to add_heat 2022-04-03 18:55:53 +02:00
Fabian Neumann
b112da0565 prepare: separate code for transport demand and nodal energy totals 2022-04-03 18:49:35 +02:00
lisazeyen
03fca360ff style improvement 2022-03-21 09:14:15 +01:00
lisazeyen
71a8bc6c96 use define spatial for all conventionals, add lifetime for H2 storage 2022-03-18 13:46:40 +01:00
lisazeyen
cfb5a797cb start to extend define_spatial for conventional carriers 2022-03-18 10:22:00 +01:00
Fabian Neumann
4e3314acd8 bugfix: remove also retrofitted H2 network 2022-01-25 12:55:57 +01:00
Fabian Neumann
90c2c909cd
fix broken prepare_sector_network when running without gas grid (#207)
Co-authored-by: lisazeyen <lisa.zeyen@web.de>

Co-authored-by: lisazeyen <lisa.zeyen@web.de>
2021-12-03 17:22:06 +01:00
Fabian Neumann
a2459881ef
allow H2 retrofitting from CH4 pipelines without endogenous CH4 grid (#204)
* allow H2 retrofitting from CH4 pipelines without endogenous CH4 grid

* add small capital cost to gas pipelines to incentivise decommissioning

* add release notes
2021-11-29 12:42:10 +01:00