From: bangerth Date: Tue, 19 Aug 2008 19:41:14 +0000 (+0000) Subject: Split the 'degree' variable into two, one for the Stokes and one for the temperature... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c21b914765acde2a98b46825afa0135a07c54c4d;p=dealii-svn.git Split the 'degree' variable into two, one for the Stokes and one for the temperature system, to make experimenting with different choices simpler. git-svn-id: https://svn.dealii.org/trunk@16596 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/examples/step-31/step-31.cc b/deal.II/examples/step-31/step-31.cc index bbdabaccb1..b1f21f0e36 100644 --- a/deal.II/examples/step-31/step-31.cc +++ b/deal.II/examples/step-31/step-31.cc @@ -331,7 +331,8 @@ class BoussinesqFlowProblem Triangulation triangulation; - const unsigned int degree; + const unsigned int stokes_degree; + const unsigned int temperature_degree; FESystem stokes_fe; DoFHandler stokes_dof_handler; @@ -807,11 +808,12 @@ template BoussinesqFlowProblem::BoussinesqFlowProblem (const unsigned int degree) : triangulation (Triangulation::maximum_smoothing), - degree (degree), - stokes_fe (FE_Q(degree+1), dim, - FE_Q(degree), 1), + stokes_degree (degree), + temperature_degree (degree), + stokes_fe (FE_Q(stokes_degree+1), dim, + FE_Q(stokes_degree), 1), stokes_dof_handler (triangulation), - temperature_fe (degree), + temperature_fe (temperature_degree), temperature_dof_handler (triangulation), time_step (0), old_time_step (0), @@ -1171,7 +1173,7 @@ BoussinesqFlowProblem::assemble_stokes_preconditioner () { stokes_preconditioner_matrix = 0; - QGauss quadrature_formula(degree+2); + QGauss quadrature_formula(stokes_degree+2); FEValues stokes_fe_values (stokes_fe, quadrature_formula, update_JxW_values | update_values | @@ -1400,8 +1402,8 @@ void BoussinesqFlowProblem::assemble_stokes_system () stokes_rhs=0; - QGauss quadrature_formula(degree+2); - QGauss face_quadrature_formula(degree+2); + QGauss quadrature_formula(stokes_degree+2); + QGauss face_quadrature_formula(stokes_degree+2); FEValues stokes_fe_values (stokes_fe, quadrature_formula, update_values | @@ -1777,7 +1779,7 @@ void BoussinesqFlowProblem::assemble_temperature_system () temperature_matrix = 0; temperature_rhs = 0; - QGauss quadrature_formula(degree+2); + QGauss quadrature_formula(temperature_degree+2); FEValues temperature_fe_values (temperature_fe, quadrature_formula, update_values | update_gradients | update_hessians | @@ -2152,7 +2154,7 @@ void BoussinesqFlowProblem::output_results () const data_out.add_data_vector (joint_solution, joint_solution_names, DataOut::type_dof_data, data_component_interpretation); - data_out.build_patches (degree); + data_out.build_patches (std::max(stokes_degree, temperature_degree)); std::ostringstream filename; filename << "solution-" << Utilities::int_to_string(timestep_number, 4) << ".vtk"; @@ -2170,7 +2172,7 @@ void BoussinesqFlowProblem::refine_mesh (const unsigned int max_grid_level) Vector estimated_error_per_cell (triangulation.n_active_cells()); KellyErrorEstimator::estimate (temperature_dof_handler, - QGauss(degree+1), + QGauss(temperature_degree+1), typename FunctionMap::type(), temperature_solution, estimated_error_per_cell); @@ -2218,7 +2220,7 @@ void BoussinesqFlowProblem::refine_mesh (const unsigned int max_grid_level) template double BoussinesqFlowProblem::get_maximal_velocity () const { - QGauss quadrature_formula(degree+2); + QGauss quadrature_formula(stokes_degree+2); const unsigned int n_q_points = quadrature_formula.size(); @@ -2257,7 +2259,7 @@ double BoussinesqFlowProblem::get_maximal_velocity () const template double BoussinesqFlowProblem::get_maximal_temperature () const { - QGauss quadrature_formula(degree+2); + QGauss quadrature_formula(temperature_degree+2); const unsigned int n_q_points = quadrature_formula.size(); FEValues fe_values (temperature_fe, quadrature_formula, @@ -2311,7 +2313,7 @@ void BoussinesqFlowProblem::run () VectorTools::project (temperature_dof_handler, temperature_constraints, - QGauss(degree+2), + QGauss(temperature_degree+2), TemperatureInitialValues(), old_temperature_solution);