From: Wolfgang Bangerth Date: Mon, 31 Oct 2016 22:06:02 +0000 (-0600) Subject: Add a bunch of tests. X-Git-Tag: v8.5.0-rc1~505^2~1 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=359f9204bc5099dcdc0ba12ba30efe74a72c4920;p=dealii.git Add a bunch of tests. --- diff --git a/tests/fe/fe_enriched_step-36b.cc b/tests/fe/fe_enriched_step-36b.cc index 4a92b81d87..fdaf06a91b 100644 --- a/tests/fe/fe_enriched_step-36b.cc +++ b/tests/fe/fe_enriched_step-36b.cc @@ -702,9 +702,9 @@ namespace Step36 virtual void - compute_derived_quantities_vector (const std::vector > &uh, - const std::vector > > &duh, - const std::vector > > &dduh, + compute_derived_quantities_vector (const std::vector > &solution_values, + const std::vector > > &solution_gradients, + const std::vector > > &solution_hessians, const std::vector > &normals, const std::vector > &evaluation_points, std::vector > &computed_quantities) const; @@ -724,23 +724,23 @@ namespace Step36 template void Postprocessor:: - compute_derived_quantities_vector (const std::vector > &uh, - const std::vector > > &/*duh*/, - const std::vector > > &/*dduh*/, + compute_derived_quantities_vector (const std::vector > &solution_values, + const std::vector > > &/*solution_gradients*/, + const std::vector > > &/*solution_hessians*/, const std::vector > &/*normals*/, const std::vector > &evaluation_points, std::vector > &computed_quantities) const { - const unsigned int n_quadrature_points = uh.size(); + const unsigned int n_quadrature_points = solution_values.size(); Assert (computed_quantities.size() == n_quadrature_points, ExcInternalError()); for (unsigned int q=0; q +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include + + +std::ofstream logfile("output"); + + +template +class LaplaceProblem +{ +public: + LaplaceProblem (); + void run (); + +private: + void make_grid_and_dofs (); + void solve (); + void output_results () const; + + Triangulation triangulation; + FESystem fe; + DoFHandler dof_handler; + + Vector solution; +}; + + +template +LaplaceProblem::LaplaceProblem () + : + fe (FE_Q(1),2), + dof_handler (triangulation) +{} + + + +template +void LaplaceProblem::make_grid_and_dofs () +{ + GridGenerator::hyper_cube (triangulation, 0, 1); + triangulation.refine_global (1); + triangulation.begin_active()->set_refine_flag (); + triangulation.execute_coarsening_and_refinement (); + + dof_handler.distribute_dofs (fe); + solution.reinit (dof_handler.n_dofs()); +} + + + +template +class SinesAndCosines : public Function +{ +public: + SinesAndCosines () + : + Function (2) + {} + + double value (const Point &p, + const unsigned int component) const + { + switch (component) + { + case 0: + return std::sin (p.norm()); + case 1: + return std::cos (p.norm()); + default: + Assert (false, ExcNotImplemented()); + return 0; + } + } +}; + + + +template +void LaplaceProblem::solve () +{ + // dummy solve. just insert some + // values as mentioned at the top + // of the file + VectorTools::interpolate (dof_handler, + SinesAndCosines(), + solution); +} + + +template +class MyPostprocessor : public DataPostprocessor +{ +public: + virtual std::vector get_names () const + { + return std::vector(1,"magnitude"); + } + + virtual + std::vector + get_data_component_interpretation () const + { + return + std::vector + (1,DataComponentInterpretation::component_is_scalar); + } + + virtual UpdateFlags get_needed_update_flags () const + { + return update_values; + } + + virtual + void + compute_derived_quantities_vector (const DataPostprocessorInputs::Vector &input_data, + std::vector > &computed_quantities) const + { + for (unsigned int q=0; q +void LaplaceProblem::output_results () const +{ + MyPostprocessor p; + DataOut data_out; + data_out.attach_dof_handler (dof_handler); + data_out.add_data_vector (solution, p); + data_out.build_patches (); + data_out.write_gnuplot (logfile); +} + + + +template +void LaplaceProblem::run () +{ + make_grid_and_dofs(); + solve (); + output_results (); +} + + + +int main () +{ + logfile << std::setprecision(2); + deallog << std::setprecision(2); + + LaplaceProblem<2> laplace_problem_2d; + laplace_problem_2d.run (); + + LaplaceProblem<3> laplace_problem_3d; + laplace_problem_3d.run (); + + return 0; +} diff --git a/tests/numerics/data_out_postprocessor_01-new.output b/tests/numerics/data_out_postprocessor_01-new.output new file mode 100644 index 0000000000..5df4e5c863 --- /dev/null +++ b/tests/numerics/data_out_postprocessor_01-new.output @@ -0,0 +1,783 @@ +# This file was generated by the deal.II library. + + +# +# For a description of the GNUPLOT format see the GNUPLOT manual. +# +# +0.5 0 1 +1 0 1 + +0.5 0.5 1 +1 0.5 1 + + +0 0.5 1 +0.5 0.5 1 + +0 1 1 +0.5 1 1 + + +0.5 0.5 1 +1 0.5 1 + +0.5 1 1 +1 1 1 + + +0 0 1 +0.25 0 1 + +0 0.25 1 +0.25 0.25 1 + + +0.25 0 1 +0.5 0 1 + +0.25 0.25 1 +0.5 0.25 1 + + +0 0.25 1 +0.25 0.25 1 + +0 0.5 1 +0.25 0.5 1 + + +0.25 0.25 1 +0.5 0.25 1 + +0.25 0.5 1 +0.5 0.5 1 + + +# This file was generated by the deal.II library. + + +# +# For a description of the GNUPLOT format see the GNUPLOT manual. +# +# +0.5 0 0 1 +1 0 0 1 + + +0.5 0 0 1 +0.5 0.5 0 1 + + +0.5 0 0 1 +0.5 0 0.5 1 + + +1 0 0 1 +1 0.5 0 1 + + +1 0 0 1 +1 0 0.5 1 + + +0.5 0.5 0 1 +1 0.5 0 1 + + +0.5 0.5 0 1 +0.5 0.5 0.5 1 + + +1 0.5 0 1 +1 0.5 0.5 1 + + +0.5 0 0.5 1 +1 0 0.5 1 + + +0.5 0 0.5 1 +0.5 0.5 0.5 1 + + +1 0 0.5 1 +1 0.5 0.5 1 + + +0.5 0.5 0.5 1 +1 0.5 0.5 1 + + +0 0.5 0 1 +0.5 0.5 0 1 + + +0 0.5 0 1 +0 1 0 1 + + +0 0.5 0 1 +0 0.5 0.5 1 + + +0.5 0.5 0 1 +0.5 1 0 1 + + +0.5 0.5 0 1 +0.5 0.5 0.5 1 + + +0 1 0 1 +0.5 1 0 1 + + +0 1 0 1 +0 1 0.5 1 + + +0.5 1 0 1 +0.5 1 0.5 1 + + +0 0.5 0.5 1 +0.5 0.5 0.5 1 + + +0 0.5 0.5 1 +0 1 0.5 1 + + +0.5 0.5 0.5 1 +0.5 1 0.5 1 + + +0 1 0.5 1 +0.5 1 0.5 1 + + +0.5 0.5 0 1 +1 0.5 0 1 + + +0.5 0.5 0 1 +0.5 1 0 1 + + +0.5 0.5 0 1 +0.5 0.5 0.5 1 + + +1 0.5 0 1 +1 1 0 1 + + +1 0.5 0 1 +1 0.5 0.5 1 + + +0.5 1 0 1 +1 1 0 1 + + +0.5 1 0 1 +0.5 1 0.5 1 + + +1 1 0 1 +1 1 0.5 1 + + +0.5 0.5 0.5 1 +1 0.5 0.5 1 + + +0.5 0.5 0.5 1 +0.5 1 0.5 1 + + +1 0.5 0.5 1 +1 1 0.5 1 + + +0.5 1 0.5 1 +1 1 0.5 1 + + +0 0 0.5 1 +0.5 0 0.5 1 + + +0 0 0.5 1 +0 0.5 0.5 1 + + +0 0 0.5 1 +0 0 1 1 + + +0.5 0 0.5 1 +0.5 0.5 0.5 1 + + +0.5 0 0.5 1 +0.5 0 1 1 + + +0 0.5 0.5 1 +0.5 0.5 0.5 1 + + +0 0.5 0.5 1 +0 0.5 1 1 + + +0.5 0.5 0.5 1 +0.5 0.5 1 1 + + +0 0 1 1 +0.5 0 1 1 + + +0 0 1 1 +0 0.5 1 1 + + +0.5 0 1 1 +0.5 0.5 1 1 + + +0 0.5 1 1 +0.5 0.5 1 1 + + +0.5 0 0.5 1 +1 0 0.5 1 + + +0.5 0 0.5 1 +0.5 0.5 0.5 1 + + +0.5 0 0.5 1 +0.5 0 1 1 + + +1 0 0.5 1 +1 0.5 0.5 1 + + +1 0 0.5 1 +1 0 1 1 + + +0.5 0.5 0.5 1 +1 0.5 0.5 1 + + +0.5 0.5 0.5 1 +0.5 0.5 1 1 + + +1 0.5 0.5 1 +1 0.5 1 1 + + +0.5 0 1 1 +1 0 1 1 + + +0.5 0 1 1 +0.5 0.5 1 1 + + +1 0 1 1 +1 0.5 1 1 + + +0.5 0.5 1 1 +1 0.5 1 1 + + +0 0.5 0.5 1 +0.5 0.5 0.5 1 + + +0 0.5 0.5 1 +0 1 0.5 1 + + +0 0.5 0.5 1 +0 0.5 1 1 + + +0.5 0.5 0.5 1 +0.5 1 0.5 1 + + +0.5 0.5 0.5 1 +0.5 0.5 1 1 + + +0 1 0.5 1 +0.5 1 0.5 1 + + +0 1 0.5 1 +0 1 1 1 + + +0.5 1 0.5 1 +0.5 1 1 1 + + +0 0.5 1 1 +0.5 0.5 1 1 + + +0 0.5 1 1 +0 1 1 1 + + +0.5 0.5 1 1 +0.5 1 1 1 + + +0 1 1 1 +0.5 1 1 1 + + +0.5 0.5 0.5 1 +1 0.5 0.5 1 + + +0.5 0.5 0.5 1 +0.5 1 0.5 1 + + +0.5 0.5 0.5 1 +0.5 0.5 1 1 + + +1 0.5 0.5 1 +1 1 0.5 1 + + +1 0.5 0.5 1 +1 0.5 1 1 + + +0.5 1 0.5 1 +1 1 0.5 1 + + +0.5 1 0.5 1 +0.5 1 1 1 + + +1 1 0.5 1 +1 1 1 1 + + +0.5 0.5 1 1 +1 0.5 1 1 + + +0.5 0.5 1 1 +0.5 1 1 1 + + +1 0.5 1 1 +1 1 1 1 + + +0.5 1 1 1 +1 1 1 1 + + +0 0 0 1 +0.25 0 0 1 + + +0 0 0 1 +0 0.25 0 1 + + +0 0 0 1 +0 0 0.25 1 + + +0.25 0 0 1 +0.25 0.25 0 1 + + +0.25 0 0 1 +0.25 0 0.25 1 + + +0 0.25 0 1 +0.25 0.25 0 1 + + +0 0.25 0 1 +0 0.25 0.25 1 + + +0.25 0.25 0 1 +0.25 0.25 0.25 1 + + +0 0 0.25 1 +0.25 0 0.25 1 + + +0 0 0.25 1 +0 0.25 0.25 1 + + +0.25 0 0.25 1 +0.25 0.25 0.25 1 + + +0 0.25 0.25 1 +0.25 0.25 0.25 1 + + +0.25 0 0 1 +0.5 0 0 1 + + +0.25 0 0 1 +0.25 0.25 0 1 + + +0.25 0 0 1 +0.25 0 0.25 1 + + +0.5 0 0 1 +0.5 0.25 0 1 + + +0.5 0 0 1 +0.5 0 0.25 1 + + +0.25 0.25 0 1 +0.5 0.25 0 1 + + +0.25 0.25 0 1 +0.25 0.25 0.25 1 + + +0.5 0.25 0 1 +0.5 0.25 0.25 1 + + +0.25 0 0.25 1 +0.5 0 0.25 1 + + +0.25 0 0.25 1 +0.25 0.25 0.25 1 + + +0.5 0 0.25 1 +0.5 0.25 0.25 1 + + +0.25 0.25 0.25 1 +0.5 0.25 0.25 1 + + +0 0.25 0 1 +0.25 0.25 0 1 + + +0 0.25 0 1 +0 0.5 0 1 + + +0 0.25 0 1 +0 0.25 0.25 1 + + +0.25 0.25 0 1 +0.25 0.5 0 1 + + +0.25 0.25 0 1 +0.25 0.25 0.25 1 + + +0 0.5 0 1 +0.25 0.5 0 1 + + +0 0.5 0 1 +0 0.5 0.25 1 + + +0.25 0.5 0 1 +0.25 0.5 0.25 1 + + +0 0.25 0.25 1 +0.25 0.25 0.25 1 + + +0 0.25 0.25 1 +0 0.5 0.25 1 + + +0.25 0.25 0.25 1 +0.25 0.5 0.25 1 + + +0 0.5 0.25 1 +0.25 0.5 0.25 1 + + +0.25 0.25 0 1 +0.5 0.25 0 1 + + +0.25 0.25 0 1 +0.25 0.5 0 1 + + +0.25 0.25 0 1 +0.25 0.25 0.25 1 + + +0.5 0.25 0 1 +0.5 0.5 0 1 + + +0.5 0.25 0 1 +0.5 0.25 0.25 1 + + +0.25 0.5 0 1 +0.5 0.5 0 1 + + +0.25 0.5 0 1 +0.25 0.5 0.25 1 + + +0.5 0.5 0 1 +0.5 0.5 0.25 1 + + +0.25 0.25 0.25 1 +0.5 0.25 0.25 1 + + +0.25 0.25 0.25 1 +0.25 0.5 0.25 1 + + +0.5 0.25 0.25 1 +0.5 0.5 0.25 1 + + +0.25 0.5 0.25 1 +0.5 0.5 0.25 1 + + +0 0 0.25 1 +0.25 0 0.25 1 + + +0 0 0.25 1 +0 0.25 0.25 1 + + +0 0 0.25 1 +0 0 0.5 1 + + +0.25 0 0.25 1 +0.25 0.25 0.25 1 + + +0.25 0 0.25 1 +0.25 0 0.5 1 + + +0 0.25 0.25 1 +0.25 0.25 0.25 1 + + +0 0.25 0.25 1 +0 0.25 0.5 1 + + +0.25 0.25 0.25 1 +0.25 0.25 0.5 1 + + +0 0 0.5 1 +0.25 0 0.5 1 + + +0 0 0.5 1 +0 0.25 0.5 1 + + +0.25 0 0.5 1 +0.25 0.25 0.5 1 + + +0 0.25 0.5 1 +0.25 0.25 0.5 1 + + +0.25 0 0.25 1 +0.5 0 0.25 1 + + +0.25 0 0.25 1 +0.25 0.25 0.25 1 + + +0.25 0 0.25 1 +0.25 0 0.5 1 + + +0.5 0 0.25 1 +0.5 0.25 0.25 1 + + +0.5 0 0.25 1 +0.5 0 0.5 1 + + +0.25 0.25 0.25 1 +0.5 0.25 0.25 1 + + +0.25 0.25 0.25 1 +0.25 0.25 0.5 1 + + +0.5 0.25 0.25 1 +0.5 0.25 0.5 1 + + +0.25 0 0.5 1 +0.5 0 0.5 1 + + +0.25 0 0.5 1 +0.25 0.25 0.5 1 + + +0.5 0 0.5 1 +0.5 0.25 0.5 1 + + +0.25 0.25 0.5 1 +0.5 0.25 0.5 1 + + +0 0.25 0.25 1 +0.25 0.25 0.25 1 + + +0 0.25 0.25 1 +0 0.5 0.25 1 + + +0 0.25 0.25 1 +0 0.25 0.5 1 + + +0.25 0.25 0.25 1 +0.25 0.5 0.25 1 + + +0.25 0.25 0.25 1 +0.25 0.25 0.5 1 + + +0 0.5 0.25 1 +0.25 0.5 0.25 1 + + +0 0.5 0.25 1 +0 0.5 0.5 1 + + +0.25 0.5 0.25 1 +0.25 0.5 0.5 1 + + +0 0.25 0.5 1 +0.25 0.25 0.5 1 + + +0 0.25 0.5 1 +0 0.5 0.5 1 + + +0.25 0.25 0.5 1 +0.25 0.5 0.5 1 + + +0 0.5 0.5 1 +0.25 0.5 0.5 1 + + +0.25 0.25 0.25 1 +0.5 0.25 0.25 1 + + +0.25 0.25 0.25 1 +0.25 0.5 0.25 1 + + +0.25 0.25 0.25 1 +0.25 0.25 0.5 1 + + +0.5 0.25 0.25 1 +0.5 0.5 0.25 1 + + +0.5 0.25 0.25 1 +0.5 0.25 0.5 1 + + +0.25 0.5 0.25 1 +0.5 0.5 0.25 1 + + +0.25 0.5 0.25 1 +0.25 0.5 0.5 1 + + +0.5 0.5 0.25 1 +0.5 0.5 0.5 1 + + +0.25 0.25 0.5 1 +0.5 0.25 0.5 1 + + +0.25 0.25 0.5 1 +0.25 0.5 0.5 1 + + +0.5 0.25 0.5 1 +0.5 0.5 0.5 1 + + +0.25 0.5 0.5 1 +0.5 0.5 0.5 1 + + diff --git a/tests/numerics/data_out_postprocessor_01.cc b/tests/numerics/data_out_postprocessor_01.cc index 0b50f4a938..ed79a15f0c 100644 --- a/tests/numerics/data_out_postprocessor_01.cc +++ b/tests/numerics/data_out_postprocessor_01.cc @@ -150,19 +150,19 @@ public: virtual void - compute_derived_quantities_vector (const std::vector > &uh, + compute_derived_quantities_vector (const std::vector > &solution_values, const std::vector > > &, const std::vector > > &, const std::vector > &, const std::vector > &, std::vector > &computed_quantities) const { - for (unsigned int q=0; q +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include + + +std::ofstream logfile("output"); + + +template +class LaplaceProblem +{ +public: + LaplaceProblem (); + void run (); + +private: + void make_grid_and_dofs (); + void solve (); + void output_results () const; + + Triangulation triangulation; + FESystem fe; + DoFHandler dof_handler; + + Vector solution; +}; + + +template +LaplaceProblem::LaplaceProblem () + : + fe (FE_Q(1),2), + dof_handler (triangulation) +{} + + + +template +void LaplaceProblem::make_grid_and_dofs () +{ + GridGenerator::hyper_cube (triangulation, 0, 1); + triangulation.refine_global (1); + triangulation.begin_active()->set_refine_flag (); + triangulation.execute_coarsening_and_refinement (); + + dof_handler.distribute_dofs (fe); + solution.reinit (dof_handler.n_dofs()); +} + + + +template +class SinesAndCosines : public Function +{ +public: + SinesAndCosines () + : + Function (2) + {} + + double value (const Point &p, + const unsigned int component) const + { + switch (component) + { + case 0: + return std::sin (p.norm()); + case 1: + return std::cos (p.norm()); + default: + Assert (false, ExcNotImplemented()); + return 0; + } + } +}; + + + +template +void LaplaceProblem::solve () +{ + // dummy solve. just insert some + // values as mentioned at the top + // of the file + VectorTools::interpolate (dof_handler, + SinesAndCosines(), + solution); +} + + +template +class MyPostprocessor : public DataPostprocessorScalar +{ +public: + MyPostprocessor () + : + DataPostprocessorScalar ("magnitude", update_values) + {} + + virtual + void + compute_derived_quantities_vector (const DataPostprocessorInputs::Vector &input_data, + std::vector > &computed_quantities) const + { + for (unsigned int q=0; q +void LaplaceProblem::output_results () const +{ + MyPostprocessor p; + DataOut data_out; + data_out.attach_dof_handler (dof_handler); + data_out.add_data_vector (solution, p); + data_out.build_patches (); + data_out.write_gnuplot (logfile); +} + + + +template +void LaplaceProblem::run () +{ + make_grid_and_dofs(); + solve (); + output_results (); +} + + + +int main () +{ + logfile << std::setprecision(2); + deallog << std::setprecision(2); + + LaplaceProblem<2> laplace_problem_2d; + laplace_problem_2d.run (); + + LaplaceProblem<3> laplace_problem_3d; + laplace_problem_3d.run (); + + return 0; +} diff --git a/tests/numerics/data_out_postprocessor_scalar_01-new.output b/tests/numerics/data_out_postprocessor_scalar_01-new.output new file mode 100644 index 0000000000..5df4e5c863 --- /dev/null +++ b/tests/numerics/data_out_postprocessor_scalar_01-new.output @@ -0,0 +1,783 @@ +# This file was generated by the deal.II library. + + +# +# For a description of the GNUPLOT format see the GNUPLOT manual. +# +# +0.5 0 1 +1 0 1 + +0.5 0.5 1 +1 0.5 1 + + +0 0.5 1 +0.5 0.5 1 + +0 1 1 +0.5 1 1 + + +0.5 0.5 1 +1 0.5 1 + +0.5 1 1 +1 1 1 + + +0 0 1 +0.25 0 1 + +0 0.25 1 +0.25 0.25 1 + + +0.25 0 1 +0.5 0 1 + +0.25 0.25 1 +0.5 0.25 1 + + +0 0.25 1 +0.25 0.25 1 + +0 0.5 1 +0.25 0.5 1 + + +0.25 0.25 1 +0.5 0.25 1 + +0.25 0.5 1 +0.5 0.5 1 + + +# This file was generated by the deal.II library. + + +# +# For a description of the GNUPLOT format see the GNUPLOT manual. +# +# +0.5 0 0 1 +1 0 0 1 + + +0.5 0 0 1 +0.5 0.5 0 1 + + +0.5 0 0 1 +0.5 0 0.5 1 + + +1 0 0 1 +1 0.5 0 1 + + +1 0 0 1 +1 0 0.5 1 + + +0.5 0.5 0 1 +1 0.5 0 1 + + +0.5 0.5 0 1 +0.5 0.5 0.5 1 + + +1 0.5 0 1 +1 0.5 0.5 1 + + +0.5 0 0.5 1 +1 0 0.5 1 + + +0.5 0 0.5 1 +0.5 0.5 0.5 1 + + +1 0 0.5 1 +1 0.5 0.5 1 + + +0.5 0.5 0.5 1 +1 0.5 0.5 1 + + +0 0.5 0 1 +0.5 0.5 0 1 + + +0 0.5 0 1 +0 1 0 1 + + +0 0.5 0 1 +0 0.5 0.5 1 + + +0.5 0.5 0 1 +0.5 1 0 1 + + +0.5 0.5 0 1 +0.5 0.5 0.5 1 + + +0 1 0 1 +0.5 1 0 1 + + +0 1 0 1 +0 1 0.5 1 + + +0.5 1 0 1 +0.5 1 0.5 1 + + +0 0.5 0.5 1 +0.5 0.5 0.5 1 + + +0 0.5 0.5 1 +0 1 0.5 1 + + +0.5 0.5 0.5 1 +0.5 1 0.5 1 + + +0 1 0.5 1 +0.5 1 0.5 1 + + +0.5 0.5 0 1 +1 0.5 0 1 + + +0.5 0.5 0 1 +0.5 1 0 1 + + +0.5 0.5 0 1 +0.5 0.5 0.5 1 + + +1 0.5 0 1 +1 1 0 1 + + +1 0.5 0 1 +1 0.5 0.5 1 + + +0.5 1 0 1 +1 1 0 1 + + +0.5 1 0 1 +0.5 1 0.5 1 + + +1 1 0 1 +1 1 0.5 1 + + +0.5 0.5 0.5 1 +1 0.5 0.5 1 + + +0.5 0.5 0.5 1 +0.5 1 0.5 1 + + +1 0.5 0.5 1 +1 1 0.5 1 + + +0.5 1 0.5 1 +1 1 0.5 1 + + +0 0 0.5 1 +0.5 0 0.5 1 + + +0 0 0.5 1 +0 0.5 0.5 1 + + +0 0 0.5 1 +0 0 1 1 + + +0.5 0 0.5 1 +0.5 0.5 0.5 1 + + +0.5 0 0.5 1 +0.5 0 1 1 + + +0 0.5 0.5 1 +0.5 0.5 0.5 1 + + +0 0.5 0.5 1 +0 0.5 1 1 + + +0.5 0.5 0.5 1 +0.5 0.5 1 1 + + +0 0 1 1 +0.5 0 1 1 + + +0 0 1 1 +0 0.5 1 1 + + +0.5 0 1 1 +0.5 0.5 1 1 + + +0 0.5 1 1 +0.5 0.5 1 1 + + +0.5 0 0.5 1 +1 0 0.5 1 + + +0.5 0 0.5 1 +0.5 0.5 0.5 1 + + +0.5 0 0.5 1 +0.5 0 1 1 + + +1 0 0.5 1 +1 0.5 0.5 1 + + +1 0 0.5 1 +1 0 1 1 + + +0.5 0.5 0.5 1 +1 0.5 0.5 1 + + +0.5 0.5 0.5 1 +0.5 0.5 1 1 + + +1 0.5 0.5 1 +1 0.5 1 1 + + +0.5 0 1 1 +1 0 1 1 + + +0.5 0 1 1 +0.5 0.5 1 1 + + +1 0 1 1 +1 0.5 1 1 + + +0.5 0.5 1 1 +1 0.5 1 1 + + +0 0.5 0.5 1 +0.5 0.5 0.5 1 + + +0 0.5 0.5 1 +0 1 0.5 1 + + +0 0.5 0.5 1 +0 0.5 1 1 + + +0.5 0.5 0.5 1 +0.5 1 0.5 1 + + +0.5 0.5 0.5 1 +0.5 0.5 1 1 + + +0 1 0.5 1 +0.5 1 0.5 1 + + +0 1 0.5 1 +0 1 1 1 + + +0.5 1 0.5 1 +0.5 1 1 1 + + +0 0.5 1 1 +0.5 0.5 1 1 + + +0 0.5 1 1 +0 1 1 1 + + +0.5 0.5 1 1 +0.5 1 1 1 + + +0 1 1 1 +0.5 1 1 1 + + +0.5 0.5 0.5 1 +1 0.5 0.5 1 + + +0.5 0.5 0.5 1 +0.5 1 0.5 1 + + +0.5 0.5 0.5 1 +0.5 0.5 1 1 + + +1 0.5 0.5 1 +1 1 0.5 1 + + +1 0.5 0.5 1 +1 0.5 1 1 + + +0.5 1 0.5 1 +1 1 0.5 1 + + +0.5 1 0.5 1 +0.5 1 1 1 + + +1 1 0.5 1 +1 1 1 1 + + +0.5 0.5 1 1 +1 0.5 1 1 + + +0.5 0.5 1 1 +0.5 1 1 1 + + +1 0.5 1 1 +1 1 1 1 + + +0.5 1 1 1 +1 1 1 1 + + +0 0 0 1 +0.25 0 0 1 + + +0 0 0 1 +0 0.25 0 1 + + +0 0 0 1 +0 0 0.25 1 + + +0.25 0 0 1 +0.25 0.25 0 1 + + +0.25 0 0 1 +0.25 0 0.25 1 + + +0 0.25 0 1 +0.25 0.25 0 1 + + +0 0.25 0 1 +0 0.25 0.25 1 + + +0.25 0.25 0 1 +0.25 0.25 0.25 1 + + +0 0 0.25 1 +0.25 0 0.25 1 + + +0 0 0.25 1 +0 0.25 0.25 1 + + +0.25 0 0.25 1 +0.25 0.25 0.25 1 + + +0 0.25 0.25 1 +0.25 0.25 0.25 1 + + +0.25 0 0 1 +0.5 0 0 1 + + +0.25 0 0 1 +0.25 0.25 0 1 + + +0.25 0 0 1 +0.25 0 0.25 1 + + +0.5 0 0 1 +0.5 0.25 0 1 + + +0.5 0 0 1 +0.5 0 0.25 1 + + +0.25 0.25 0 1 +0.5 0.25 0 1 + + +0.25 0.25 0 1 +0.25 0.25 0.25 1 + + +0.5 0.25 0 1 +0.5 0.25 0.25 1 + + +0.25 0 0.25 1 +0.5 0 0.25 1 + + +0.25 0 0.25 1 +0.25 0.25 0.25 1 + + +0.5 0 0.25 1 +0.5 0.25 0.25 1 + + +0.25 0.25 0.25 1 +0.5 0.25 0.25 1 + + +0 0.25 0 1 +0.25 0.25 0 1 + + +0 0.25 0 1 +0 0.5 0 1 + + +0 0.25 0 1 +0 0.25 0.25 1 + + +0.25 0.25 0 1 +0.25 0.5 0 1 + + +0.25 0.25 0 1 +0.25 0.25 0.25 1 + + +0 0.5 0 1 +0.25 0.5 0 1 + + +0 0.5 0 1 +0 0.5 0.25 1 + + +0.25 0.5 0 1 +0.25 0.5 0.25 1 + + +0 0.25 0.25 1 +0.25 0.25 0.25 1 + + +0 0.25 0.25 1 +0 0.5 0.25 1 + + +0.25 0.25 0.25 1 +0.25 0.5 0.25 1 + + +0 0.5 0.25 1 +0.25 0.5 0.25 1 + + +0.25 0.25 0 1 +0.5 0.25 0 1 + + +0.25 0.25 0 1 +0.25 0.5 0 1 + + +0.25 0.25 0 1 +0.25 0.25 0.25 1 + + +0.5 0.25 0 1 +0.5 0.5 0 1 + + +0.5 0.25 0 1 +0.5 0.25 0.25 1 + + +0.25 0.5 0 1 +0.5 0.5 0 1 + + +0.25 0.5 0 1 +0.25 0.5 0.25 1 + + +0.5 0.5 0 1 +0.5 0.5 0.25 1 + + +0.25 0.25 0.25 1 +0.5 0.25 0.25 1 + + +0.25 0.25 0.25 1 +0.25 0.5 0.25 1 + + +0.5 0.25 0.25 1 +0.5 0.5 0.25 1 + + +0.25 0.5 0.25 1 +0.5 0.5 0.25 1 + + +0 0 0.25 1 +0.25 0 0.25 1 + + +0 0 0.25 1 +0 0.25 0.25 1 + + +0 0 0.25 1 +0 0 0.5 1 + + +0.25 0 0.25 1 +0.25 0.25 0.25 1 + + +0.25 0 0.25 1 +0.25 0 0.5 1 + + +0 0.25 0.25 1 +0.25 0.25 0.25 1 + + +0 0.25 0.25 1 +0 0.25 0.5 1 + + +0.25 0.25 0.25 1 +0.25 0.25 0.5 1 + + +0 0 0.5 1 +0.25 0 0.5 1 + + +0 0 0.5 1 +0 0.25 0.5 1 + + +0.25 0 0.5 1 +0.25 0.25 0.5 1 + + +0 0.25 0.5 1 +0.25 0.25 0.5 1 + + +0.25 0 0.25 1 +0.5 0 0.25 1 + + +0.25 0 0.25 1 +0.25 0.25 0.25 1 + + +0.25 0 0.25 1 +0.25 0 0.5 1 + + +0.5 0 0.25 1 +0.5 0.25 0.25 1 + + +0.5 0 0.25 1 +0.5 0 0.5 1 + + +0.25 0.25 0.25 1 +0.5 0.25 0.25 1 + + +0.25 0.25 0.25 1 +0.25 0.25 0.5 1 + + +0.5 0.25 0.25 1 +0.5 0.25 0.5 1 + + +0.25 0 0.5 1 +0.5 0 0.5 1 + + +0.25 0 0.5 1 +0.25 0.25 0.5 1 + + +0.5 0 0.5 1 +0.5 0.25 0.5 1 + + +0.25 0.25 0.5 1 +0.5 0.25 0.5 1 + + +0 0.25 0.25 1 +0.25 0.25 0.25 1 + + +0 0.25 0.25 1 +0 0.5 0.25 1 + + +0 0.25 0.25 1 +0 0.25 0.5 1 + + +0.25 0.25 0.25 1 +0.25 0.5 0.25 1 + + +0.25 0.25 0.25 1 +0.25 0.25 0.5 1 + + +0 0.5 0.25 1 +0.25 0.5 0.25 1 + + +0 0.5 0.25 1 +0 0.5 0.5 1 + + +0.25 0.5 0.25 1 +0.25 0.5 0.5 1 + + +0 0.25 0.5 1 +0.25 0.25 0.5 1 + + +0 0.25 0.5 1 +0 0.5 0.5 1 + + +0.25 0.25 0.5 1 +0.25 0.5 0.5 1 + + +0 0.5 0.5 1 +0.25 0.5 0.5 1 + + +0.25 0.25 0.25 1 +0.5 0.25 0.25 1 + + +0.25 0.25 0.25 1 +0.25 0.5 0.25 1 + + +0.25 0.25 0.25 1 +0.25 0.25 0.5 1 + + +0.5 0.25 0.25 1 +0.5 0.5 0.25 1 + + +0.5 0.25 0.25 1 +0.5 0.25 0.5 1 + + +0.25 0.5 0.25 1 +0.5 0.5 0.25 1 + + +0.25 0.5 0.25 1 +0.25 0.5 0.5 1 + + +0.5 0.5 0.25 1 +0.5 0.5 0.5 1 + + +0.25 0.25 0.5 1 +0.5 0.25 0.5 1 + + +0.25 0.25 0.5 1 +0.25 0.5 0.5 1 + + +0.5 0.25 0.5 1 +0.5 0.5 0.5 1 + + +0.25 0.5 0.5 1 +0.5 0.5 0.5 1 + + diff --git a/tests/numerics/data_out_postprocessor_scalar_01.cc b/tests/numerics/data_out_postprocessor_scalar_01.cc index d0be151916..c9342ca9f2 100644 --- a/tests/numerics/data_out_postprocessor_scalar_01.cc +++ b/tests/numerics/data_out_postprocessor_scalar_01.cc @@ -139,19 +139,19 @@ public: virtual void - compute_derived_quantities_vector (const std::vector > &uh, + compute_derived_quantities_vector (const std::vector > &solution_values, const std::vector > > &, const std::vector > > &, const std::vector > &, const std::vector > &, std::vector > &computed_quantities) const { - for (unsigned int q=0; q +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include + + +std::ofstream logfile("output"); + + +template +class LaplaceProblem +{ +public: + LaplaceProblem (); + void run (); + +private: + void make_grid_and_dofs (); + void solve (); + void output_results () const; + + Triangulation triangulation; + FESystem fe; + DoFHandler dof_handler; + + Vector solution; +}; + + +template +LaplaceProblem::LaplaceProblem () + : + fe (FE_Q(1),2), + dof_handler (triangulation) +{} + + + +template +void LaplaceProblem::make_grid_and_dofs () +{ + GridGenerator::hyper_cube (triangulation, 0, 1); + triangulation.refine_global (1); + triangulation.begin_active()->set_refine_flag (); + triangulation.execute_coarsening_and_refinement (); + + dof_handler.distribute_dofs (fe); + solution.reinit (dof_handler.n_dofs()); +} + + + +template +class SinesAndCosines : public Function +{ +public: + SinesAndCosines () + : + Function (2) + {} + + double value (const Point &p, + const unsigned int component) const + { + switch (component) + { + case 0: + return std::sin (p.norm()); + case 1: + return std::cos (p.norm()); + default: + Assert (false, ExcNotImplemented()); + return 0; + } + } +}; + + + +template +void LaplaceProblem::solve () +{ + // dummy solve. just insert some + // values as mentioned at the top + // of the file + VectorTools::interpolate (dof_handler, + SinesAndCosines(), + solution); +} + + +template +class MyPostprocessor : public DataPostprocessorVector +{ +public: + MyPostprocessor () + : + DataPostprocessorVector ("magnitude_times_d", update_values) + {} + + virtual + void + compute_derived_quantities_vector (const DataPostprocessorInputs::Vector &input_data, + std::vector > &computed_quantities) const + { + for (unsigned int q=0; q +void LaplaceProblem::output_results () const +{ + MyPostprocessor p; + DataOut data_out; + data_out.attach_dof_handler (dof_handler); + data_out.add_data_vector (solution, p); + data_out.build_patches (); + data_out.write_gnuplot (logfile); +} + + + +template +void LaplaceProblem::run () +{ + make_grid_and_dofs(); + solve (); + output_results (); +} + + + +int main () +{ + logfile << std::setprecision(2); + deallog << std::setprecision(2); + + LaplaceProblem<2> laplace_problem_2d; + laplace_problem_2d.run (); + + LaplaceProblem<3> laplace_problem_3d; + laplace_problem_3d.run (); + + return 0; +} diff --git a/tests/numerics/data_out_postprocessor_vector_01-new.output b/tests/numerics/data_out_postprocessor_vector_01-new.output new file mode 100644 index 0000000000..6e914eca0c --- /dev/null +++ b/tests/numerics/data_out_postprocessor_vector_01-new.output @@ -0,0 +1,783 @@ +# This file was generated by the deal.II library. + + +# +# For a description of the GNUPLOT format see the GNUPLOT manual. +# +# +0.5 0 1 1 +1 0 1 1 + +0.5 0.5 1 1 +1 0.5 1 1 + + +0 0.5 1 1 +0.5 0.5 1 1 + +0 1 1 1 +0.5 1 1 1 + + +0.5 0.5 1 1 +1 0.5 1 1 + +0.5 1 1 1 +1 1 1 1 + + +0 0 1 1 +0.25 0 1 1 + +0 0.25 1 1 +0.25 0.25 1 1 + + +0.25 0 1 1 +0.5 0 1 1 + +0.25 0.25 1 1 +0.5 0.25 1 1 + + +0 0.25 1 1 +0.25 0.25 1 1 + +0 0.5 1 1 +0.25 0.5 1 1 + + +0.25 0.25 1 1 +0.5 0.25 1 1 + +0.25 0.5 1 1 +0.5 0.5 1 1 + + +# This file was generated by the deal.II library. + + +# +# For a description of the GNUPLOT format see the GNUPLOT manual. +# +# +0.5 0 0 1 1 1 +1 0 0 1 1 1 + + +0.5 0 0 1 1 1 +0.5 0.5 0 1 1 1 + + +0.5 0 0 1 1 1 +0.5 0 0.5 1 1 1 + + +1 0 0 1 1 1 +1 0.5 0 1 1 1 + + +1 0 0 1 1 1 +1 0 0.5 1 1 1 + + +0.5 0.5 0 1 1 1 +1 0.5 0 1 1 1 + + +0.5 0.5 0 1 1 1 +0.5 0.5 0.5 1 1 1 + + +1 0.5 0 1 1 1 +1 0.5 0.5 1 1 1 + + +0.5 0 0.5 1 1 1 +1 0 0.5 1 1 1 + + +0.5 0 0.5 1 1 1 +0.5 0.5 0.5 1 1 1 + + +1 0 0.5 1 1 1 +1 0.5 0.5 1 1 1 + + +0.5 0.5 0.5 1 1 1 +1 0.5 0.5 1 1 1 + + +0 0.5 0 1 1 1 +0.5 0.5 0 1 1 1 + + +0 0.5 0 1 1 1 +0 1 0 1 1 1 + + +0 0.5 0 1 1 1 +0 0.5 0.5 1 1 1 + + +0.5 0.5 0 1 1 1 +0.5 1 0 1 1 1 + + +0.5 0.5 0 1 1 1 +0.5 0.5 0.5 1 1 1 + + +0 1 0 1 1 1 +0.5 1 0 1 1 1 + + +0 1 0 1 1 1 +0 1 0.5 1 1 1 + + +0.5 1 0 1 1 1 +0.5 1 0.5 1 1 1 + + +0 0.5 0.5 1 1 1 +0.5 0.5 0.5 1 1 1 + + +0 0.5 0.5 1 1 1 +0 1 0.5 1 1 1 + + +0.5 0.5 0.5 1 1 1 +0.5 1 0.5 1 1 1 + + +0 1 0.5 1 1 1 +0.5 1 0.5 1 1 1 + + +0.5 0.5 0 1 1 1 +1 0.5 0 1 1 1 + + +0.5 0.5 0 1 1 1 +0.5 1 0 1 1 1 + + +0.5 0.5 0 1 1 1 +0.5 0.5 0.5 1 1 1 + + +1 0.5 0 1 1 1 +1 1 0 1 1 1 + + +1 0.5 0 1 1 1 +1 0.5 0.5 1 1 1 + + +0.5 1 0 1 1 1 +1 1 0 1 1 1 + + +0.5 1 0 1 1 1 +0.5 1 0.5 1 1 1 + + +1 1 0 1 1 1 +1 1 0.5 1 1 1 + + +0.5 0.5 0.5 1 1 1 +1 0.5 0.5 1 1 1 + + +0.5 0.5 0.5 1 1 1 +0.5 1 0.5 1 1 1 + + +1 0.5 0.5 1 1 1 +1 1 0.5 1 1 1 + + +0.5 1 0.5 1 1 1 +1 1 0.5 1 1 1 + + +0 0 0.5 1 1 1 +0.5 0 0.5 1 1 1 + + +0 0 0.5 1 1 1 +0 0.5 0.5 1 1 1 + + +0 0 0.5 1 1 1 +0 0 1 1 1 1 + + +0.5 0 0.5 1 1 1 +0.5 0.5 0.5 1 1 1 + + +0.5 0 0.5 1 1 1 +0.5 0 1 1 1 1 + + +0 0.5 0.5 1 1 1 +0.5 0.5 0.5 1 1 1 + + +0 0.5 0.5 1 1 1 +0 0.5 1 1 1 1 + + +0.5 0.5 0.5 1 1 1 +0.5 0.5 1 1 1 1 + + +0 0 1 1 1 1 +0.5 0 1 1 1 1 + + +0 0 1 1 1 1 +0 0.5 1 1 1 1 + + +0.5 0 1 1 1 1 +0.5 0.5 1 1 1 1 + + +0 0.5 1 1 1 1 +0.5 0.5 1 1 1 1 + + +0.5 0 0.5 1 1 1 +1 0 0.5 1 1 1 + + +0.5 0 0.5 1 1 1 +0.5 0.5 0.5 1 1 1 + + +0.5 0 0.5 1 1 1 +0.5 0 1 1 1 1 + + +1 0 0.5 1 1 1 +1 0.5 0.5 1 1 1 + + +1 0 0.5 1 1 1 +1 0 1 1 1 1 + + +0.5 0.5 0.5 1 1 1 +1 0.5 0.5 1 1 1 + + +0.5 0.5 0.5 1 1 1 +0.5 0.5 1 1 1 1 + + +1 0.5 0.5 1 1 1 +1 0.5 1 1 1 1 + + +0.5 0 1 1 1 1 +1 0 1 1 1 1 + + +0.5 0 1 1 1 1 +0.5 0.5 1 1 1 1 + + +1 0 1 1 1 1 +1 0.5 1 1 1 1 + + +0.5 0.5 1 1 1 1 +1 0.5 1 1 1 1 + + +0 0.5 0.5 1 1 1 +0.5 0.5 0.5 1 1 1 + + +0 0.5 0.5 1 1 1 +0 1 0.5 1 1 1 + + +0 0.5 0.5 1 1 1 +0 0.5 1 1 1 1 + + +0.5 0.5 0.5 1 1 1 +0.5 1 0.5 1 1 1 + + +0.5 0.5 0.5 1 1 1 +0.5 0.5 1 1 1 1 + + +0 1 0.5 1 1 1 +0.5 1 0.5 1 1 1 + + +0 1 0.5 1 1 1 +0 1 1 1 1 1 + + +0.5 1 0.5 1 1 1 +0.5 1 1 1 1 1 + + +0 0.5 1 1 1 1 +0.5 0.5 1 1 1 1 + + +0 0.5 1 1 1 1 +0 1 1 1 1 1 + + +0.5 0.5 1 1 1 1 +0.5 1 1 1 1 1 + + +0 1 1 1 1 1 +0.5 1 1 1 1 1 + + +0.5 0.5 0.5 1 1 1 +1 0.5 0.5 1 1 1 + + +0.5 0.5 0.5 1 1 1 +0.5 1 0.5 1 1 1 + + +0.5 0.5 0.5 1 1 1 +0.5 0.5 1 1 1 1 + + +1 0.5 0.5 1 1 1 +1 1 0.5 1 1 1 + + +1 0.5 0.5 1 1 1 +1 0.5 1 1 1 1 + + +0.5 1 0.5 1 1 1 +1 1 0.5 1 1 1 + + +0.5 1 0.5 1 1 1 +0.5 1 1 1 1 1 + + +1 1 0.5 1 1 1 +1 1 1 1 1 1 + + +0.5 0.5 1 1 1 1 +1 0.5 1 1 1 1 + + +0.5 0.5 1 1 1 1 +0.5 1 1 1 1 1 + + +1 0.5 1 1 1 1 +1 1 1 1 1 1 + + +0.5 1 1 1 1 1 +1 1 1 1 1 1 + + +0 0 0 1 1 1 +0.25 0 0 1 1 1 + + +0 0 0 1 1 1 +0 0.25 0 1 1 1 + + +0 0 0 1 1 1 +0 0 0.25 1 1 1 + + +0.25 0 0 1 1 1 +0.25 0.25 0 1 1 1 + + +0.25 0 0 1 1 1 +0.25 0 0.25 1 1 1 + + +0 0.25 0 1 1 1 +0.25 0.25 0 1 1 1 + + +0 0.25 0 1 1 1 +0 0.25 0.25 1 1 1 + + +0.25 0.25 0 1 1 1 +0.25 0.25 0.25 1 1 1 + + +0 0 0.25 1 1 1 +0.25 0 0.25 1 1 1 + + +0 0 0.25 1 1 1 +0 0.25 0.25 1 1 1 + + +0.25 0 0.25 1 1 1 +0.25 0.25 0.25 1 1 1 + + +0 0.25 0.25 1 1 1 +0.25 0.25 0.25 1 1 1 + + +0.25 0 0 1 1 1 +0.5 0 0 1 1 1 + + +0.25 0 0 1 1 1 +0.25 0.25 0 1 1 1 + + +0.25 0 0 1 1 1 +0.25 0 0.25 1 1 1 + + +0.5 0 0 1 1 1 +0.5 0.25 0 1 1 1 + + +0.5 0 0 1 1 1 +0.5 0 0.25 1 1 1 + + +0.25 0.25 0 1 1 1 +0.5 0.25 0 1 1 1 + + +0.25 0.25 0 1 1 1 +0.25 0.25 0.25 1 1 1 + + +0.5 0.25 0 1 1 1 +0.5 0.25 0.25 1 1 1 + + +0.25 0 0.25 1 1 1 +0.5 0 0.25 1 1 1 + + +0.25 0 0.25 1 1 1 +0.25 0.25 0.25 1 1 1 + + +0.5 0 0.25 1 1 1 +0.5 0.25 0.25 1 1 1 + + +0.25 0.25 0.25 1 1 1 +0.5 0.25 0.25 1 1 1 + + +0 0.25 0 1 1 1 +0.25 0.25 0 1 1 1 + + +0 0.25 0 1 1 1 +0 0.5 0 1 1 1 + + +0 0.25 0 1 1 1 +0 0.25 0.25 1 1 1 + + +0.25 0.25 0 1 1 1 +0.25 0.5 0 1 1 1 + + +0.25 0.25 0 1 1 1 +0.25 0.25 0.25 1 1 1 + + +0 0.5 0 1 1 1 +0.25 0.5 0 1 1 1 + + +0 0.5 0 1 1 1 +0 0.5 0.25 1 1 1 + + +0.25 0.5 0 1 1 1 +0.25 0.5 0.25 1 1 1 + + +0 0.25 0.25 1 1 1 +0.25 0.25 0.25 1 1 1 + + +0 0.25 0.25 1 1 1 +0 0.5 0.25 1 1 1 + + +0.25 0.25 0.25 1 1 1 +0.25 0.5 0.25 1 1 1 + + +0 0.5 0.25 1 1 1 +0.25 0.5 0.25 1 1 1 + + +0.25 0.25 0 1 1 1 +0.5 0.25 0 1 1 1 + + +0.25 0.25 0 1 1 1 +0.25 0.5 0 1 1 1 + + +0.25 0.25 0 1 1 1 +0.25 0.25 0.25 1 1 1 + + +0.5 0.25 0 1 1 1 +0.5 0.5 0 1 1 1 + + +0.5 0.25 0 1 1 1 +0.5 0.25 0.25 1 1 1 + + +0.25 0.5 0 1 1 1 +0.5 0.5 0 1 1 1 + + +0.25 0.5 0 1 1 1 +0.25 0.5 0.25 1 1 1 + + +0.5 0.5 0 1 1 1 +0.5 0.5 0.25 1 1 1 + + +0.25 0.25 0.25 1 1 1 +0.5 0.25 0.25 1 1 1 + + +0.25 0.25 0.25 1 1 1 +0.25 0.5 0.25 1 1 1 + + +0.5 0.25 0.25 1 1 1 +0.5 0.5 0.25 1 1 1 + + +0.25 0.5 0.25 1 1 1 +0.5 0.5 0.25 1 1 1 + + +0 0 0.25 1 1 1 +0.25 0 0.25 1 1 1 + + +0 0 0.25 1 1 1 +0 0.25 0.25 1 1 1 + + +0 0 0.25 1 1 1 +0 0 0.5 1 1 1 + + +0.25 0 0.25 1 1 1 +0.25 0.25 0.25 1 1 1 + + +0.25 0 0.25 1 1 1 +0.25 0 0.5 1 1 1 + + +0 0.25 0.25 1 1 1 +0.25 0.25 0.25 1 1 1 + + +0 0.25 0.25 1 1 1 +0 0.25 0.5 1 1 1 + + +0.25 0.25 0.25 1 1 1 +0.25 0.25 0.5 1 1 1 + + +0 0 0.5 1 1 1 +0.25 0 0.5 1 1 1 + + +0 0 0.5 1 1 1 +0 0.25 0.5 1 1 1 + + +0.25 0 0.5 1 1 1 +0.25 0.25 0.5 1 1 1 + + +0 0.25 0.5 1 1 1 +0.25 0.25 0.5 1 1 1 + + +0.25 0 0.25 1 1 1 +0.5 0 0.25 1 1 1 + + +0.25 0 0.25 1 1 1 +0.25 0.25 0.25 1 1 1 + + +0.25 0 0.25 1 1 1 +0.25 0 0.5 1 1 1 + + +0.5 0 0.25 1 1 1 +0.5 0.25 0.25 1 1 1 + + +0.5 0 0.25 1 1 1 +0.5 0 0.5 1 1 1 + + +0.25 0.25 0.25 1 1 1 +0.5 0.25 0.25 1 1 1 + + +0.25 0.25 0.25 1 1 1 +0.25 0.25 0.5 1 1 1 + + +0.5 0.25 0.25 1 1 1 +0.5 0.25 0.5 1 1 1 + + +0.25 0 0.5 1 1 1 +0.5 0 0.5 1 1 1 + + +0.25 0 0.5 1 1 1 +0.25 0.25 0.5 1 1 1 + + +0.5 0 0.5 1 1 1 +0.5 0.25 0.5 1 1 1 + + +0.25 0.25 0.5 1 1 1 +0.5 0.25 0.5 1 1 1 + + +0 0.25 0.25 1 1 1 +0.25 0.25 0.25 1 1 1 + + +0 0.25 0.25 1 1 1 +0 0.5 0.25 1 1 1 + + +0 0.25 0.25 1 1 1 +0 0.25 0.5 1 1 1 + + +0.25 0.25 0.25 1 1 1 +0.25 0.5 0.25 1 1 1 + + +0.25 0.25 0.25 1 1 1 +0.25 0.25 0.5 1 1 1 + + +0 0.5 0.25 1 1 1 +0.25 0.5 0.25 1 1 1 + + +0 0.5 0.25 1 1 1 +0 0.5 0.5 1 1 1 + + +0.25 0.5 0.25 1 1 1 +0.25 0.5 0.5 1 1 1 + + +0 0.25 0.5 1 1 1 +0.25 0.25 0.5 1 1 1 + + +0 0.25 0.5 1 1 1 +0 0.5 0.5 1 1 1 + + +0.25 0.25 0.5 1 1 1 +0.25 0.5 0.5 1 1 1 + + +0 0.5 0.5 1 1 1 +0.25 0.5 0.5 1 1 1 + + +0.25 0.25 0.25 1 1 1 +0.5 0.25 0.25 1 1 1 + + +0.25 0.25 0.25 1 1 1 +0.25 0.5 0.25 1 1 1 + + +0.25 0.25 0.25 1 1 1 +0.25 0.25 0.5 1 1 1 + + +0.5 0.25 0.25 1 1 1 +0.5 0.5 0.25 1 1 1 + + +0.5 0.25 0.25 1 1 1 +0.5 0.25 0.5 1 1 1 + + +0.25 0.5 0.25 1 1 1 +0.5 0.5 0.25 1 1 1 + + +0.25 0.5 0.25 1 1 1 +0.25 0.5 0.5 1 1 1 + + +0.5 0.5 0.25 1 1 1 +0.5 0.5 0.5 1 1 1 + + +0.25 0.25 0.5 1 1 1 +0.5 0.25 0.5 1 1 1 + + +0.25 0.25 0.5 1 1 1 +0.25 0.5 0.5 1 1 1 + + +0.5 0.25 0.5 1 1 1 +0.5 0.5 0.5 1 1 1 + + +0.25 0.5 0.5 1 1 1 +0.5 0.5 0.5 1 1 1 + + diff --git a/tests/numerics/data_out_postprocessor_vector_01.cc b/tests/numerics/data_out_postprocessor_vector_01.cc index 754db2aad7..84af679c0d 100644 --- a/tests/numerics/data_out_postprocessor_vector_01.cc +++ b/tests/numerics/data_out_postprocessor_vector_01.cc @@ -139,20 +139,20 @@ public: virtual void - compute_derived_quantities_vector (const std::vector > &uh, + compute_derived_quantities_vector (const std::vector > &solution_values, const std::vector > > &, const std::vector > > &, const std::vector > &, const std::vector > &, std::vector > &computed_quantities) const { - for (unsigned int q=0; q::n_output_variables () const template void Postprocess::compute_derived_quantities_vector ( - const std::vector< Vector< double > > &uh, - const std::vector< std::vector< Tensor< 1, dim > > > &duh, - const std::vector< std::vector< Tensor< 2, dim > > > &dduh, + const std::vector< Vector< double > > &solution_values, + const std::vector< std::vector< Tensor< 1, dim > > > &solution_gradients, + const std::vector< std::vector< Tensor< 2, dim > > > &solution_hessians, const std::vector< Point< dim > > & /* normals */, const std::vector< Point< dim > > & /* locations */, std::vector< Vector< double > > &computed_quantities ) const { - Assert(computed_quantities.size() == uh.size(), - ExcDimensionMismatch (computed_quantities.size(), uh.size())); + Assert(computed_quantities.size() == solution_values.size(), + ExcDimensionMismatch (computed_quantities.size(), solution_values.size())); for (unsigned int i=0; i::n_output_variables () const template void Postprocess::compute_derived_quantities_scalar ( - const std::vector< double > &uh, - const std::vector< Tensor< 1, dim > > &duh, - const std::vector< Tensor< 2, dim > > &dduh, + const std::vector< double > &solution_values, + const std::vector< Tensor< 1, dim > > &solution_gradients, + const std::vector< Tensor< 2, dim > > &solution_hessians, const std::vector< Point< dim > > & /* normals */, const std::vector< Point< dim > > & /* locations */, std::vector< Vector< double > > &computed_quantities ) const { - Assert(computed_quantities.size() == uh.size(), - ExcDimensionMismatch (computed_quantities.size(), uh.size())); + Assert(computed_quantities.size() == solution_values.size(), + ExcDimensionMismatch (computed_quantities.size(), solution_values.size())); for (unsigned int i=0; i