Merge pull request #51 from iiasa/2020_release

2020 release of MESSAGEix-GLOBIOM documentation
iiasa · Mar 18, 2021 · 637a8d4 · 637a8d4
2 parents 5d38de3 + 590b66c
commit 637a8d4
Show file tree

Hide file tree

Showing 35 changed files with 234 additions and 1,230 deletions.
diff --git a/_static/electricity_generation_fossil_nuclear.png b/_static/electricity_generation_fossil_nuclear.png
diff --git a/_static/electricity_generation_renewable.png b/_static/electricity_generation_renewable.png
diff --git a/_static/message-globiom.bib b/_static/message-globiom.bib
diff --git a/annex/index.rst b/annex/index.rst
@@ -1,20 +1,7 @@
 Annex: mathematical formulation
 *******************************
 
-This Annex provides a description of the mathematical formulation of MESSAGE-GLOBIOM and its modules.
-
-Note that the “MESSAGE V” module implementation was superseded by the generalized MESSAGEix energy model framework.
+This mathematical formulation of MESSAGE-GLOBIOM relies on the generalized MESSAGEix energy model framework.
 See the :ref:`MESSAGEix documentation <message_ix:core>` for a complete description of its formulation.
-Although it is not in active use, the older MESSAGE V formulation is preserved here for reference.
-
-.. toctree::
-   :maxdepth: 1
-
-   macro
-   message/index
-
-
-Extra pages
-===========
-
-See :doc:`/_extra/index` for text that (as of 2020-03-05) is omitted from the main contents.
+The equation system of the older MESSAGE V implementation can be found in the `2017 release
+<https://docs.messageix.org/projects/global/en/v2017/annex/>`_ of this documentation.
diff --git a/annex/macro.rst b/annex/macro.rst
diff --git a/annex/message/1_introduction.rst b/annex/message/1_introduction.rst