Rudy rain operator

.gitignore

@@ -51,6 +51,9 @@ validation_tests/case_studies/towradgi/Model
 validation_tests/case_studies/towradgi/PARTITIONS
 validation_tests/case_studies/towradgi/Validation
 
+validation_tests/reports/validations_report_alg_DE1.pdf
+
+examples/cairns_excel/cairns_initialcond
 
 parameters.tex
 ch5.png

.travis.yml

@@ -1,19 +1,45 @@
 language: python
-sudo: required
-virtualenv:
-  system_site_packages: true
-env:
-  matrix:
-    #- PYTHON_VERSION="2.7"  ANUGA_PARALLEL="openmpi"  DISTRIB="conda"
-    - PYTHON_VERSION="2.7"  ANUGA_PARALLEL="openmpi"  DISTRIB="ubuntu"
-    #- PYTHON_VERSION="2.7"  ANUGA_PARALLEL="mpich2"  DISTRIB="conda"
-    - PYTHON_VERSION="2.7"  ANUGA_PARALLEL="mpich2"  DISTRIB="ubuntu" COVERAGE="--coverage"
-    - PYTHON_VERSION="2.7"  ANUGA_PARALLEL="false"   DISTRIB="ubuntu"
-    #- PYTHON_VERSION="2.6"  ANUGA_PARALLEL="false"   DISTRIB="conda"
-
-install: 
+matrix:
+
+   include:
+
+       - os: osx
+         language: generic
+         sudo: false
+         python: "2.7"
+         env: PYTHON_VERSION="2.7"  ANUGA_PARALLEL="false"  DISTRIB="conda_macos"
+
+       - os: linux
+         language: generic
+         sudo: required
+         python: "2.7"
+         env: PYTHON_VERSION="2.7"  ANUGA_PARALLEL="openmpi"  DISTRIB="conda"
+
+       - os: linux
+         dist: trusty
+         sudo: required
+         python: "2.7_with_system_site_packages"
+         env: PYTHON_VERSION="2.7"  ANUGA_PARALLEL="mpich"  DISTRIB="ubuntu"
+
+       - os: linux
+         dist: trusty
+         sudo: required
+         python: "2.7_with_system_site_packages"
+         env: PYTHON_VERSION="2.7"  ANUGA_PARALLEL="false"  DISTRIB="ubuntu"
+
+       - os: linux
+         dist: trusty
+         sudo: required
+         python: "2.7_with_system_site_packages"
+         env: PYTHON_VERSION="2.7"  ANUGA_PARALLEL="openmpi"  DISTRIB="ubuntu" COVERAGE="--coverage"
+
+
+install:
+    - if [[ "$DISTRIB" == "conda_macos" ]]; then source tools/install_conda_macos.sh; fi
     - if [[ "$DISTRIB" == "conda" ]]; then source tools/install_conda.sh; fi
     - if [[ "$DISTRIB" == "ubuntu" ]]; then source tools/install_ubuntu.sh; fi
+    - if [[ "$COVERAGE" == "--coverage" ]]; then pip install coverage coveralls; fi
+
 
 script: 
     - python runtests.py $COVERAGE

INSTALL.rst

@@ -1,29 +1,22 @@
 
 
-Installation
-============
+******************
+Anuga Installation
+******************
 
 .. contents::
 
+
 Introduction
-------------
+============
 
 AnuGA_ is a python package with some C extensions (and an optional fortran 
 extension). At present AnuGA has only been run and tested using python 2.x.
 We recommend python 2.7.  
 
-If you have a python 2.7 environment with gcc and gfortran support, 
-then you can use pip to install the latest release 
-version of AnuGA::
-
-	pip install anuga
-
-You might want to install the dependencies via ubuntu ``apt-get`` or ``conda install`` 
-to download pre-compiled versions of the dependencies. See below. 
-
 
 Dependencies
-------------
+============
 
 AnuGA requires the following packages:
 
