From 04699f5336817e07f68be14399882707483c6a88 Mon Sep 17 00:00:00 2001 From: bangerth Date: Tue, 21 Jan 2014 06:31:36 +0000 Subject: [PATCH] Fix the same problem again in another location. git-svn-id: https://svn.dealii.org/trunk@32270 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/source/numerics/solution_transfer.cc | 3 +- tests/hp/solution_transfer_07.cc | 109 +++++++++++++++++++ tests/hp/solution_transfer_07.output | 4 + 3 files changed, 115 insertions(+), 1 deletion(-) create mode 100644 tests/hp/solution_transfer_07.cc create mode 100644 tests/hp/solution_transfer_07.output diff --git a/deal.II/source/numerics/solution_transfer.cc b/deal.II/source/numerics/solution_transfer.cc index b34bcaec37..54433972bb 100644 --- a/deal.II/source/numerics/solution_transfer.cc +++ b/deal.II/source/numerics/solution_transfer.cc @@ -149,7 +149,8 @@ SolutionTransfer::refine_interpolate(const VECTOR &in, ExcNumberOfDoFsPerCellHasChanged()); for (unsigned int i=0; isecond.indices_ptr)[i]); - cell->set_dof_values_by_interpolation(local_values, out); + cell->set_dof_values_by_interpolation(local_values, out, + cell->active_fe_index()); } } } diff --git a/tests/hp/solution_transfer_07.cc b/tests/hp/solution_transfer_07.cc new file mode 100644 index 0000000000..7d2adaa665 --- /dev/null +++ b/tests/hp/solution_transfer_07.cc @@ -0,0 +1,109 @@ +// --------------------------------------------------------------------- +// $Id$ +// +// Copyright (C) 2011 - 2014 by the deal.II authors +// +// This file is part of the deal.II library. +// +// The deal.II library is free software; you can use it, redistribute +// it, and/or modify it under the terms of the GNU Lesser General +// Public License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// The full text of the license can be found in the file LICENSE at +// the top level of the deal.II distribution. +// +// --------------------------------------------------------------------- + + + +// SolutionTransfer accessed the active_fe_index of the cell from which to +// interpolate to children, but this active_fe_index is now on an inactive +// cell and may no longer be valid. we need to use the number previously +// stored + +#include "../tests.h" +#include +#include +#include + +#include + +#include + +#include +#include +#include +#include + +#include +#include +#include +#include + +#include + +#include + +#include + +using namespace dealii; + + +template +void test () +{ + Triangulation triangulation; + GridGenerator::hyper_cube (triangulation); + + hp::FECollection fe_collection; + fe_collection.push_back(FE_Q(1)); + fe_collection.push_back(FE_Q(2)); + + hp::DoFHandler dof_handler(triangulation); + dof_handler.begin_active()->set_active_fe_index(0); + dof_handler.distribute_dofs (fe_collection); + + // Init solution + Vector solution(dof_handler.n_dofs()); + solution = 1.0; + + + // set refine flag for the only cell we have, then do the refinement + SolutionTransfer, hp::DoFHandler > + solution_trans(dof_handler); + dof_handler.begin_active()->set_refine_flag (); + solution_trans.prepare_for_pure_refinement(); + triangulation.execute_coarsening_and_refinement (); + + // now set the active_fe_index flags on the new set of fine level cells, but + // also clear the one from the now inactive cell + dof_handler.begin(0)->set_active_fe_index(1); + for (unsigned int c=0; cn_children(); ++c) + dof_handler.begin(0)->child(c)->set_active_fe_index(1); + + // distribute dofs and transfer solution there + dof_handler.distribute_dofs (fe_collection); + + Vector new_solution(dof_handler.n_dofs()); + solution_trans.refine_interpolate(solution, new_solution); + + // we should now have only 1s in the new_solution vector + for (unsigned int i=0; i (); + test<2> (); + test<3> (); +} diff --git a/tests/hp/solution_transfer_07.output b/tests/hp/solution_transfer_07.output new file mode 100644 index 0000000000..fb71de2867 --- /dev/null +++ b/tests/hp/solution_transfer_07.output @@ -0,0 +1,4 @@ + +DEAL::OK +DEAL::OK +DEAL::OK -- 2.39.5