Updating version to 3.5.0

hannorein · Jun 1, 2017 · 25ba45f · 25ba45f
1 parent bd9fbfe
commit 25ba45f
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 7 deletions.
diff --git a/README.rst b/README.rst
@@ -1,7 +1,7 @@
 REBOUND - An open-source multi-purpose N-body code
 ==================================================
 
-.. image:: http://img.shields.io/badge/rebound-v3.4.0-green.svg?style=flat
+.. image:: http://img.shields.io/badge/rebound-v3.5.0-green.svg?style=flat
     :target: http://rebound.readthedocs.org
 .. image:: https://badge.fury.io/py/rebound.svg
     :target: https://badge.fury.io/py/rebound

diff --git a/changelog.rst b/changelog.rst
@@ -3,6 +3,11 @@ Changelog
 
 This changelog only includes the most important changes in recent updates. For a full log of all changes, please refer to git.
 
+Version 3.5.0
+-------------
+* The WHFast integrator now supports Jacobi coordinates (default), democratic heliocentric coordinates and WHDS coordinates. The previously separate WHFastHelio integrator has been removed. The coordinate system can now be changed by simply setting the coordinates flag in the ri_whfast struct.
+* Included a experimental new integrator MERCURIUS. This is similar to the hybrid integrator in Mercury but uses WHFast and IAS15. Not ready for production yet.
+
 Version 3.4.0
 -------------
 * Added a screenshot functionality for the WebGL ipython widget. This lets you take screenshots programmatically which is useful to create movies of simulations. 

diff --git a/doc/conf.py b/doc/conf.py
@@ -137,9 +137,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '3.4'
+version = '3.5'
 # The full version, including alpha/beta/rc tags.
-release = '3.4.0'
+release = '3.5.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/setup.py b/setup.py
@@ -17,7 +17,7 @@
     ghash = subprocess.check_output(["git", "rev-parse", "HEAD"]).decode("ascii")
     ghash_arg = "-DGITHASH="+ghash.strip()
 except:
-    ghash_arg = "-DGITHASH=ac845995edf5a6a9adc02443239db46720a2cc39" #GITHASHAUTOUPDATE
+    ghash_arg = "-DGITHASH=bd9fbfeeb89d812e9ab1d64482cc397b9d530347" #GITHASHAUTOUPDATE
 
 extra_link_args=[]
 if sys.platform == 'darwin':
@@ -61,7 +61,7 @@
     long_description = f.read()
 
 setup(name='rebound',
-    version='3.4.0',
+    version='3.5.0',
     description='An open-source multi-purpose N-body code',
     long_description=long_description,
     url='http://github.com/hannorein/rebound',

diff --git a/src/rebound.c b/src/rebound.c
@@ -63,7 +63,7 @@
 const int reb_max_messages_length = 1024;   // needs to be constant expression for array size
 const int reb_max_messages_N = 10;
 const char* reb_build_str = __DATE__ " " __TIME__;  // Date and time build string. 
-const char* reb_version_str = "3.4.0";         // **VERSIONLINE** This line gets updated automatically. Do not edit manually.
+const char* reb_version_str = "3.5.0";         // **VERSIONLINE** This line gets updated automatically. Do not edit manually.
 const char* reb_githash_str = STRINGIFY(GITHASH);             // This line gets updated automatically. Do not edit manually.
 
 void reb_step(struct reb_simulation* const r){

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-3.4.0
+3.5.0