Merge branch 'master' of github.com:/GeoscienceAustralia/anuga_core

.travis.yml

@@ -2,16 +2,6 @@ language: python
 matrix:
 
    include:
-       - os: linux
-         sudo: required
-         python: "2.7_with_system_site_packages"
-         env: PYTHON_VERSION="2.7"  ANUGA_PARALLEL="openmpi"  DISTRIB="ubuntu"
-
-       - os: linux
-         sudo: required
-         python: "2.7_with_system_site_packages"
-         env: PYTHON_VERSION="2.7"  ANUGA_PARALLEL="mpich2"  DISTRIB="ubuntu"
-
        - os: linux
          dist: trusty
          sudo: required

README.rst

@@ -10,26 +10,26 @@
 
 
 =====
-AnuGA
+ANUGA
 =====
 
 .. contents::
 
-What is AnuGA?
+What is ANUGA?
 --------------
 
-AnuGA (pronounced "AHnooGAH") is open-source software for the simulation of
+ANUGA (pronounced "AHnooGAH") is open-source software for the simulation of
 the shallow water equation, in particular it can be used to model tsunamis
 and floods.
 
-AnuGA is a python package with some C extensions (and an optional 
-fortran extension). At present AnuGA has not been ported to python 3. 
+ANUGA is a python package with some C extensions (and an optional 
+fortran extension). At present ANUGA has not been ported to python 3. 
 We recommend using python 2.7  
 
 Developed at Geoscience Australia and Mathematical Sciences Institute at the
 Australian National University.
 
-Copyright 2004 - 2015 
+Copyright 2004 - 2017 
 Ole Nielsen, Stephen Roberts, Duncan Gray, Jane Sexton, Gareth Davies
 
 
@@ -43,7 +43,7 @@ For installation instructions, see
 Documentation
 -------------
 
-AnuGA documentation is available in the doc folder. In particular the 
+ANUGA documentation is available in the doc folder. In particular the 
 `user_manual <https://github.com/GeoscienceAustralia/anuga_core/raw/master/doc/anuga_user_manual.pdf>`_
 
 Also helpful information is available noline at
@@ -54,10 +54,12 @@ Also helpful information is available noline at
 Web sites
 ---------
 
-The user's site is:
-
-    http://anuga.anu.edu.au/
+The user's site is: http://anuga.anu.edu.au/
+The WikiPedia for ANUGA is: https://en.wikipedia.org/wiki/ANUGA_Hydro
+The GitHub repository for ANUGA is: https://github.com/GeoscienceAustralia/anuga_core
 
+A viewer is available for displaying the ANUGA sww output files. ANUGA viewer repository is: https://github.com/GeoscienceAustralia/anuga-viewer
+
 
 Mailing Lists
 -------------
@@ -70,25 +72,29 @@ Please see anuga user mailing list here:
 Latest source code
 ------------------
 
-The latest development version of AnuGA's sources are is available at:
+The latest development version of ANUGA's sources are is available at:
 
     https://github.com/GeoscienceAustralia/anuga_core
 
-They can be downloaded as a zip file or using the Git client.
+They can be downloaded as a zip file or using the Git client as follows
+
+    git clone https://github.com/GeoscienceAustralia/anuga_core (for read only)
+    git clone git@github.com:GeoscienceAustralia/anuga_core.git (to contribute)
 
+For the latter option see e.g. https://help.github.com/articles/adding-a-new-ssh-key-to-your-github-account/ for instructions on how to authenticate using ssh keys.
 
 Bug reports
 -----------
 
-To search for bugs or report them, please use the AnuGA's Bug Tracker at:
+To search for bugs or report them, please use the ANUGA's Bug Tracker at:
 
     https://github.com/GeoscienceAustralia/anuga_core/issues
 
 
 Developer information
 ---------------------
 
-If you would like to take part in AnuGA development, take a look
+If you would like to take part in ANUGA development, take a look
 at `CONTRIBUTING.rst <https://github.com/GeoscienceAustralia/anuga_core/blob/master/CONTRIBUTING.rst>`_.
 
 

anuga/__init__.py

@@ -21,7 +21,7 @@
 #-----------------------------------------------------
 
 
-__version__ = '2.0'
+__version__ = '2.0.2'
 
 __svn_revision__ = filter(str.isdigit, "$Revision: 9737 $")
 

tools/install_ubuntu.sh

@@ -33,11 +33,11 @@ if [ $(dpkg-query -W -f='${Status}\n' openmpi-bin 2>/dev/null | grep -c "ok inst
 then
   ANUGA_PARALLEL="openmpi"
 fi
-
-
-
+
+
 sudo apt-get update -q
 
+
 ##########################################################
 # Use standard ubuntu packages in their default version