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

48 Commits

Author SHA1 Message Date
Fabian Neumann
84edde8f63
add time series segmentation with tsam package (#186) 
* add time segmentation with tsam

* cut off SEG

* Snakefile: adjust memory function

* untangle memory reservation calculation

* prepare: document segmentation option

* correct typo
 2020-12-03 16:02:21 +01:00
Fabian Neumann
c1447875d5
no defaults channel in environment.yaml (#144) 
* no defaults channel in environment.yaml

* GIS from conda-forge

* remove channel pinning and add descartes via conda

* remove geopandas version restriction

* travis: remove duplicated conda list
 2020-12-02 17:48:47 +01:00
Fabian Neumann
9c526687fd environment: remove snakemake-minimal version constraint 2020-11-12 16:27:52 +01:00
Fabian Neumann
0988551896
environment: limit libgdal to 3.0.4 max (#197) 
* environment: limit libgdal to 3.0.4 max

* environment: test numpy version

* environment: lift numpy version restriction

* environment: reintroduce numpy version restriction
 2020-09-25 19:57:09 +02:00
Fabian Neumann
9966038837 environment: limit libgdal to 3.0.2 (2nd try) 2020-09-25 15:47:44 +02:00
Fabian Neumann
b81dfcaada environment: limit libgdal to 3.0.2 2020-09-25 15:34:35 +02:00
Fabian Neumann
06b8fe1e98 environment: add mamba 2020-09-25 15:06:39 +02:00
Fabian Neumann
fcb895a098
environment: limit snakemake to 5.24.2 (#195) 
until https://github.com/snakemake/snakemake/issues/635 resolved
 2020-09-25 14:01:00 +02:00
Fabian Neumann
8c5efb5252
add compatibility with pyomo 5.7.0 (#172) 
* add compatibility with pyomo 5.7.0

* add release notes [skip travis]
 2020-07-20 17:33:15 +02:00
Fabian Neumann
5d689f501e
environment: pin atlite to 0.03 (#163) 2020-06-08 12:28:18 +02:00
Fabian Neumann
5ea29551b9
add REUSE.software license information (#160) 
* add REUSE.software license information

* add release note on licensing

* Update doc/index.rst

Co-authored-by: euronion <42553970+euronion@users.noreply.github.com>

* Update doc/index.rst

Co-authored-by: euronion <42553970+euronion@users.noreply.github.com>

* Update doc/release_notes.rst [skip travis]

Co-authored-by: euronion <42553970+euronion@users.noreply.github.com>
 2020-05-29 09:50:55 +02:00
Fabian Neumann
fbbf1ba0ee environment: PyPSA 0.17 2020-03-23 17:05:59 +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
Fabian Neumann
c87a88967c environment: restrict geopandas to <=0.6.3 2020-03-17 17:48:01 +01:00
Fabian Neumann
53cdd4433e environment: pin vresutils to 0.3.1 (#137) 2020-03-15 12:52:50 +01:00
Fabian Neumann
c2d3cd283f environment: add lxml for pd.read_html (closes #129) 2020-02-25 11:28:38 +01:00
Fabian Neumann
e6a1da2996
environment: add gurobipy (#127) 
* environment: add gurobipy

* environment: add gurobi channel
 2020-02-13 16:43:50 +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
Jonas Hörsch
52e4a1b285 environment: Free pyproj from version constraint (fixes #119) (#120) 
* environment: Free pyproj from version constraint (fixes #119)

proj was constrained to 1.9.6, since cartopy was incompatible with
recent proj versions.

* build_renewable_profiles: Import gdal and geokit after forking

GDAL sets up a shared context on module import which seems to contain a
handle to the PROJ database for coordinate reference systems. By forking
these handles seem to become invalidated or at least are not usable in parallel
anymore.

Instead importing gdal only after setting up the different processes fixes
the database disk image is malformed proj error.
 2020-01-23 09:55:59 +01:00
Fabian Neumann
5934f4f7a1
prepare release v0.1.0 (#117) 2020-01-09 14:09:28 +01:00
euronion
85c356297a Add logging to logfiles to all snakemake workflow scripts. (#102) 
* Add logging to logfiles to all snakemake workflow scripts.

* Fix missing quotation marks in Snakefile.

* Apply suggestions from code review

Co-Authored-By: Fabian Neumann <fabian.neumann@outlook.de>

* Apply suggestions from code review

Co-Authored-By: Fabian Neumann <fabian.neumann@outlook.de>

* doc: fix _ec_ filenames in docs

* Allow logging message format to be specified in config.yaml.

* Add logging for Snakemake rule 'retrieve_databundle '.

* Add limited logging to STDERR only for retrieve_*.py scripts.

* Import progressbar module only on demand.

* Fix logging to file and enable concurrent printing to STDERR for most scripts.

* Add new 'logging_format' option to Travis CI test config.yaml.

* Add missing parenthesis (bug fix) and cross-os compatible paths.

* Fix typos in messages.

* Use correct log files for logging (bug fix).

* doc: fix line references

* config: logging_format in all configs

* doc: add doc for logging_format

* environment: update to powerplantmatching 0.4.3

* doc: update line references for tutorial.rst

* Change logging configuration scheme for config.yaml.

* Add helper function for doing basic logging configuration.

* Add logpath for prepare_links_p_nom rule.

* Outsource basic logging configuration for all scripts to _helper submodule.

* Update documentation for changed config.yaml structure.

Instead of 'logging_level' and 'logging_format', now 'logging' with subcategories is used.

* _helpers: Change configure_logging signature.
 2019-11-28 08:22:52 +01:00
Fabian Neumann
81d9d2ab4d
battery+H2: option for stores and links instead of storage_units (#97) 
* add_electricity: stores and links instead of storageunits

* move code for attaching in add_extra_stores.py

* Update Snakefile

Co-Authored-By: Fabian Neumann <fabian.neumann@outlook.de>

* Update Snakefile

Co-Authored-By: Fabian Neumann <fabian.neumann@outlook.de>

* Update Snakefile

Co-Authored-By: Fabian Neumann <fabian.neumann@outlook.de>

* rename to add_extra_components.py

* incorporate suggestions

* Snakefile: update script name

* extra_components: import _add_missing_carriers_from_costs

* Add '_ec" infix in Snakefile

* Snakefile add infix at missing spot

* remove unintendetely inserted data.bundle, correct import in add_extra_components

* environment: fix pyyaml version

* set powerplantmatching as conda-dependency

* environment fix minimal ppm version

* environment reinsert pyyaml

* environment: carry over changes to environment.docs.yaml

* extra_components: add carriers

* update docstring

* Update scripts/add_extra_components.py

* Update scripts/add_extra_components.py

* tutorial: fix hyperlink [skip travis]

* update release notes

* update documentation

* add_electricity: merge removal of suptech
 2019-11-19 19:36:28 +01:00
FabianHofmann
0ea5a5c28f Powerplants (#94) 
* add nice carrier names to n.carriers

* closes #48

* update environment
 2019-11-09 09:08:25 +01:00
Fabian Neumann
7141ce9e5c environment: update to pypsa v0.15 2019-11-08 17:02:42 +01:00
Fabian Neumann
4010e9450d
Complete test pipeline for windows with vresutils memorylogger fixed (#93) 2019-11-08 16:47:39 +01:00
Fabian Neumann
979ff3de72 revert to pyproj<=1.9.6 2019-10-28 15:08:53 +01:00
Fabian Neumann
7663d71219 update conda environment files 2019-10-28 12:02:33 +01:00
Fabian Neumann
ad61968dac use pypsa master branch 2019-10-25 12:33:39 +02:00
Fabian Neumann
0fef13ee86 resolve merge conflicts 2019-10-24 16:22:57 +02:00
Fabian
c18d00a9ef Closes #73 2019-10-17 09:56:24 +02:00
Fabian Neumann
67f8f6e24e add packages yaml and ppm for docs 2019-10-14 13:19:41 -06:00
Fabian Neumann
245ce357f1 fix pyproj version to 1.9.5.1 (closes #72) 2019-10-14 10:06:11 -04:00
Fabian Neumann
886e6234ce reverse environment update 2019-10-09 10:47:24 -04:00
Fabian Neumann
c24e60a624 update environment.yaml 2019-10-03 16:54:22 +02:00
Fabian Neumann
9ddd9ccd75 update environment.yaml 2019-10-03 12:34:41 +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
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
8a9248ee15 Update dependencies for new pypsa version 2019-05-24 13:59:45 +02: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
Jonas Hoersch
ef867ebfc0 environment: Update environment.yaml to blacklist netcdf4 version with regression 2019-02-15 20:59:42 +01:00
Jonas Hoersch
e2078f25cd Update environment.yaml to new versions 2019-02-01 18:09:55 +01:00
Jonas Hoersch
70857f955c Use glaes and geokit repositories from PyPSA fork 2018-12-19 14:44:11 +01:00
Jonas Hoersch
802261eedd Use GLAES library by FZJ-IEK-3 for computing GIS potentials 2018-12-11 15:39:42 +01:00
Jonas Hoersch
04a291b91b Move from countrycodes to maintained pycountry 2018-12-10 18:34:22 +01:00
Jonas Hörsch
ba3a008018 add_electricity: Adapt to reverse compatible argument change in timeseries_opsd 2018-09-03 23:20:46 +02:00
Jonas Hörsch
95e0c77e70 Update environment.yaml to reflect the new library versions 
Also force all GIS stuff to be provided from conda-forge and not fall back to
defaults, which is THE principal source of library breakage.
 2018-08-17 10:42:56 +02:00
Jonas Hörsch
b2d23a3355 Remove dependency on ECMWF API 
The ECMWF API is being deprecated in favor of a new service the CDS API.
Atlite's ERA5 cutout generation code will have to be ported eventually.
 2018-08-08 14:49:50 +02:00
Jonas Hörsch
e17ccfec47 Add environment.yaml file for conda 2018-07-10 17:44:19 +02:00