Added fast parallel interpolator. Some adjustment to BORG icgen

This commit is contained in:
Guilhem Lavaux 2015-08-28 11:56:35 +02:00
parent 21507e3013
commit 8d4ee1bfdd
6 changed files with 48 additions and 7 deletions

View file

@ -7,7 +7,8 @@ import icgen.cosmogrowth as cg
import sys
import argparse
ADAPT_SMOOTH="/home/bergeron1NS/lavaux/Software/cosmotool/build/sample/simple3DFilter"
#ADAPT_SMOOTH="/home/bergeron1NS/lavaux/Software/cosmotool/build/sample/simple3DFilter"
ADAPT_SMOOTH="/home/guilhem/PROJECTS/cosmotool/build/sample/simple3DFilter"
cosmo={'omega_M_0':0.3175, 'h':0.6711}
cosmo['omega_lambda_0']=1-cosmo['omega_M_0']
cosmo['omega_k_0'] = 0
@ -32,13 +33,13 @@ args = parser.parse_args()
for i in xrange(args.start, args.end, args.step):
for i in [4629]:#xrange(args.start, args.end, args.step):
print i
pos,vel,density,N,L,_ = bic.run_generation("%s/initial_density_%d.dat" % (args.base,i), 0.001, astart,
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)
q = pos + vel
q = pos + vel + [np.ones(vel[0].shape[0])]
with h5.File("particles.h5", mode="w") as f:
f.create_dataset("particles", data=np.array(q).transpose())

View file

@ -137,7 +137,7 @@ def run_generation(input_borg, a_borg, a_ic, cosmo, supersample=1, supergenerate
p.normalize(cosmo['SIGMA8']*Dborg)
density = do_supergenerate(density,mulfac=supergenerate,Pk=p,L=L,h=cosmo['h'])
lpt = LagrangianPerturbation(density, L, fourier=True, supersample=supersample)
lpt = LagrangianPerturbation(-density, L, fourier=True, supersample=supersample)
# Generate grid
posq = gen_posgrid(N*supergenerate, L)