From 89e564e7d4858f5325b6b6420f01b6c612b1791b Mon Sep 17 00:00:00 2001 From: Luca Heltai Date: Tue, 12 Jan 2021 23:52:34 +0100 Subject: [PATCH] Modify step-70 to use new enter_subsection() --- examples/step-70/step-70.cc | 52 ++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 30 deletions(-) diff --git a/examples/step-70/step-70.cc b/examples/step-70/step-70.cc index e887674939..165f7c0798 100644 --- a/examples/step-70/step-70.cc +++ b/examples/step-70/step-70.cc @@ -383,45 +383,37 @@ namespace Step70 // solid domain, and `Particle grid` is used to distribute some tracer // particles, that are advected with the velocity and only used as // passive tracers. - enter_my_subsection(this->prm); - this->prm.enter_subsection("Grid generation"); + enter_subsection("Grid generation"); { - this->prm.add_parameter("Fluid grid generator", name_of_fluid_grid); - this->prm.add_parameter("Fluid grid generator arguments", - arguments_for_fluid_grid); + add_parameter("Fluid grid generator", name_of_fluid_grid); + add_parameter("Fluid grid generator arguments", arguments_for_fluid_grid); - this->prm.add_parameter("Solid grid generator", name_of_solid_grid); - this->prm.add_parameter("Solid grid generator arguments", - arguments_for_solid_grid); + add_parameter("Solid grid generator", name_of_solid_grid); + add_parameter("Solid grid generator arguments", arguments_for_solid_grid); - this->prm.add_parameter("Particle grid generator", name_of_particle_grid); - this->prm.add_parameter("Particle grid generator arguments", - arguments_for_particle_grid); + add_parameter("Particle grid generator", name_of_particle_grid); + add_parameter("Particle grid generator arguments", + arguments_for_particle_grid); } - this->prm.leave_subsection(); - leave_my_subsection(this->prm); + leave_subsection(); - enter_my_subsection(this->prm); - this->prm.enter_subsection("Refinement and remeshing"); + enter_subsection("Refinement and remeshing"); { - this->prm.add_parameter("Refinement step frequency", - refinement_frequency); - this->prm.add_parameter("Refinement maximal level", max_level_refinement); - this->prm.add_parameter("Refinement minimal level", min_level_refinement); - this->prm.add_parameter("Refinement strategy", - refinement_strategy, - "", - Patterns::Selection( - "fixed_fraction|fixed_number")); - this->prm.add_parameter("Refinement coarsening fraction", - coarsening_fraction); - this->prm.add_parameter("Refinement fraction", refinement_fraction); - this->prm.add_parameter("Maximum number of cells", max_cells); + add_parameter("Refinement step frequency", refinement_frequency); + add_parameter("Refinement maximal level", max_level_refinement); + add_parameter("Refinement minimal level", min_level_refinement); + add_parameter("Refinement strategy", + refinement_strategy, + "", + this->prm, + Patterns::Selection("fixed_fraction|fixed_number")); + add_parameter("Refinement coarsening fraction", coarsening_fraction); + add_parameter("Refinement fraction", refinement_fraction); + add_parameter("Maximum number of cells", max_cells); } - this->prm.leave_subsection(); - leave_my_subsection(this->prm); + leave_subsection(); // The final task is to correct the default dimension for the right hand // side function and define a meaningful default angular velocity instead of -- 2.39.5