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
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
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
Fabian Neumann
a60f180f61
fix logging
2021-10-02 10:23:27 +02:00
lisazeyen
0d999a4991
prepare_sector_network: code formatting
...
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2021-10-01 17:10:42 +02:00
Fabian Neumann
18fabd930e
Apply suggestions from code review
2021-09-30 17:46:26 +02:00
Fabian Neumann
90079248a3
Merge branch 'master' into dh-share
2021-09-30 14:48:26 +02:00
lisazeyen
f6bb498730
include PR review
2021-09-29 16:13:23 +02:00
Fabian Neumann
1e248b314d
compatibility with biomass transport
2021-09-29 15:45:14 +02:00
lisazeyen
854bd80818
rename central_fraction->district heating potential, restructure district heating share implementation
2021-09-29 14:37:36 +02:00
lisazeyen
e27ec46878
add further comments
2021-09-29 09:23:39 +02:00
lisazeyen
234a32c504
bug fix
2021-09-29 09:23:39 +02:00
Fabian Neumann
8ecc54fbe6
Merge branch 'master' into dh-share
2021-09-28 17:29:29 +02:00
lisazeyen
53eab1ead2
slice biomass potentials with the pop_layout index instead of the country if biomass transport = True
2021-09-28 17:25:04 +02:00
lisazeyen
dadfa8691b
update mocksnakemake for testing
2021-09-28 16:36:40 +02:00
Fabian Neumann
385779fbbf
Merge branch 'master' into biomass-transport
2021-09-28 11:33:21 +02:00
Fabian Neumann
ec04d7909a
Merge pull request #148 from PyPSA/co2-network
...
Add CO2 network
2021-09-28 11:29:20 +02:00
