Commits

Matthew Turk committed 75fe3d2 Merge

Merged in ngoldbaum/enzo-dev-ngoldbaum (pull request #56)

  • Participants
  • Parent commits 6ff7653, 62a3f12

Comments (0)

Files changed (2)

File src/anyl/AnalyzeCluster.C

 #include "mpi.h"
 #endif /* USE_MPI */
 #define DEFINE_STORAGE
+#include "../enzo/EnzoTiming.h"
 #include "../enzo/ErrorExceptions.h"
 #include "../enzo/macros_and_parameters.h"
 #include "../enzo/units.h"
               float *VelocityUnits, FLOAT Time);
 int CosmologyComputeExpansionFactor(FLOAT time, FLOAT *a, FLOAT *dadt);
 
-main(Eint32 argc, char *argv[])
+Eint32 main(Eint32 argc, char *argv[])
 {
   CommunicationInitialize(&argc, &argv);
 

File src/enzo/Make.mach.darwin

 
 LOCAL_PACKAGES       = /usr/local
 
-LOCAL_MPI_INSTALL    = /usr
+# This will not work on OSX Lion or newer.  You may wany to try installing
+# openmpi via macports.  
+LOCAL_MPI_INSTALL    = /usr/local
 LOCAL_FC_INSTALL     = /usr/local
-LOCAL_HDF5_INSTALL   = $(HOME)/local
+LOCAL_HDF5_INSTALL   = $(YT_DEST)
 LOCAL_SZIP_INSTALL   = $(LOCAL_PACKAGES)
 LOCAL_HYPRE_INSTALL  = $(HOME)
-LOCAL_PYTHON_INSTALL = $(HOME)/yt-i386/
-LOCAL_PYTHON_INSTALL = /Library/Frameworks/Python.framework/Versions/Current/
-LOCAL_CVODE_INSTALL  = /usr/local/
+LOCAL_PYTHON_INSTALL = $(YT_DEST)
 
 #-----------------------------------------------------------------------
 # Compiler settings