Skip to content
Snippets Groups Projects
Commit b987f19d authored by WAUTELET Philippe's avatar WAUTELET Philippe
Browse files

Merge branch 'MNH-55X-dev-OPENACC' into MNH-55X-dev-OPENACC-FFT

# Conflicts:
#	src/MNH/advection_metsv.f90
#	src/MNH/advection_uvw.f90
#	src/MNH/ice4_fast_rg.f90
#	src/MNH/turb.f90
#	src/ZSOLVER/advection_uvw_cen.f90
#	src/ZSOLVER/dyn_sources.f90
#	src/ZSOLVER/gdiv.f90
#	src/ZSOLVER/get_halo.f90
#	src/ZSOLVER/pressurez.f90
#	src/ZSOLVER/rain_ice_red.f90
#	src/ZSOLVER/turb.f90
parents 00ebd599 1fd2acd8
No related branches found
No related tags found
No related merge requests found
Showing
with 223 additions and 308 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment