Merge branch 'master' of github.com:danieljprice/phantom [skip ci]

build/Makefile

@@ -133,6 +133,7 @@ ifeq ($(MCFOST), yes)
     else
     #--otherwise assume the source code is lying around somewhere
        MCFOST_LIBS = $(MCFOST_INSTALL)/lib/$(FC)
+       HDF5_DIR	= $(MCFOST_LIBS)
        MCFOST_INCLUDE = $(MCFOST_INSTALL)/include
        ifeq ("X$(MCFOST_LIB)","X")
           MCFOST_LIB = $(MCFOST_DIR)/src
@@ -148,7 +149,6 @@ ifeq ($(MCFOST), yes)
     LDFLAGS+= -I$(MCFOST_INCLUDE) -I$(MCFOST_INCLUDE)/voro++ -I$(MCFOST_INCLUDE)/hdf5 -I$(MCFOST_INCLUDE)/$(FC) \
 	-L$(MCFOST_LIB) -lmcfost -L$(MCFOST_LIBS) $(LIBCXX) -lcfitsio -lvoro++ -lsprng \
    -L$(HDF5_DIR) -lhdf5_fortran -lhdf5 -lz #$(LXGBOOST)
-	#-L$(HDF5_DIR)/lib/Intel -lhdf5_fortran
 endif
 
 include Makefile_systems
@@ -491,7 +491,7 @@ ifdef METRIC
 else
     SRCMETRIC= metric_minkowski.f90
 endif
-SRCGR=inverse4x4.f90 einsteintk_utils.f90 $(SRCMETRIC) metric_tools.f90 utils_gr.f90 interpolate3D.f90 tmunu2grid.f90 
+SRCGR=inverse4x4.f90 einsteintk_utils.f90 $(SRCMETRIC) metric_tools.f90 utils_gr.f90 interpolate3D.f90 tmunu2grid.f90
 #
 # chemistry and cooling
 #
@@ -998,7 +998,7 @@ phantom2mcfost: checkmcfost
         ANALYSISBIN=$@ ANALYSISONLY=yes LDFLAGS="-L$(MCFOST_DIR)/src -lmcfost $(LIBCXX)"
 
 analysis_mcfost.o: analysis_mcfost.f90
-	$(FC) -c $(FFLAGS) -I$(MCFOST_INCLUDE) $< -o $@
+	$(FC) -c $(FFLAGS) -I$(MCFOST_INCLUDE) -I$(MCFOST_DIR)/src $< -o $@
 
 analysis_mcfost.o: checkmcfost
 

docs/physics/radiation.rst

@@ -49,7 +49,7 @@ are needed to compute P from u, and so the units of the simulation are no longer
 The main effect of radiation pressure is to reduce the effective adiabatic index of the gas.
 One can see this because when the gas pressure term dominates, we have
 
-   :math:`P = \frac32 \rho u`
+   :math:`P = \frac23 \rho u`
 
 implying :math:`\gamma=5/3`, whereas when the radiation pressure term dominates, we have
 
@@ -131,4 +131,4 @@ See also
 --------
 
 - :doc:`Equations of state available in Phantom <eos>`
-- :doc:`MCFOST </external-utilities/mcfost>`
+- :doc:`MCFOST </external-utilities/mcfost>`

src/main/units.f90

@@ -100,13 +100,13 @@ subroutine set_units(dist,mass,time,G,c)
        utime = sqrt(udist**3/(gg*umass))
        if (present(time)) print "(a)",' WARNING: over-riding time unit with G=1 assumption'
     elseif (present(dist) .and. present(time)) then
-       umass = udist**2/(gg*utime**2)
+       umass = udist**3/(gg*utime**2)
        if (present(mass)) print "(a)",' WARNING: over-riding mass unit with G=1 assumption'
     elseif (present(mass) .and. present(time)) then
        udist = (utime**2*(gg*umass))**(1.d0/3.d0)
        if (present(dist)) print "(a)",' WARNING: over-riding length unit with G=1 assumption'
     elseif (present(time)) then
-       umass = udist**2/(gg*utime**2)     ! udist is 1
+       umass = udist**3/(gg*utime**2)     ! udist is 1
     else
        utime = sqrt(udist**3/(gg*umass))  ! udist and umass are 1
     endif