From: Wolfgang Bangerth Date: Thu, 23 Feb 2006 21:53:08 +0000 (+0000) Subject: Re-enable the use of DerivativeApproximation, now that the issue with X-Git-Tag: v8.0.0~12196 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5933573ad07470f7a0e68caa654332f2d23efa5;p=dealii.git Re-enable the use of DerivativeApproximation, now that the issue with that class is resolved (see hp/crash_04) git-svn-id: https://svn.dealii.org/trunk@12486 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/examples/step-21/step-21.cc b/deal.II/examples/step-21/step-21.cc index 0e4a21fd0d..a7a9ed989f 100644 --- a/deal.II/examples/step-21/step-21.cc +++ b/deal.II/examples/step-21/step-21.cc @@ -1591,13 +1591,9 @@ void DGMethod::refine_grid () //random refinement. we need to do this since DerivativeApproximation //isn't really ready yet for hp -// DerivativeApproximation::approximate_gradient (mapping_collection[0], -// dof_handler, -// solution2, -// gradient_indicator); - - for (unsigned int i=0; i::refine_grid () // h-refinement. cell = dof_handler.begin_active (); for (; cell!=endc; ++cell) - if (!cell->refine_flag_set ()) + if (!cell->refine_flag_set () + && + (cell->active_fe_index() < fe_collection.size()-1)) cell->set_active_fe_index (cell->active_fe_index () + 1); triangulation.execute_coarsening_and_refinement (); @@ -1667,7 +1665,7 @@ void DGMethod::output_results (const unsigned int cycle) const data_out.attach_dof_handler (dof_handler); data_out.add_data_vector (solution2, "u"); - data_out.build_patches (5); + data_out.build_patches (4); // data_out.write_gnuplot(gnuplot_output); data_out.write_gmv(gnuplot_output); @@ -1690,7 +1688,7 @@ void DGMethod::output_results (const unsigned int cycle) const template void DGMethod::run () { - for (unsigned int cycle=0; cycle<5; ++cycle) + for (unsigned int cycle=0; cycle<7; ++cycle) { deallog << "Cycle " << cycle << ':' << std::endl;