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

2500 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Tom Brown
952534c5c9 Generalise limitation of tech potentials 
tech name must only appear, but not be identical to generator
carrier. This allows to use the name "offshore" for both "offshore-ac"
and "offshore-dc", but then "solar" also catches "solar thermal",
which is fine since for solar thermal potentials are np.inf, unless
limit is 0 since np.inf*0 is nan.
 2019-04-24 12:17:42 +02:00
Tom Brown
d48d51f765 Cater for AC and DC offshore in plotting 2019-04-23 16:22:09 +02:00
Tom Brown
5157041ee2 Update for compatibility with latest PyPSA-eur master branch 
Remove non-renewable generator and storage units from electricity-only
base network, since they're added differently here with links.

Remove unncessary cruft from config.yaml which is not used by
PyPSA-Eur-Sec (e.g. renewable configuration parameters).

Rename "naptha" to correct "naphtha".
 2019-04-18 15:23:37 +02:00
Tom Brown
3b0e0dfb3a Changes to make solving and post-processing work 2019-04-18 12:12:38 +02:00
Tom Brown
cfe44ce702 Copy solve_network.py and *_summary.py from pypsa-eur sector branch 2019-04-18 11:39:17 +02:00
Tom Brown
4638744505 Update README with data bundle 2019-04-17 18:09:48 +02:00
Tom Brown
e88b6c850f Fix prepare_sector_network to reproduce old sector prenetworks 
from pypsa-eur sector branch
 2019-04-17 17:04:33 +02:00
Tom Brown
ad865c18c6 Copy prepare_network.py from pypsa-eur sector commit 95820e57f795 
...to scripts/prepare_sector_network.py
 2019-04-17 14:24:22 +02:00
Tom Brown
ea22a792b7 Fix all data preparation steps up to prepare_network 2019-04-17 11:44:16 +02:00
Tom Brown
1b26c3c737 Copy data preparation scripts from pypsa-eur sector branch 2019-04-16 16:03:51 +02:00
Fabian Neumann
6e5cec1cbd
Merge branch 'master' into master 2019-04-06 13:53:20 +02:00
Jonas Hoersch
9ec97bd367 fixup! cluster_network: [compat] Pyomo 5.6.1 removed po.sum 2019-03-09 17:50:28 +01:00
Jonas Hoersch
93119fc86b cluster_network: [compat] Pyomo 5.6.1 removed po.sum 2019-03-09 17:08:55 +01:00
Jonas Hoersch
3688122aa7 base_network: [compat] read_csv in pandas 0.24 is stricter 
read_csv now raises a ValueError when it encounters NaN in a boolean column.
 2019-03-06 20:40:29 +01:00
Jonas Hoersch
edb3988e9e README, environment.yaml: Warn about recent fix of network clustering in PyPSA 
Update to latest master of PyPSA.
 2019-03-02 18:56:18 +01:00
