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

Fixed typo

Browse source
This commit is contained in:
Guilhem Lavaux 2015-09-29 16:34:46 +02:00
parent 82e79dda78
commit 56ee1156f0
5 changed files with 35 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

17
python_sample/gen_2lpt_density.py
View file

@ -1,3 +1,4 @@
import numexpr as ne
import numpy as np
import cosmotool as ct
import icgen as bic
@ -25,6 +26,7 @@ parser.add_argument('--base', type=str, required=True)
parser.add_argument('--N', type=int, default=256)
parser.add_argument('--output', type=str, default="dcic_%d.npy")
parser.add_argument('--supersample', type=int, default=1)
parser.add_argument('--rsd', action='store_true')
args = parser.parse_args()
@ -32,8 +34,19 @@ args = parser.parse_args()
for i in xrange(args.start, args.end, args.step):
print i
# pos,_,density,N,L,_ = bic.run_generation("/nethome/lavaux/remote/borg_2m++_128/initial_density_%d.dat" % i, 0.001, astart, cosmo, supersample=2, do_lpt2=True)
pos,_,density,N,L,_,_ = bic.run_generation("%s/initial_density_%d.dat" % (args.base,i), 0.001, astart,
cosmo, supersample=args.supersample, do_lpt2=True, needvel=False)
pos,vel,density,N,L,_,_ = bic.run_generation("%s/initial_density_%d.dat" % (args.base,i), 0.001, astart,
cosmo, supersample=args.supersample, do_lpt2=True, needvel=True)
if args.rsd:
inv_r2 = ne.evaluate('1/sqrt(x**2+y**2+z**2)',
local_dict={'x':pos[0], 'y':pos[1], 'z':pos[2]})
rsd = lambda p,v: ne.evaluate('x + (x*vx)*inv_r2 / H',
local_dict={'x':p, 'inv_r2':inv_r2,
'vx':v, 'H':100.0}, out=p, casting='unsafe')
rsd(pos[0], vel[0])
rsd(pos[1], vel[1])
rsd(pos[2], vel[2])
dcic = ct.cicParticles(pos, L, args.N)
dcic /= np.average(np.average(np.average(dcic, axis=0), axis=0), axis=0)

2
python_sample/icgen/borgicgen.py
View file

@ -140,7 +140,7 @@ def run_generation(input_borg, a_borg, a_ic, cosmo, supersample=1, supergenerate
lpt = LagrangianPerturbation(-density, L, fourier=True, supersample=supersample)
# Generate grid
posq = gen_posgrid(N*supergenerate, L)
posq = gen_posgrid(N*supersample, L)
vel= []
posx = []