bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
951 Commits 1 Branch 0 Tags 133 MiB
2bb723ef04
Commit Graph

518 Commits

Author SHA1 Message Date
Fabian Neumann
9cf5be84fd bugfix: solve_network should look for wildcard sector_opts 2022-08-03 17:07:19 +02:00
Fabian Neumann
286520f396 compatibility: fix plotting for new pypsa version 2022-08-03 17:06:41 +02:00
lisazeyen
34a3d9aaad remove depreciated distutils.version 2022-08-02 09:27:37 +02:00
lisazeyen
7c3b4b6664 split grouping years for power and heat techs 2022-08-02 09:18:06 +02:00
lisazeyen
339ccc6026 remove snakemake dependencies 2022-08-02 09:16:25 +02:00
lisazeyen
a11f7bc245 remove not needed pop_layout from plot_summary 2022-08-02 08:47:46 +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
18f4eac351 adjust script to new grouping years 2022-08-01 15:24:07 +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
lisazeyen
530e453eba
Merge pull request #251 from PyPSA/cf-sector-opts 
option to specify any config through sector opts with CF+<label>+<value>
 2022-07-26 15:53:49 +02:00
Fabian Neumann
2791e7bdc2 use packaging.version instead of deprecated distutils.StrictVersion 2022-07-25 14:27:31 +02:00
Fabian Neumann
503ecd2907 use + separator instead of : 2022-07-24 21:27:12 +02:00
Fabian Neumann
a65dd4e6c2 use snakemake.utils.update_config instead of mergedeep 2022-07-24 21:26:19 +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
Fabian Neumann
3986856282 merge master 2022-07-01 10:13:33 +02:00
Fabian Neumann
5082c8761b
Merge pull request #245 from PyPSA/bus_units 
Document units of bus carriers
 2022-06-30 17:43:14 +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
3134bbb5c5 remove accidental file additions 2022-06-30 08:43:46 +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
Fabian Neumann
a8171ec9f3 color adaptations, new features 2022-06-28 18:03:29 +02:00
Fabian Neumann
20e1fb40fb update mock_snakemake for new snakemake versions 2022-06-28 17:18:09 +02:00
Fabian Neumann
8b134405dd
Merge pull request #243 from ebbekyhl/Coal-carbon-capture 
Add coal with carbon capture
 2022-06-28 14:04:31 +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
2d2f5ba409
Merge pull request #238 from PyPSA/config-export 
copy_config: copy actual snakemake.config
 2022-06-23 17:19:08 +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
2d562c1349 add coloring for ammonia 2022-06-10 14:57:03 +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
lisazeyen
dc997c6ff2
Update build_population_weighted_energy_totals.py 
adjust mocksnakemake
 2022-05-02 18:19:59 +02:00
Fabian Neumann
361100bfab Merge branch 'master' into transport 2022-05-02 10:28:43 +02:00
Fabian Neumann
cdd56288ff fix EU bus location with new config setting 2022-04-12 16:21:09 +02:00
Fabian Neumann
c5ca8f4c20 fix: squeeze IDEES dataframe at correct location 2022-04-12 16:11:06 +02:00
Fabian Neumann
c54b4f9920 copy_config: copy actual snakemake.config 2022-04-12 15:16:05 +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
lisazeyen
9322f90318 add minimum capacity for AC and DC lines depending on previous year 2022-04-12 10:04:27 +02:00
lisazeyen
cfdec7e56d simplify pipe retrofitting constraint 2022-04-12 10:04:27 +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
lisazeyen
08cef37e7e improve code style 2022-03-18 10:22:00 +01:00
lisazeyen
5502943301
scripts/solve_network.py: Style improvement 
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
 2022-03-17 18:15:59 +01:00
lisazeyen
aed81940b3
add_existing_baseyear.py: Style improvement 
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
 2022-03-17 18:15:14 +01:00
Fabian Neumann
c754f253bc plotting adjustments for pypsa 0.19.1 2022-02-20 16:13:11 +01:00
Fabian Neumann
4b1360c3f0 do not aggregate rooftop and solar PV in plots 2022-02-20 15:59:51 +01:00
Fabian Neumann
3323f34896 bugfix: also plot h2 corridors where no retrofit 2022-02-04 12:26:58 +01:00
Fabian Neumann
b6cfcf6364 bugfix: mock_snakemake configfiles 2022-01-25 12:57:04 +01:00
Fabian Neumann
1bcbb1ed19 Merge branch 'master' of github.com:pypsa/pypsa-eur-sec 2022-01-25 12:56:08 +01:00
Fabian Neumann
4e3314acd8 bugfix: remove also retrofitted H2 network 2022-01-25 12:55:57 +01:00
Tim Pedersen
0d7ad643bc
Resolved error whith /tmp (#224) 2022-01-24 14:34:54 +01:00
Fabian Neumann
c273eb7f2c plot_network: legends, EqualEarth projection, w/wo retrofit compatibility 2022-01-23 14:20:18 +01:00
lisazeyen
c40904a727 adjust h2_plot function to work with myopic, since build year is now in links.index 2022-01-07 16:59:48 +01:00
lisazeyen
9f8b54a3ce adjust pipe retrofitting constraint to work with myopic 2022-01-07 16:59:14 +01:00
lisazeyen
5b30f0ece6 avoid doubling of the existing natural gas grid 2022-01-07 16:53:37 +01:00
lisazeyen
030bf96d32 update mocksnakemake 2022-01-07 12:45:33 +01:00
lisazeyen
c9ce9190a7 adjust to spatital resolved gas nodes 2022-01-07 12:40:17 +01:00
lisazeyen
b5aa4234ef adjust capital cost of existing renewables to consider e.g. electricity grid connection costs as well 2022-01-07 12:09:02 +01:00
lisazeyen
953e1c883e adjust functions to new default lifetime np.inf instead of previous NaN 2022-01-07 11:38:25 +01:00
lisazeyen
372473d76c update mocksnakemake 2022-01-07 11:32:31 +01:00
Fabian Neumann
7535a0d385
update data bundle (#216) 2022-01-06 10:29:59 +01:00
Fabian Neumann
d1762919c5
add option 'seqXXX' to sweep global co2 sequestration potentials (#208) 
* add option 'seqXXX' to sweep global co2 sequestration potentials

* add release notes
 2021-12-10 12:05:38 +01:00
Fabian Neumann
82096f92e8
fix for GlobalConstraints mu with "co2_sequestration_limit" (#211) 
* fix for GlobalConstraints mu with co2_sequestration_limit

* add release notes
 2021-12-06 11:31:48 +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
263628fa22
add option to automatically download and extract sector databundle (#198) 2021-11-29 09:12:55 +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
ad7dd1aa3f correct max gas pipeline loading 2021-11-28 12:11:04 +01:00
Fabian Neumann
bb9f437855 fix copying pypsa-eur config 2021-11-24 10:54:39 +01:00
Fabian Neumann
7863c269bd plot_network: gas network show max used capacity 2021-11-24 10:53:54 +01:00
Koen van Greevenbroek
977dbfe933 Remove non-ascii character from source file 
Unfortunately Snakemake for now reads files using the default OS file
encoding, which may not be UTF-8. Therefore, it is best to be
conservative and only use ascii in source files for now.
 2021-11-22 14:02:57 +01:00