This commit is contained in:
Guilhem Lavaux 2011-03-11 14:31:56 -06:00
parent cb630e1f91
commit 873b3ea2b0
3 changed files with 11 additions and 3 deletions

View file

@ -335,7 +335,13 @@ int main(int argc, char **argv)
double *expfact;
metricTransform(simu, args_info.axis_arg, args_info.preReShift_flag, args_info.peculiarVelocities_flag, expfact);
if (args_info.cosmo_flag)
metricTransform(simu, args_info.axis_arg, args_info.preReShift_flag, args_info.peculiarVelocities_flag, expfact);
else
{
expfact = new double[simu->NumPart];
for (int j = 0; j < simu->NumPart; j++) expfact[j] = 1.0;
}
makeBox(simu, expfact, simuOut, args_info);
delete simu;

View file

@ -20,4 +20,6 @@ option "rangeZ_min" - "Minimum range in Z for making the box (after distorti
option "rangeZ_max" - "Maximum range in Z for making the box (after distortion)" double required
option "preReShift" - "Reshift the zero of the Z axis" flag off
option "peculiarVelocities" - "Added peculiar velocities distortion" flag off
option "peculiarVelocities" - "Added peculiar velocities distortion" flag off
option "cosmo" - "Apply cosmological redshift" flag on

View file

@ -9,6 +9,7 @@ bool loadParticleInfo(ParticleInfo& info,
const std::string& particles,
const std::string& extra_info)
{
int numpart;
NcFile f_info(extra_info.c_str());
@ -29,7 +30,6 @@ bool loadParticleInfo(ParticleInfo& info,
{
UnformattedRead f(particles);
int numpart;
float mul, offset;
f.beginCheckpoint();