Add fastscapelib (C++) integration #6204

benbovy · 2025-01-15T11:20:52Z

Related to #5323.

Experimenting with Fastscapelib's flexible grid interface so it is possible to run a Fastscape landscape evolution model based on (any?) deal.ii triangulation used through ASPECT.

cc @MFraters @Minerallo

Before your first pull request:

I have read the guidelines in our CONTRIBUTING.md document.

For all pull requests:

I have followed the instructions for indenting my code.

For new features/models or changes of existing features:

I have tested my new feature locally to ensure it is correct.
I have created a testcase for the new feature/benchmark in the tests/ directory.
I have added a changelog entry in the doc/modules/changes directory that will inform other users of my change.

Fastscapelib and Xtensor are treated as external dependencies (using find_package in the CMake configuration).

…o add-fastscapelib-cpp-integration

and build aspect with fastscapelib

Agnostic from the wrapped DEAL.II triangulation type.

Motly removing parts of the FastScape (fastscapelib-fortran) plugin that are irrelevant here.

benbovy · 2025-01-22T12:14:05Z

I've made some progress and cleaned up a few things:

The grid adapter class dealii_grid (in fastscapecc_adapter.h) should now work with most DEAL.II meshes (at least that's the idea). The only constraint is to have a uniform mesh with constant cell area (passed explicitly to the grid adapter constructor).
I cleaned up and removed a lot of things inherited from the FastScape plugin (i.e., the one already available in Aspect that uses fastscapelib-fortran). This includes removing plugin parameters and data members for initializing the surface mesh, which we should now get from the geometry model object instead (as implemented for both the box and spherical shell models, although the refinement levels are not correctly defined yet).
- In particular, there were some geometry model parameters (re-)declared in the plugin's declare_parameters method... Not sure why since those are already declared in Aspect's geometry model component? We can add them back if needed.

benbovy · 2025-01-22T12:23:05Z

include/aspect/mesh_deformation/fastscapecc.h

+        // TODO: reuse Fastscapecc's ``dim`` template parameter here?
+        // (in theory Fastscapelib C++ may support both 1D and 2D surface domains)
+        using SurfaceMeshType = Triangulation<2, 3>;


I don't know if this is something available in Aspect, but in theory it would be possible to support a 2-dimensional "disk" geometry model and run this plugin (fastscape erosion) on the 1-dimensional "circle" boundary. I guess that for the general case we could write this instead?

using SurfaceMeshType = Triangulation<dim-1, dim>

Is should be <dim-1,dim>, yes

benbovy · 2025-01-22T12:29:59Z

source/mesh_deformation/fastscapecc.cc

+      // surface_constraints.distribute(surface_solution);
+
+      // Temporary storage for computation
+      std::vector<std::vector<double>> temporary_variables(dim + 2, std::vector<double>());


nit: using nested vectors seems unnecessary in my opinion. We could use separate variables instead, which is more readable.

Future proof in case the plugin later supports aspect simulations on 2-dimensional domains (i.e., FastScapecc<2>) Use SFINAE to select the right implementation of surface mesh initialization from the input geometry model (still need to check SFINAE substitution order). Using "if constexpr" would have been better but Aspect seems to still use C++14 as the lowest required standard. Also cleaned up header includes and fastscapelib grid adapter.

We don't really need it. We can downcast the geometry model object instead.

std::is_same_v is from C++17 onward.

Minerallo and others added 30 commits January 15, 2025 09:19

Add fastscapelib xtensor xtl to contrib and Cmakelist

e7dc2d1

add interface fastcapecc.cc .h and prm in cookbook

8c016e7

replaced hard variables back

abbfe0f

add test case fastscape_eroding_box_cc.prm

2308b65

add test repository and output_screen

857afab

correction of V in m/s

9fc768f

add mpi communication

7c7f828

add trimesh and spherical geometry

2c649a9

reactivate box geometry

d00dacd

rebased ASPECT and remove std::cout messages

4e38e3a

update fastscapelib

8ef7c21

update with Healpix

3d4090a

add healpix_cxx library

fc6a048

Healpix library with box coupling

365d90e

error correction and grid_box = std::make_unique to figure out

81fc75b

add modules cmake healpix brew

fb4d0b6

add assert if box of shell

ec934d1

setting index nsides

1ca89d0

array size

07bda86

no mst sink

ec5081d

timestep to test

5147666

If you read this please send help

7ade8d8

add mpirun path and addtional modelule to load

5f9a868

use radial velocity

c72b29f

add fastscapelib cmake config

557029e

Add initial fastscape dealii adapter.

6c881cc

add fastscapelib cmake config

7340ada

indent

e4b0575

Merge branch 'coupling_fs_adapter' into add-fastscapelib-cpp-integration

4bb6352

remove fastscapelib, xtensor and healpix sources

614fdef

Fastscapelib and Xtensor are treated as external dependencies (using find_package in the CMake configuration).

benbovy and others added 13 commits January 16, 2025 16:02

cmake: remove fastscapelib xtensor included from contrib

51e843a

cmake: remove healpix support

07f9016

cleanup and fixes (fastscapelib stable version)

bad804e

clean-up (remove healpix)

c637ad3

add back fastscape (fortran) python VTK script

a9f6876

tried ito interpolate to higher resolution

0449818

Merge remote-tracking branch 'Minerallo/coupling_fs_updated15jan' int…

e66ef84

…o add-fastscapelib-cpp-integration

indent + some cleanup

5d4fb60

temp link error dirty fix

78479d8

add temporary instructions to install fastsacpelib

74b8d08

and build aspect with fastscapelib

nit

4cde3e6

make fastscapelib grid adapater more agnostic

ed95139

Agnostic from the wrapped DEAL.II triangulation type.

clean-up

0601980

Motly removing parts of the FastScape (fastscapelib-fortran) plugin that are irrelevant here.

benbovy commented Jan 22, 2025

View reviewed changes

benbovy added 3 commits January 23, 2025 11:44

remove GeometryType

b172233

We don't really need it. We can downcast the geometry model object instead.

C++14 support

a484377

std::is_same_v is from C++17 onward.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add fastscapelib (C++) integration #6204

Add fastscapelib (C++) integration #6204

benbovy commented Jan 15, 2025 •

edited

Loading

benbovy commented Jan 22, 2025 •

edited

Loading

benbovy Jan 22, 2025

tjhei Jan 22, 2025

benbovy Jan 22, 2025

Add fastscapelib (C++) integration #6204

Are you sure you want to change the base?

Add fastscapelib (C++) integration #6204

Conversation

benbovy commented Jan 15, 2025 • edited Loading

Before your first pull request:

For all pull requests:

For new features/models or changes of existing features:

benbovy commented Jan 22, 2025 • edited Loading

benbovy Jan 22, 2025

Choose a reason for hiding this comment

tjhei Jan 22, 2025

Choose a reason for hiding this comment

benbovy Jan 22, 2025

Choose a reason for hiding this comment

benbovy commented Jan 15, 2025 •

edited

Loading

benbovy commented Jan 22, 2025 •

edited

Loading