Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

SWIFTsim
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents

Snippets Groups Projects

c8be4935

Commit c8be4935 authored 8 years ago by Pedro Gonnet

Downloads
- Plain Diff

Merge branch 'new_timeline_mpi' of gitlab.cosma.dur.ac.uk:swift/swiftsim into new_timeline_mpi

Conflicts:
	src/task.c

parents 73da4be8 8e3f584c

No related branches found

No related tags found

2 merge requests!304Star particle infrastructure,!303MPI send/recv fixes for inactive cells

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

examples/CoolingHaloWithSpin/cooling_halo.yml 6 additions, 6 deletions

examples/CoolingHaloWithSpin/cooling_halo.yml
examples/CoolingHaloWithSpin/run.sh 2 additions, 1 deletion

examples/CoolingHaloWithSpin/run.sh
src/debug.c 40 additions, 20 deletions

src/debug.c
src/engine.c 15 additions, 7 deletions

src/engine.c
src/engine.h 1 addition, 1 deletion

src/engine.h
src/hydro/Default/hydro.h 65 additions, 53 deletions

src/hydro/Default/hydro.h
src/hydro/Default/hydro_debug.h 2 additions, 3 deletions

src/hydro/Default/hydro_debug.h
src/hydro/Default/hydro_part.h 3 additions, 6 deletions

src/hydro/Default/hydro_part.h
src/runner.c 15 additions, 1 deletion

src/runner.c
src/scheduler.c 6 additions, 3 deletions

src/scheduler.c
src/timestep.h 13 additions, 13 deletions

src/timestep.h

with 168 additions and 114 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 sign in to comment