- Downloads
Merge branch 'master' into parameter_file_in_snapshot
Conflicts: src/engine.c fixdt kick changes.
Showing
- examples/CosmoVolume/cosmoVolume.yml 4 additions, 1 deletionexamples/CosmoVolume/cosmoVolume.yml
- examples/ExternalPointMass/externalPointMass.yml 4 additions, 1 deletionexamples/ExternalPointMass/externalPointMass.yml
- examples/SedovBlast/sedov.yml 4 additions, 1 deletionexamples/SedovBlast/sedov.yml
- examples/SodShock/sodShock.yml 4 additions, 1 deletionexamples/SodShock/sodShock.yml
- examples/UniformBox/uniformBox.yml 4 additions, 1 deletionexamples/UniformBox/uniformBox.yml
- examples/main.c 16 additions, 15 deletionsexamples/main.c
- examples/parameter_example.yml 4 additions, 1 deletionexamples/parameter_example.yml
- examples/plot_tasks.py 3 additions, 2 deletionsexamples/plot_tasks.py
- examples/plot_tasks_MPI.py 3 additions, 2 deletionsexamples/plot_tasks_MPI.py
- src/Makefile.am 2 additions, 1 deletionsrc/Makefile.am
- src/cell.h 1 addition, 1 deletionsrc/cell.h
- src/debug.c 2 additions, 1 deletionsrc/debug.c
- src/drift.h 100 additions, 0 deletionssrc/drift.h
- src/engine.c 217 additions, 100 deletionssrc/engine.c
- src/engine.h 10 additions, 1 deletionsrc/engine.h
- src/hydro/Default/hydro.h 4 additions, 3 deletionssrc/hydro/Default/hydro.h
- src/hydro/Gadget2/hydro.h 7 additions, 4 deletionssrc/hydro/Gadget2/hydro.h
- src/hydro/Gadget2/hydro_io.h 2 additions, 2 deletionssrc/hydro/Gadget2/hydro_io.h
- src/hydro/Minimal/hydro.h 5 additions, 11 deletionssrc/hydro/Minimal/hydro.h
- src/hydro/Minimal/hydro_iact.h 11 additions, 17 deletionssrc/hydro/Minimal/hydro_iact.h
Loading
Please sign in to comment