-
- Downloads
Merge branch 'master' into 'mesh_force_task'
# Conflicts: # src/Makefile.am
Showing
- configure.ac 13 additions, 0 deletionsconfigure.ac
- doc/Doxyfile.in 1 addition, 1 deletiondoc/Doxyfile.in
- examples/CoolingHalo/cooling_halo.yml 0 additions, 6 deletionsexamples/CoolingHalo/cooling_halo.yml
- examples/CoolingHaloWithSpin/cooling_halo.yml 0 additions, 3 deletionsexamples/CoolingHaloWithSpin/cooling_halo.yml
- examples/ExternalPointMass/externalPointMass.yml 2 additions, 6 deletionsexamples/ExternalPointMass/externalPointMass.yml
- examples/HydrostaticHalo/hydrostatic.yml 0 additions, 3 deletionsexamples/HydrostaticHalo/hydrostatic.yml
- examples/IsothermalPotential/isothermal.yml 4 additions, 9 deletionsexamples/IsothermalPotential/isothermal.yml
- examples/KeplerianRing/keplerian_ring.yml 3 additions, 8 deletionsexamples/KeplerianRing/keplerian_ring.yml
- examples/KeplerianRing/write_gadget.py 1 addition, 1 deletionexamples/KeplerianRing/write_gadget.py
- examples/MultiTypes/multiTypes.yml 1 addition, 3 deletionsexamples/MultiTypes/multiTypes.yml
- examples/parameter_example.yml 7 additions, 14 deletionsexamples/parameter_example.yml
- src/Makefile.am 1 addition, 1 deletionsrc/Makefile.am
- src/adiabatic_index.h 40 additions, 0 deletionssrc/adiabatic_index.h
- src/cbrt.h 94 additions, 0 deletionssrc/cbrt.h
- src/common_io.c 17 additions, 16 deletionssrc/common_io.c
- src/common_io.h 3 additions, 1 deletionsrc/common_io.h
- src/equation_of_state/planetary/equation_of_state.h 20 additions, 12 deletionssrc/equation_of_state/planetary/equation_of_state.h
- src/hydro/MinimalMultiMat/hydro_io.h 2 additions, 2 deletionssrc/hydro/MinimalMultiMat/hydro_io.h
- src/parallel_io.c 1 addition, 1 deletionsrc/parallel_io.c
- src/parser.c 577 additions, 291 deletionssrc/parser.c
Loading
Please register or sign in to comment