From 0a2344563d4916a0947f4da7f661a5206ace098e Mon Sep 17 00:00:00 2001
From: Yohai Meiron <yohai@meiron.org>
Date: Wed, 17 Mar 2021 20:37:12 -0400
Subject: [PATCH] run directory now separate from source directory

---
 .gitignore |  1 +
 Makefile   | 15 ++++++++-------
 init.py    |  2 ++
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 737bf91..a83a44e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,5 @@ grapite-dev-exec-threshold
 phigrape
 *.h5
 .*
+CUDA
 .gitignore
diff --git a/Makefile b/Makefile
index 49305a7..f9d07cb 100644
--- a/Makefile
+++ b/Makefile
@@ -5,23 +5,24 @@ OPTIMIZATION ?= 3
 CUDAINC       = -I$(CUDAHOME)/include -I$(CUDAHOME)/samples/common/inc/
 CUDALIB       = -L$(CUDAHOME)/lib64 -lcudart -lcudadevrt -lcuda
 
-default grapite: GRAPEHOME = ../grapite
-default grapite: GRAPELIB  = -L$(GRAPEHOME) -lgrapite -fopenmp
+default: grapite
+grapite: GRAPEHOME = ../grapite
+grapite: GRAPELIB  = -L$(GRAPEHOME) -lgrapite
 yebisu:  GRAPEHOME = ../yebisu
 yebisu:  GRAPELIB  = -L$(GRAPEHOME) -lyebisug6
 sapporo: GRAPEHOME = ../sapporo2/lib
-sapporo: GRAPELIB  = -L$(GRAPEHOME) -lsapporo -fopenmp
+sapporo: GRAPELIB  = -L$(GRAPEHOME) -lsapporo
          GRAPEINC  = -I$(GRAPEHOME)
 
-CXXFLAGS     += -O$(OPTIMIZATION)
+CXXFLAGS     += -std=c++11 -O$(OPTIMIZATION)
 INC           = $(GRAPEINC) $(CUDAINC)
-LIB           = $(GRAPELIB) $(CUDALIB) -lm -fopenmp
+LIB           = $(GRAPELIB) $(CUDALIB) -lm
 MPICXX       ?= mpic++
 EXECUTABLE   ?= phigrape
 
 # HDF5
-CPPFLAGS     += -DHAS_HDF5
-LIB          += -lhdf5 -lz -ldl
+#CPPFLAGS     += -DHAS_HDF5
+#LIB          += -lhdf5 -lz -ldl
 
 default:
 	$(MPICXX) $(CPPFLAGS) $(CXXFLAGS) $(INC) black_holes.cpp external.cpp io.cpp config.cpp phigrape.cpp -o $(EXECUTABLE) $(LIB)
diff --git a/init.py b/init.py
index 649f75f..d6b1f34 100644
--- a/init.py
+++ b/init.py
@@ -91,6 +91,8 @@ def gen_mask(particle_list, frac):
         mask = np.ones(N, dtype=int)
     elif frac==1:
         mask = np.zeros(N, dtype=int)
+    elif (frac < 0) or (1 < frac):
+        raise RuntimeError('Fraction has to be between 0 and 1')
     else:
         X = particle_list[:,:3]
         V = particle_list[:,3:]