Merge pull request danieljprice#199 from cpinte/master

build/Makefile

@@ -120,10 +120,16 @@ ifeq ($(MCFOST), yes)
     MCFOST_LIBS = $(MCFOST_INSTALL)/lib/$(FC)
     MCFOST_INCLUDE = $(MCFOST_INSTALL)/include
 
+    ifeq ($(MCFOST_NO_XGBOOST), yes)
+        LXGBOOST=""
+    else
+        LXGBOOST= -lxgboost -ldmlc -lrabit
+    endif
+
     FPPFLAGS+= -DMCFOST
     LDFLAGS+= -I$(MCFOST_INCLUDE) -I$(MCFOST_INCLUDE)/voro++ -I$(MCFOST_INCLUDE)/hdf5 -I$(MCFOST_INCLUDE)/$(FC) \
 	-L$(MCFOST_DIR)/src -lmcfost -L$(MCFOST_LIBS) $(LIBCXX) -lcfitsio -lvoro++ -lsprng \
-	-L$(HDF5ROOT)/lib/Intel -lhdf5_fortran -L$(HDF5ROOT)/lib -lhdf5 -lz -lxgboost -ldmlc -lrabit -lhdf5_fortran -lhdf5 -lz
+	-L$(HDF5ROOT)/lib/Intel -lhdf5_fortran -L$(HDF5ROOT)/lib -lhdf5_fortran -lhdf5 -lz $(LXGBOOST)
 endif
 
 include Makefile_systems

src/setup/setup_disc.f90

@@ -576,9 +576,14 @@ subroutine equation_of_state(gamma)
  integer :: i
 
  is_isothermal = (maxvxyzu==3)
- if (use_mcfost) then
-    is_isothermal = .false.
-    nfulldump = 1
+
+ if (compiled_with_mcfost) then
+    if (use_mcfost) then
+       is_isothermal = .false.
+       nfulldump = 1
+    else
+       is_isothermal = .true.
+    endif
  endif
 
  if (is_isothermal) then