yohai/phigrape
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

run directory now separate from source directory

Browse source
This commit is contained in:
Yohai Meiron 2021-03-17 20:37:12 -04:00
parent 11c0db23a3
commit 0a2344563d
3 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -10,4 +10,5 @@ grapite-dev-exec-threshold
phigrape phigrape
*.h5 *.h5
.* .*
CUDA
.gitignore .gitignore

15
Makefile
View file

@ -5,23 +5,24 @@ OPTIMIZATION ?= 3
CUDAINC = -I$(CUDAHOME)/include -I$(CUDAHOME)/samples/common/inc/ CUDAINC = -I$(CUDAHOME)/include -I$(CUDAHOME)/samples/common/inc/
CUDALIB = -L$(CUDAHOME)/lib64 -lcudart -lcudadevrt -lcuda CUDALIB = -L$(CUDAHOME)/lib64 -lcudart -lcudadevrt -lcuda
default grapite: GRAPEHOME = ../grapite default: grapite
default grapite: GRAPELIB = -L$(GRAPEHOME) -lgrapite -fopenmp grapite: GRAPEHOME = ../grapite
grapite: GRAPELIB = -L$(GRAPEHOME) -lgrapite
yebisu: GRAPEHOME = ../yebisu yebisu: GRAPEHOME = ../yebisu
yebisu: GRAPELIB = -L$(GRAPEHOME) -lyebisug6 yebisu: GRAPELIB = -L$(GRAPEHOME) -lyebisug6
sapporo: GRAPEHOME = ../sapporo2/lib sapporo: GRAPEHOME = ../sapporo2/lib
sapporo: GRAPELIB = -L$(GRAPEHOME) -lsapporo -fopenmp sapporo: GRAPELIB = -L$(GRAPEHOME) -lsapporo
GRAPEINC = -I$(GRAPEHOME) GRAPEINC = -I$(GRAPEHOME)
CXXFLAGS += -O$(OPTIMIZATION) CXXFLAGS += -std=c++11 -O$(OPTIMIZATION)
INC = $(GRAPEINC) $(CUDAINC) INC = $(GRAPEINC) $(CUDAINC)
LIB = $(GRAPELIB) $(CUDALIB) -lm -fopenmp LIB = $(GRAPELIB) $(CUDALIB) -lm
MPICXX ?= mpic++ MPICXX ?= mpic++
EXECUTABLE ?= phigrape EXECUTABLE ?= phigrape
# HDF5 # HDF5
CPPFLAGS += -DHAS_HDF5 #CPPFLAGS += -DHAS_HDF5
LIB += -lhdf5 -lz -ldl #LIB += -lhdf5 -lz -ldl
default: default:
$(MPICXX) $(CPPFLAGS) $(CXXFLAGS) $(INC) black_holes.cpp external.cpp io.cpp config.cpp phigrape.cpp -o $(EXECUTABLE) $(LIB) $(MPICXX) $(CPPFLAGS) $(CXXFLAGS) $(INC) black_holes.cpp external.cpp io.cpp config.cpp phigrape.cpp -o $(EXECUTABLE) $(LIB)

2
init.py
View file

@ -91,6 +91,8 @@ def gen_mask(particle_list, frac):
mask = np.ones(N, dtype=int) mask = np.ones(N, dtype=int)
elif frac==1: elif frac==1:
mask = np.zeros(N, dtype=int) mask = np.zeros(N, dtype=int)
elif (frac < 0) or (1 < frac):
raise RuntimeError('Fraction has to be between 0 and 1')
else: else:
X = particle_list[:,:3] X = particle_list[:,:3]
V = particle_list[:,3:] V = particle_list[:,3:]