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

6ad43f47

Commit 6ad43f47 authored 6 years ago by Matthieu Schaller

Downloads
- Plain Diff

Merge branch 'black_hole_tasks' into star_formation_mpi_comms

Conflicts:
	tools/task_plots/analyse_tasks.py
	tools/task_plots/plot_tasks.py

parents 5ee42c0f 9355dbdd

Branches

Tags

1 merge request!805Communication tasks for on-the-fly star formation

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

examples/HydroTests/SodShock_3D/sodShock.yml 3 additions, 0 deletions

examples/HydroTests/SodShock_3D/sodShock.yml
examples/parameter_example.yml 1 addition, 1 deletion

examples/parameter_example.yml
src/engine.c 4 additions, 2 deletions

src/engine.c
src/engine_maketasks.c 0 additions, 1 deletion

src/engine_maketasks.c
src/space.c 2 additions, 0 deletions

src/space.c
tools/task_plots/analyse_tasks.py 2 additions, 0 deletions

tools/task_plots/analyse_tasks.py
tools/task_plots/plot_tasks.py 6 additions, 0 deletions

tools/task_plots/plot_tasks.py

with 18 additions and 4 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