Tom Brown
03670c1ab3
Simplify industry load-link-bus to avoid numerical problems
...
Gurobi had numerical problems solving the system.
Trivial load-link-bus combinations to manage CO2 have been replaced
with simple loads.
2019-07-19 12:10:22 +02:00
Tom Brown
06cb526fef
Re-integrate industry, aviation and shipping into model
...
Following plan by Marta and Kun
2019-07-19 10:21:12 +02:00
Tom Brown
990ab035c3
Include light-rail and high-speed-rail in "electricity rail"
...
This then conforms with JRC IDEES totals
2019-07-19 10:19:21 +02:00
Tom Brown
7509d61348
Split industrial demand across nodes by population
2019-07-18 15:55:58 +02:00
Tom Brown
b132193f7f
Read in more sector detail for road, rail, aviation and navigation
2019-07-18 15:38:37 +02:00
Tom Brown
f3b6027cd5
Incorporate Marta and Kun's scripts to build industry demand
...
By country and by energy source.
2019-07-18 11:40:38 +02:00
Tom Brown
ddca9afcc7
Give all loads a carrier; rename heat buses; fix district h losses
...
Heat buses renamed to:
rural (for low-density areas where district heating not possible)
urban decentral (for high-density areas without district heating and
individual heating technologies) (used to be called "urban")
urban central (for high-density areas with district heating) (used to
be called "central")
District heating losses applied only to urban central.
2019-07-16 16:00:21 +02:00
Tom Brown
6cc676d6cf
190516: Try removing H2 network too
2019-07-12 08:51:25 +02:00
Fabian Neumann
7ef5146393
outline for rules overview
2019-06-19 13:12:02 +02:00
Fabian Neumann
2979b89291
Merge remote-tracking branch 'upstream/master' into solve_network
2019-06-18 13:48:52 +02:00
Fabian Neumann
5119a73477
merge upstream/master in co2limit
2019-06-18 13:33:01 +02:00
Fabian Neumann
dc1feadcba
generalize solve_network
...
* skip_iterating flag: solve network only once without updating impedances
* extra_functionality parameter: add function to modify pyomo model
* extra_functionality args: function arguments for extra_functionality
* extra_postprocessing: add function for postprocessing steps depending on n.model
2019-06-18 13:24:29 +02:00
Jeroen Peters
97985e3c52
Fix by changing po.Constraint.Skip into pypsa.opt.Constraint.Skip
2019-06-18 13:18:59 +02:00
Jonas Hörsch
ac32f2cad6
Fix typo introduced in previous commit
2019-06-18 13:18:59 +02:00
Jonas Hörsch
ffe7cf7db2
agg_p_nom_min_max.csv: Skip unconstrained values
2019-06-18 13:18:59 +02:00
Jonas Hörsch
2f728b33c8
solve_network: Move country/carrier constraints to opts as CCL
2019-06-18 13:18:59 +02:00
Jonas Hörsch
d7fcbbba7b
solve_network: Backwards compatibility
...
Make sure not providing a csv-file with capacity limits does not break.
2019-06-18 13:18:59 +02:00
Jeroen Peters
a2c736e2bf
Include config handle
2019-06-18 13:18:59 +02:00
Jeroen Peters
504a9fd595
Add handle for limits
2019-06-18 13:18:59 +02:00
Jeroen Peters
c065cad811
Fix missing code
2019-06-18 13:18:59 +02:00
Jeroen Peters
c1f79c4275
agg_p_nom_minmax.csv: add csv with minmax values
2019-06-18 13:18:59 +02:00
Jeroen Peters
f68f4c4205
solve_network.py: add minmax constraint per country
2019-06-18 13:18:59 +02:00
Fabian Neumann
c99480e0f3
add co2 emissions reduction factor to wildcard
2019-06-18 11:50:54 +02:00
Fabian Neumann
85631baf99
doc: local path to doc/img
2019-06-07 11:08:31 +02:00
Fabian Neumann
9bc702bc07
doc: move img folder into doc
2019-06-07 11:07:12 +02:00
Fabian Neumann
362f183c32
doc: add frame for documentation
2019-06-07 10:34:36 +02:00
Fabian Neumann
4820588d6b
README: remove bug note
2019-06-06 11:30:00 +02:00
Fabian Neumann
fba1f6c73b
add instructions to delete tar.xz and add natura.tiff from command line ( #45 )
...
* README: add instructions to delete tar.xz and add natura.tiff from command line
* README: minor syntax fix
2019-06-06 11:22:19 +02:00
Jonas Hoersch
5de59fe453
base_network: Replace deprecated yaml.load by yaml.safe_load
...
Refer to https://msg.pyyaml.org/load for details.
2019-06-05 18:07:36 +02:00
Fabian Neumann
4056ad7ad8
environment.yaml: install pypsa and dependencies through conda-forge ( #44 )
...
* environment.yaml: install pypsa and dependencies through conda-forge
* environment.yaml: remove rasterstats + restore memory_profiler
2019-06-05 14:14:37 +02:00
Jonas Hoersch
63a6cebab2
build_renewable_profiles: Communicate extent as pickleable tuple ( fixes #42 )
2019-05-28 13:50:42 +02:00
Jonas Hoersch
97eaebb0ea
environment.yaml: Separate dependencies of pip packages more cleanly
...
Dependencies are either of atlite, pypsa or the workflow itself.
Use snakemake-minimal instead of snakemake (fixes #39 )
2019-05-26 10:24:42 +02:00
Jonas Hoersch
25923d6a40
README: Add link to pre-computed natura raster
2019-05-24 15:07:48 +02:00
Jonas Hoersch
8a9248ee15
Update dependencies for new pypsa version
2019-05-24 13:59:45 +02:00
Tom Brown
ae3059f676
Add "central" option to remove electricity grid (HVAC, HVDC, B2B)
2019-05-16 16:08:16 +02:00
Tom Brown
8394dca22c
Rule to save a copy of important config files after each run
2019-05-16 09:39:03 +02:00
Tom Brown
9ad0eb01e2
Use waste heat from FT and fuel cells in district heating
2019-05-14 11:49:32 +02:00
Tom Brown
c723291ac4
Save solve logs separately for each run
2019-05-13 18:37:11 +02:00
Tom Brown
77bef57c60
Automatic plotting of network maps with costs per node
2019-05-13 17:09:26 +02:00
Tom Brown
52a02bd979
Compute cfs; compute nodal costs, capacities, cfs; fix prices
2019-05-13 16:48:29 +02:00
Tom Brown
71c04909b5
Allow option of underground H2 storage
2019-05-13 16:47:54 +02:00
Tom Brown
3c28e4daba
Include lossless and costless H2 network to examine benefit
...
Agglomerate H2 storage for this case.
Need to replace with separate H2 links and stores.
2019-05-12 11:27:56 +02:00
Tom Brown
a10a7d2b15
Limit sequestration to 200 Mt/a, introduce SMR, vent stored CO2
2019-05-11 15:55:06 +02:00
Tom Brown
38c49ad460
Fix paper_graphics.py maps for cartopy and industrial demands
2019-05-09 17:28:16 +02:00
Tom Brown
1aa9f9e70b
Copy over paper_graphics.py from old pypsa-eur sector branch
2019-05-09 15:22:14 +02:00
Tom Brown
0ab5bd200a
Fix gas and oil stores so that they allow fossil fuel extraction
...
Before both initial SOC and final SOC were set to be zero, which
prevents synthetic fuel transfer over the year boundary, and prevents
the use of fossil fuels for non-zero CO2 scenarios.
Now done properly with cyclic Store (prevents accumulation of fossil
fuels as a form of sequestration) and Generator (to imitate fossil
fuel extraction).
2019-05-08 12:18:18 +02:00
Tom Brown
5357b7b92f
Record total capacities and total costs
2019-05-03 17:11:13 +02:00
Fabian Neumann
6b964540ed
config: new color palette for tech_colors
2019-05-03 14:19:51 +02:00
Tom Brown
c47ffb8d03
Changes for 190501-256
2019-05-02 08:39:29 +02:00
Tom Brown
82a057791e
Allow storing FT fuels, cost for FT conversion, fossil FT fuels
...
Also include raw data/costs.csv
2019-04-30 12:05:36 +02:00