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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit f13c833ea0a81790d14c0711d79c59438128858e
Author: Stephane Popinet <s.popinet at niwa.co.nz>
Date:   Wed Jul 20 10:07:38 2005 +1000

    `shapes' has been moved to tools and is installed
    
    darcs-hash:20050720000738-fbd8f-3f781c1cc0dece1e3d04de2121bbccf2612adbf8.gz

diff --git a/test/advection/graphic/Makefile.am b/test/advection/graphic/Makefile.am
index 9d05627..dd6702b 100644
--- a/test/advection/graphic/Makefile.am
+++ b/test/advection/graphic/Makefile.am
@@ -18,7 +18,7 @@ report.ps: report.sh timestamp
 	sh report.sh "tests/*"
 
 star.gts:
-	../../poisson/shapes star | transform -i -s 0.9 > star.gts
+	shapes star | transform -i -s 0.9 > star.gts
 
 clean-generic:
 	$(RM) -f tests/*/*.eps tests/*/log tests/*/*~ tests/*/core timestamp test.sh star.gts
diff --git a/test/euler/boundaries/boundaries.sh b/test/euler/boundaries/boundaries.sh
index 5309a44..c7a7307 100644
--- a/test/euler/boundaries/boundaries.sh
+++ b/test/euler/boundaries/boundaries.sh
@@ -1,5 +1,5 @@
 if ! $donotrun; then
-    ../../poisson/shapes almgren > boundaries.gts
+    shapes almgren > boundaries.gts
     for level in 7 8 9; do
 	if sed "s/LEVEL/$level/g" < $1 | \
            gerris2D -; then :
diff --git a/test/euler/capwave/wave.sh b/test/euler/capwave/wave.sh
index 410db27..d121022 100755
--- a/test/euler/capwave/wave.sh
+++ b/test/euler/capwave/wave.sh
@@ -10,7 +10,7 @@ else
         print x " " 0.01*cos (2.*3.14159265359*x);
       print "-0.51 -0.51"
     }' > $file
-    ../poisson/shapes $file > wave.gts
+    shapes $file > wave.gts
     rm -f $file
 fi
 
diff --git a/test/euler/channel/channel.sh b/test/euler/channel/channel.sh
index 5b9be55..ab14b31 100644
--- a/test/euler/channel/channel.sh
+++ b/test/euler/channel/channel.sh
@@ -1,5 +1,5 @@
 if ! $donotrun; then
-    ../../poisson/shapes channel | transform --revert --scale 4 --tx 1.5 > channel.gts
+    shapes channel | transform --revert --scale 4 --tx 1.5 > channel.gts
     for level in 5 6 7; do
 	if sed "s/LEVEL/$level/g" < $1 | \
            gerris2D -; then :
diff --git a/test/euler/spurious/spurious.sh b/test/euler/spurious/spurious.sh
index 5ef83e2..6539b06 100755
--- a/test/euler/spurious/spurious.sh
+++ b/test/euler/spurious/spurious.sh
@@ -1,5 +1,5 @@
 if ! $donotrun; then
-    ../../poisson/shapes ellipse | transform --scale 0.8 > circle.gts
+    shapes ellipse | transform --scale 0.8 > circle.gts
     for La in 12000 1200 120; do
 	mu=`echo $La | awk '{print sqrt (0.4/$1)}'`
 	tmax=`echo $mu | awk '{print 1000.*$1*0.4}'`
diff --git a/test/ocean/waves.sh b/test/ocean/waves.sh
index e47ce3d..753821f 100755
--- a/test/ocean/waves.sh
+++ b/test/ocean/waves.sh
@@ -3,7 +3,7 @@
 if test -f basin.gts; then
     :
 else
-    ../poisson/shapes ellipse -n 500 | transform -s 1.999 -i > basin.gts
+    shapes ellipse -n 500 | transform -s 1.999 -i > basin.gts
 fi
 
 cat <<EOF
diff --git a/test/poisson/Makefile.am b/test/poisson/Makefile.am
index 9ee5304..a61d7f7 100644
--- a/test/poisson/Makefile.am
+++ b/test/poisson/Makefile.am
@@ -8,10 +8,7 @@ LDADD = $(GFS2D_LIBS)
 AM_CFLAGS = -DFTT_2D=1
 
 noinst_PROGRAMS = \
-	simple \
-	shapes
-
-shapes_LDADD = $(GTS_LIBS)
+	simple
 
 EXTRA_DIST = \
 	command.awk \
diff --git a/tools/Makefile.am b/tools/Makefile.am
index a0cc9a3..5c39380 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -11,7 +11,8 @@ bin_PROGRAMS = \
 	ppmcombine \
 	gfscompare2D \
 	gfscompare2D3 \
-	gfscompare3D
+	gfscompare3D \
+	shapes
 
 bin_SCRIPTS = \
 	darcs2dist \
@@ -41,3 +42,5 @@ ppmcombine_CFLAGS = $(AM_CFLAGS) -DFTT_2D=1
 ppmcombine_LDADD = $(GFS2D_LIBS)
 
 streamanime_LDADD = $(GFS3D_LIBS)
+
+shapes_LDADD = $(GTS_LIBS)
diff --git a/test/poisson/shapes.c b/tools/shapes.c
similarity index 100%
rename from test/poisson/shapes.c
rename to tools/shapes.c

-- 
Gerris Flow Solver