Jeroen Peters
2cd7062718 config.yaml: Update CPLEX parameters to work with CPLEX 12.8.0 (#29) 2019-02-27 16:26:05 +01:00
Jonas Hoersch
66fe76288c add_electricity: Assume load scaling factor is 1.0 if omitted 2019-02-22 22:06:03 +01:00
Jeroen Peters
0cafe40bdd add_electricity.py: Add a simple load scaler (#21) 
* Add simple load scaler

* Add scaler to config

* Update config.yaml

* Update add_electricity.py
 2019-02-22 21:47:41 +01:00
Jonas Hoersch
f0a0a2531e add_electricity: Fix for choices of countries without any offshore or hydro 
fixes #22.
 2019-02-22 17:09:52 +01:00
Jonas Hoersch
31aefae93c make_summary: Allow mixing volume and cost limit 2019-02-22 17:08:43 +01:00
Jeroen Peters
d111cedc03 Add warning for capital costs to 0 2019-02-22 15:03:53 +01:00
Heronimonimo
1c192253bf Remove capital costs for existing conventional capacity 
All the existing conventional capacity has sunk capital costs. Therefore these should be put to 0.
 2019-02-22 15:03:53 +01:00
Jonas Hoersch
8b819569bc cluster_network: Fix busmap_for_n_clusters for single country (fixes #18) 
Also update debugging helper.
 2019-02-20 21:10:45 +01:00
Heronimonimo
9c78d6591d Add CCGT to the weight factor for conventional carriers 2019-02-20 19:18:06 +01:00
Jonas Hoersch
9279c7f027 solve_network: Remove hard-coded solver fallback in busmap_for_n_clusters 
Necessary for when `clustering_for_n_clusters` is used from the simplify_network
rule.

Fixes #12
 2019-02-20 19:08:25 +01:00
Heronimonimo
6f1b387804 Add CCGT to plot 2019-02-20 17:31:14 +01:00
Jeroen Peters
dc94378539 Add coincbc to environment (#11) 2019-02-20 17:10:23 +01:00
Heronimonimo
22efde131b Add ipopt to environment 2019-02-20 17:08:52 +01:00
Jonas Hörsch
2e02c8366e
fixup! add_electricity: add CCGT to extendable generators 2019-02-18 00:43:09 +01:00
Fabian Neumann
02e1a12667 add_electricity: add CCGT to extendable generators 2019-02-16 12:52:18 +01:00
Fabian Neumann
0af4035805 add_electricity: add CCGT to extendable generators 2019-02-16 10:41:21 +01:00
Jonas Hoersch
49737e764c config: Update solar correction_factory based on a flh comparison with Pietzcker2014 2019-02-15 20:59:42 +01:00
Jonas Hoersch
33823c9012 build_country_flh: Fix aggregated flh reports for wind 2019-02-15 20:59:42 +01:00
Jonas Hoersch
ef867ebfc0 environment: Update environment.yaml to blacklist netcdf4 version with regression 2019-02-15 20:59:42 +01:00
Heronimonimo
77ba8a76f0 Extend readme 2019-02-15 18:32:48 +01:00
Jonas Hoersch
6bb9cd1025 add_electricity: Refactor extendable generators to provide a OCGT-ext technology 
Partially adresses #7.
 2019-02-15 18:28:41 +01:00
Jonas Hoersch
50abd6c0c9 build_country_flh: Add rule for per-country full load hours tables and plots 2019-02-15 18:27:04 +01:00
Jonas Hoersch
f49682c61d build_renewable_profiles: Extend calculate_potential to optionally save the exclusion map 2019-02-15 11:11:41 +01:00
Jonas Hoersch
c858ed0b0d build_renewable_profiles: Pass all globals with init_globals 2019-02-15 11:11:31 +01:00
Jonas Hoersch
7f3f096ba6 Fix model for country selections without DC links (fixes #5) 2019-02-13 19:03:57 +01:00
Jonas Hoersch
1b6fe5be80 base_network: Fix _add_links_from_tyndp if there are none left (fixes #5) 2019-02-12 16:41:07 +01:00
Jonas Hoersch
15e986a0ec make_summary: Update summary creation for new line volume/cost constraints 
Fixes #4.
 2019-02-10 16:08:39 +01:00
Jonas Hoersch
448e8c238e cluster_network: Fall back to using ipopt in distribute_clusters 
if the configured solver does not support quadratic objectives.
 2019-02-10 15:33:53 +01:00
Jonas Hoersch
6284cf7e8b add_electicity: Report countries missing from the hydro inflow time-series 2019-02-07 17:41:01 +01:00
Jonas Hoersch
f9ed49b38a Add environment.fixedversions.yaml 2019-02-07 13:07:49 +01:00
Jonas Hoersch
3e11d569d0 build_shapes: Fix pycountry API change (fixes #1) 
See also
72b1927b3c
 2019-02-07 13:03:18 +01:00
Jonas Hoersch
d57df6b0c8 Merge branch 'glaes' 2019-02-06 12:06:32 +01:00
Jonas Hoersch
c5b093380b solve_network: Slightly increase requested memory 
Encountered out-of-memory kills for the 512_lc networks.
 2019-02-06 11:49:06 +01:00
Jonas Hoersch
8c9e650feb fixup! trace_solve_network: Save intermediate line capacities 2019-02-06 11:48:59 +01:00