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

Fixed regeneration step in generateMock. Fixed gadget loading (missing initialization for multiple files)

Browse source
This commit is contained in:
Guilhem Lavaux 2013-01-29 13:58:12 -06:00
parent 64e226c786
commit 9bd0cbbb88
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
c_tools/mock/generateMock.cpp
View file

@ -317,9 +317,9 @@ void buildBox(SimuData *simu, long num_targets, long loaded,
for (int j = 0; j < 3; j++) for (int j = 0; j < 3; j++)
{ {
boxed->Pos[j][loaded] = (simu->Pos[j][pid]-ranges[j*2])*mul[j]; boxed->Pos[j][loaded] = max(min((simu->Pos[j][pid]-ranges[j*2])*mul[j], double(1)), double(0));
assert(boxed->Pos[j][loaded] > 0); assert(boxed->Pos[j][loaded] >= 0);
assert(boxed->Pos[j][loaded] < 1); assert(boxed->Pos[j][loaded] <= 1);
} }
uniqueID[loaded] = (simu_uniqueID != 0) ? simu_uniqueID[pid] : 0; uniqueID[loaded] = (simu_uniqueID != 0) ? simu_uniqueID[pid] : 0;
expansion_fac[loaded] = efac[pid]; expansion_fac[loaded] = efac[pid];
@ -400,6 +400,7 @@ void makeBoxFromParameter(SimuData *simu, SimuData* &boxed, generateMock_info& a
mul = new double[3]; mul = new double[3];
ranges = new double[6]; ranges = new double[6];
snapshot_split = new long[*num_snapshots]; snapshot_split = new long[*num_snapshots];
expansion_fac = new double[boxed->NumPart];
boxed->new_attribute("uniqueID", uniqueID, delete_adaptor<long>); boxed->new_attribute("uniqueID", uniqueID, delete_adaptor<long>);
@ -408,6 +409,7 @@ void makeBoxFromParameter(SimuData *simu, SimuData* &boxed, generateMock_info& a
boxed->new_attribute("particle_id", particle_id, delete_adaptor<long>); boxed->new_attribute("particle_id", particle_id, delete_adaptor<long>);
boxed->new_attribute("num_snapshots", num_snapshots, delete_adaptor<int>); boxed->new_attribute("num_snapshots", num_snapshots, delete_adaptor<int>);
boxed->new_attribute("snapshot_split", snapshot_split, delete_adaptor<long>); boxed->new_attribute("snapshot_split", snapshot_split, delete_adaptor<long>);
boxed->new_attribute("expansion_fac", expansion_fac, delete_adaptor<double>);
v_id->get(particle_id, boxed->NumPart); v_id->get(particle_id, boxed->NumPart);
v_snap->get(snapshot_split, *num_snapshots); v_snap->get(snapshot_split, *num_snapshots);

2
c_tools/mock/loaders/gadget_loader.cpp
View file

@ -77,7 +77,7 @@ public:
SimulationLoader *gadgetLoader(const std::string& snapshot, double Mpc_unitLength, int flags) SimulationLoader *gadgetLoader(const std::string& snapshot, double Mpc_unitLength, int flags)
{ {
bool singleFile; bool singleFile = false;
int num_files; int num_files;
SimuData *d; SimuData *d;