@@ -33,26 +26,29 @@ AnuGA requires the following packages:
 * `gdal <http://gdal.org/>`_
 * `netcdf <http://www.unidata.ucar.edu/software/netcdf/>`_
 * `nose <http://nose.readthedocs.org/en/latest/>`_
+* `dill <https://dill.readthedocs.io/>`_
 * A C compiler (preferably GCC or TDM-GCC_ MinGW_ on Windows)
 
 
-Ubuntu Install
-++++++++++++++
+Installing the latest DEVELOPMENT version on Ubuntu
+===================================================
 
 AnuGA is developed on Ubuntu. The preferred way to install the dependencies is 
 to use the standard ubuntu ``apt-get`` method. 
 
-We have a script in the ``tools`` directory,
-`install_ubuntu.sh <https://github.com/GeoscienceAustralia/anuga_core/blob/master/tools/install_ubuntu.sh>`_
-which when run from the ``anuga_core`` directory will install AnuGA and all the dependencies using ``apt-get``.
+We suggest installing the latest version of ANUGA_ from Github_.
+We try to maintain the *master* branch stable and
+`passing all tests <https://travis-ci.org/GeoscienceAustralia/anuga_core/branches>`_,
+so it should be safe to use.
+
+Follow these instructions to
+`Install ANUGA on Ubuntu (using apt-get) <https://github.com/GeoscienceAustralia/anuga_core/wiki/Install-ANUGA-on-Ubuntu-(using-apt-get)>`_
 
-For extended instructions checkout the wiki page
-`install ANUGA on Ubuntu <https://github.com/GeoscienceAustralia/anuga_core/wiki/Install-ANUGA-on-Ubuntu>`_
 
 
 
 Alternative Ubuntu Install
-++++++++++++++++++++++++++
+==========================
 
 An alternative is to install the dependencies using the Anaconda_ or the Miniconda_ Python 
 distributions by `Continuum Analytics`_.
@@ -65,50 +61,42 @@ Both Anaconda_ and Miniconda_ do not require administrative rights
 to your computer and do not interfere with the Python installed 
 in your system.
 
+Follow these instructions to 
+`Install ANUGA on Ubuntu (using Miniconda) <https://github.com/GeoscienceAustralia/anuga_core/wiki/Install-ANUGA-on-Ubuntu-(using-Miniconda)>`_
 
-Anaconda and Miniconda
-~~~~~~~~~~~~~~~~~~~~~~
 
-Once you have downloaded and installed Anaconda_ or Miniconda_
-open a terminal (or ``cmd.exe`` on Windows).
 
-With  Miniconda_, you can create 
-a specific environment for AnuGA, by running::
+Windows 10 Install using 'Ubuntu on Windows'
+==========================
 
-    conda create -n anuga_env python=2.7
-    source activate anuga_env
-
-
-With either Anaconda_ or Miniconda_ you can now install the dependencies by running::
+Starting from Windows 10, it is possible to run an Ubuntu Bash console from Windows. This can greatly simplify the install for Windows users. You'll still need administrator access though. 
 
-    conda install pip nose numpy scipy matplotlib netcdf4
-    conda install -c pingucarsti gdal 
-
-and setup GDAL_DATA environment variable:
+Follow the instructions 
+`Install ANUGA on Window 10 using Ubuntu for Windows <https://github.com/GeoscienceAustralia/anuga_core/wiki/Install-ANUGA-on-Windows-10-using-Ubuntu-on-Windows'>`_
 
-    export GDAL_DATA=`gdal-config --datadir` 
-
-(You should add this command to your .bashrc file.)    
 
 
-Windows Dependency Installation
-+++++++++++++++++++++++++++++++
+Native Windows Installation
+===============================
 
-We have successfully install AnuGA on windows using Gohlke Binaries and using Miniconda. 
-At present we recommend using the Gohlke Binaries. 
+We have successfully installed AnuGA 'natively' on windows using Gohlke Binaries and using Miniconda. 
+At present we recommend using the Miniconda. 
 
