Commit Graph

4679 Commits

Author SHA1 Message Date
Koen van Greevenbroek
5ee280b96f Update default CPLEX options following PyPSA update
For more recent versions of CPLEX and PyPSA, using dotted options
works while the current default crashes a CPLEX solve with
"AttributeError: 'RootParameterGroup' object has no attribute
'barrier_convergetol'". See https://github.com/PyPSA/PyPSA/pull/168.
2021-10-05 11:00:30 +02:00
Fabian Neumann
23a167c308 config: co2_budget is currently compulsory. Add back in. 2021-10-04 18:12:19 +02:00
Fabian Neumann
e872595c79 release_notes: correct version 2021-10-04 18:02:05 +02:00
Fabian Neumann
47e6badd58 doc: fix typo in conf.py 2021-10-04 17:57:18 +02:00
Fabian Neumann
056ee67c61
Merge pull request #174 from PyPSA/release-v0.6
Preparation of release v0.6
2021-10-04 17:47:06 +02:00
Fabian Neumann
c5452d9882 release_notes: opener 2021-10-04 17:45:54 +02:00
Fabian Neumann
b915f08ac2 installation: update to new databundle location 2021-10-04 17:44:17 +02:00
Fabian Neumann
2597d980e0 config: optimise default for overnight scenario for consistency planning/cost year 2021-10-04 14:29:53 +02:00
Fabian Neumann
19d128aafd bugfix: take district heating progress not potential 2021-10-04 14:28:59 +02:00
Fabian Neumann
1f8c1678b8 add fneum 2021-10-04 14:28:27 +02:00
Fabian Neumann
692f4705c4 merge master 2021-10-04 13:21:33 +02:00
Fabian Neumann
c168fd60d3 add release note for agriculture, forestry and fishing 2021-10-04 11:19:15 +02:00
Fabian Neumann
cecee2c9c7
Merge pull request #147 from PyPSA/agriculture-energy-co2
Add agriculture, forestry and fishing
2021-10-04 11:10:46 +02:00
Fabian Neumann
7f0ed1372c organise release notes 2021-10-04 10:02:47 +02:00
lisazeyen
4135718e37 use agriculture sector as default, add missing colors 2021-10-04 09:23:54 +02:00
lisazeyen
017c188518 fix typo for district heating with capital D 2021-10-04 09:23:23 +02:00
Fabian Neumann
274eadd085 correct derived heat residential capitalisation 2021-10-03 12:51:03 +02:00
Fabian Neumann
aca1023c3d bump version to 0.6.0 2021-10-02 11:17:29 +02:00
Fabian Neumann
2bfc091f8b update data bundle 2021-10-02 11:12:45 +02:00
Fabian Neumann
2e6e9c6802
Merge branch 'master' into agriculture-energy-co2 2021-10-02 10:51:28 +02:00
Fabian Neumann
b560d95b6a merge master 2021-10-02 10:41:56 +02:00
Fabian Neumann
4375083838 create parallel structures for land-use constraints w/wo m 2021-10-02 10:40:49 +02:00
Fabian Neumann
4400658099 edit release note 2021-10-02 10:40:01 +02:00
Fabian Neumann
fb601cc051
Merge pull request #149 from PyPSA/dh-share
Include today's district heating share for myopic optimisation
2021-10-02 10:34:07 +02:00
Fabian Neumann
7987fd23cf add release note 2021-10-02 10:33:56 +02:00
Fabian Neumann
a60f180f61 fix logging 2021-10-02 10:23:27 +02:00
Fabian Neumann
c0adb51454 decapitalize columns in build_energy_totals 2021-10-02 10:03:40 +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
ff6d736a89
Merge branch 'master' into myopic-low-clustering-gens 2021-09-30 14:51:45 +02:00
Fabian Neumann
90079248a3
Merge branch 'master' into dh-share 2021-09-30 14:48:26 +02:00
lisazeyen
339187c1f1 update config 2021-09-29 16:23:38 +02:00
lisazeyen
f6bb498730 include PR review 2021-09-29 16:13:23 +02:00
Fabian Neumann
de48b4656f
Merge pull request #151 from PyPSA/enspreso-biomass
spatially-explicit biomass potentials from ENSPRESO
2021-09-29 15:46:51 +02:00
Fabian Neumann
5fb169c31f
Merge branch 'master' into enspreso-biomass 2021-09-29 15:46:11 +02:00
Fabian Neumann
1e248b314d compatibility with biomass transport 2021-09-29 15:45:14 +02:00
lisazeyen
9d8827bf59 Merge remote-tracking branch 'origin/master' into dh-share 2021-09-29 15:03:45 +02:00
lisazeyen
854bd80818 rename central_fraction->district heating potential, restructure district heating share implementation 2021-09-29 14:37:36 +02:00
lisazeyen
8322350fee move calculation of district heating share to build_energy_totals 2021-09-29 14:36:56 +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
5c24742526 temporarily disable h2 liquefaction in shipping by default 2021-09-28 17:34:47 +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
Fabian Neumann
8cf8a49b48 Merge branch 'master' of github.com:nworbmot/PyPSA-Eur-Sec 2021-09-28 17:24:09 +02:00
Fabian Neumann
488b93a079 extend release notes on plastics recycling 2021-09-28 17:24:00 +02:00
Fabian Neumann
fcc10aa950
Merge branch 'master' into master 2021-09-28 17:15:26 +02:00
Fabian Neumann
2f19814786 Merge branch 'nworbmot-master' 2021-09-28 17:13:30 +02:00
Fabian Neumann
9f4e1f2176 make HVC recycling ready for pathway, minor edits 2021-09-28 17:08:03 +02:00
lisazeyen
dadfa8691b update mocksnakemake for testing 2021-09-28 16:36:40 +02:00