Merge branch 'master' into inverts

GeoscienceAustralia · Apr 4, 2017 · 552c3dc · 552c3dc
2 parents 91b0c7f + 30ecb1b
commit 552c3dc
Show file tree

Hide file tree

Showing 11 changed files with 4 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -51,6 +51,7 @@ 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
 
 parameters.tex
 ch5.png

diff --git a/INSTALL.rst b/INSTALL.rst
@@ -140,7 +140,7 @@ the installation. See this `excellent documentation for Windows users`_
 
 .. _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/

diff --git a/README.rst b/README.rst
@@ -8,9 +8,6 @@
     :target: https://pypi.python.org/pypi/anuga/
     :alt: Latest Version
 
-.. image:: https://img.shields.io/pypi/dm/anuga.svg
-    :target: https://pypi.python.org/pypi/anuga/
-    :alt: Downloads
 
 =====
 AnuGA

diff --git a/examples/README.txt b/examples/README.txt
@@ -1,9 +1,9 @@
 This directory contains demos of flow scenarios modelled with ANUGA.
 See the ANUGA user manual for detailed descriptions.
 
-runup.py: Simple hypothetical runup example
+simple_examples/runup.py: Simple hypothetical runup example
 
-channel1.py - channel3.py: Channel examples
+simple_examples/channel1.py - channel3.py: Channel examples
 
 cairns/runcairns.py: Full scale inundation example
 
diff --git a/examples/buildings.py → examples/simple_examples/buildings.py b/examples/buildings.py → examples/simple_examples/buildings.py
diff --git a/examples/channel1.py → examples/simple_examples/channel1.py b/examples/channel1.py → examples/simple_examples/channel1.py
diff --git a/examples/channel2.py → examples/simple_examples/channel2.py b/examples/channel2.py → examples/simple_examples/channel2.py
diff --git a/examples/channel3.py → examples/simple_examples/channel3.py b/examples/channel3.py → examples/simple_examples/channel3.py
diff --git a/examples/channel3_parallel.py → ...ples/simple_examples/channel3_parallel.py b/examples/channel3_parallel.py → ...ples/simple_examples/channel3_parallel.py
diff --git a/examples/channel_variable.py → examples/simple_examples/channel_variable.py b/examples/channel_variable.py → examples/simple_examples/channel_variable.py
diff --git a/examples/runup.py → examples/simple_examples/runup.py b/examples/runup.py → examples/simple_examples/runup.py