Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fastscape: Rename Qtrapez function, fix some warnings, and add stabilization flag. #5530

Merged
merged 1 commit into from
Dec 25, 2023
Merged

Fastscape: Rename Qtrapez function, fix some warnings, and add stabilization flag. #5530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 7 additions & 2 deletions include/aspect/mesh_deformation/fastscape.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,12 @@ namespace aspect
void
compute_velocity_constraints_on_boundary(const DoFHandler<dim> &mesh_deformation_dof_handler,
AffineConstraints<double> &mesh_velocity_constraints,
const std::set<types::boundary_id> &boundary_id) const;
const std::set<types::boundary_id> &boundary_id) const override;

/**
* Returns whether or not the plugin requires surface stabilization
*/
bool needs_surface_stabilization () const override;

/**
* Declare parameters for the FastScape plugin.
Expand All @@ -75,7 +80,7 @@ namespace aspect
/**
* Parse parameters for the FastScape plugin.
*/
void parse_parameters (ParameterHandler &prm);
void parse_parameters (ParameterHandler &prm) override;

private:
/**
Expand Down
14 changes: 13 additions & 1 deletion source/mesh_deformation/fastscape.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@ namespace aspect
std::vector<std::vector<double>> local_aspect_values(dim+2, std::vector<double>());

// Get a quadrature rule that exists only on the corners, and increase the refinement if specified.
const QIterated<dim-1> face_corners (QTrapez<1>(),
const QIterated<dim-1> face_corners (QTrapezoid<1>(),
std::pow(2,additional_refinement_levels+surface_refinement_difference));

FEFaceValues<dim> fe_face_values (this->get_mapping(),
Expand Down Expand Up @@ -1549,6 +1549,18 @@ namespace aspect
out_silt_fraction << buffer_silt_fraction.str();
}



template <int dim>
bool
FastScape<dim>::
needs_surface_stabilization () const
{
return true;
}



template <int dim>
void FastScape<dim>::declare_parameters(ParameterHandler &prm)
{
Expand Down