From: wolf Date: Thu, 15 Apr 1999 12:52:04 +0000 (+0000) Subject: Revert to two space dimensions, change several things to make the postprocessing... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14a5b1f5a1bd510a164385c613587366c5b59382;p=dealii-svn.git Revert to two space dimensions, change several things to make the postprocessing work again. git-svn-id: https://svn.dealii.org/trunk@1144 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/Attic/examples/poisson/Makefile b/deal.II/deal.II/Attic/examples/poisson/Makefile index f43777d1c6..f332cf3faa 100644 --- a/deal.II/deal.II/Attic/examples/poisson/Makefile +++ b/deal.II/deal.II/Attic/examples/poisson/Makefile @@ -23,7 +23,7 @@ run-parameters = $(target).prm # To execute additional action apart from running the program, fill # in this list: -additional-run-action = gnuplot make_ps +additional-run-action = cd results ; gnuplot make_ps # To specify which files are to be deleted by "make clean" (apart from # the usual ones: object files, executables, backups, etc), fill in the @@ -51,8 +51,8 @@ h-files = $(wildcard *.h) lib-h-files = $(wildcard ../../include/*/*.h) # list of libraries needed to link with -libs = ./Obj.a -ldeal_II_3d -llac -lbase -libs.g = ./Obj.g.a -ldeal_II_3d.g -llac.g -lbase.g +libs = ./Obj.a -ldeal_II_2d -llac -lbase +libs.g = ./Obj.g.a -ldeal_II_2d.g -llac.g -lbase.g # check whether we use debug mode or not diff --git a/deal.II/deal.II/Attic/examples/poisson/equation.cc b/deal.II/deal.II/Attic/examples/poisson/equation.cc index 17dc3ead17..043f3da5dc 100644 --- a/deal.II/deal.II/Attic/examples/poisson/equation.cc +++ b/deal.II/deal.II/Attic/examples/poisson/equation.cc @@ -83,4 +83,4 @@ void PoissonEquation::assemble (Vector &, -template class PoissonEquation<3>; +template class PoissonEquation<2>; diff --git a/deal.II/deal.II/Attic/examples/poisson/poisson.cc b/deal.II/deal.II/Attic/examples/poisson/poisson.cc index 6c657c1b33..bbfa7841ea 100644 --- a/deal.II/deal.II/Attic/examples/poisson/poisson.cc +++ b/deal.II/deal.II/Attic/examples/poisson/poisson.cc @@ -5,7 +5,7 @@ #include "poisson.h" #include - +#include int main (int argc, char **argv) { @@ -15,7 +15,10 @@ int main (int argc, char **argv) { return 1; }; - PoissonProblem<3> poisson; + // no additional output to console + deallog.depth_console (0); + + PoissonProblem<2> poisson; MultipleParameterLoop input_data; poisson.declare_parameters(input_data); diff --git a/deal.II/deal.II/Attic/examples/poisson/poisson.prm b/deal.II/deal.II/Attic/examples/poisson/poisson.prm index 21e2f74296..e8f7b5adda 100644 --- a/deal.II/deal.II/Attic/examples/poisson/poisson.prm +++ b/deal.II/deal.II/Attic/examples/poisson/poisson.prm @@ -1,5 +1,5 @@ set Test run = { zoom in | ball | curved line | random | jump | L-region} -set Global refinement = {{ 1 | 3 | 3 | 0 | 3 | 3 }} #{{ 2 | 3 | 3 | 1 | 3 | 3 }} +set Global refinement = {{ 2 | 5 | 6 | 0 | 3 | 5 }} set Right hand side = {{ zero | zero | trigpoly | constant | zero | zero }} set Boundary values = {{ sine | sine | zero | zero | jump | sine }} set Output file = results/{{ zoom_in | ball | curved_line | random | jump | L-region }}.gnuplot diff --git a/deal.II/deal.II/Attic/examples/poisson/problem.cc b/deal.II/deal.II/Attic/examples/poisson/problem.cc index 4c91b1f563..56903c84e0 100644 --- a/deal.II/deal.II/Attic/examples/poisson/problem.cc +++ b/deal.II/deal.II/Attic/examples/poisson/problem.cc @@ -569,4 +569,4 @@ void PoissonProblem::run (ParameterHandler &prm) { -template class PoissonProblem<3>; +template class PoissonProblem<2>; diff --git a/deal.II/deal.II/Attic/examples/poisson/results/make_ps b/deal.II/deal.II/Attic/examples/poisson/results/make_ps new file mode 100644 index 0000000000..8fb453ef33 --- /dev/null +++ b/deal.II/deal.II/Attic/examples/poisson/results/make_ps @@ -0,0 +1,32 @@ +set data style lines +set noxtics +set noytics +set noztics +set nokey +set para +set term postscript eps + +!echo " Making " +set output "zoom_in.eps" +splot "zoom_in.gnuplot" + +!echo " Making " +set output "ball.eps" +splot "ball.gnuplot" + +!echo " Making " +set output "curved_line.eps" +splot "curved_line.gnuplot" + +!echo " Making " +set output "random.eps" +splot "random.gnuplot" + +!echo " Making " +set output "jump.eps" +splot "jump.gnuplot" + +!echo " Making " +set view 52,115 +set output "L-region.eps" +splot "L-region.gnuplot" diff --git a/tests/big-tests/poisson/Makefile b/tests/big-tests/poisson/Makefile index f43777d1c6..f332cf3faa 100644 --- a/tests/big-tests/poisson/Makefile +++ b/tests/big-tests/poisson/Makefile @@ -23,7 +23,7 @@ run-parameters = $(target).prm # To execute additional action apart from running the program, fill # in this list: -additional-run-action = gnuplot make_ps +additional-run-action = cd results ; gnuplot make_ps # To specify which files are to be deleted by "make clean" (apart from # the usual ones: object files, executables, backups, etc), fill in the @@ -51,8 +51,8 @@ h-files = $(wildcard *.h) lib-h-files = $(wildcard ../../include/*/*.h) # list of libraries needed to link with -libs = ./Obj.a -ldeal_II_3d -llac -lbase -libs.g = ./Obj.g.a -ldeal_II_3d.g -llac.g -lbase.g +libs = ./Obj.a -ldeal_II_2d -llac -lbase +libs.g = ./Obj.g.a -ldeal_II_2d.g -llac.g -lbase.g # check whether we use debug mode or not diff --git a/tests/big-tests/poisson/equation.cc b/tests/big-tests/poisson/equation.cc index 17dc3ead17..043f3da5dc 100644 --- a/tests/big-tests/poisson/equation.cc +++ b/tests/big-tests/poisson/equation.cc @@ -83,4 +83,4 @@ void PoissonEquation::assemble (Vector &, -template class PoissonEquation<3>; +template class PoissonEquation<2>; diff --git a/tests/big-tests/poisson/make_ps b/tests/big-tests/poisson/make_ps deleted file mode 100644 index 3d202fe484..0000000000 --- a/tests/big-tests/poisson/make_ps +++ /dev/null @@ -1,32 +0,0 @@ -set data style lines -set noxtics -set noytics -set noztics -set nokey -set para -set term postscript eps - -!echo " Making " -set output "fig.zoom_in.eps" -splot "gnuplot.zoom_in" - -!echo " Making " -set output "fig.ball.eps" -splot "gnuplot.ball" - -!echo " Making " -set output "fig.curved_line.eps" -splot "gnuplot.curved_line" - -!echo " Making " -set output "fig.random.eps" -splot "gnuplot.random" - -!echo " Making " -set output "fig.jump.eps" -splot "gnuplot.jump" - -!echo " Making " -set view 52,115 -set output "fig.L-region.eps" -splot "gnuplot.L-region" diff --git a/tests/big-tests/poisson/poisson.cc b/tests/big-tests/poisson/poisson.cc index 6c657c1b33..bbfa7841ea 100644 --- a/tests/big-tests/poisson/poisson.cc +++ b/tests/big-tests/poisson/poisson.cc @@ -5,7 +5,7 @@ #include "poisson.h" #include - +#include int main (int argc, char **argv) { @@ -15,7 +15,10 @@ int main (int argc, char **argv) { return 1; }; - PoissonProblem<3> poisson; + // no additional output to console + deallog.depth_console (0); + + PoissonProblem<2> poisson; MultipleParameterLoop input_data; poisson.declare_parameters(input_data); diff --git a/tests/big-tests/poisson/poisson.prm b/tests/big-tests/poisson/poisson.prm index 21e2f74296..e8f7b5adda 100644 --- a/tests/big-tests/poisson/poisson.prm +++ b/tests/big-tests/poisson/poisson.prm @@ -1,5 +1,5 @@ set Test run = { zoom in | ball | curved line | random | jump | L-region} -set Global refinement = {{ 1 | 3 | 3 | 0 | 3 | 3 }} #{{ 2 | 3 | 3 | 1 | 3 | 3 }} +set Global refinement = {{ 2 | 5 | 6 | 0 | 3 | 5 }} set Right hand side = {{ zero | zero | trigpoly | constant | zero | zero }} set Boundary values = {{ sine | sine | zero | zero | jump | sine }} set Output file = results/{{ zoom_in | ball | curved_line | random | jump | L-region }}.gnuplot diff --git a/tests/big-tests/poisson/problem.cc b/tests/big-tests/poisson/problem.cc index 4c91b1f563..56903c84e0 100644 --- a/tests/big-tests/poisson/problem.cc +++ b/tests/big-tests/poisson/problem.cc @@ -569,4 +569,4 @@ void PoissonProblem::run (ParameterHandler &prm) { -template class PoissonProblem<3>; +template class PoissonProblem<2>; diff --git a/tests/big-tests/poisson/results/make_ps b/tests/big-tests/poisson/results/make_ps new file mode 100644 index 0000000000..8fb453ef33 --- /dev/null +++ b/tests/big-tests/poisson/results/make_ps @@ -0,0 +1,32 @@ +set data style lines +set noxtics +set noytics +set noztics +set nokey +set para +set term postscript eps + +!echo " Making " +set output "zoom_in.eps" +splot "zoom_in.gnuplot" + +!echo " Making " +set output "ball.eps" +splot "ball.gnuplot" + +!echo " Making " +set output "curved_line.eps" +splot "curved_line.gnuplot" + +!echo " Making " +set output "random.eps" +splot "random.gnuplot" + +!echo " Making " +set output "jump.eps" +splot "jump.gnuplot" + +!echo " Making " +set view 52,115 +set output "L-region.eps" +splot "L-region.gnuplot"