Merge pull request #609 from danieljprice/tillotson

AUTHORS

@@ -28,6 +28,7 @@ Simone Ceppi <[email protected]>
 Spencer Magnall <[email protected]>
 Caitlyn Hardiman <[email protected]>
 Enrico Ragusa <[email protected]>
+Amber Tilly <[email protected]>
 Cristiano Longarini <[email protected]>
 Sergei Biriukov <[email protected]>
 Giovanni Dipierro <[email protected]>
@@ -56,6 +57,7 @@ Farzana Meru <[email protected]>
 Nicolás Cuello <[email protected]>
 Chris Nixon <[email protected]>
 Miguel Gonzalez-Bolivar <[email protected]>
+AmberBTilly <[email protected]>
 Benoit Commercon <[email protected]>
 Christopher Russell <[email protected]>
 Giulia Ballabio <[email protected]>
@@ -65,6 +67,7 @@ Maxime Lombart <[email protected]>
 Orsola De Marco <[email protected]>
 Shunquan Huang <[email protected]>
 Zachary Pellow <[email protected]>
+ryosuke-hirai <[email protected]>
 Ariel Chitan <[email protected]>
 Chunliang Mu <[email protected]>
 Cox, Samuel <[email protected]>

build/Makefile

@@ -513,7 +513,10 @@ SRCCHEM= fs_data.f90 mol_data.f90 utils_spline.f90 \
 # equations of state
 #
 SRCMESA= eos_mesa_microphysics.f90 eos_mesa.f90
-SRCEOS = eos_barotropic.f90 eos_stratified.f90 eos_piecewise.f90 ${SRCMESA} eos_shen.f90 eos_helmholtz.f90 eos_idealplusrad.f90 ionization.F90 eos_gasradrec.f90 eos_HIIR.f90 eos.f90
+
+SRCEOS = eos_tillotson.f90 eos_barotropic.f90 eos_stratified.f90 eos_piecewise.f90 ${SRCMESA} \
+         eos_shen.f90 eos_helmholtz.f90 eos_idealplusrad.f90 \
+         ionization.F90 eos_gasradrec.f90 eos_HIIR.f90 eos.f90
 
 ifeq ($(HDF5), yes)
     SRCREADWRITE_DUMPS= utils_hdf5.f90 utils_dumpfiles_hdf5.f90 readwrite_dumps_common.f90 readwrite_dumps_fortran.F90 readwrite_dumps_hdf5.F90 readwrite_dumps.F90
@@ -529,7 +532,7 @@ endif
 
 SOURCES= physcon.f90 ${CONFIG} ${SRCKERNEL} io.F90 units.f90 \
          mpi_dens.F90 mpi_force.F90 mpi_utils.F90 dtype_kdtree.F90 utils_omp.F90 utils_cpuinfo.f90 \
-         utils_infiles.f90 utils_allocate.f90 icosahedron.f90 quartic.f90 \
+         utils_infiles.f90 utils_allocate.f90 icosahedron.f90 cubicsolve.f90 quartic.f90 \
          utils_system.f90 utils_mathfunc.f90 part.F90 ${DOMAIN} boundary.f90 boundary_dynamic.f90 utils_timing.f90 mpi_balance.F90 \
          setup_params.f90 timestep.f90 utils_dumpfiles.f90 utils_indtimesteps.F90 \
          utils_sort.f90 utils_supertimestep.F90 utils_tables.f90 utils_gravwave.f90 \
@@ -619,7 +622,7 @@ SRCDUMP= physcon.f90 ${CONFIG} ${SRCKERNEL} utils_omp.F90 io.F90 units.f90 mpi_u
          utils_timing.f90 utils_infiles.f90 dtype_kdtree.f90 utils_allocate.f90 part.F90 \
          ${DOMAIN} mpi_dens.F90 mpi_force.F90 boundary.f90 boundary_dynamic.f90 \
          mpi_balance.F90 mpi_memory.f90 mpi_derivs.F90 mpi_tree.F90 kdtree.F90 linklist_kdtree.F90 \
-         utils_dumpfiles.f90 utils_vectors.f90 utils_mathfunc.f90 \
+         utils_dumpfiles.f90 utils_vectors.f90 utils_mathfunc.f90 cubicsolve.f90 \
          utils_datafiles.f90 utils_filenames.f90 utils_system.f90 utils_tables.f90 datafiles.f90 gitinfo.f90 \
          centreofmass.f90 \
          timestep.f90 ${SRCEOS} cullendehnen.f90 dust_formation.f90 \

build/Makefile_setups

@@ -95,10 +95,10 @@ ifeq ($(SETUP), randomwind)
 endif
 
 ifeq ($(SETUP), solarsystem)
-#   orbits of minor planets
-    ISOTHERMAL=yes
-    SETUPFILE=utils_ephemeris.f90 utils_mpc.f90 setup_solarsystem.f90
+#   planets and minor bodies in the solar system
+    SETUPFILE=utils_ephemeris.f90 utils_mpc.f90 set_bodies.f90 setup_solarsystem.f90
     KNOWN_SETUP=yes
+    GRAVITY=yes
     DUST=yes
 endif
 

docs/getting-started/systems-list.rst

@@ -25,6 +25,8 @@
    +------------------+---------------------------------------------------------------------------------------------------------------------------+
    | ifortmac         | default settings for the Intel Fortran Compiler on Mac OS                                                                 | 
    +------------------+---------------------------------------------------------------------------------------------------------------------------+
+   | ifx              | default settings for the new Intel Fortran Compiler                                                                       | 
+   +------------------+---------------------------------------------------------------------------------------------------------------------------+
    | ipopeyearch      | Flatiron CCA popeye cluster icelake node                                                                                  | 
    +------------------+---------------------------------------------------------------------------------------------------------------------------+
    | isca             | local cluster at the University of Exeter                                                                                 |