Skip to content

Minor clean-ups to the FastScape interfaces. #6723

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

Merged
merged 2 commits into from
Nov 3, 2025
Merged

Minor clean-ups to the FastScape interfaces. #6723

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1628f66
Minor clean-ups to the FastScape interfaces.
bangerth Oct 21, 2025
9772085
Name a variable 'dummy' that is a dummy variable.
bangerth Oct 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 23 additions & 18 deletions source/mesh_deformation/fastscape.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ namespace aspect
&sand_transport_coefficient,
&silt_transport_coefficient);

// generate a combined array for kf kd both onshore and offshore
// generate a combined array for kf and kd both onshore and offshore
std::vector<double> combined_kd(fastscape_array_size);
std::vector<double> combined_kf(fastscape_array_size);
for (unsigned int i = 0; i < fastscape_array_size; ++i)
Expand All @@ -515,7 +515,7 @@ namespace aspect
{
combined_kf[i] = sediment_river_incision_rate;
combined_kd[i] = sediment_transport_coefficient;
};
}
}

// select additional output for Fastscape vtu
Expand Down Expand Up @@ -558,24 +558,27 @@ namespace aspect
mesh_velocity_z[i] = (elevation[i] - elevation_old[i])/aspect_timestep_in_years;
}
else
// For ranks other than the root:
{
// add a declare for kd
std::vector<double> bedrock_transport_coefficient_array(fastscape_array_size);
for (unsigned int i=0; i<local_aspect_values.size(); ++i)
MPI_Ssend(&local_aspect_values[i][0], local_aspect_values[1].size(), MPI_DOUBLE, 0, 42, this->get_mpi_communicator());
MPI_Ssend(&local_aspect_values[i][0], local_aspect_values[i].size(), MPI_DOUBLE,
/* destination is root= */ 0,
/* tag= */ 42,
this->get_mpi_communicator());

// Check whether the FastScape mesh was filled with data.
const bool fastscape_mesh_filled = Utilities::MPI::broadcast (this->get_mpi_communicator(), true, 0);
if (fastscape_mesh_filled != true)
throw aspect::QuietException();

// This is called solely so we can set the timer and will return immediately.
std::vector<double> dummy(fastscape_array_size);
execute_fastscape(mesh_velocity_z,
mesh_velocity_z,
mesh_velocity_z,
mesh_velocity_z,
mesh_velocity_z,
bedrock_transport_coefficient_array,
dummy,
aspect_timestep_in_years,
fastscape_steps_per_aspect_step);
}
Expand All @@ -585,14 +588,15 @@ namespace aspect
// that will be interpolated back to ASPECT. We need this table on all
// processes, and can achieve this goal by first filling it on the root process,
// and then replicating it on all processes (if possible using shared memory).
TableIndices<dim> size_idx;
for (unsigned int d=0; d<dim; ++d)
size_idx[d] = table_intervals[d]+1;

Table<dim,double> velocity_table;
if (Utilities::MPI::this_mpi_process(this->get_mpi_communicator()) == 0)
velocity_table = fill_data_table(mesh_velocity_z, size_idx, fastscape_nx, fastscape_ny);
{
TableIndices<dim> size_idx;
for (unsigned int d=0; d<dim; ++d)
size_idx[d] = table_intervals[d]+1;

velocity_table = fill_data_table(mesh_velocity_z, size_idx, fastscape_nx, fastscape_ny);
}
velocity_table.replicate_across_communicator (this->get_mpi_communicator(),
/*root_process=*/0);

Expand All @@ -608,9 +612,9 @@ namespace aspect
// Then create a function that can be interpolated from the data table.
// Use move semantics to ensure that we keep using the replicated
// table:
Functions::InterpolatedUniformGridData<dim> velocities (std::move(interpolation_extent),
std::move(table_intervals),
std::move(velocity_table));
const Functions::InterpolatedUniformGridData<dim> velocities (std::move(interpolation_extent),
std::move(table_intervals),
std::move(velocity_table));

VectorFunctionFromScalarFunctionObject<dim> vector_function_object(
[&](const Point<dim> &p) -> double
Expand All @@ -620,10 +624,11 @@ namespace aspect
dim-1,
dim);

VectorTools::interpolate_boundary_values (mesh_deformation_dof_handler,
*boundary_ids.begin(),
vector_function_object,
mesh_velocity_constraints);
for (const types::boundary_id boundary : boundary_ids)
VectorTools::interpolate_boundary_values (mesh_deformation_dof_handler,
boundary,
vector_function_object,
mesh_velocity_constraints);

this->get_computing_timer().leave_subsection("FastScape plugin");
}
Expand Down