-
- Downloads
Merge branch 'mpi_stars2_matthieu' into eagle-stellar-evolution
Conflicts: src/cell.h src/engine_maketasks.c src/engine_marktasks.c src/runner.c src/space.c src/stars/EAGLE/stars.h src/stars/EAGLE/stars_iact.h src/stars/EAGLE/stars_part.h
Branches
Tags
Showing
- .gitignore 2 additions, 0 deletions.gitignore
- doc/Doxyfile.in 1 addition, 0 deletionsdoc/Doxyfile.in
- examples/EAGLE_low_z/EAGLE_12/eagle_12.yml 29 additions, 1 deletionexamples/EAGLE_low_z/EAGLE_12/eagle_12.yml
- examples/EAGLE_low_z/EAGLE_25/eagle_25.yml 27 additions, 0 deletionsexamples/EAGLE_low_z/EAGLE_25/eagle_25.yml
- examples/EAGLE_low_z/EAGLE_50/eagle_50.yml 29 additions, 1 deletionexamples/EAGLE_low_z/EAGLE_50/eagle_50.yml
- examples/EAGLE_low_z/EAGLE_6/eagle_6.yml 27 additions, 0 deletionsexamples/EAGLE_low_z/EAGLE_6/eagle_6.yml
- examples/IsolatedGalaxy/IsolatedGalaxy_starformation/isolated_galaxy.yml 4 additions, 3 deletions...edGalaxy/IsolatedGalaxy_starformation/isolated_galaxy.yml
- examples/Makefile.am 1 addition, 1 deletionexamples/Makefile.am
- examples/main.c 13 additions, 2 deletionsexamples/main.c
- examples/parameter_example.yml 0 additions, 2 deletionsexamples/parameter_example.yml
- src/active.h 34 additions, 5 deletionssrc/active.h
- src/cell.c 288 additions, 86 deletionssrc/cell.c
- src/cell.h 71 additions, 68 deletionssrc/cell.h
- src/engine.c 22 additions, 12 deletionssrc/engine.c
- src/engine_drift.c 53 additions, 0 deletionssrc/engine_drift.c
- src/engine_maketasks.c 886 additions, 837 deletionssrc/engine_maketasks.c
- src/engine_marktasks.c 114 additions, 135 deletionssrc/engine_marktasks.c
- src/partition.c 8 additions, 6 deletionssrc/partition.c
- src/runner.c 226 additions, 100 deletionssrc/runner.c
- src/runner_doiact.h 12 additions, 0 deletionssrc/runner_doiact.h
Loading
Please register or sign in to comment