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
01db4f4408
compatibility with technology-data v0.5
2023-02-10 07:49:45 +01:00
Fabian
94fb6c646c
prepare sector: add allam cycle
...
build sequestration: fix input for new snakemake versions
2023-02-08 22:57:01 +01:00
Fabian Neumann
ad8ccf3b25
fix process emission localisation with co2 (not) spatially resolved
2023-02-06 09:52:35 +01:00
Fabian Neumann
a0b18a8fcd
manage process emissions in spatial
2023-02-06 09:46:24 +01:00
Fabian Neumann
984ab9350c
Update scripts/prepare_sector_network.py
2023-01-30 11:54:19 +01:00
Fabian Neumann
6996748d9b
Merge branch 'master' into cluster_heat_nodes
2023-01-30 11:53:00 +01:00
Fabian Neumann
697be2d9e3
fix capacities of biomass transport
...
The biomass transport links are split into either direction
because they have a marginal cost associated with the
transport. With p_nom_extendable, many decision variables
are created. This commit tries another way where
capacities are non-extendable and set to sufficiently high
values.
2023-01-25 08:41:08 +01:00
Fabian Neumann
71e2a4943c
carbon management
2023-01-24 18:44:39 +01:00
Fabian Neumann
64969c2dee
add methanol store
2023-01-05 13:42:01 +01:00
Fabian Neumann
383aef7e1c
rename shipping_average_efficiency to shipping_oil_efficiency
2023-01-03 08:38:10 +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
292ec9d5a1
fix computation of shipping demands
2022-12-28 13:45:42 +01:00
Fabian Neumann
f645d13743
Merge branch 'master' into methanol
2022-12-28 12:51:59 +01:00
Fabian Neumann
138d151c8b
only compute solar thermal profiles if technology is included
2022-12-28 12:48:51 +01:00
Fabian Neumann
3999afdb5a
fixes to methanol implementation
2022-12-28 12:19:20 +01:00
Fabian Neumann
3d7c354d2b
merge master
2022-12-27 11:16:39 +01:00
Fabian Neumann
99343b1221
Merge pull request #277 from PyPSA/int-ports
...
distribute international shipping by port trade volumes
2022-12-27 10:57:01 +01:00
Fabian Neumann
0c62bfc9ee
complete methanol for shipping
2022-12-03 12:22:05 +01:00
Fabian Neumann
c44f1d61c7
remove hard-coded methanol efficiency
2022-11-27 18:28:57 +01:00
Fabian
df4eb85a19
fix typos
2022-11-18 09:08:07 +01:00
Fabian Neumann
16a92477f0
methanol in shipping
2022-11-13 18:25:32 +01:00
Fabian Neumann
84618b3ee1
distribute international shipping by port trade volumes
2022-11-13 13:43:05 +01:00
Fabian Neumann
1611d63a8a
Merge branch 'master' into nh3
2022-10-01 16:01:39 +02:00
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
34a3d9aaad
remove depreciated distutils.version
2022-08-02 09:27:37 +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
cbab86c4bc
add heat buses clustering to myopic
2022-08-01 18:15:35 +02:00
lisazeyen
973074de21
add function to cluster heat buses
2022-08-01 18:03:11 +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
Fabian Neumann
2037534557
prepare: only add ammonia to spatial if config selected
2022-06-23 15:24:44 +02:00
Fabian Neumann
9f91af28e7
fix syntax errors
2022-06-23 15:17:41 +02:00
Fabian Neumann
37c052667a
handle absent ammonia config flag
2022-06-22 15:50:32 +02:00
Ebbe Kyhl
2a3b576cbd
Add coal with carbon capture
2022-06-14 15:00:53 +02:00
Fabian Neumann
4ecfccea6c
handle ammonia demand both regionalised and copperplated
2022-06-10 17:07:48 +02:00
Fabian Neumann
27ac40d2ea
use spatial namespace to manage ammonia resolution
2022-06-10 16:56:00 +02:00
Fabian Neumann
a2a4cf7c02
use config to manage conversion efficiencies
2022-06-10 16:43:29 +02:00
Fabian Neumann
6cfee1f98a
add ammonia as carrier: with Haber-Bosch, crackers, store, load
2022-06-10 14:46:39 +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
Fabian Neumann
d04f6c02a7
Merge branch 'master' into retrofit-gas-pipelines
2021-11-29 09:13:51 +01:00
Fabian Neumann
3ecb761b57
add regionalised hydrogen salt cavern storage potentials ( #191 )
...
* add regionalised hydrogen salt cavern storage potentials
* fix reading in salt-cavern potentials and typo in imports
* by default disable nearshore and offshore salt cavern potentials
Co-authored-by: lisazeyen <lisa.zeyen@web.de>
2021-11-29 09:12:07 +01:00
Fabian Neumann
67ba2fa813
address deprecation warnings
2021-11-14 12:57:46 +01:00
Fabian Neumann
4cd964b3bd
gas_network: use IGGIELGN scigrid dataset
2021-11-13 16:48:08 +01:00
Fabian Neumann
b39a852d3b
correct syntax errors
2021-11-12 12:50:46 +01:00
Fabian Neumann
44ea5ef48a
add local gas input capacities (p_nom) and disable p_nom_extendable
2021-11-10 18:24:13 +01:00
Fabian Neumann
57c0dd29d1
disentangle gas input nodes by lng, prod, entry with mmc/d#
2021-11-09 14:52:08 +01:00
Fabian Neumann
985705403e
revision gas infrastructure representation 2
2021-11-04 21:48:54 +01:00
Fabian Neumann
6a00d5bfca
revision gas infrastructure representation
2021-11-03 20:34:43 +01:00
Fabian Neumann
37e2e53486
Merge branch 'master' into retrofit-gas-pipelines
2021-11-02 19:03:26 +01:00
Fabian Neumann
19d128aafd
bugfix: take district heating progress not potential
2021-10-04 14:28:59 +02:00
Fabian Neumann
2e6e9c6802
Merge branch 'master' into agriculture-energy-co2
2021-10-02 10:51:28 +02:00
