Commit Graph

638 Commits

Author SHA1 Message Date
Fabian Neumann
6e47c71195 clustered_population: add missing cutout input 2022-07-22 20:48:24 +02:00
Fabian Neumann
16bd4b6c2c fix snapshot creation based on weather year 2022-07-22 19:14:00 +02:00
Fabian Neumann
79078b2cae merge master 2022-07-20 15:55:00 +02:00
Fabian Neumann
b3dac6d3c4 subworkflow flags amend 2022-07-20 15:53:57 +02:00
Fabian Neumann
d346e9c34a Merge branch 'master' of github.com:pypsa/pypsa-eur-sec 2022-07-20 15:47:55 +02:00
Fabian Neumann
10243398e7 do not use subworkflow flags for pure data#
causes problems when config retrieve_databundle is disabled
2022-07-20 15:47:47 +02:00
Fabian Neumann
d2b2842a37 Merge branch 'master' into multiyear 2022-07-20 15:18:42 +02:00
Tom Brown
ec1aa1b76b README, doc: add reference to hydrogen network paper as showcase of model 2022-07-18 20:40:21 +02:00
Fabian Neumann
51c76651ba
Merge pull request #248 from PyPSA/thermal-storage-bugfix
fix unit conversion for thermal energy storage
2022-07-11 19:04:53 +02:00
Fabian Neumann
adc0dd1e0c fix unit conversion for thermal energy storage (closes #247) 2022-07-11 15:46:21 +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
lisazeyen
b4d0a8404c change unit from carrier gas from MWh_th -> MWh_LHV 2022-06-29 08:57:08 +02:00
lisazeyen
187c9cbaa3 add release notes 2022-06-29 08:49:29 +02:00
Irieo
7604bb1654 Document units of bus carriers 2022-06-28 18:31:45 +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
bf61e83be0
Merge pull request #239 from PyPSA/ci-summaries
CI: include summary and plotting rules
2022-06-23 17:18:44 +02:00
Fabian Neumann
a2e26004d7 add further missing handling of weather_year wildcard 2022-06-15 15:36:37 +02:00
Fabian Neumann
9f9e65afb1 add missing handling of weather_year wildcard 2022-06-15 15:18:07 +02:00
Fabian Neumann
8055e45b68 combine time selection with weather year 2022-06-15 14:56:46 +02:00
Fabian Neumann
fa66c50dc1 merge master 2022-06-15 09:29:19 +02:00
Ebbe Kyhl
2a3b576cbd Add coal with carbon capture 2022-06-14 15:00:53 +02:00
Fabian Neumann
8dfd8b5a7f
Merge pull request #241 from PyPSA/agri-mach-oil
fix agriculture machinery oil load with spatial.oil.nodes
2022-06-03 14:30:02 +02:00
Fabian Neumann
b025622edf fix agriculture machinery oil load with spatial.oil.nodes 2022-06-03 14:29:23 +02:00
Tom Brown
292d713817 README,doc: soften warnings, add limitations section to doc 2022-06-03 12:33:33 +02:00
Fabian Neumann
ba369cf782
Merge pull request #240 from PyPSA/fix_PPs_grouping_years
fix grouping years list issue caused by newer powerplant database
2022-05-31 17:25:56 +02:00
Irieo
aa2820c9b1 fix grouping years list issue caused by newer powerplant database 2022-05-31 16:16:40 +02:00
lisazeyen
f4e1d28be3
Merge pull request #236 from PyPSA/transport
separate rules for transport demand and nodal energy totals
2022-05-02 18:30:07 +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
ae28839cca CI: include summary and plotting rules 2022-04-12 15:23:48 +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