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

260 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabian Neumann
2979b89291 Merge remote-tracking branch 'upstream/master' into solve_network 2019-06-18 13:48:52 +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
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
Fabian Neumann
6b964540ed config: new color palette for tech_colors 2019-05-03 14:19: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