[SCM] Gerris Flow Solver branch, upstream, updated. b3aa46814a06c9cb2912790b23916ffb44f1f203

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 8c147df9c13fca4e79292c1255f3d5b66b7a7dbc
Author: Stephane Popinet <s.popinet at niwa.co.nz>
Date:   Tue Oct 4 15:16:14 2005 +1000

    Restructured test/ directory
    
    darcs-hash:20051004051614-fbd8f-b86c35f9d6d6c71a0c7aa7006e5489ae626efb59.gz

diff --git a/configure.in b/configure.in
index b831059..f9cf3c5 100644
--- a/configure.in
+++ b/configure.in
@@ -419,9 +419,8 @@ src/dx2D.mdf
 src/dx2D3.mdf
 src/dx3D.mdf
 tools/Makefile
-test/Makefile
 modules/Makefile
-test/euler/Makefile
+test/Makefile
 doc/Makefile
 doc/tutorial/Makefile
 doc/examples/Makefile
diff --git a/test/Makefile.am b/test/Makefile.am
index 3b62566..a9b2cba 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,3 +1,65 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = euler
+TESTDIRS = \
+	poisson \
+	circle \
+	advection \
+	reynolds \
+	periodic \
+	merging \
+	boundaries \
+	channel \
+	spurious \
+	capwave \
+	waves \
+	geo
+
+EXTRA_DIST = \
+	template.tex \
+	tests.bib \
+	depend.py \
+	test.py \
+	gfs2tex \
+	l2hconf.pm \
+	Makefile.deps
+
+TESTS = test.sh
+
+test.sh: $(TESTDIRS)
+	@echo "python test.py $(TESTDIRS)" > test.sh
+	@chmod +x test.sh
+
+clean-generic:
+	$(RM) *.dvi *.aux *.log *.toc *.out tests.tex *.pyc test.sh *.bbl *.blg
+
+tests: tests.ps.gz l2hconf.pm
+	latex2html -no_math -html_version 3.2,math -address "" -info "" -split +3 -show_section_numbers -toc_depth 5 -t "Gerris Tests" -local_icons -white tests.tex
+	cp -f ../doc/share/darcs.css tests/tests.css
+
+tests.dvi: tests.tex tests.bib
+	latex -interaction=nonstopmode tests.tex > /dev/null 2>&1
+	bibtex tests
+	latex -interaction=nonstopmode tests.tex > /dev/null 2>&1
+	latex -interaction=nonstopmode tests.tex
+
+tests.ps.gz: tests.dvi
+	dvips tests.dvi -o tests.ps
+	gzip -f --best tests.ps
+
+tests.pdf: tests.dvi
+	dvips -Ppdf -G0 tests.dvi -o tests.ps
+	ps2pdf -sPAPERSIZE=a4 -dMaxSubsetPct=100 -dCompatibilityLevel=1.2 -dSubsetFonts=true -dEmbedAllFonts=true tests.ps tests.pdf
+	rm -f tests.ps
+
+tests.tex: template.tex Makefile.deps
+	rm -r -f tests
+	python gfs2tex $(TESTDIRS)
+	cp -f template.tex tests.tex
+
+Makefile.deps: Makefile.am depend.py
+	python depend.py $(TESTDIRS) > Makefile.deps
+
+-include Makefile.deps
+
+tests.tar.gz: tests $(DOCS)
+	tar czf tests.tar.gz tests $(DOCS)
diff --git a/test/euler/advection/advection.gfs b/test/advection/advection.gfs
similarity index 100%
rename from test/euler/advection/advection.gfs
rename to test/advection/advection.gfs
diff --git a/test/euler/advection/advection.sh b/test/advection/advection.sh
similarity index 100%
rename from test/euler/advection/advection.sh
rename to test/advection/advection.sh
diff --git a/test/euler/advection/error.ref b/test/advection/error.ref
similarity index 100%
rename from test/euler/advection/error.ref
rename to test/advection/error.ref
diff --git a/test/euler/advection/order.ref b/test/advection/order.ref
similarity index 100%
rename from test/euler/advection/order.ref
rename to test/advection/order.ref
diff --git a/test/euler/boundaries/boundaries.gfs b/test/boundaries/boundaries.gfs
similarity index 100%
rename from test/euler/boundaries/boundaries.gfs
rename to test/boundaries/boundaries.gfs
diff --git a/test/euler/boundaries/boundaries.sh b/test/boundaries/boundaries.sh
similarity index 100%
rename from test/euler/boundaries/boundaries.sh
rename to test/boundaries/boundaries.sh
diff --git a/test/euler/boundaries/orderU.ref b/test/boundaries/orderU.ref
similarity index 100%
rename from test/euler/boundaries/orderU.ref
rename to test/boundaries/orderU.ref
diff --git a/test/euler/boundaries/orderV.ref b/test/boundaries/orderV.ref
similarity index 100%
rename from test/euler/boundaries/orderV.ref
rename to test/boundaries/orderV.ref
diff --git a/test/euler/boundaries/orderfU.ref b/test/boundaries/orderfU.ref
similarity index 100%
rename from test/euler/boundaries/orderfU.ref
rename to test/boundaries/orderfU.ref
diff --git a/test/euler/boundaries/orderfV.ref b/test/boundaries/orderfV.ref
similarity index 100%
rename from test/euler/boundaries/orderfV.ref
rename to test/boundaries/orderfV.ref
diff --git a/test/euler/capwave/capwave.gfs b/test/capwave/capwave.gfs
similarity index 100%
rename from test/euler/capwave/capwave.gfs
rename to test/capwave/capwave.gfs
diff --git a/test/euler/capwave/capwave.sh b/test/capwave/capwave.sh
similarity index 100%
rename from test/euler/capwave/capwave.sh
rename to test/capwave/capwave.sh
diff --git a/test/euler/capwave/convergence.ref b/test/capwave/convergence.ref
similarity index 100%
rename from test/euler/capwave/convergence.ref
rename to test/capwave/convergence.ref
diff --git a/test/euler/capwave/prosperetti b/test/capwave/prosperetti
similarity index 100%
rename from test/euler/capwave/prosperetti
rename to test/capwave/prosperetti
diff --git a/test/euler/channel/channel.gfs b/test/channel/channel.gfs
similarity index 100%
rename from test/euler/channel/channel.gfs
rename to test/channel/channel.gfs
diff --git a/test/euler/channel/channel.sh b/test/channel/channel.sh
similarity index 100%
rename from test/euler/channel/channel.sh
rename to test/channel/channel.sh
diff --git a/test/euler/channel/orderU.ref b/test/channel/orderU.ref
similarity index 100%
rename from test/euler/channel/orderU.ref
rename to test/channel/orderU.ref
diff --git a/test/euler/channel/orderV.ref b/test/channel/orderV.ref
similarity index 100%
rename from test/euler/channel/orderV.ref
rename to test/channel/orderV.ref
diff --git a/test/euler/channel/orderfU.ref b/test/channel/orderfU.ref
similarity index 100%
rename from test/euler/channel/orderfU.ref
rename to test/channel/orderfU.ref
diff --git a/test/euler/channel/orderfV.ref b/test/channel/orderfV.ref
similarity index 100%
rename from test/euler/channel/orderfV.ref
rename to test/channel/orderfV.ref
diff --git a/test/euler/check.py b/test/check.py
similarity index 100%
rename from test/euler/check.py
rename to test/check.py
diff --git a/test/euler/circle/circle.gfs b/test/circle/circle.gfs
similarity index 100%
rename from test/euler/circle/circle.gfs
rename to test/circle/circle.gfs
diff --git a/test/euler/circle/circle.sh b/test/circle/circle.sh
similarity index 100%
rename from test/euler/circle/circle.sh
rename to test/circle/circle.sh
diff --git a/test/euler/circle/error.ref b/test/circle/error.ref
similarity index 100%
rename from test/euler/circle/error.ref
rename to test/circle/error.ref
diff --git a/test/euler/circle/order.ref b/test/circle/order.ref
similarity index 100%
rename from test/euler/circle/order.ref
rename to test/circle/order.ref
diff --git a/test/euler/circle/refined/error.ref b/test/circle/refined/error.ref
similarity index 100%
rename from test/euler/circle/refined/error.ref
rename to test/circle/refined/error.ref
diff --git a/test/euler/circle/refined/order.ref b/test/circle/refined/order.ref
similarity index 100%
rename from test/euler/circle/refined/order.ref
rename to test/circle/refined/order.ref
diff --git a/test/euler/circle/refined/refined.gfs b/test/circle/refined/refined.gfs
similarity index 100%
rename from test/euler/circle/refined/refined.gfs
rename to test/circle/refined/refined.gfs
diff --git a/test/euler/circle/refined/res-7.ref b/test/circle/refined/res-7.ref
similarity index 100%
rename from test/euler/circle/refined/res-7.ref
rename to test/circle/refined/res-7.ref
diff --git a/test/euler/circle/refined/solution.gfv b/test/circle/refined/solution.gfv
similarity index 100%
rename from test/euler/circle/refined/solution.gfv
rename to test/circle/refined/solution.gfv
diff --git a/test/euler/circle/res-7.ref b/test/circle/res-7.ref
similarity index 100%
rename from test/euler/circle/res-7.ref
rename to test/circle/res-7.ref
diff --git a/test/euler/circle/solution.gfv b/test/circle/solution.gfv
similarity index 100%
rename from test/euler/circle/solution.gfv
rename to test/circle/solution.gfv
diff --git a/test/euler/circle/star/error.ref b/test/circle/star/error.ref
similarity index 100%
rename from test/euler/circle/star/error.ref
rename to test/circle/star/error.ref
diff --git a/test/euler/circle/star/order.ref b/test/circle/star/order.ref
similarity index 100%
rename from test/euler/circle/star/order.ref
rename to test/circle/star/order.ref
diff --git a/test/euler/circle/star/res-7.ref b/test/circle/star/res-7.ref
similarity index 100%
rename from test/euler/circle/star/res-7.ref
rename to test/circle/star/res-7.ref
diff --git a/test/euler/circle/star/solution.gfv b/test/circle/star/solution.gfv
similarity index 100%
rename from test/euler/circle/star/solution.gfv
rename to test/circle/star/solution.gfv
diff --git a/test/euler/circle/star/star.gfs b/test/circle/star/star.gfs
similarity index 100%
rename from test/euler/circle/star/star.gfs
rename to test/circle/star/star.gfs
diff --git a/test/euler/circle/thin/error.ref b/test/circle/thin/error.ref
similarity index 100%
rename from test/euler/circle/thin/error.ref
rename to test/circle/thin/error.ref
diff --git a/test/euler/circle/thin/order.ref b/test/circle/thin/order.ref
similarity index 100%
rename from test/euler/circle/thin/order.ref
rename to test/circle/thin/order.ref
diff --git a/test/euler/circle/thin/res-7.ref b/test/circle/thin/res-7.ref
similarity index 100%
rename from test/euler/circle/thin/res-7.ref
rename to test/circle/thin/res-7.ref
diff --git a/test/euler/circle/thin/solution.gfv b/test/circle/thin/solution.gfv
similarity index 100%
rename from test/euler/circle/thin/solution.gfv
rename to test/circle/thin/solution.gfv
diff --git a/test/euler/circle/thin/thin.gfs b/test/circle/thin/thin.gfs
similarity index 100%
rename from test/euler/circle/thin/thin.gfs
rename to test/circle/thin/thin.gfs
diff --git a/test/euler/depend.py b/test/depend.py
similarity index 95%
rename from test/euler/depend.py
rename to test/depend.py
index 244265f..47876c2 100755
--- a/test/euler/depend.py
+++ b/test/depend.py
@@ -3,7 +3,7 @@
 import sys
 import os
 import os.path
