diff --git a/.gitignore b/.gitignore index e2c691fa..7143eb0d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,10 @@ *~ *~gm -*.pyc +*.py[cod] *.lst *.lxi *.log -Dispa-SET/Simulations/* +Simulations/* .pickle/ ~$Config.xlsx ~* diff --git a/Docs/conf.py b/Docs/conf.py index 16c3952a..e415a5fc 100644 --- a/Docs/conf.py +++ b/Docs/conf.py @@ -123,7 +123,7 @@ # The name of an image file (relative to this directory) to place at the top # of the sidebar. -#html_logo = None +html_logo = 'figures/logo.png' # The name of an image file (within the static path) to use as favicon of the # docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 diff --git a/Docs/figures/logo.png b/Docs/figures/logo.png new file mode 100644 index 00000000..b8a36237 Binary files /dev/null and b/Docs/figures/logo.png differ diff --git a/Docs/index.rst b/Docs/index.rst index 36cc8a70..d4b17e4d 100644 --- a/Docs/index.rst +++ b/Docs/index.rst @@ -28,11 +28,11 @@ http://www.dispaset.eu/latest/index.html   Main contributors: -* Sylvain Quoilin (Main Developper) +* Sylvain Quoilin (University of Liège, Belgium)) -* Konstantinos Kavvadias +* Konstantinos Kavvadias (Joint Research Centre, EU Commission) -* Andreas Zucker +* Andreas Zucker (Joint Research Centre, EU Commission) Contents diff --git a/Docs/overview.rst b/Docs/overview.rst index 8aa1e1d5..7845cc8a 100644 --- a/Docs/overview.rst +++ b/Docs/overview.rst @@ -4,8 +4,7 @@ Overview ======== :Organization: `Joint Research Centre`_, - `Institute of Energy and Transport`_, - Energy Technology Policy Outlook Unit + `European Commission`_, :Version: |version| :Date: |today| @@ -80,7 +79,7 @@ References .. _pandas: http://pandas.pydata.org .. _pyomo: http://www.pyomo.org/ .. _GAMS_api: http://www.gams.com/help/index.jsp?topic=%2Fgams.doc%2Fapis%2Findex.html -.. _Institute of Energy and Transport: https://ec.europa.eu/jrc/en/institutes/iet +.. _European Commission: https://ec.europa.eu/ .. _Joint Research Centre: https://ec.europa.eu/jrc/en diff --git a/Docs/releases.rst b/Docs/releases.rst index 26c2a414..96b39213 100644 --- a/Docs/releases.rst +++ b/Docs/releases.rst @@ -17,7 +17,7 @@ Changelog Version 2.2 ^^^^^^^^^^^ -* Inclusion of CHP, power2heat and thermal storage +* Inclusion of CHP, power2heat and thermal storage (these new features can be tested by running the config file for Cyprus: 'ConfigFiles/ConfigCY.xlsx') * Bug fixes diff --git a/README.md b/README.md index 99d12283..1fddaf7d 100644 --- a/README.md +++ b/README.md @@ -52,6 +52,6 @@ can be redistributed and/or modified under the terms of this license. ### Main developpers - Sylvain Quoilin (University of Liège) -- Ignacio Hidalgo (European Commission, Institute for Energy and Transport) -- Andreas Zucker (European Commission, Institute for Energy and Transport) +- Konstantinos Kavvadias (Joint Research Centre, European Commission) +- Andreas Zucker (Joint Research Centre, European Commission)