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

Added support for unordered particle id

Browse source
This commit is contained in:
Guilhem Lavaux 2012-11-20 10:05:24 -05:00
parent 03782c8843
commit 7d90960783
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
c_tools/mock/generateMock.cpp
View file

@ -3,6 +3,7 @@
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>
#include <string> #include <string>
#include <algorithm>
#include <CosmoTool/loadSimu.hpp> #include <CosmoTool/loadSimu.hpp>
#include <CosmoTool/loadRamses.hpp> #include <CosmoTool/loadRamses.hpp>
#include <CosmoTool/loadGadget.hpp> #include <CosmoTool/loadGadget.hpp>
@ -189,7 +190,7 @@ SimuData *doLoadMultidark(const char *multidarkname)
cout << "loading multidark particles" << endl; cout << "loading multidark particles" << endl;
actualNumPart = 0; actualNumPart = 0;
for (int i = 0; i < outd->NumPart; i++) { for (int i = 0; i < outd->NumPart; i++) {
fscanf(fp, "%d %d %f %f %f\n", &outd->Id[i], fscanf(fp, "%d %f %f %f %f\n", &outd->Id[i],
&outd->Pos[0][i], &outd->Pos[1][i], &outd->Pos[0][i], &outd->Pos[1][i],
&outd->Pos[2][i], &outd->Vel[2][i]); &outd->Pos[2][i], &outd->Vel[2][i]);
@ -569,16 +570,25 @@ void makeBoxFromParameter(SimuData *simu, double *efac, SimuData* &boxed, genera
} }
uint32_t k = 0; uint32_t k = 0;
uint32_t max_id = *std::max_element(simu->Id, simu->Id + simu->NumPart);
uint32_t min_id = *std::min_element(simu->Id, simu->Id + simu->NumPart);
uint32_t *id_to_part = new uint32_t[max_id-min_id+1];
for (uint32_t i = 0; i < simu->NumPart; i++)
id_to_part[simu->Id[i]-min_id] = i;
for (uint32_t i = 0; i < boxed->NumPart; i++) for (uint32_t i = 0; i < boxed->NumPart; i++)
{ {
int id = particle_id[i]; int id = particle_id[i];
assert(id >= min_id && id <= max_id);
int pid = id_to_part[id-min_id];
for (int j = 0; j < 3; j++) for (int j = 0; j < 3; j++)
{ {
boxed->Pos[j][i] = (simu->Pos[j][id]-ranges[j][0])*mul[j]; boxed->Pos[j][i] = (simu->Pos[j][pid]-ranges[j][0])*mul[j];
} }
} }
delete[] id_to_part;
delete[] particle_id; delete[] particle_id;
} }