-sys.path.append("../../doc/examples")
+sys.path.append("../doc/examples")
 import gfs2tex
 
 dists = ""
diff --git a/test/euler/Makefile.am b/test/euler/Makefile.am
deleted file mode 100644
index 2df369e..0000000
--- a/test/euler/Makefile.am
+++ /dev/null
@@ -1,65 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-TESTDIRS = \
-	poisson \
-	circle \
-	advection \
-	reynolds \
-	periodic \
-	merging \
-	boundaries \
-	channel \
-	spurious \
-	capwave \
-	waves \
-	geo
-
-EXTRA_DIST = \
-	template.tex \
-	tests.bib \
-	depend.py \
-	test.py \
-	gfs2tex \
-	l2hconf.pm \
-	Makefile.deps
-
-TESTS = test.sh
-
-test.sh: $(TESTDIRS)
-	@echo "python test.py $(TESTDIRS)" > test.sh
-	@chmod +x test.sh
-
-clean-generic:
-	$(RM) *.dvi *.aux *.log *.toc *.out tests.tex *.pyc test.sh *.bbl *.blg
-
-tests: tests.ps.gz l2hconf.pm
-	latex2html -no_math -html_version 3.2,math -address "" -info "" -split +3 -show_section_numbers -toc_depth 5 -t "Gerris Tests" -local_icons -white tests.tex
-	cp -f ../../doc/share/darcs.css tests/tests.css
-
-tests.dvi: tests.tex tests.bib
-	latex -interaction=nonstopmode tests.tex > /dev/null 2>&1
-	bibtex tests
-	latex -interaction=nonstopmode tests.tex > /dev/null 2>&1
-	latex -interaction=nonstopmode tests.tex
-
-tests.ps.gz: tests.dvi
-	dvips tests.dvi -o tests.ps
-	gzip -f --best tests.ps
-
-tests.pdf: tests.dvi
-	dvips -Ppdf -G0 tests.dvi -o tests.ps
-	ps2pdf -sPAPERSIZE=a4 -dMaxSubsetPct=100 -dCompatibilityLevel=1.2 -dSubsetFonts=true -dEmbedAllFonts=true tests.ps tests.pdf
-	rm -f tests.ps
-
-tests.tex: template.tex Makefile.deps
-	rm -r -f tests
-	python gfs2tex $(TESTDIRS)
-	cp -f template.tex tests.tex
-
-Makefile.deps: Makefile.am depend.py
-	python depend.py $(TESTDIRS) > Makefile.deps
-
--include Makefile.deps
-
-tests.tar.gz: tests $(DOCS)
-	tar czf tests.tar.gz tests $(DOCS)
diff --git a/test/euler/geo/beta/beta.gfs b/test/geo/beta/beta.gfs
similarity index 100%
rename from test/euler/geo/beta/beta.gfs
rename to test/geo/beta/beta.gfs
diff --git a/test/euler/geo/beta/beta.sh b/test/geo/beta/beta.sh
similarity index 100%
rename from test/euler/geo/beta/beta.sh
rename to test/geo/beta/beta.sh
diff --git a/test/euler/geo/beta/c b/test/geo/beta/c
similarity index 100%
rename from test/euler/geo/beta/c
rename to test/geo/beta/c
diff --git a/test/euler/geo/beta/dlw b/test/geo/beta/dlw
similarity index 100%
rename from test/euler/geo/beta/dlw
rename to test/geo/beta/dlw
diff --git a/test/euler/geo/beta/energy-nonlinear.ref b/test/geo/beta/energy-nonlinear.ref
similarity index 100%
rename from test/euler/geo/beta/energy-nonlinear.ref
rename to test/geo/beta/energy-nonlinear.ref
diff --git a/test/euler/geo/beta/energy.ref b/test/geo/beta/energy.ref
similarity index 100%
rename from test/euler/geo/beta/energy.ref
rename to test/geo/beta/energy.ref
diff --git a/test/euler/geo/beta/lls b/test/geo/beta/lls
similarity index 100%
rename from test/euler/geo/beta/lls
rename to test/geo/beta/lls
diff --git a/test/euler/geo/beta/llw b/test/geo/beta/llw
similarity index 100%
rename from test/euler/geo/beta/llw
rename to test/geo/beta/llw
diff --git a/test/euler/geo/beta/pzm b/test/geo/beta/pzm
similarity index 100%
rename from test/euler/geo/beta/pzm
rename to test/geo/beta/pzm
diff --git a/test/euler/geo/e.ref b/test/geo/e.ref
similarity index 100%
rename from test/euler/geo/e.ref
rename to test/geo/e.ref
diff --git a/test/euler/geo/geo.gfs b/test/geo/geo.gfs
similarity index 100%
rename from test/euler/geo/geo.gfs
rename to test/geo/geo.gfs
diff --git a/test/euler/geo/geo.gfv b/test/geo/geo.gfv
similarity index 100%
rename from test/euler/geo/geo.gfv
rename to test/geo/geo.gfv
diff --git a/test/euler/geo/geo.sh b/test/geo/geo.sh
similarity index 100%
rename from test/euler/geo/geo.sh
rename to test/geo/geo.sh
diff --git a/test/euler/gfs2tex b/test/gfs2tex
similarity index 86%
rename from test/euler/gfs2tex
rename to test/gfs2tex
index b3501bd..a859e4d 100755
--- a/test/euler/gfs2tex
+++ b/test/gfs2tex
@@ -4,14 +4,14 @@ import sys
 import os
 import os.path
 import glob
