Skip to content

Commit

Permalink
Remove now redundant namespace identifier.
Browse files Browse the repository at this point in the history
  • Loading branch information
@marcfehling
marcfehling committed Aug 8, 2022
1 parent 8a24c52 commit 3d02dc1
Show file tree
Hide file tree
Showing 3 changed files with 117 additions and 149 deletions.
66 changes: 31 additions & 35 deletions include/deal.II/hp/refinement.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ namespace hp
*/
template <int dim, int spacedim>
void
full_p_adaptivity(const dealii::DoFHandler<dim, spacedim> &dof_handler);
full_p_adaptivity(const DoFHandler<dim, spacedim> &dof_handler);

/**
* Adapt which finite element to use on cells that have been specifically
Expand All @@ -172,9 +172,8 @@ namespace hp
*/
template <int dim, int spacedim>
void
p_adaptivity_from_flags(
const dealii::DoFHandler<dim, spacedim> &dof_handler,
const std::vector<bool> & p_flags);
p_adaptivity_from_flags(const DoFHandler<dim, spacedim> &dof_handler,
const std::vector<bool> & p_flags);

/**
* Adapt which finite element to use on cells whose criteria meet a certain
Expand Down Expand Up @@ -204,10 +203,10 @@ namespace hp
template <int dim, typename Number, int spacedim>
void
p_adaptivity_from_absolute_threshold(
const dealii::DoFHandler<dim, spacedim> &dof_handler,
const Vector<Number> & criteria,
const Number p_refine_threshold,
const Number p_coarsen_threshold,
const DoFHandler<dim, spacedim> &dof_handler,
const Vector<Number> & criteria,
const Number p_refine_threshold,
const Number p_coarsen_threshold,
const ComparisonFunction<typename identity<Number>::type>
&compare_refine = std::greater_equal<Number>(),
const ComparisonFunction<typename identity<Number>::type>
Expand Down Expand Up @@ -247,10 +246,10 @@ namespace hp
template <int dim, typename Number, int spacedim>
void
p_adaptivity_from_relative_threshold(
const dealii::DoFHandler<dim, spacedim> &dof_handler,
const Vector<Number> & criteria,
const double p_refine_fraction = 0.5,
const double p_coarsen_fraction = 0.5,
const DoFHandler<dim, spacedim> &dof_handler,
const Vector<Number> & criteria,
const double p_refine_fraction = 0.5,
const double p_coarsen_fraction = 0.5,
const ComparisonFunction<typename identity<Number>::type>
&compare_refine = std::greater_equal<Number>(),
const ComparisonFunction<typename identity<Number>::type>
Expand Down Expand Up @@ -291,10 +290,10 @@ namespace hp
template <int dim, typename Number, int spacedim>
void
p_adaptivity_fixed_number(
const dealii::DoFHandler<dim, spacedim> &dof_handler,
const Vector<Number> & criteria,
const double p_refine_fraction = 0.5,
const double p_coarsen_fraction = 0.5,
const DoFHandler<dim, spacedim> &dof_handler,
const Vector<Number> & criteria,
const double p_refine_fraction = 0.5,
const double p_coarsen_fraction = 0.5,
const ComparisonFunction<typename identity<Number>::type>
&compare_refine = std::greater_equal<Number>(),
const ComparisonFunction<typename identity<Number>::type>
Expand Down Expand Up @@ -328,9 +327,8 @@ namespace hp
*/
template <int dim, typename Number, int spacedim>
void
p_adaptivity_from_regularity(
const dealii::DoFHandler<dim, spacedim> &dof_handler,
const Vector<Number> & sobolev_indices);
p_adaptivity_from_regularity(const DoFHandler<dim, spacedim> &dof_handler,
const Vector<Number> &sobolev_indices);

/**
* Adapt which finite element to use on each cell based on how its criterion
Expand All @@ -355,7 +353,7 @@ namespace hp
template <int dim, typename Number, int spacedim>
void
p_adaptivity_from_reference(
const dealii::DoFHandler<dim, spacedim> & dof_handler,
const DoFHandler<dim, spacedim> & dof_handler,
const Vector<Number> & criteria,
const Vector<Number> & references,
const ComparisonFunction<typename identity<Number>::type> &compare_refine,
Expand Down Expand Up @@ -592,12 +590,12 @@ namespace hp
*/
template <int dim, typename Number, int spacedim>
void
predict_error(const dealii::DoFHandler<dim, spacedim> &dof_handler,
const Vector<Number> & error_indicators,
Vector<Number> & predicted_errors,
const double gamma_p = std::sqrt(0.4),
const double gamma_h = 2.,
const double gamma_n = 1.);
predict_error(const DoFHandler<dim, spacedim> &dof_handler,
const Vector<Number> & error_indicators,
Vector<Number> & predicted_errors,
const double gamma_p = std::sqrt(0.4),
const double gamma_h = 2.,
const double gamma_n = 1.);

/**
* @}
Expand All @@ -621,7 +619,7 @@ namespace hp
*/
template <int dim, int spacedim>
void
force_p_over_h(const dealii::DoFHandler<dim, spacedim> &dof_handler);
force_p_over_h(const DoFHandler<dim, spacedim> &dof_handler);

/**
* Choose p-adaptivity over h-adaptivity whenever it is invoked on all
Expand Down Expand Up @@ -669,7 +667,7 @@ namespace hp
*/
template <int dim, int spacedim>
void
choose_p_over_h(const dealii::DoFHandler<dim, spacedim> &dof_handler);
choose_p_over_h(const DoFHandler<dim, spacedim> &dof_handler);

/**
* @}
Expand Down Expand Up @@ -714,10 +712,9 @@ namespace hp
*/
template <int dim, int spacedim>
bool
limit_p_level_difference(
const dealii::DoFHandler<dim, spacedim> &dof_handler,
const unsigned int max_difference = 1,
const unsigned int contains_fe_index = 0);
limit_p_level_difference(const DoFHandler<dim, spacedim> &dof_handler,
const unsigned int max_difference = 1,
const unsigned int contains_fe_index = 0);

/**
* Transfer all future FE indices from the DoFHandler object
Expand All @@ -733,9 +730,8 @@ namespace hp
*/
template <int dim, int spacedim>
unsigned int
copy_future_fe_indices(
const dealii::DoFHandler<dim, spacedim> &dof_handler_source,
dealii::DoFHandler<dim, spacedim> & dof_handler_destination);
copy_future_fe_indices(const DoFHandler<dim, spacedim> &dof_handler_source,
DoFHandler<dim, spacedim> &dof_handler_destination);

/**
* @}
Expand Down

0 comments on commit 3d02dc1

Please sign in to comment.