-Follow the instructions 
+Follow the instructions  
+`install ANUGA on Windows using Miniconda
+<https://github.com/GeoscienceAustralia/anuga_core/wiki/Install-ANUGA-on-Windows-using-Miniconda>`_
+
+Alternatively follow the instructions 
 `install ANUGA on Windows using the Gohlke Binaries
 <https://github.com/GeoscienceAustralia/anuga_core/wiki/Install-ANUGA-on-Windows-using-Gohlke-Binaries>`_
 
-Alternatively if you want ot use Miniconda, follow the instructions 
-`install ANUGA on Windows using Miniconda
-<https://github.com/GeoscienceAustralia/anuga_core/wiki/Install-ANUGA-on-Windows-using-Miniconda>`_
+
+
 
 
 
 GCC dependency for Windows users
-++++++++++++++++++++++++++++++++++++
+--------------------------------
 
 Unfortunately, the ``gcc`` compiler MinGW_ included in Anaconda or 
 installable via Miniconda_ doesn't have OpenMP_ support. This is required to compile
@@ -121,79 +109,18 @@ the installation. See this `excellent documentation for Windows users`_
 (they even have screenshots!). The same applies if you are using Miniconda_.
 
 
-Installing AnuGA
-----------------
 
-After you've installed the dependencies you can proceed to install AnuGA
-using pip_.
-Open a terminal (or ``cmd.exe`` on Windows) and run::
-
-    pip install anuga
-
-
-If you already have AnuGA installed and want to **upgrade** to a newer
-version, use::
-
-    pip install anuga --upgrade
-
-To uninstall simply run::
-
-    pip uninstall anuga
 
 
 .. note::
 
     The Windows installer from older versions is no longer supported.
-
-Installing the latest development version
------------------------------------------
-
-If you want the very latest code and features,
-you can install AnuGA directly from Github_.
-We try to maintain the *master* branch stable and
-`passing all tests <https://travis-ci.org/GeoscienceAustralia/anuga_core/branches>`__,
-so it should be safe to use.
-
-First, you'll need to `install git`_.
-Then, open a terminal and run::
-
-    git clone git://github.com/GeoscienceAustralia/anuga_core.git 
-
-This will fetch the source code from Github_
-and place it in a folder called ``anuga_core`` in the directory where you ran the
-command.
-Then, just ``cd`` into the directory and run ``pip``::
-
-    cd anuga_core
-    pip install --upgrade .
 
 
-Testing the install
--------------------
-
-
-From the source directory run ``python runtests.py``
-
-    python runtests.py
 
-
-If you get an error message or weird result,
-please write to the `mailing list`_ or `create an issue on the github site 
-<https://github.com/GeoscienceAustralia/anuga_core/issues>`__.
-
-To make it easier for us to debug you problem, please include the following
-information:
-
-* Operating system
-* Python distribution (Anaconda_, PythonXY_, `ETS/Canopy`_, own install)
-* Python version (2.6, 2.7 etc)
-* The script you ran (and gave you an error/weird result)
-* The error message (the part that says ``Traceback: ...``) or result (figure,
-  numbers, etc)
-
-.. _AnuGA http://anuga.anu.edu.au/ 
+.. _AnuGA: http://anuga.anu.edu.au/ 
 .. _install git: http://git-scm.com/
-.. _Github: https://github.com/stoiver/anuga_core/
+.. _Github: https://github.com/GeoscienceAustralia/anuga_core/
 .. _Python: http://www.python.org/
 .. _pip: http://www.pip-installer.org
 .. _MinGW: http://www.mingw.org/
@@ -206,4 +133,3 @@ information:
 .. _OpenMP: http://openmp.org/
 .. _TDM-GCC: http://tdm-gcc.tdragon.net/
 .. _excellent documentation for Windows users: http://docs-windows.readthedocs.org/en/latest/devel.html#mingw-with-openmp-support
-