-sys.path.append("../../doc/examples")
+sys.path.append("../doc/examples")
 import gfs2tex
 
 if not os.access("tests",os.F_OK):
     os.mkdir("tests")
 
 dico = {}
-for f in glob.glob("../../doc/html/*.html"):
+for f in glob.glob("../doc/html/*.html"):
     gfs2tex.dictionary(dico,open(f))
 
 for start in sys.argv[1:]:
diff --git a/test/euler/l2hconf.pm b/test/l2hconf.pm
similarity index 100%
rename from test/euler/l2hconf.pm
rename to test/l2hconf.pm
diff --git a/test/euler/merging/levels.gfv b/test/merging/levels.gfv
similarity index 100%
rename from test/euler/merging/levels.gfv
rename to test/merging/levels.gfv
diff --git a/test/euler/merging/merging.gfs b/test/merging/merging.gfs
similarity index 100%
rename from test/euler/merging/merging.gfs
rename to test/merging/merging.gfs
diff --git a/test/euler/merging/merging.sh b/test/merging/merging.sh
similarity index 100%
rename from test/euler/merging/merging.sh
rename to test/merging/merging.sh
diff --git a/test/euler/merging/sim.err.ref b/test/merging/sim.err.ref
similarity index 100%
rename from test/euler/merging/sim.err.ref
rename to test/merging/sim.err.ref
diff --git a/test/euler/merging/simc.err.ref b/test/merging/simc.err.ref
similarity index 100%
rename from test/euler/merging/simc.err.ref
rename to test/merging/simc.err.ref
diff --git a/test/euler/merging/vorticity.gfv b/test/merging/vorticity.gfv
similarity index 100%
rename from test/euler/merging/vorticity.gfv
rename to test/merging/vorticity.gfv
diff --git a/test/euler/periodic/periodic.gfs b/test/periodic/periodic.gfs
similarity index 100%
rename from test/euler/periodic/periodic.gfs
rename to test/periodic/periodic.gfs
diff --git a/test/euler/periodic/periodic.sh b/test/periodic/periodic.sh
similarity index 100%
rename from test/euler/periodic/periodic.sh
rename to test/periodic/periodic.sh
diff --git a/test/euler/periodic/r0.ref b/test/periodic/r0.ref
similarity index 100%
rename from test/euler/periodic/r0.ref
rename to test/periodic/r0.ref
diff --git a/test/euler/periodic/r1.ref b/test/periodic/r1.ref
similarity index 100%
rename from test/euler/periodic/r1.ref
rename to test/periodic/r1.ref
diff --git a/test/euler/periodic/r2.ref b/test/periodic/r2.ref
similarity index 100%
rename from test/euler/periodic/r2.ref
rename to test/periodic/r2.ref
diff --git a/test/euler/poisson/circle/circle.gfs b/test/poisson/circle/circle.gfs
similarity index 100%
rename from test/euler/poisson/circle/circle.gfs
rename to test/poisson/circle/circle.gfs
diff --git a/test/euler/poisson/circle/error.ref b/test/poisson/circle/error.ref
similarity index 100%
rename from test/euler/poisson/circle/error.ref
rename to test/poisson/circle/error.ref
diff --git a/test/euler/poisson/circle/order.ref b/test/poisson/circle/order.ref
similarity index 100%
rename from test/euler/poisson/circle/order.ref
rename to test/poisson/circle/order.ref
diff --git a/test/euler/poisson/circle/res-7.ref b/test/poisson/circle/res-7.ref
similarity index 100%
rename from test/euler/poisson/circle/res-7.ref
rename to test/poisson/circle/res-7.ref
diff --git a/test/euler/poisson/error.ref b/test/poisson/error.ref
similarity index 100%
rename from test/euler/poisson/error.ref
rename to test/poisson/error.ref
diff --git a/test/euler/poisson/order.ref b/test/poisson/order.ref
similarity index 100%
rename from test/euler/poisson/order.ref
rename to test/poisson/order.ref
diff --git a/test/euler/poisson/poisson.gfs b/test/poisson/poisson.gfs
similarity index 100%
rename from test/euler/poisson/poisson.gfs
rename to test/poisson/poisson.gfs
diff --git a/test/euler/poisson/poisson.sh b/test/poisson/poisson.sh
similarity index 100%
rename from test/euler/poisson/poisson.sh
rename to test/poisson/poisson.sh
diff --git a/test/euler/poisson/res-7.ref b/test/poisson/res-7.ref
similarity index 100%
rename from test/euler/poisson/res-7.ref
rename to test/poisson/res-7.ref
diff --git a/test/euler/reynolds/box/box.gfs b/test/reynolds/box/box.gfs
similarity index 100%
rename from test/euler/reynolds/box/box.gfs
rename to test/reynolds/box/box.gfs
diff --git a/test/euler/reynolds/box/div5.ref b/test/reynolds/box/div5.ref
similarity index 100%
rename from test/euler/reynolds/box/div5.ref
rename to test/reynolds/box/div5.ref
diff --git a/test/euler/reynolds/box/div6.ref b/test/reynolds/box/div6.ref
similarity index 100%
rename from test/euler/reynolds/box/div6.ref
rename to test/reynolds/box/div6.ref
diff --git a/test/euler/reynolds/box/div7.ref b/test/reynolds/box/div7.ref
similarity index 100%
rename from test/euler/reynolds/box/div7.ref
rename to test/reynolds/box/div7.ref
diff --git a/test/euler/reynolds/box/reynolds.ref b/test/reynolds/box/reynolds.ref
similarity index 100%
rename from test/euler/reynolds/box/reynolds.ref
rename to test/reynolds/box/reynolds.ref
diff --git a/test/euler/reynolds/div5.ref b/test/reynolds/div5.ref
similarity index 100%
rename from test/euler/reynolds/div5.ref
rename to test/reynolds/div5.ref
diff --git a/test/euler/reynolds/div6.ref b/test/reynolds/div6.ref
similarity index 100%
rename from test/euler/reynolds/div6.ref
rename to test/reynolds/div6.ref
diff --git a/test/euler/reynolds/div7.ref b/test/reynolds/div7.ref
similarity index 100%
rename from test/euler/reynolds/div7.ref
rename to test/reynolds/div7.ref
diff --git a/test/euler/reynolds/reynolds.gfs b/test/reynolds/reynolds.gfs
similarity index 100%
rename from test/euler/reynolds/reynolds.gfs
rename to test/reynolds/reynolds.gfs
diff --git a/test/euler/reynolds/reynolds.ref b/test/reynolds/reynolds.ref
similarity index 100%
rename from test/euler/reynolds/reynolds.ref
rename to test/reynolds/reynolds.ref
diff --git a/test/euler/reynolds/reynolds.sh b/test/reynolds/reynolds.sh
similarity index 100%
rename from test/euler/reynolds/reynolds.sh
rename to test/reynolds/reynolds.sh
diff --git a/test/euler/spurious/convergence.ref b/test/spurious/convergence.ref
similarity index 100%
rename from test/euler/spurious/convergence.ref
rename to test/spurious/convergence.ref
diff --git a/test/euler/spurious/spurious.gfs b/test/spurious/spurious.gfs
similarity index 100%
rename from test/euler/spurious/spurious.gfs
rename to test/spurious/spurious.gfs
diff --git a/test/euler/spurious/spurious.sh b/test/spurious/spurious.sh
similarity index 100%
rename from test/euler/spurious/spurious.sh
rename to test/spurious/spurious.sh
diff --git a/test/euler/spurious/vectors.gfv b/test/spurious/vectors.gfv
similarity index 100%
rename from test/euler/spurious/vectors.gfv
rename to test/spurious/vectors.gfv
diff --git a/test/euler/template.tex b/test/template.tex
similarity index 100%
rename from test/euler/template.tex
rename to test/template.tex
diff --git a/test/euler/test.py b/test/test.py
similarity index 98%
rename from test/euler/test.py
rename to test/test.py
index 2605604..5696ef6 100644
--- a/test/euler/test.py
+++ b/test/test.py
@@ -2,7 +2,7 @@ import sys
 import commands
 import os
 import os.path
-sys.path.append("../../doc/examples")
+sys.path.append("../doc/examples")
 import gfs2tex
 from datetime import *
 
diff --git a/test/euler/tests.bib b/test/tests.bib
similarity index 100%
rename from test/euler/tests.bib
rename to test/tests.bib
diff --git a/test/euler/waves/correlation.ref b/test/waves/correlation.ref
similarity index 100%
rename from test/euler/waves/correlation.ref
rename to test/waves/correlation.ref
diff --git a/test/euler/waves/solution.gfv b/test/waves/solution.gfv
similarity index 100%
rename from test/euler/waves/solution.gfv
rename to test/waves/solution.gfv
diff --git a/test/euler/waves/waves.gfs b/test/waves/waves.gfs
similarity index 100%
rename from test/euler/waves/waves.gfs
rename to test/waves/waves.gfs
diff --git a/test/euler/waves/waves.sh b/test/waves/waves.sh
similarity index 100%
rename from test/euler/waves/waves.sh
rename to test/waves/waves.sh

-- 
Gerris Flow Solver