mwtkrayer
/
suspendtools
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: mwtkrayer:33cc40a0956ab34ae4b28e422c1cc1541e93d06c
Branches Tags
mwtkrayer:master
..
compare: mwtkrayer:b7b250ca5f37d7a695888cee9e77add4f9d69c38
Branches Tags
mwtkrayer:master

2 Commits
33cc40a095 ... b7b250ca5f

Author SHA1 Message Date
Michael Krayer b7b250ca5f initialize particles directly from standalone ucf file 2021-12-16 10:26:19 +01:00
Michael Krayer 2465e10b70 correct scalar col names: start counting from 1 2021-12-16 10:25:16 +01:00
2 changed files with 9 additions and 3 deletions
Show Stats Expand all files Collapse all files

6
particle.py
View File

@ -62,6 +62,12 @@ class Particles:
col[key]-=1 col[key]-=1
return cls.from_array(pp,col,time,period,select_col=select_col) return cls.from_array(pp,col,time,period,select_col=select_col)
@classmethod
def from_ucf(cls,file,period,select_col=None):
from .ucf import read_particles
(pp,col,time) = read_particles(file,step=1,verbosity=False,debug=False)
return cls.from_array(pp,col,time,period,select_col=select_col)
@classmethod @classmethod
def from_position(cls,x,y,z,time,period): def from_position(cls,x,y,z,time,period):
assert x.ndim==1 and y.ndim==1 and z.ndim==1,\ assert x.ndim==1 and y.ndim==1 and z.ndim==1,\

6
ucf.py
View File

@ -864,9 +864,9 @@ def colmap_from_flags(irank,ihybrid,idem,iscal):
col['tyc'] = ioffset; ioffset+=1 col['tyc'] = ioffset; ioffset+=1
col['tzc'] = ioffset; ioffset+=1 col['tzc'] = ioffset; ioffset+=1
if iscal>0: if iscal>0:
for ii in range(0,iscal): for ii in range(iscal):
col['s'+str(ii)] = ioffset; ioffset+=1 col['s'+str(ii+1)] = ioffset; ioffset+=1
col['q'+str(ii)] = ioffset; ioffset+=1 col['q'+str(ii+1)] = ioffset; ioffset+=1
return col return col
def grid_chunk(chunk,gridg): def grid_chunk(chunk,gridg):