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

2626 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Brown
8cbd3992ff Move config.yaml to a static place; "Getting Started" in README.md 
config.default.yaml should be copied to config.yaml by new users.

That way config.yaml doesn't change every time the developers use new
settings.

A basic "Getting Started" section is added to the README.

Changes to be committed:
	modified:   .gitignore
	modified:   README.md
	renamed:    config.yaml -> config.default.yaml
 2020-04-30 09:56:24 +02:00
Tom Brown
f9952b9aad Fixed for PyPSA-Eur 0.1.0, PyPSA 0.17.0 and plotting 
This commit now work with PyPSA-Eur 0.1.0 (tested with commit
bb3477 from 14th April 2020).

Changes to line/link_widths/colors for plotting networks in PyPSA
0.17.0.

Other corrections to plotting code so it works with this version.

Include oil boilers in colors in config.yaml.
 2020-04-29 18:23:18 +02:00
Tom Brown
478832f484 Merge branch 'master' of github.com:nworbmot/pypsa-eur-sec 2020-04-29 09:53:11 +02:00
Tom Brown
c314afb704
Merge pull request #56 from d-fine/oil_boiler 
add new link oil boiler
 2020-04-23 17:25:32 +02:00
euronion
bb3477cd69
Add information on PRs to contribution guidelines. (#151) 2020-04-14 10:54:39 +02:00
d-fine dev
a4db176458 add new link oil boiler 
* prepare_sector_network:
    - add link for oil boiler in function add_industry()
    - add function for partitioning clusters into different heat node types

* config.yaml: add option for oil_boiler

* costs.csv: add costs for oil boiler
 2020-04-09 14:58:03 +02:00
Jan Frederick
0adaf2c1b6 cleaned code for better understanding 2020-04-06 16:38:54 +02:00
Jan Frederick
b4c502f901 Updated description 2020-04-03 12:12:27 +02:00
Jan Frederick
b707578bfb Update build_renewable_profiles.py 2020-04-03 12:09:17 +02:00
Jan Frederick
32248724bd add if statements for "keep all availble areas" 
Add possibility to keep all availble areas for the potential area generation.
 2020-04-03 12:02:25 +02:00
Jan Frederick
6bd32f83d0 Merge branch 'master' of https://github.com/PyPSA/pypsa-eur 2020-04-03 11:53:23 +02:00
JanFrederickUnnewehr
22184ebaa7
Find "all" closest links and not only the first entry in the dataframe (#143) 
* find all closest links that are in operation

* update function _find_closest_links

* update _set_electrical_parameters_links

* Update scripts/base_network.py

* cleanup code

Co-authored-by: FabianHofmann <hofmann@fias.uni-frankfurt.de>
 2020-04-01 00:20:32 +02:00
Jan Frederick
7e84ed4d81 Merge branch 'master' of https://github.com/PyPSA/pypsa-eur 2020-03-31 11:16:55 +02:00
Fabian Neumann
3c1c604c7e
cluster: skip recalculation of link parameters if empty (#149) 2020-03-29 11:39:18 +02:00
Tom Brown
bd85f751ac Include home battery for low voltage node 2020-03-26 14:54:10 +01:00
Tom Brown
31cad1bd6d Separate rooftop and utility solar PV 2020-03-26 10:06:59 +01:00
lisazeyen
1e4616fb16
Merge pull request #55 from PyPSA/new_plot_network 
make the script running with pandas 1.0, colors for some network plot…
 2020-03-25 17:16:06 +01:00
lisazeyen
a239f7efbf make the script running with pandas 1.0, colors for some network plots, add option to plot the current transmission system in the cost_network plot 2020-03-25 17:14:28 +01:00
Tom Brown
0df8fc50cf Summaries and plotting: Fix groupby with two bys for pandas 1.0.x 2020-03-25 16:42:38 +01:00
Tom Brown
62887b7870 Move solving memory from Snakefile to config.yaml 2020-03-25 14:51:37 +01:00
Tom Brown
9b326ba493 Include electricity distribution grid between load and EVs 2020-03-25 12:52:25 +01:00
Fabian Neumann
fbbf1ba0ee environment: PyPSA 0.17 2020-03-23 17:05:59 +01:00
Jan Frederick
664dd9ef8f Merge branch 'master' of https://github.com/PyPSA/pypsa-eur 2020-03-19 17:56:33 +01:00
Fabian Neumann
7688d9ea27
build_bus_regions: fix 'cannot insert name, already exists' in geopandas 0.7.0 (#145) 
* build_bus_regions: fix 'cannot insert name, already exists'

* environment: allow geopandas 0.7.0

* build_bus_regions: ignore index when concatenating
 2020-03-18 09:56:47 +01:00
JanFrederickUnnewehr
a5cde4d384
Merge pull request #2 from PyPSA/master 
environment: restrict geopandas to <=0.6.3
 2020-03-17 18:17:12 +01:00
Fabian Neumann
c87a88967c environment: restrict geopandas to <=0.6.3 2020-03-17 17:48:01 +01:00
JanFrederickUnnewehr
f9939b7fd5
Merge pull request #1 from PyPSA/master 
fix snakemake as --cores (-j) is now a mandatory argument
 2020-03-17 15:46:20 +01:00
Fabian Neumann
0c6c23478b fix snakemake as --cores (-j) is now a mandatory argument 
in 5.11.0 https://snakemake.readthedocs.io/en/stable/project_info/history.html
 2020-03-17 14:55:30 +01:00
euronion
ccc56ce3c8
Fix: Correctly determine the bus to attatch custom powerplants to. (#131) 
* Add index integrity checks for custom powerplants.

* Update .csv template for custom powerplants.

* Update data/custom_powerplants.csv

* Revert "Merge branch 'master' into fix/custom-powerplants"

This reverts commit 5cd9c1afafd1ab36c31181ffed7635152805ee52, reversing
changes made to 5b1df27b25fdc89acca88395a0ba999f84dce109.

* Update release_notes.rst

* Rephrasing update to release notes.

* Merge with upstream/master (revert reverted merge).

Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
 2020-03-17 09:50:38 +01:00
Fabian Neumann
d57989c027
scripts: mini code cleanup (#140) 2020-03-16 15:55:01 +01:00
euronion
2f85b0ede5
Separate retrieval and building of cutouts, natura raster into distinct configurations each. (#136) 
* Separate config switches for retrieving and building cutout, natura raster.

* Include new switches in tutorial and test configs.

* Update release_notes.rst

* Update toplevel.csv

* Update tutorial.rst

* Update configuration.rst
 2020-03-16 15:51:47 +01:00
Fabian Neumann
e6057196e5 doc: add warning and link to pypsa-eur-sec [skip travis] 2020-03-15 13:28:06 +01:00
Fabian Neumann
53cdd4433e environment: pin vresutils to 0.3.1 (#137) 2020-03-15 12:52:50 +01:00
Tom Brown
5661047533
README: Add warnings & link to PyPSA-Eur-Sec repo 2020-03-04 19:39:34 +01:00
Tom Brown
1dd5f076a2 README: Add explanation of different sectoral spatial resolutions 2020-03-04 18:38:53 +01:00
Tom Brown
c88bb56b62 README: Include Marta Victoria's diagram of sector linkages 2020-03-04 18:32:06 +01:00
Tom Brown
22f6fe8388 README: Add usage warning 2020-03-04 18:26:26 +01:00
Tom Brown
5dc572c35e solve_network.py: Remove hacked installation of conda libraries 2020-03-04 18:10:57 +01:00
Fabian Neumann
69fd46290f
solve: include {min,max}_iterations parameters (#130) 
* solve: include {min,max}_iteration parameters

* solve: iterations fix defaults
 2020-02-25 22:00:36 +01:00
Fabian Neumann
c2d3cd283f environment: add lxml for pd.read_html (closes #129) 2020-02-25 11:28:38 +01:00
Fabian Neumann
8bed137ca5 unify skip_iterations & skip_iterating to skip_iterations 2020-02-19 17:03:19 +01:00
Martha Maria
63a09bd6da
solving options skip_iterations 
change to "skip_iterating", as required in scripts/solve_network.py
 2020-02-19 09:50:52 +01:00
Martha Maria
b63c19ebc4
solving options skip_iterations 
change to "skip_iterating", as required in scripts/solve_network.py
 2020-02-19 09:48:40 +01:00
Fabian Neumann
e6a1da2996
environment: add gurobipy (#127) 
* environment: add gurobipy

* environment: add gurobi channel
 2020-02-13 16:43:50 +01:00
Fabian Neumann
cd85d61470
helpers: importing networks with override_components (#128) 
* helpers: importing networks with override_components (closes #122) [skip travis]

* Update scripts/plot_network.py

Co-Authored-By: FabianHofmann <hofmann@fias.uni-frankfurt.de>

Co-authored-by: FabianHofmann <hofmann@fias.uni-frankfurt.de>
 2020-02-13 15:51:24 +01:00
Fabian
543bb95759 small fix for solve_operations_network 2020-02-10 16:47:11 +01:00
FabianHofmann
1ecca802f3 Nomopyomo (#116) 
* play around, add new nomopyomo feature

* fix constraints

* fix constraints

* set solver to cbc due to error with gurobi900

* update environments
shift lv and lc constraints to prepare_network
start modifying opt constraints

* correct BAU

* correct environment

* fix import

* fix SAFE constraint

* fix battery charger ratio constraint

* code cleaning

* restructure solve scripts

* fix CCL constraint

* adjust doc

* solve_network: update doc string

* revert unwanted changes

* update environment.yaml

* update environment.yaml II

* force conda update, revert last commit

* revert last change, use other channel priority

* remove trace_sove_network

* add skip_iterating and track_iterations options to config file

* revert last commit, fix environment to current pypsa master

* line break, trigger CI with updated pypsa

* nomopyomo: PR review

Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
 2020-02-10 12:06:43 +01:00
FabianHofmann
ef9e64d457
set bus to nan for powerplants not assigned in kdtree (#123) 
* solves #109

* fix substations_i for no-neighbours in kdtree
 2020-02-03 15:01:24 +01:00
Fabian Neumann
b479973b7e doc: fix tutorial notes to account for '_ec' in filenames [skip travis] 
* Adressing feedback from denyin: Private message regarding: [pypsa] MissingRuleException when using snakemake command
 2020-02-02 11:07:29 +01:00
Tom Brown
ab401907b2 Merge branch 'master' of github.com:nworbmot/pypsa-eur-sec 2020-01-31 19:25:19 +01:00