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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 2ad53b0f7abe40b88f19227f8dce50ad7ff5a81d
Author: Stephane Popinet <s.popinet at niwa.co.nz>
Date:   Wed Jun 15 14:54:52 2005 +1000

    Added biblio to tests doc and a few bug fixes
    
    darcs-hash:20050615045452-fbd8f-e3794408392847d2be01d59a03f7859627841c7d.gz

diff --git a/doc/examples/gfs2tex.py b/doc/examples/gfs2tex.py
index 2ca81aa..c162b9d 100644
--- a/doc/examples/gfs2tex.py
+++ b/doc/examples/gfs2tex.py
@@ -230,7 +230,7 @@ class Example:
 
     def run(self,env=""):
         out = os.popen("cd " + self.path + " && " +\
-                       "sh -c \"time -p " + env + self.command + "\" 2>&1")
+                       "sh -c \"time -p " + env + " " + self.command + "\" 2>&1")
         lines = []
         for l in out:
             record = l.split()
diff --git a/test/euler/Makefile.am b/test/euler/Makefile.am
index ee0d5f6..a02172e 100644
--- a/test/euler/Makefile.am
+++ b/test/euler/Makefile.am
@@ -5,6 +5,7 @@ TESTDIRS = \
 
 EXTRA_DIST = \
 	template.tex \
+	tests.bib \
 	depend.py \
 	test.py \
 	gfs2tex \
@@ -18,14 +19,15 @@ test.sh: $(TESTDIRS)
 	@chmod +x test.sh
 
 clean-generic:
-	$(RM) *.dvi *.aux *.log *.toc *.out tests.tex *.pyc test.sh
+	$(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.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
 
diff --git a/test/euler/reynolds/reynolds.gfs b/test/euler/reynolds/reynolds.gfs
index 9ca4fa3..17140db 100644
--- a/test/euler/reynolds/reynolds.gfs
+++ b/test/euler/reynolds/reynolds.gfs
@@ -8,7 +8,7 @@
 # introduce numerical dissipation which will slowly dissipate the
 # kinetic energy of the initial solution. By monitoring the evolution of
 # the kinetic energy, the dissipative properties of the numerical scheme
-# can be measured.
+# can be measured (see \cite{rider95} for details).
 #
 # Figures \ref{divmax} and figure \ref{divL2} illustrate the evolution
 # of the divergence of the velocity field with time. This is a check of
diff --git a/test/euler/template.tex b/test/euler/template.tex
new file mode 100644
index 0000000..0ac6138
--- /dev/null
+++ b/test/euler/template.tex
@@ -0,0 +1,31 @@
+\documentclass[a4paper]{article}
+\usepackage{html}
+\usepackage{color}
+\usepackage{graphicx}
+\pagecolor{white}
+
+\oddsidemargin=4mm
+\evensidemargin=-1mm
+\topmargin=-7mm
+\textwidth=15.42cm
+\textheight=23.2cm
+
+\begin{document}
+
+\mbox{}\vspace{1cm}
+\begin{center}
+{\Huge Gerris Tests}\\
+\vspace{1cm}
+\input{summary.tex}
+\vspace{5mm}
+\end{center}
+
+\section{Euler}
+
+\input{reynolds/reynolds.tex}
+\input{reynolds/box/box.tex}
+
+\bibliographystyle{plain}
+\bibliography{tests}
+
+\end{document}
diff --git a/test/euler/test.py b/test/euler/test.py
index e1a26d0..e8005db 100644
--- a/test/euler/test.py
+++ b/test/euler/test.py
@@ -10,7 +10,7 @@ env = "PYTHONPATH=$PYTHONPATH:" + os.getcwd()
 system = commands.getoutput('uname -o -n -m')
 path = commands.getoutput('which gerris2D')
 version = commands.getoutput("""gerris2D -V 2>&1 | awk '{if ($5 == "version") print $6;}'""")
-start = datetime.now()
+starttime = datetime.now()
 
 n = 0
 failed = 0
@@ -30,8 +30,8 @@ for start in sys.argv[1:]:
                 print >>open(test.path + "/status",'w'), "{\color{green}PASS}:"
             n += 1
 
-end = datetime.now()
-e = end - start
+endtime = datetime.now()
+e = endtime - starttime
 s = e.seconds
 h = int(s/3600)
 s -= h*3600
@@ -43,8 +43,8 @@ print >>summary, r'\begin{tabular}{ll}'
 print >>summary, r'{\bf Version} &', version, r'\\'
 print >>summary, r'{\bf Path} &', path, r'\\'
 print >>summary, r'{\bf System} &', system, r'\\'
-print >>summary, r'{\bf Start} &', start.strftime('%a %d %b %H:%M:%S'), r'\\'
-print >>summary, r'{\bf Finish} &', end.strftime('%a %d %b %H:%M:%S'), r'\\'
+print >>summary, r'{\bf Start} &', starttime.strftime('%a %d %b %H:%M:%S'), r'\\'
+print >>summary, r'{\bf Finish} &', endtime.strftime('%a %d %b %H:%M:%S'), r'\\'
 print >>summary, r'{\bf Elapsed} &', repr(e.days) + ":" + repr(h) + ":" + repr(m) + ":" + repr(s), r'\\'
 print >>summary, r'{\bf Status} &',
 if failed:
diff --git a/test/euler/tests.bib b/test/euler/tests.bib
new file mode 100644
index 0000000..4df0aaf
--- /dev/null
+++ b/test/euler/tests.bib
@@ -0,0 +1,10 @@
+ at TechReport{rider95,
+  author = 	 {W. J. Rider},
+  title = 	 {Approximate projection methods for incompressible flows: Implementation, variants and robustness},
+  institution =  {Los Alamos National Laboratory},
+  year = 	 1995,
+  number =	 {LA-UR-2000},
+  local_url =    {rider95.ps.gz},
+  url =          {http://www-xdiv.lanl.gov/XHM/personnel/wjr/Web_papers/proj/proj.ps.Z},
+  pages=         {81-85}
+}

-- 
Gerris Flow Solver