Generic fix and path update

This commit is contained in:
Guilhem Lavaux 2017-07-11 15:36:19 +02:00
parent 019480c0e0
commit 07cfe4137f
6 changed files with 27 additions and 8 deletions

View file

@ -388,6 +388,7 @@ def loadGadget(str filename, int snapshot_id, int gadgetFormat = 1, bool loadPos
cdef int flags
cdef SimuData *data
cdef Simulation simu
cdef const char *filename_bs
flags = 0
if loadPosition:
@ -401,7 +402,10 @@ def loadGadget(str filename, int snapshot_id, int gadgetFormat = 1, bool loadPos
if loadMass:
flags |= NEED_MASS
data = loadGadgetMulti(filename, snapshot_id, flags, gadgetFormat)
filename_b = bytes(filename, 'utf-8')
filename_bs = filename_b
with nogil:
data = loadGadgetMulti(filename_bs, snapshot_id, flags, gadgetFormat)
if data == <SimuData*>0:
return None