guilhem_lavaux/cosmotool
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes for gadget IO

Browse Source
This commit is contained in:
Guilhem Lavaux 2020-08-04 10:43:45 +02:00
parent 689cc70daa
commit 46831ba9ab
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builder/build-wheels.sh
View File

@ -8,7 +8,7 @@ yum install -y cmake3 gsl-devel zlib-devel
ln -fs /usr/bin/cmake3 /usr/bin/cmake ln -fs /usr/bin/cmake3 /usr/bin/cmake
ALL_PYTHON="cp37-cp37m cp38-cp38" ALL_PYTHON="cp36-cp36m cp37-cp37m cp38-cp38"
# Compile wheels # Compile wheels
for pkg in $ALL_PYTHON; do for pkg in $ALL_PYTHON; do

2
builder/start.sh
View File

@ -9,4 +9,4 @@ if ! [ -e ${d}/setup.py ] ; then
exit 1 exit 1
fi fi
podman run -ti --rm -e PLAT=manylinux2014_x86_64 -v ${d}:/io:Z quay.io/pypa/manylinux2014_x86_64 /io/builder/build-wheels.sh podman run -ti --rm -e PLAT=manylinux2010_x86_64 -v ${d}:/io:Z quay.io/pypa/manylinux2010_x86_64 /io/builder/build-wheels.sh

3
python/_cosmotool.pyx
View File

@ -513,7 +513,8 @@ def writeGadget(str filename, object simulation):
simdata.TotalNumPart = NumPart simdata.TotalNumPart = NumPart
simdata.NumPart = NumPart simdata.NumPart = NumPart
cxx_writeGadget(filename, &simdata) filename_b = bytes(filename, 'utf-8')
cxx_writeGadget(filename_b, &simdata)
def loadRamses(str basepath, int snapshot_id, int cpu_id, bool doublePrecision = False, bool loadPosition = True, bool loadVelocity = False, bool loadId = False, bool loadMass = False): def loadRamses(str basepath, int snapshot_id, int cpu_id, bool doublePrecision = False, bool loadPosition = True, bool loadVelocity = False, bool loadId = False, bool loadMass = False):
""" loadRamses(basepath, snapshot_id, cpu_id, doublePrecision = False, loadPosition = True, loadVelocity = False) """ loadRamses(basepath, snapshot_id, cpu_id, doublePrecision = False, loadPosition = True, loadVelocity = False)

4
python/cosmotool/simu.py
View File

@ -98,12 +98,12 @@ def simpleWriteGadget(filename, positions, boxsize=1.0, Hubble=100, Omega_M=0.30
s.positions = positions s.positions = positions
if velocities: if velocities is not None:
s.velocities = velocities s.velocities = velocities
else: else:
s.velocities = [np.zeros(positions[0].size,dtype=np.float32)]*3 s.velocities = [np.zeros(positions[0].size,dtype=np.float32)]*3
if identifiers: if identifiers is not None:
s.identifiers = identifiers s.identifiers = identifiers
else: else:
s.identifiers = np.arange(positions[0].size, dtype=np.int64) s.identifiers = np.arange(positions[0].size, dtype=np.int64)