mirror of
https://github.com/Richard-Sti/csiborgtools.git
synced 2024-12-22 22:08:02 +00:00
rename int dtype
This commit is contained in:
parent
6183b9d6b9
commit
07a7e41078
1 changed files with 25 additions and 4 deletions
|
@ -2,14 +2,15 @@
|
||||||
import numpy
|
import numpy
|
||||||
from scipy.io import FortranFile
|
from scipy.io import FortranFile
|
||||||
from os import listdir
|
from os import listdir
|
||||||
from os.path import join
|
from os.path import (join, isfile)
|
||||||
from tqdm import tqdm
|
from tqdm import tqdm
|
||||||
|
|
||||||
|
|
||||||
F16 = numpy.float16
|
F16 = numpy.float16
|
||||||
F32 = numpy.float32
|
F32 = numpy.float32
|
||||||
F64 = numpy.float64
|
F64 = numpy.float64
|
||||||
INT32 = numpy.int32
|
I32 = numpy.I32
|
||||||
|
I64 = numpy.I64
|
||||||
|
|
||||||
|
|
||||||
def get_sim_path(n, fname="ramses_out_{}", srcdir="/mnt/extraspace/hdesmond"):
|
def get_sim_path(n, fname="ramses_out_{}", srcdir="/mnt/extraspace/hdesmond"):
|
||||||
|
@ -119,7 +120,7 @@ def read_sp(dtype, partfile):
|
||||||
"""
|
"""
|
||||||
if dtype in [F16, F32, F64]:
|
if dtype in [F16, F32, F64]:
|
||||||
return partfile.read_reals('d')
|
return partfile.read_reals('d')
|
||||||
elif dtype in [INT32]:
|
elif dtype in [I32]:
|
||||||
return partfile.read_ints()
|
return partfile.read_ints()
|
||||||
else:
|
else:
|
||||||
raise TypeError("Unexpected dtype `{}`.".format(dtype))
|
raise TypeError("Unexpected dtype `{}`.".format(dtype))
|
||||||
|
@ -171,7 +172,7 @@ def read_particle(pars_extract, n, simpath, verbose=True):
|
||||||
# Order in which the particles are written in the FortranFile
|
# Order in which the particles are written in the FortranFile
|
||||||
forder = [("x", F16), ("y", F16), ("z", F16),
|
forder = [("x", F16), ("y", F16), ("z", F16),
|
||||||
("vx", F16), ("vy", F16), ("vz", F16),
|
("vx", F16), ("vy", F16), ("vz", F16),
|
||||||
("M", F32), ("ID", INT32), ("level", INT32)]
|
("M", F32), ("ID", I32), ("level", I32)]
|
||||||
fnames = [fp[0] for fp in forder]
|
fnames = [fp[0] for fp in forder]
|
||||||
fdtypes = [fp[1] for fp in forder]
|
fdtypes = [fp[1] for fp in forder]
|
||||||
# Check there are no strange parameters
|
# Check there are no strange parameters
|
||||||
|
@ -259,3 +260,23 @@ def read_clumpid(n, simpath, verbose=True):
|
||||||
clumpid[i:i + j] = ff.read_ints()
|
clumpid[i:i + j] = ff.read_ints()
|
||||||
|
|
||||||
return clumpid
|
return clumpid
|
||||||
|
|
||||||
|
def read_clumps(n, simpath):
|
||||||
|
pass
|
||||||
|
# n = str(n).zfill(5)
|
||||||
|
# fname = join(simpath, "output_{}".format(n), "clump_{}.dat".format(n))
|
||||||
|
#
|
||||||
|
# if not isfile(fname):
|
||||||
|
# raise FileExistsError("Clump file `{}` does not exist.".format(fname))
|
||||||
|
#
|
||||||
|
# arr = numpy.genfromtxt(fname)
|
||||||
|
#
|
||||||
|
# cols = [("index", I64)]
|
||||||
|
#
|
||||||
|
#
|
||||||
|
#
|
||||||
|
# return arr
|
||||||
|
|
||||||
|
|
||||||
|
#index lev parent(2) ncell peak_x peak_y(5) peak_z rho- rho+(8) rho_av mass_cl relevance(11)
|
||||||
|
#clumparr = numpy.genfromtxt(srcdir1+"/clump_"+outnr1+".dat")
|
||||||
|
|
Loading…
Reference in a new issue