From cf6d436325525406cdca1d4048d8781e44ccdc21 Mon Sep 17 00:00:00 2001 From: wolf Date: Wed, 30 Apr 2003 15:24:38 +0000 Subject: [PATCH] Remove some 1d stuff. Allows linking with icc as well. git-svn-id: https://svn.dealii.org/trunk@7501 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/deal.II/wave-test-3.cc | 217 +---------------------------------- 1 file changed, 3 insertions(+), 214 deletions(-) diff --git a/tests/deal.II/wave-test-3.cc b/tests/deal.II/wave-test-3.cc index 5cba64b010..15eed7412a 100644 --- a/tests/deal.II/wave-test-3.cc +++ b/tests/deal.II/wave-test-3.cc @@ -1997,14 +1997,6 @@ void IntegratedValueAtOrigin::compute_functionals (Vector &j1, /*------------------------ SeismicSignal --------------------------------*/ -template <> -void SeismicSignal<1>::compute_functionals (Vector &, - Vector &) -{ - Assert (false, ExcNotImplemented()); -} - - template void SeismicSignal::compute_functionals (Vector &j1, Vector &j2) { @@ -2055,14 +2047,6 @@ void SeismicSignal::compute_functionals (Vector &j1, /*------------------------ EarthSurface --------------------------------*/ -template <> -void EarthSurface<1>::compute_functionals (Vector &, - Vector &) -{ - Assert (false, ExcNotImplemented()); -} - - template void EarthSurface::compute_functionals (Vector &j1, Vector &j2) { @@ -2103,14 +2087,6 @@ void EarthSurface::compute_functionals (Vector &j1, /*------------------------ SplitSignal --------------------------------*/ -template <> -void SplitSignal<1>::compute_functionals (Vector &, - Vector &) -{ - Assert (false, ExcInternalError()); -} - - template void SplitSignal::compute_functionals (Vector &j1, Vector &j2) { @@ -2172,46 +2148,6 @@ void SplitLine::compute_endtime_vectors (Vector &, } -#if 2 == 1 - -template <> -void SplitLine<1>::compute_endtime_vectors (Vector &final_u_bar, - Vector &final_v_bar) { - const unsigned int dim = 1; - - const double n_q_points = quadrature->n_quadrature_points; - const unsigned int dofs_per_cell = fe->dofs_per_cell; - - final_u_bar.reinit (dof->n_dofs()); - final_v_bar.reinit (dof->n_dofs()); - - DoFHandler::active_cell_iterator cell = dof->begin_active (), - endc = dof->end (); - - FEValues fe_values (*fe, *quadrature, UpdateFlags(update_values | update_JxW_values)); - std::vector cell_dof_indices (dofs_per_cell); - - for (; cell!=endc; ++cell) - { - if ((cell->vertex(0)(0) < -0.5) || - (cell->vertex(1)(0) > 0.5)) - continue; - - fe_values.reinit (cell); - - std::vector local_functional (dofs_per_cell, 0); - for (unsigned int shape_func=0; shape_funcget_dof_indices (cell_dof_indices); - for (unsigned int shape_func=0; shape_func::reset () { } -template <> -double EvaluateSeismicSignal<1>::evaluate () -{ - Assert (false, ExcNotImplemented()); - return 0; -} - - template double EvaluateSeismicSignal::evaluate () { const unsigned int n_q_points = this->quadrature_face->n_quadrature_points; @@ -2682,14 +2610,6 @@ void EvaluateSplitSignal::reset () { } -template <> -double EvaluateSplitSignal<1>::evaluate () -{ - Assert (false, ExcNotImplemented()); - return 0; -} - - template double EvaluateSplitSignal::evaluate () { if ((this->time<=1.6) || (this->time>1.8)) @@ -2770,39 +2690,6 @@ double EvaluateOneBranch1d::evaluate () } -#if 2 == 1 - -template <> -double EvaluateOneBranch1d<1>::evaluate () { - if ((time<=2.5-time_step) || (time>2.5)) - return 0; - - const unsigned int n_q_points = quadrature->n_quadrature_points; - DoFHandler<1>::active_cell_iterator cell = dof->begin_active(), - endc = dof->end(); - double u_integrated=0; - FEValues<1> fe_values (*fe, *quadrature, UpdateFlags(update_values | update_JxW_values)); - std::vector cell_u (fe->dofs_per_cell); - - for (; cell!=endc; ++cell) - if ((cell->center()(0) > -0.6) && - (cell->center()(0) < -0.4)) - { - fe_values.reinit (cell); - fe_values.get_function_values (*u, cell_u); - - double local_integral = 0; - for (unsigned int point=0; point::evaluate () } -#if 2 == 1 - -template <> -double EvaluateSecondCrossing1d<1>::evaluate () { - if ((time<=2.4-time_step) || (time>2.4)) - return 0; - - const unsigned int n_q_points = quadrature->n_quadrature_points; - DoFHandler<1>::active_cell_iterator cell = dof->begin_active(), - endc = dof->end(); - double u_integrated=0; - FEValues<1> fe_values (*fe, *quadrature, - UpdateFlags(update_values | update_JxW_values | update_q_points)); - std::vector cell_u (fe->dofs_per_cell); - - for (; cell!=endc; ++cell) - if ((cell->center()(0) > -0.03) && - (cell->center()(0) < 0.03)) - { - fe_values.reinit (cell); - fe_values.get_function_values (*u, cell_u); - double local_integral = 0; - for (unsigned int point=0; point::set_dual_functional (const std::string &name) { } -#if 2 == 1 - -template <> -void WaveParameters<1>::make_coarse_grid (const std::string &name) { - const unsigned int dim = 1; - - coarse_grid = new Triangulation(MeshSmoothing(smoothing_on_refinement | - eliminate_refined_inner_islands)); - - if (name == "line") - GridGenerator::hyper_cube (*coarse_grid, -1, 1); - else - if (name == "split line") - { - const Point<1> vertices[4] = { Point<1>(-1.), - Point<1>(-1./3.), - Point<1>(1./3.), - Point<1>(1.) }; - std::vector > cells (3, CellData<1>()); - cells[0].vertices[0] = 0; - cells[0].vertices[1] = 1; - cells[0].material_id = 0; - - cells[1].vertices[0] = 1; - cells[1].vertices[1] = 2; - cells[1].material_id = 0; - - cells[2].vertices[0] = 2; - cells[2].vertices[1] = 3; - cells[2].material_id = 0; - - coarse_grid->create_triangulation (std::vector >(&vertices[0], - &vertices[4]), - cells, - SubCellData()); - - typename Triangulation::active_cell_iterator cell = coarse_grid->begin_active(); - (++cell)->set_refine_flag (); - (++cell)->set_refine_flag (); - coarse_grid->execute_coarsening_and_refinement (); - - for (int k=0; k<2; ++k) - { - for (cell=coarse_grid->begin_active(); cell!=coarse_grid->end(); ++cell) - if (cell->level() == k+1) - cell->set_refine_flag (); - coarse_grid->execute_coarsening_and_refinement (); - }; - } - else - AssertThrow (false, ExcParameterNotInList(name)); - - coarse_grid->refine_global (initial_refinement); -}; - -#endif - #if 2 == 2 @@ -4167,14 +3963,14 @@ void WaveParameters<2>::make_coarse_grid (const std::string &name) { }; -case uniform_channel: + case uniform_channel: { coarse_grid->refine_global (initial_refinement-1); break; }; -default: + default: Assert (false, ExcInternalError()); }; }; @@ -4182,7 +3978,7 @@ default: }; -case square: + case square: case seismic_square: { GridGenerator::hyper_cube (*coarse_grid, -1, 1); @@ -7604,13 +7400,6 @@ const Quadrature &FEHelper::get_quadrature (const std::string &name) { } -template <> -const Quadrature<0> &FEHelper<1>::get_quadrature_face (const std::string &) { - static const Quadrature<0> dummy_quadrature(1); - return dummy_quadrature; -} - - template const Quadrature &FEHelper::get_quadrature_face (const std::string &name) { if (name=="linear") -- 2.39.5