guilhem_lavaux/vide_public
0
0
Fork 0
mirror of https://bitbucket.org/cosmicvoids/vide_public.git synced 2025-07-04 15:21:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed spurious braces and a SEGV in multidark loading procedure

Browse source
This commit is contained in:
Guilhem Lavaux 2013-02-28 18:24:23 -06:00
parent 14b52c4248
commit 99f1b3888e
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
c_tools/mock/generateMock.cpp
View file

@ -240,7 +240,7 @@ void selectBox(SimuData *simu, std::vector<long>& targets, generateMock_info& ar
(simu->Pos[j][i] > ranges[j][0]) &&
(simu->Pos[j][i] < ranges[j][1]);
p.Pos[j] = simu->Pos[j][i];
p.Vel[j] = (simu->Vel != 0) ? simu->Vel[j][i] : 0;
p.Vel[j] = (simu->Vel[j] != 0) ? simu->Vel[j][i] : 0;
}
p.ID = (simu->Id != 0) ? simu->Id[i] : -1;

3
c_tools/mock/loaders/multidark_loader.cpp
View file

@ -75,7 +75,7 @@ public:
if (p.ID == -99 &&
p.Pos[0] == -99 && p.Pos[1] == -99 &&
p.Pos[2] == -99 && p.Vel[2] == -99) {
p.Pos[2] == -99 && p.Vel[2] == -99)
break;
if (preproc != 0 && !preproc->accept(p))
@ -93,7 +93,6 @@ public:
reallocArray(index, allocated, actualNumPart);
}
}
}
applyTransformations(simu);
simu->NumPart = actualNumPart;
simu->TotalNumPart = actualNumPart;