-
Notifications
You must be signed in to change notification settings - Fork 258
[WIP] Fastscape c++ integration with adapter #6389
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.
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
Open
Minerallo
wants to merge
123
commits into
geodynamics:main
Choose a base branch
from
Minerallo:add-fastscapelib-cpp-integration_copy
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
123 commits
Select commit
Hold shift + click to select a range
42a27b3
add fastscapelib cmake config
benbovy 14087d8
Add fastscapelib xtensor xtl to contrib and Cmakelist
Minerallo bb2724b
add interface fastcapecc.cc .h and prm in cookbook
Minerallo cceca11
replaced hard variables back
Minerallo 2cc8d89
add test case fastscape_eroding_box_cc.prm
Minerallo 557cffd
add test repository and output_screen
Minerallo efa08cf
correction of V in m/s
Minerallo 9c1047c
add mpi communication
Minerallo c73469c
add trimesh and spherical geometry
Minerallo e25afd9
reactivate box geometry
Minerallo a7611ec
rebased ASPECT and remove std::cout messages
Minerallo 55514ab
update fastscapelib
Minerallo 7995eb2
update with Healpix
Minerallo bdc2c0c
add healpix_cxx library
Minerallo 0998c50
Healpix library with box coupling
Minerallo 7876461
error correction and grid_box = std::make_unique to figure out
Minerallo 6a31835
add modules cmake healpix brew
Minerallo 1217b44
add assert if box of shell
Minerallo 97dccf2
setting index nsides
Minerallo 2dc4619
array size
Minerallo d6041bd
no mst sink
MFraters 5b16c19
timestep to test
Minerallo 4ae27d7
If you read this please send help
MFraters 2a369ba
add mpirun path and addtional modelule to load
Minerallo cb01fbd
use radial velocity
Minerallo b0466c0
Add initial fastscape dealii adapter.
MFraters c2a90c5
indent
MFraters 2e99573
remove fastscapelib, xtensor and healpix sources
benbovy bdeb3d2
cmake: remove fastscapelib xtensor included from contrib
benbovy caf31fc
cmake: remove healpix support
benbovy fb094f6
cleanup and fixes (fastscapelib stable version)
benbovy df7a739
clean-up (remove healpix)
benbovy 433eddb
add back fastscape (fortran) python VTK script
benbovy a37729e
update and resolve conflicts
Minerallo a49d70f
indent + some cleanup
benbovy 569433a
temp link error dirty fix
benbovy 0fff693
add temporary instructions to install fastsacpelib
benbovy b82cf34
nit
benbovy b4997af
make fastscapelib grid adapater more agnostic
benbovy 113a73b
clean-up
benbovy e0d2f56
refactor init surface mesh
benbovy 29fbbc4
remove GeometryType
benbovy 86fe4d7
C++14 support
benbovy 4b936a2
Restore fastscapecc_adapter.h from fastscape adapter commit
Minerallo a0a51ff
Restore latest fastscapecc_adapter.h from commit 9745776 (refactor in…
Minerallo 8338271
updated Benoit Branch
Minerallo bb7b926
add fastscape iteration and support for 2D in adapter.h
Minerallo 7f385aa
change back to dynamic cast for model geonetry
Minerallo ded3ebd
address benoit comment fixed value and flow graph
Minerallo 9414548
add init surface mesh for box
Minerallo 0b3da11
add back condition for box or sphere geometry
Minerallo 962ee9b
correct elevation init
Minerallo 8348a7d
Also make sure the XTL headers can be found.
bangerth 1a32cab
Fix the copyright header.
bangerth 4dfa1ca
add copyright to adapter and remove pout messages
Minerallo ba9edb7
update h _vz problem
Minerallo 83320b0
push to make PR WIP
Minerallo d36e812
Deal with the fact that Xtensor moved all of its header files.
bangerth a7656b3
Account for the fact that FastScape has removed some files after 0.2.2.
bangerth 4385cb8
add projected velocity and radial velocity to projected_solution_surf…
Minerallo bf08ae3
added mapping for vertex_index for spherical
Minerallo 98e9c06
change back to surface_solution projection and add additional refinement
Minerallo c85282b
fixed surface_elevation
Minerallo 9f57401
fix model extent and repetition for topography calculation
Minerallo 619c3b4
removed not used variables
Minerallo ce51b13
Avoid the use of a deprecated function.
bangerth d459e20
Add a set of necessary braces.
bangerth 87b99ce
Slightly improve the documentation of the FastScapeCC couplers.
bangerth 3969d51
Convert the 'surface_fe' variable into a non-pointer.
bangerth 4fe148d
Merge the init_surface_mesh() functions into one.
bangerth c39320e
Move common code out of the if-else branches.
bangerth 326ce9c
Add an assertion.
bangerth 7431ca7
Leave a TODO.
bangerth d38a49d
Minor edits + some TODOs for project_surface_solution().
bangerth 98db3bc
Limit the scope of some variables.
bangerth c53574b
Add documentation and a TODO.
bangerth 7189a6d
Leave several more TODOs.
bangerth 89ec826
change for n_used_vertices
Minerallo 0740232
made surface_velocity_solution and surface_height local variables for…
Minerallo 74abd77
Use the gravity model to obtain a vertical direction
Minerallo c1524c4
Use parallel distributed Triangulation for surface mesh
Minerallo d711623
Query the velocity from Dofs using introspection
Minerallo 6344e5b
remove to do distributed triangulation
Minerallo b1d6fdb
fixed dx dy calculation
Minerallo c8c0002
Remove two unused variables.
bangerth 8cdd327
tried debugging and print statement
Minerallo 6dbbcf5
indent
Minerallo 6dc999a
indent and back to old picking value for interpolation
Minerallo 3c4e1dc
add back height variable missing
Minerallo 6935a41
format Fastscape variable with mesh grid.shape
Minerallo 54d607f
fastscape working but error when solving mesh displacement
Minerallo 094d001
add visualization for fastscape
Minerallo a37293f
add fastscape visualisation repository for 1 aspect timestep test
Minerallo 406678f
correction fastscape visualisation for timestep 0
Minerallo b0c85fc
add sinker resolver
Minerallo 0af1910
add diffusion_eroder but doesn't seems usefull with dealii grid adapter
Minerallo 031bfb5
Remove unused variables.
bangerth 4cde447
Remove comment that is no longer needed.
bangerth cf9bbf4
Only compile files when with FastScape++.
bangerth 77b4607
Also export whether we are building with FastScape++.
bangerth 0afabff
deactivate error OFF message during cmake
Minerallo 58c55cf
Merge branch 'main' into add-fastscapelib-cpp-integration_copy
Minerallo 2453282
Leave more TODOs.
bangerth 115881f
correct V unit to m/s and rename grid_extent to Box grid_extent
bangerth 11ccf3e
declare box_grid_extent and rename cell to volume_cell
Minerallo 6a4d926
rename cell
Minerallo 316bbf8
uplift rate in m/s for Fastscape
Minerallo 4186fe0
box working with brut values in flow function
Minerallo 9d00b91
corrected visualisation and made elevation mutable
Minerallo 47151ba
rename variable m and n
Minerallo 4ea2cb1
based node fixed thought function, uplift rate corrected for xt::array
Minerallo 7841b4c
add visu function for later commented
Minerallo 97123f7
MPI send the data place before receiving them
Minerallo d8a8f6c
Use deal.II's send/receive functionality over MPI's.
bangerth 1b66e0b
Make sure we can actually query the compile guards.
bangerth 0997f1f
Leave more comments and TODOs.
bangerth aa074f6
Address some comments.
bangerth e6fee9a
Indent according to our usual scheme.
bangerth 41c579f
Add some compatibility classes.
bangerth ce49957
Ensure we use the vertical direction, not the z-direction.
bangerth 4f8f097
Merge pull request #1 from bangerth/add-fastscapelib-cpp-integration_…
Minerallo 8666176
tried adding multimap
Minerallo a8ea6ea
make multimap with isend working
Minerallo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The values make more sense than the variables,
m(area exponent) andn(slope exponent) were flipped. The right order is:(side note: this is also why I prefer the names
area_exp/slope_expoverm/nto avoid confusion and one character variable names).