From 9c39a2b9fbf24d049523f149cb94523be65fba06 Mon Sep 17 00:00:00 2001 From: Sylvain Quoilin Date: Mon, 16 Oct 2017 14:50:34 +0200 Subject: [PATCH] Last updates to the docs --- .gitignore | 4 ++-- Docs/conf.py | 2 +- Docs/figures/logo.png | Bin 0 -> 13693 bytes Docs/index.rst | 6 +++--- Docs/overview.rst | 5 ++--- Docs/releases.rst | 2 +- README.md | 4 ++-- 7 files changed, 11 insertions(+), 12 deletions(-) create mode 100644 Docs/figures/logo.png 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 0000000000000000000000000000000000000000..b8a36237652fff1779f05b6b3965900db4ec3dad GIT binary patch literal 13693 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 NG7^g7m7+#L{{y{0MneDq literal 0 HcmV?d00001 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)