From a351b322443a854efb0273336baf35d6e208a38f Mon Sep 17 00:00:00 2001
From: Lambert Theisen <lambert.theisen@rwth-aachen.de>
Date: Sun, 15 Dec 2019 15:18:58 +0100
Subject: [PATCH] Update to version 1.1

---
 CHANGELOG.rst          | 17 +++++++++++++++++
 README.rst             |  4 ++--
 docs/conf.py           |  2 +-
 fenicsR13/fenicsR13.py |  4 ++--
 setup.py               |  2 +-
 5 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 79fb80d..3a63214 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,23 @@
 Change log
 ----------
 
+1.1 (2019-12-15)
+~~~~~~~~~~~~~~~~
+
+- Symmetrize system
+    - Scale the equations to match
+    - Introduce subfunctionals
+    - Subfunctionals are equal for off-diagonal entries
+    - Resolve stf-terms using orthogonality
+    - Make r13 as default in formulation rather than decoupled
+    - Refactor CIP as separate subfunctionals
+    - Add antisymm ring, not used for now but can improve convergence
+- Create package
+    - Move files into separate folder and add setup.py
+    - CI is changed
+    - Installation through "pip install ." in toplevel
+- Clean repository
+
 1.0 (2019-09-23)
 ~~~~~~~~~~~~~~~~
 
diff --git a/README.rst b/README.rst
index bc9ae4b..3c471f5 100644
--- a/README.rst
+++ b/README.rst
@@ -258,7 +258,7 @@ Python notes
 Create new version tag
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 1. Add CHANGELOG entry
-2. Adapt version in `conf.py` for docs
+2. Adapt version in `conf.py` for docs and `setup.py` for package
 3. Change badge in ``README.rst``
 4. Change version in program information printing
 
@@ -381,7 +381,7 @@ Contact
     :target: https://git.rwth-aachen.de/lamboo/fenicsR13/pipelines
     :alt: Test coverage
 
-.. |version| image:: https://img.shields.io/badge/version-v1.0-blue.svg
+.. |version| image:: https://img.shields.io/badge/version-v1.1-blue.svg
     :target: https://git.rwth-aachen.de/lamBOO/fenicsR13/-/tags
     :alt: Documentation Website
 
diff --git a/docs/conf.py b/docs/conf.py
index ca65382..9fd2728 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -25,7 +25,7 @@ copyright = '2019'
 author = 'Lambert Theisen'
 
 # The full version, including alpha/beta/rc tags
-release = '1.0'
+release = '1.1'
 
 # -- General configuration ---------------------------------------------------
 
diff --git a/fenicsR13/fenicsR13.py b/fenicsR13/fenicsR13.py
index 3369914..ead7d72 100755
--- a/fenicsR13/fenicsR13.py
+++ b/fenicsR13/fenicsR13.py
@@ -28,7 +28,7 @@ def print_information():
 
     .. code-block:: text
 
-        -> Version: v1.0
+        -> Version: v1.1
         -> Contact: Lambert Theisen <lambert.theisen@rwth-aachen.de>
         -> Contact: Manuel Torrilhon <mt@mathcces.rwth-aachen.de>
         -> Repository: <https://git.rwth-aachen.de/lamBOO/fenicsR13>
@@ -40,7 +40,7 @@ def print_information():
         |_|  \___|_| |_|_|\___|___/_| \_\_|____/
 
     """
-    print(r"""-> Version: v1.0
+    print(r"""-> Version: v1.1
 -> Contact: Lambert Theisen <lambert.theisen@rwth-aachen.de>
 -> Contact: Manuel Torrilhon <mt@mathcces.rwth-aachen.de>
 -> Repository: <https://git.rwth-aachen.de/lamBOO/fenicsR13>
diff --git a/setup.py b/setup.py
index 5703f1d..5f67cec 100644
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@ def readme(): # pylint: disable=missing-function-docstring
 
 setup(
     name="fenicsR13",
-    version="1.0",
+    version="1.1",
     description="FEniCS (FEM) Solver for Non.-Eq.-Gases Based on R13 Equations",
     long_description=readme(),
     url="https://git.rwth-aachen.de/lamBOO/fenicsR13",
-- 
GitLab