From: Wolfgang Bangerth Date: Wed, 6 May 1998 15:37:35 +0000 (+0000) Subject: Example update and trivial bug fix. X-Git-Tag: v8.0.0~22995 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d3998365525db7ebc995d9644ae09a5fd0df576b;p=dealii.git Example update and trivial bug fix. git-svn-id: https://svn.dealii.org/trunk@259 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/Attic/examples/error-estimation/Makefile b/deal.II/deal.II/Attic/examples/error-estimation/Makefile index 772ffb9c43..873179dc03 100644 --- a/deal.II/deal.II/Attic/examples/error-estimation/Makefile +++ b/deal.II/deal.II/Attic/examples/error-estimation/Makefile @@ -23,12 +23,12 @@ run-parameters = # To execute additional action apart from running the program, fill # in this list: -additional-run-action = gnuplot make_ps +additional-run-action = gnuplot make_ps ; ./strip_comments # To specify which files are to be deleted by "make clean" (apart from # the usual ones: object files, executables, backups, etc), fill in the # following list -delete-files = gnuplot* *inp *.ps *.eps +delete-files = gnuplot* *inp *.ps *.eps history.* diff --git a/deal.II/deal.II/Attic/examples/error-estimation/error-estimation.cc b/deal.II/deal.II/Attic/examples/error-estimation/error-estimation.cc index 7031910d93..0c37bccd61 100644 --- a/deal.II/deal.II/Attic/examples/error-estimation/error-estimation.cc +++ b/deal.II/deal.II/Attic/examples/error-estimation/error-estimation.cc @@ -385,8 +385,8 @@ void PoissonProblem::run (const unsigned int start_level, tria->execute_refinement (); break; case error_estimator: - tria->execute_refinement (); tria->refine_fixed_number (estimated_error_per_cell, 0.3); + tria->execute_refinement (); break; }; cout << endl << endl; diff --git a/deal.II/deal.II/Attic/examples/error-estimation/make_ps b/deal.II/deal.II/Attic/examples/error-estimation/make_ps index 8fa3f5b4ee..df9f68edaf 100644 --- a/deal.II/deal.II/Attic/examples/error-estimation/make_ps +++ b/deal.II/deal.II/Attic/examples/error-estimation/make_ps @@ -21,3 +21,6 @@ set output "history.estimated_error.eps" plot "history.estimated_error.gnuplot" using 1:2 title "L2 error","history.estimated_error.gnuplot" using 1:3 title "Linfty error","history.estimated_error.gnuplot" using 1:4 title "H1 error","history.estimated_error.gnuplot" using 1:5 title "Estimated H1 error" + +set output "history.compare.eps" +plot "history.global.gnuplot" using 1:2 title "global refinement -- L2 error", "history.true_error.gnuplot" using 1:2 title "ref. by true error -- L2 error", "history.estimated_error.gnuplot" using 1:2 title "ref. by estimated error -- L2 error", "history.global.gnuplot" using 1:4 title "global refinement -- H1 error", "history.true_error.gnuplot" using 1:4 title "ref. by true error -- H1 error", "history.estimated_error.gnuplot" using 1:4 title "ref. by estimated error -- H1 error" diff --git a/tests/big-tests/error-estimation/Makefile b/tests/big-tests/error-estimation/Makefile index 772ffb9c43..873179dc03 100644 --- a/tests/big-tests/error-estimation/Makefile +++ b/tests/big-tests/error-estimation/Makefile @@ -23,12 +23,12 @@ run-parameters = # To execute additional action apart from running the program, fill # in this list: -additional-run-action = gnuplot make_ps +additional-run-action = gnuplot make_ps ; ./strip_comments # To specify which files are to be deleted by "make clean" (apart from # the usual ones: object files, executables, backups, etc), fill in the # following list -delete-files = gnuplot* *inp *.ps *.eps +delete-files = gnuplot* *inp *.ps *.eps history.* diff --git a/tests/big-tests/error-estimation/error-estimation.cc b/tests/big-tests/error-estimation/error-estimation.cc index 7031910d93..0c37bccd61 100644 --- a/tests/big-tests/error-estimation/error-estimation.cc +++ b/tests/big-tests/error-estimation/error-estimation.cc @@ -385,8 +385,8 @@ void PoissonProblem::run (const unsigned int start_level, tria->execute_refinement (); break; case error_estimator: - tria->execute_refinement (); tria->refine_fixed_number (estimated_error_per_cell, 0.3); + tria->execute_refinement (); break; }; cout << endl << endl; diff --git a/tests/big-tests/error-estimation/make_ps b/tests/big-tests/error-estimation/make_ps index 8fa3f5b4ee..df9f68edaf 100644 --- a/tests/big-tests/error-estimation/make_ps +++ b/tests/big-tests/error-estimation/make_ps @@ -21,3 +21,6 @@ set output "history.estimated_error.eps" plot "history.estimated_error.gnuplot" using 1:2 title "L2 error","history.estimated_error.gnuplot" using 1:3 title "Linfty error","history.estimated_error.gnuplot" using 1:4 title "H1 error","history.estimated_error.gnuplot" using 1:5 title "Estimated H1 error" + +set output "history.compare.eps" +plot "history.global.gnuplot" using 1:2 title "global refinement -- L2 error", "history.true_error.gnuplot" using 1:2 title "ref. by true error -- L2 error", "history.estimated_error.gnuplot" using 1:2 title "ref. by estimated error -- L2 error", "history.global.gnuplot" using 1:4 title "global refinement -- H1 error", "history.true_error.gnuplot" using 1:4 title "ref. by true error -- H1 error", "history.estimated_error.gnuplot" using 1:4 title "ref. by estimated error -- H1 error"