From 7e35476892c54426e654599e0190ced71a17de98 Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Thu, 20 Feb 2014 15:29:59 +0000 Subject: [PATCH] fix a couple more DataOut related broken tests git-svn-id: https://svn.dealii.org/trunk@32521 0785d39b-7218-0410-832d-ea1e28bc413d --- .../{data_out_09.output => data_out_09.debug.output} | 0 tests/codim_one/bem.cc | 12 ++++++------ tests/codim_one/bem.output | 10 +++++----- tests/codim_one/gradients.cc | 2 +- tests/codim_one/interpolation_2.cc | 3 +-- tests/codim_one/interpolation_2.output | 2 +- tests/codim_one/projection.cc | 3 +-- tests/codim_one/projection.output | 2 +- tests/integrators/mesh_worker_1d_dg.cc | 2 +- tests/metis/metis_03.cc | 2 +- 10 files changed, 18 insertions(+), 20 deletions(-) rename tests/bits/{data_out_09.output => data_out_09.debug.output} (100%) diff --git a/tests/bits/data_out_09.output b/tests/bits/data_out_09.debug.output similarity index 100% rename from tests/bits/data_out_09.output rename to tests/bits/data_out_09.debug.output diff --git a/tests/codim_one/bem.cc b/tests/codim_one/bem.cc index 2a5a8b6bef..2dd3d4cec5 100644 --- a/tests/codim_one/bem.cc +++ b/tests/codim_one/bem.cc @@ -558,9 +558,9 @@ BEM::solve() // is the tangential component of the // perturbation induced in the // velocity. - tangential_derivative.reinit(dof_handler_q.n_dofs()); - tangential_velocity.reinit(dof_handler_q.n_dofs()); - error.reinit(dof_handler_q.n_dofs()); + tangential_velocity.reinit(tria.n_active_cells()); + tangential_derivative.reinit(tria.n_active_cells()); + error.reinit(tria.n_active_cells()); QMidpoint q_midpoint; QTrapez q_trapez; const QIterated q_iterated(q_midpoint, 1); @@ -704,9 +704,9 @@ BEM::output_results() DataOut > dataout; dataout.attach_dof_handler(dof_handler_q); - dataout.add_data_vector(smooth_solution, "linear_potential"); - dataout.add_data_vector(tangential_derivative, "tangential_velocity"); - dataout.add_data_vector(error, "error"); + dataout.add_data_vector(dof_handler_q, smooth_solution, "linear_potential"); + dataout.add_data_vector(tangential_derivative, "tangential_velocity", DataOut >::type_cell_data); + dataout.add_data_vector(error, "error", DataOut >::type_cell_data); dataout.build_patches(); // dataout.build_patches(fe_q.degree); dataout.write_vtk(logfile); diff --git a/tests/codim_one/bem.output b/tests/codim_one/bem.output index df1b830cea..116dee8a76 100644 --- a/tests/codim_one/bem.output +++ b/tests/codim_one/bem.output @@ -75,7 +75,7 @@ CELL_TYPES 20 POINT_DATA 40 SCALARS linear_potential double 1 LOOKUP_TABLE default -3.77476e-15 3.77476e-15 5.09391 5.09391 9.68919 9.68919 13.3360 13.3360 15.6774 15.6774 16.4842 16.4842 15.6774 15.6774 13.3360 13.3360 9.68919 9.68919 5.09391 5.09391 1.77636e-15 1.77636e-15 -5.09391 -5.09391 -9.68919 -9.68919 -13.3360 -13.3360 -15.6774 -15.6774 -16.4842 -16.4842 -15.6774 -15.6774 -13.3360 -13.3360 -9.68919 -9.68919 -5.09391 -5.09391 +3.77476e-15 5.09391 5.09391 9.68919 9.68919 13.3360 13.3360 15.6774 15.6774 16.4842 16.4842 15.6774 15.6774 13.3360 13.3360 9.68919 9.68919 5.09391 5.09391 1.77636e-15 1.77636e-15 -5.09391 -5.09391 -9.68919 -9.68919 -13.3360 -13.3360 -15.6774 -15.6774 -16.4842 -16.4842 -15.6774 -15.6774 -13.3360 -13.3360 -9.68919 -9.68919 -5.09391 -5.09391 3.77476e-15 SCALARS tangential_velocity double 1 LOOKUP_TABLE default 2.61582 2.61582 2.35976 2.35976 1.87272 1.87272 1.20236 1.20236 0.414305 0.414305 -0.414305 -0.414305 -1.20236 -1.20236 -1.87272 -1.87272 -2.35976 -2.35976 -2.61582 -2.61582 -2.61582 -2.61582 -2.35976 -2.35976 -1.87272 -1.87272 -1.20236 -1.20236 -0.414305 -0.414305 0.414305 0.414305 1.20236 1.20236 1.87272 1.87272 2.35976 2.35976 2.61582 2.61582 @@ -218,7 +218,7 @@ CELL_TYPES 40 POINT_DATA 80 SCALARS linear_potential double 1 LOOKUP_TABLE default --2.22045e-16 -2.22045e-16 2.07761 2.07761 4.10406 4.10406 6.02946 6.02946 7.80639 7.80639 9.39110 9.39110 10.7446 10.7446 11.8335 11.8335 12.6310 12.6310 13.1175 13.1175 13.2810 13.2810 13.1175 13.1175 12.6310 12.6310 11.8335 11.8335 10.7446 10.7446 9.39110 9.39110 7.80639 7.80639 6.02946 6.02946 4.10406 4.10406 2.07761 2.07761 8.88178e-16 8.88178e-16 -2.07761 -2.07761 -4.10406 -4.10406 -6.02946 -6.02946 -7.80639 -7.80639 -9.39110 -9.39110 -10.7446 -10.7446 -11.8335 -11.8335 -12.6310 -12.6310 -13.1175 -13.1175 -13.2810 -13.2810 -13.1175 -13.1175 -12.6310 -12.6310 -11.8335 -11.8335 -10.7446 -10.7446 -9.39110 -9.39110 -7.80639 -7.80639 -6.02946 -6.02946 -4.10406 -4.10406 -2.07761 -2.07761 +-2.22045e-16 2.07761 2.07761 4.10406 4.10406 6.02946 6.02946 7.80639 7.80639 9.39110 9.39110 10.7446 10.7446 11.8335 11.8335 12.6310 12.6310 13.1175 13.1175 13.2810 13.2810 13.1175 13.1175 12.6310 12.6310 11.8335 11.8335 10.7446 10.7446 9.39110 9.39110 7.80639 7.80639 6.02946 6.02946 4.10406 4.10406 2.07761 2.07761 8.88178e-16 8.88178e-16 -2.07761 -2.07761 -4.10406 -4.10406 -6.02946 -6.02946 -7.80639 -7.80639 -9.39110 -9.39110 -10.7446 -10.7446 -11.8335 -11.8335 -12.6310 -12.6310 -13.1175 -13.1175 -13.2810 -13.2810 -13.1175 -13.1175 -12.6310 -12.6310 -11.8335 -11.8335 -10.7446 -10.7446 -9.39110 -9.39110 -7.80639 -7.80639 -6.02946 -6.02946 -4.10406 -4.10406 -2.07761 -2.07761 -2.22045e-16 SCALARS tangential_velocity double 1 LOOKUP_TABLE default 2.32093 2.32093 2.26378 2.26378 2.15089 2.15089 1.98503 1.98503 1.77030 1.77030 1.51198 1.51198 1.21643 1.21643 0.890926 0.890926 0.543485 0.543485 0.182661 0.182661 -0.182661 -0.182661 -0.543485 -0.543485 -0.890926 -0.890926 -1.21643 -1.21643 -1.51198 -1.51198 -1.77030 -1.77030 -1.98503 -1.98503 -2.15089 -2.15089 -2.26378 -2.26378 -2.32093 -2.32093 -2.32093 -2.32093 -2.26378 -2.26378 -2.15089 -2.15089 -1.98503 -1.98503 -1.77030 -1.77030 -1.51198 -1.51198 -1.21643 -1.21643 -0.890926 -0.890926 -0.543485 -0.543485 -0.182661 -0.182661 0.182661 0.182661 0.543485 0.543485 0.890926 0.890926 1.21643 1.21643 1.51198 1.51198 1.77030 1.77030 1.98503 1.98503 2.15089 2.15089 2.26378 2.26378 2.32093 2.32093 @@ -226,7 +226,7 @@ SCALARS error double 1 LOOKUP_TABLE default 0.327091 0.327091 0.319037 0.319037 0.303127 0.303127 0.279753 0.279753 0.249491 0.249491 0.213085 0.213085 0.171433 0.171433 0.125559 0.125559 0.0765940 0.0765940 0.0257426 0.0257426 -0.0257426 -0.0257426 -0.0765940 -0.0765940 -0.125559 -0.125559 -0.171433 -0.171433 -0.213085 -0.213085 -0.249491 -0.249491 -0.279753 -0.279753 -0.303127 -0.303127 -0.319037 -0.319037 -0.327091 -0.327091 -0.327091 -0.327091 -0.319037 -0.319037 -0.303127 -0.303127 -0.279753 -0.279753 -0.249491 -0.249491 -0.213085 -0.213085 -0.171433 -0.171433 -0.125559 -0.125559 -0.0765940 -0.0765940 -0.0257426 -0.0257426 0.0257426 0.0257426 0.0765940 0.0765940 0.125559 0.125559 0.171433 0.171433 0.213085 0.213085 0.249491 0.249491 0.279753 0.279753 0.303127 0.303127 0.319037 0.319037 0.327091 0.327091 DEAL:cg::Starting value 57.6585 -DEAL:cg::Convergence step 2 value 2.81863e-13 +DEAL:cg::Convergence step 2 value 2.81867e-13 # vtk DataFile Version 3.0 #This file was generated ASCII @@ -481,7 +481,7 @@ CELL_TYPES 80 POINT_DATA 160 SCALARS linear_potential double 1 LOOKUP_TABLE default --8.04912e-16 -8.04912e-16 0.913864 0.913864 1.82209 1.82209 2.71909 2.71909 3.59932 3.59932 4.45736 4.45736 5.28792 5.28792 6.08588 6.08588 6.84632 6.84632 7.56454 7.56454 8.23613 8.23613 8.85694 8.85694 9.42315 9.42315 9.93125 9.93125 10.3781 10.3781 10.7610 10.7610 11.0776 11.0776 11.3258 11.3258 11.5042 11.5042 11.6117 11.6117 11.6476 11.6476 11.6117 11.6117 11.5042 11.5042 11.3258 11.3258 11.0776 11.0776 10.7610 10.7610 10.3781 10.3781 9.93125 9.93125 9.42315 9.42315 8.85694 8.85694 8.23613 8.23613 7.56454 7.56454 6.84632 6.84632 6.08588 6.08588 5.28792 5.28792 4.45736 4.45736 3.59932 3.59932 2.71909 2.71909 1.82209 1.82209 0.913864 0.913864 1.69309e-15 1.69309e-15 -0.913864 -0.913864 -1.82209 -1.82209 -2.71909 -2.71909 -3.59932 -3.59932 -4.45736 -4.45736 -5.28792 -5.28792 -6.08588 -6.08588 -6.84632 -6.84632 -7.56454 -7.56454 -8.23613 -8.23613 -8.85694 -8.85694 -9.42315 -9.42315 -9.93125 -9.93125 -10.3781 -10.3781 -10.7610 -10.7610 -11.0776 -11.0776 -11.3258 -11.3258 -11.5042 -11.5042 -11.6117 -11.6117 -11.6476 -11.6476 -11.6117 -11.6117 -11.5042 -11.5042 -11.3258 -11.3258 -11.0776 -11.0776 -10.7610 -10.7610 -10.3781 -10.3781 -9.93125 -9.93125 -9.42315 -9.42315 -8.85694 -8.85694 -8.23613 -8.23613 -7.56454 -7.56454 -6.84632 -6.84632 -6.08588 -6.08588 -5.28792 -5.28792 -4.45736 -4.45736 -3.59932 -3.59932 -2.71909 -2.71909 -1.82209 -1.82209 -0.913864 -0.913864 +-8.04912e-16 0.913864 0.913864 1.82209 1.82209 2.71909 2.71909 3.59932 3.59932 4.45736 4.45736 5.28792 5.28792 6.08588 6.08588 6.84632 6.84632 7.56454 7.56454 8.23613 8.23613 8.85694 8.85694 9.42315 9.42315 9.93125 9.93125 10.3781 10.3781 10.7610 10.7610 11.0776 11.0776 11.3258 11.3258 11.5042 11.5042 11.6117 11.6117 11.6476 11.6476 11.6117 11.6117 11.5042 11.5042 11.3258 11.3258 11.0776 11.0776 10.7610 10.7610 10.3781 10.3781 9.93125 9.93125 9.42315 9.42315 8.85694 8.85694 8.23613 8.23613 7.56454 7.56454 6.84632 6.84632 6.08588 6.08588 5.28792 5.28792 4.45736 4.45736 3.59932 3.59932 2.71909 2.71909 1.82209 1.82209 0.913864 0.913864 1.74860e-15 1.74860e-15 -0.913864 -0.913864 -1.82209 -1.82209 -2.71909 -2.71909 -3.59932 -3.59932 -4.45736 -4.45736 -5.28792 -5.28792 -6.08588 -6.08588 -6.84632 -6.84632 -7.56454 -7.56454 -8.23613 -8.23613 -8.85694 -8.85694 -9.42315 -9.42315 -9.93125 -9.93125 -10.3781 -10.3781 -10.7610 -10.7610 -11.0776 -11.0776 -11.3258 -11.3258 -11.5042 -11.5042 -11.6117 -11.6117 -11.6476 -11.6476 -11.6117 -11.6117 -11.5042 -11.5042 -11.3258 -11.3258 -11.0776 -11.0776 -10.7610 -10.7610 -10.3781 -10.3781 -9.93125 -9.93125 -9.42315 -9.42315 -8.85694 -8.85694 -8.23613 -8.23613 -7.56454 -7.56454 -6.84632 -6.84632 -6.08588 -6.08588 -5.28792 -5.28792 -4.45736 -4.45736 -3.59932 -3.59932 -2.71909 -2.71909 -1.82209 -1.82209 -0.913864 -0.913864 -8.04912e-16 SCALARS tangential_velocity double 1 LOOKUP_TABLE default 2.16310 2.16310 2.14976 2.14976 2.12317 2.12317 2.08349 2.08349 2.03096 2.03096 1.96592 1.96592 1.88875 1.88875 1.79994 1.79994 1.70003 1.70003 1.58964 1.58964 1.46944 1.46944 1.34019 1.34019 1.20268 1.20268 1.05775 1.05775 0.906300 0.906300 0.749262 0.749262 0.587605 0.587605 0.422325 0.422325 0.254441 0.254441 0.0849883 0.0849883 -0.0849883 -0.0849883 -0.254441 -0.254441 -0.422325 -0.422325 -0.587605 -0.587605 -0.749262 -0.749262 -0.906300 -0.906300 -1.05775 -1.05775 -1.20268 -1.20268 -1.34019 -1.34019 -1.46944 -1.46944 -1.58964 -1.58964 -1.70003 -1.70003 -1.79994 -1.79994 -1.88875 -1.88875 -1.96592 -1.96592 -2.03096 -2.03096 -2.08349 -2.08349 -2.12317 -2.12317 -2.14976 -2.14976 -2.16310 -2.16310 -2.16310 -2.16310 -2.14976 -2.14976 -2.12317 -2.12317 -2.08349 -2.08349 -2.03096 -2.03096 -1.96592 -1.96592 -1.88875 -1.88875 -1.79994 -1.79994 -1.70003 -1.70003 -1.58964 -1.58964 -1.46944 -1.46944 -1.34019 -1.34019 -1.20268 -1.20268 -1.05775 -1.05775 -0.906300 -0.906300 -0.749262 -0.749262 -0.587605 -0.587605 -0.422325 -0.422325 -0.254441 -0.254441 -0.0849883 -0.0849883 0.0849883 0.0849883 0.254441 0.254441 0.422325 0.422325 0.587605 0.587605 0.749262 0.749262 0.906300 0.906300 1.05775 1.05775 1.20268 1.20268 1.34019 1.34019 1.46944 1.46944 1.58964 1.58964 1.70003 1.70003 1.79994 1.79994 1.88875 1.88875 1.96592 1.96592 2.03096 2.03096 2.08349 2.08349 2.12317 2.12317 2.14976 2.14976 2.16310 2.16310 @@ -984,7 +984,7 @@ CELL_TYPES 160 POINT_DATA 320 SCALARS linear_potential double 1 LOOKUP_TABLE default -3.05311e-15 3.05311e-15 0.424999 0.424999 0.849342 0.849342 1.27238 1.27238 1.69345 1.69345 2.11191 2.11191 2.52711 2.52711 2.93842 2.93842 3.34520 3.34520 3.74682 3.74682 4.14266 4.14266 4.53211 4.53211 4.91458 4.91458 5.28947 5.28947 5.65620 5.65620 6.01421 6.01421 6.36295 6.36295 6.70187 6.70187 7.03046 7.03046 7.34821 7.34821 7.65463 7.65463 7.94925 7.94925 8.23161 8.23161 8.50128 8.50128 8.75784 8.75784 9.00090 9.00090 9.23008 9.23008 9.44502 9.44502 9.64540 9.64540 9.83091 9.83091 10.0013 10.0013 10.1562 10.1562 10.2955 10.2955 10.4189 10.4189 10.5262 10.5262 10.6173 10.6173 10.6920 10.6920 10.7503 10.7503 10.7919 10.7919 10.8169 10.8169 10.8253 10.8253 10.8169 10.8169 10.7919 10.7919 10.7503 10.7503 10.6920 10.6920 10.6173 10.6173 10.5262 10.5262 10.4189 10.4189 10.2955 10.2955 10.1562 10.1562 10.0013 10.0013 9.83091 9.83091 9.64540 9.64540 9.44502 9.44502 9.23008 9.23008 9.00090 9.00090 8.75784 8.75784 8.50128 8.50128 8.23161 8.23161 7.94925 7.94925 7.65463 7.65463 7.34821 7.34821 7.03046 7.03046 6.70187 6.70187 6.36295 6.36295 6.01421 6.01421 5.65620 5.65620 5.28947 5.28947 4.91458 4.91458 4.53211 4.53211 4.14266 4.14266 3.74682 3.74682 3.34520 3.34520 2.93842 2.93842 2.52711 2.52711 2.11191 2.11191 1.69345 1.69345 1.27238 1.27238 0.849342 0.849342 0.424999 0.424999 6.38378e-16 6.38378e-16 -0.424999 -0.424999 -0.849342 -0.849342 -1.27238 -1.27238 -1.69345 -1.69345 -2.11191 -2.11191 -2.52711 -2.52711 -2.93842 -2.93842 -3.34520 -3.34520 -3.74682 -3.74682 -4.14266 -4.14266 -4.53211 -4.53211 -4.91458 -4.91458 -5.28947 -5.28947 -5.65620 -5.65620 -6.01421 -6.01421 -6.36295 -6.36295 -6.70187 -6.70187 -7.03046 -7.03046 -7.34821 -7.34821 -7.65463 -7.65463 -7.94925 -7.94925 -8.23161 -8.23161 -8.50128 -8.50128 -8.75784 -8.75784 -9.00090 -9.00090 -9.23008 -9.23008 -9.44502 -9.44502 -9.64540 -9.64540 -9.83091 -9.83091 -10.0013 -10.0013 -10.1562 -10.1562 -10.2955 -10.2955 -10.4189 -10.4189 -10.5262 -10.5262 -10.6173 -10.6173 -10.6920 -10.6920 -10.7503 -10.7503 -10.7919 -10.7919 -10.8169 -10.8169 -10.8253 -10.8253 -10.8169 -10.8169 -10.7919 -10.7919 -10.7503 -10.7503 -10.6920 -10.6920 -10.6173 -10.6173 -10.5262 -10.5262 -10.4189 -10.4189 -10.2955 -10.2955 -10.1562 -10.1562 -10.0013 -10.0013 -9.83091 -9.83091 -9.64540 -9.64540 -9.44502 -9.44502 -9.23008 -9.23008 -9.00090 -9.00090 -8.75784 -8.75784 -8.50128 -8.50128 -8.23161 -8.23161 -7.94925 -7.94925 -7.65463 -7.65463 -7.34821 -7.34821 -7.03046 -7.03046 -6.70187 -6.70187 -6.36295 -6.36295 -6.01421 -6.01421 -5.65620 -5.65620 -5.28947 -5.28947 -4.91458 -4.91458 -4.53211 -4.53211 -4.14266 -4.14266 -3.74682 -3.74682 -3.34520 -3.34520 -2.93842 -2.93842 -2.52711 -2.52711 -2.11191 -2.11191 -1.69345 -1.69345 -1.27238 -1.27238 -0.849342 -0.849342 -0.424999 -0.424999 +3.05311e-15 0.424999 0.424999 0.849342 0.849342 1.27238 1.27238 1.69345 1.69345 2.11191 2.11191 2.52711 2.52711 2.93842 2.93842 3.34520 3.34520 3.74682 3.74682 4.14266 4.14266 4.53211 4.53211 4.91458 4.91458 5.28947 5.28947 5.65620 5.65620 6.01421 6.01421 6.36295 6.36295 6.70187 6.70187 7.03046 7.03046 7.34821 7.34821 7.65463 7.65463 7.94925 7.94925 8.23161 8.23161 8.50128 8.50128 8.75784 8.75784 9.00090 9.00090 9.23008 9.23008 9.44502 9.44502 9.64540 9.64540 9.83091 9.83091 10.0013 10.0013 10.1562 10.1562 10.2955 10.2955 10.4189 10.4189 10.5262 10.5262 10.6173 10.6173 10.6920 10.6920 10.7503 10.7503 10.7919 10.7919 10.8169 10.8169 10.8253 10.8253 10.8169 10.8169 10.7919 10.7919 10.7503 10.7503 10.6920 10.6920 10.6173 10.6173 10.5262 10.5262 10.4189 10.4189 10.2955 10.2955 10.1562 10.1562 10.0013 10.0013 9.83091 9.83091 9.64540 9.64540 9.44502 9.44502 9.23008 9.23008 9.00090 9.00090 8.75784 8.75784 8.50128 8.50128 8.23161 8.23161 7.94925 7.94925 7.65463 7.65463 7.34821 7.34821 7.03046 7.03046 6.70187 6.70187 6.36295 6.36295 6.01421 6.01421 5.65620 5.65620 5.28947 5.28947 4.91458 4.91458 4.53211 4.53211 4.14266 4.14266 3.74682 3.74682 3.34520 3.34520 2.93842 2.93842 2.52711 2.52711 2.11191 2.11191 1.69345 1.69345 1.27238 1.27238 0.849342 0.849342 0.424999 0.424999 6.38378e-16 6.38378e-16 -0.424999 -0.424999 -0.849342 -0.849342 -1.27238 -1.27238 -1.69345 -1.69345 -2.11191 -2.11191 -2.52711 -2.52711 -2.93842 -2.93842 -3.34520 -3.34520 -3.74682 -3.74682 -4.14266 -4.14266 -4.53211 -4.53211 -4.91458 -4.91458 -5.28947 -5.28947 -5.65620 -5.65620 -6.01421 -6.01421 -6.36295 -6.36295 -6.70187 -6.70187 -7.03046 -7.03046 -7.34821 -7.34821 -7.65463 -7.65463 -7.94925 -7.94925 -8.23161 -8.23161 -8.50128 -8.50128 -8.75784 -8.75784 -9.00090 -9.00090 -9.23008 -9.23008 -9.44502 -9.44502 -9.64540 -9.64540 -9.83091 -9.83091 -10.0013 -10.0013 -10.1562 -10.1562 -10.2955 -10.2955 -10.4189 -10.4189 -10.5262 -10.5262 -10.6173 -10.6173 -10.6920 -10.6920 -10.7503 -10.7503 -10.7919 -10.7919 -10.8169 -10.8169 -10.8253 -10.8253 -10.8169 -10.8169 -10.7919 -10.7919 -10.7503 -10.7503 -10.6920 -10.6920 -10.6173 -10.6173 -10.5262 -10.5262 -10.4189 -10.4189 -10.2955 -10.2955 -10.1562 -10.1562 -10.0013 -10.0013 -9.83091 -9.83091 -9.64540 -9.64540 -9.44502 -9.44502 -9.23008 -9.23008 -9.00090 -9.00090 -8.75784 -8.75784 -8.50128 -8.50128 -8.23161 -8.23161 -7.94925 -7.94925 -7.65463 -7.65463 -7.34821 -7.34821 -7.03046 -7.03046 -6.70187 -6.70187 -6.36295 -6.36295 -6.01421 -6.01421 -5.65620 -5.65620 -5.28947 -5.28947 -4.91458 -4.91458 -4.53211 -4.53211 -4.14266 -4.14266 -3.74682 -3.74682 -3.34520 -3.34520 -2.93842 -2.93842 -2.52711 -2.52711 -2.11191 -2.11191 -1.69345 -1.69345 -1.27238 -1.27238 -0.849342 -0.849342 -0.424999 -0.424999 3.05311e-15 SCALARS tangential_velocity double 1 LOOKUP_TABLE default 2.08213 2.08213 2.07892 2.07892 2.07250 2.07250 2.06289 2.06289 2.05010 2.05010 2.03414 2.03414 2.01505 2.01505 1.99286 1.99286 1.96759 1.96759 1.93928 1.93928 1.90799 1.90799 1.87375 1.87375 1.83663 1.83663 1.79667 1.79667 1.75394 1.75394 1.70851 1.70851 1.66044 1.66044 1.60982 1.60982 1.55671 1.55671 1.50120 1.50120 1.44337 1.44337 1.38332 1.38332 1.32114 1.32114 1.25692 1.25692 1.19076 1.19076 1.12277 1.12277 1.05305 1.05305 0.981697 0.981697 0.908835 0.908835 0.834571 0.834571 0.759020 0.759020 0.682299 0.682299 0.604526 0.604526 0.525821 0.525821 0.446305 0.446305 0.366101 0.366101 0.285332 0.285332 0.204124 0.204124 0.122600 0.122600 0.0408877 0.0408877 -0.0408877 -0.0408877 -0.122600 -0.122600 -0.204124 -0.204124 -0.285332 -0.285332 -0.366101 -0.366101 -0.446305 -0.446305 -0.525821 -0.525821 -0.604526 -0.604526 -0.682299 -0.682299 -0.759020 -0.759020 -0.834571 -0.834571 -0.908835 -0.908835 -0.981697 -0.981697 -1.05305 -1.05305 -1.12277 -1.12277 -1.19076 -1.19076 -1.25692 -1.25692 -1.32114 -1.32114 -1.38332 -1.38332 -1.44337 -1.44337 -1.50120 -1.50120 -1.55671 -1.55671 -1.60982 -1.60982 -1.66044 -1.66044 -1.70851 -1.70851 -1.75394 -1.75394 -1.79667 -1.79667 -1.83663 -1.83663 -1.87375 -1.87375 -1.90799 -1.90799 -1.93928 -1.93928 -1.96759 -1.96759 -1.99286 -1.99286 -2.01505 -2.01505 -2.03414 -2.03414 -2.05010 -2.05010 -2.06289 -2.06289 -2.07250 -2.07250 -2.07892 -2.07892 -2.08213 -2.08213 -2.08213 -2.08213 -2.07892 -2.07892 -2.07250 -2.07250 -2.06289 -2.06289 -2.05010 -2.05010 -2.03414 -2.03414 -2.01505 -2.01505 -1.99286 -1.99286 -1.96759 -1.96759 -1.93928 -1.93928 -1.90799 -1.90799 -1.87375 -1.87375 -1.83663 -1.83663 -1.79667 -1.79667 -1.75394 -1.75394 -1.70851 -1.70851 -1.66044 -1.66044 -1.60982 -1.60982 -1.55671 -1.55671 -1.50120 -1.50120 -1.44337 -1.44337 -1.38332 -1.38332 -1.32114 -1.32114 -1.25692 -1.25692 -1.19076 -1.19076 -1.12277 -1.12277 -1.05305 -1.05305 -0.981697 -0.981697 -0.908835 -0.908835 -0.834571 -0.834571 -0.759020 -0.759020 -0.682299 -0.682299 -0.604526 -0.604526 -0.525821 -0.525821 -0.446305 -0.446305 -0.366101 -0.366101 -0.285332 -0.285332 -0.204124 -0.204124 -0.122600 -0.122600 -0.0408877 -0.0408877 0.0408877 0.0408877 0.122600 0.122600 0.204124 0.204124 0.285332 0.285332 0.366101 0.366101 0.446305 0.446305 0.525821 0.525821 0.604526 0.604526 0.682299 0.682299 0.759020 0.759020 0.834571 0.834571 0.908835 0.908835 0.981697 0.981697 1.05305 1.05305 1.12277 1.12277 1.19076 1.19076 1.25692 1.25692 1.32114 1.32114 1.38332 1.38332 1.44337 1.44337 1.50120 1.50120 1.55671 1.55671 1.60982 1.60982 1.66044 1.66044 1.70851 1.70851 1.75394 1.75394 1.79667 1.79667 1.83663 1.83663 1.87375 1.87375 1.90799 1.90799 1.93928 1.93928 1.96759 1.96759 1.99286 1.99286 2.01505 2.01505 2.03414 2.03414 2.05010 2.05010 2.06289 2.06289 2.07250 2.07250 2.07892 2.07892 2.08213 2.08213 diff --git a/tests/codim_one/gradients.cc b/tests/codim_one/gradients.cc index 693d46091d..d610d4c365 100644 --- a/tests/codim_one/gradients.cc +++ b/tests/codim_one/gradients.cc @@ -190,7 +190,7 @@ void test(std::string filename) // write graphical output DataOut > dataout; - dataout.attach_dof_handler(dof_handler_help); + dataout.attach_triangulation(triangulation); dataout.add_data_vector(projected_directional_derivative, "derivative"); dataout.build_patches(); dataout.write_vtk(logfile); diff --git a/tests/codim_one/interpolation_2.cc b/tests/codim_one/interpolation_2.cc index c6f93c49f6..6467d4b696 100644 --- a/tests/codim_one/interpolation_2.cc +++ b/tests/codim_one/interpolation_2.cc @@ -70,8 +70,7 @@ void test(std::string filename) VectorTools::interpolate(dof_handler, cosine, interpolated_one); DataOut > dataout; - dataout.attach_dof_handler(dof_handler); - dataout.add_data_vector(interpolated_one, "numbering"); + dataout.add_data_vector(dof_handler, interpolated_one, "numbering"); dataout.build_patches(); dataout.write_vtk(logfile); } diff --git a/tests/codim_one/interpolation_2.output b/tests/codim_one/interpolation_2.output index 80050c449c..6eafed5466 100644 --- a/tests/codim_one/interpolation_2.output +++ b/tests/codim_one/interpolation_2.output @@ -107,7 +107,7 @@ CELL_TYPES 31 POINT_DATA 62 SCALARS numbering double 1 LOOKUP_TABLE default -6.12323e-17 6.12323e-17 0.0305550 0.0305550 0.103368 0.103368 0.173285 0.173285 0.196642 0.196642 0.158788 0.158788 0.0834524 0.0834524 0.0176029 0.0176029 0.00200973 0.00200973 0.0462882 0.0462882 0.123095 0.123095 0.184717 0.184717 0.192611 0.192611 0.141826 0.141826 0.0641634 0.0641634 0.00795761 0.00795761 0.00795761 0.00795761 0.0641634 0.0641634 0.141826 0.141826 0.192611 0.192611 0.184717 0.184717 0.123095 0.123095 0.0462882 0.0462882 0.00200973 0.00200973 0.0176029 0.0176029 0.0834524 0.0834524 0.158788 0.158788 0.196642 0.196642 0.173285 0.173285 0.103368 0.103368 0.0305550 0.0305550 +6.12323e-17 0.0305550 0.0305550 0.103368 0.103368 0.173285 0.173285 0.196642 0.196642 0.158788 0.158788 0.0834524 0.0834524 0.0176029 0.0176029 0.00200973 0.00200973 0.0462882 0.0462882 0.123095 0.123095 0.184717 0.184717 0.192611 0.192611 0.141826 0.141826 0.0641634 0.0641634 0.00795761 0.00795761 0.00795761 0.00795761 0.0641634 0.0641634 0.141826 0.141826 0.192611 0.192611 0.184717 0.184717 0.123095 0.123095 0.0462882 0.0462882 0.00200973 0.00200973 0.0176029 0.0176029 0.0834524 0.0834524 0.158788 0.158788 0.196642 0.196642 0.173285 0.173285 0.103368 0.103368 0.0305550 0.0305550 6.12323e-17 DEAL::Test<1,2> # vtk DataFile Version 3.0 #This file was generated diff --git a/tests/codim_one/projection.cc b/tests/codim_one/projection.cc index c2fdac3481..3050a0b07b 100644 --- a/tests/codim_one/projection.cc +++ b/tests/codim_one/projection.cc @@ -77,8 +77,7 @@ void test(std::string filename, unsigned int n) VectorTools::project(dof_handler, constraints, quad, cosine, projected_one); DataOut > dataout; - dataout.attach_dof_handler(dof_handler); - dataout.add_data_vector(projected_one, "projection"); + dataout.add_data_vector(dof_handler, projected_one, "projection"); dataout.build_patches(); dataout.write_vtk(logfile); } diff --git a/tests/codim_one/projection.output b/tests/codim_one/projection.output index 5a23c0c452..51b23b00b6 100644 --- a/tests/codim_one/projection.output +++ b/tests/codim_one/projection.output @@ -107,7 +107,7 @@ CELL_TYPES 31 POINT_DATA 62 SCALARS projection double 1 LOOKUP_TABLE default --6.51797e-05 -6.51797e-05 0.0318027 0.0318027 0.107769 0.107769 0.180745 0.180745 0.205132 0.205132 0.165612 0.165612 0.0869875 0.0869875 0.0182934 0.0182934 0.00203072 0.00203072 0.0482144 0.0482144 0.128357 0.128357 0.192681 0.192681 0.200923 0.200923 0.147906 0.147906 0.0668623 0.0668623 0.00823378 0.00823378 0.00823378 0.00823378 0.0668623 0.0668623 0.147906 0.147906 0.200923 0.200923 0.192681 0.192681 0.128357 0.128357 0.0482144 0.0482144 0.00203072 0.00203072 0.0182934 0.0182934 0.0869875 0.0869875 0.165612 0.165612 0.205132 0.205132 0.180745 0.180745 0.107769 0.107769 0.0318027 0.0318027 +-6.51797e-05 0.0318027 0.0318027 0.107769 0.107769 0.180745 0.180745 0.205132 0.205132 0.165612 0.165612 0.0869875 0.0869875 0.0182934 0.0182934 0.00203072 0.00203072 0.0482144 0.0482144 0.128357 0.128357 0.192681 0.192681 0.200923 0.200923 0.147906 0.147906 0.0668623 0.0668623 0.00823378 0.00823378 0.00823378 0.00823378 0.0668623 0.0668623 0.147906 0.147906 0.200923 0.200923 0.192681 0.192681 0.128357 0.128357 0.0482144 0.0482144 0.00203072 0.00203072 0.0182934 0.0182934 0.0869875 0.0869875 0.165612 0.165612 0.205132 0.205132 0.180745 0.180745 0.107769 0.107769 0.0318027 0.0318027 -6.51797e-05 DEAL::Test<2,3>, continous finite element q_1 # vtk DataFile Version 3.0 #This file was generated diff --git a/tests/integrators/mesh_worker_1d_dg.cc b/tests/integrators/mesh_worker_1d_dg.cc index 1db5ba294d..4f620a4840 100644 --- a/tests/integrators/mesh_worker_1d_dg.cc +++ b/tests/integrators/mesh_worker_1d_dg.cc @@ -388,7 +388,7 @@ namespace Advection data_out.add_data_vector (solution, solution_names, - DataOut >::type_automatic, + DataOut >::type_dof_data, interpretation); data_out.build_patches (fe.degree); diff --git a/tests/metis/metis_03.cc b/tests/metis/metis_03.cc index dec3fc7c40..44f731f925 100644 --- a/tests/metis/metis_03.cc +++ b/tests/metis/metis_03.cc @@ -73,7 +73,7 @@ void test () } DataOut data_out; - data_out.attach_dof_handler (dof_handler); + data_out.attach_triangulation (triangulation); data_out.add_data_vector (partitions, "partitions"); data_out.build_patches (); -- 2.39.5