From 9041cba3b23d80b926c265db9f373bbbfd059261 Mon Sep 17 00:00:00 2001 From: Guilhem Lavaux Date: Sun, 14 Oct 2012 11:10:42 -0400 Subject: [PATCH 1/5] Link to all dependencies From 4e89f5eb2cdd0dbbf0668941d04cfda80edb20a1 Mon Sep 17 00:00:00 2001 From: Guilhem Lavaux Date: Sun, 14 Oct 2012 11:15:03 -0400 Subject: [PATCH 2/5] Add a missing QHull include path --- GetQhull.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GetQhull.cmake b/GetQhull.cmake index f34ad62..f3e5a57 100644 --- a/GetQhull.cmake +++ b/GetQhull.cmake @@ -10,7 +10,7 @@ if ((NOT QHULL_INCLUDE_PATH) OR (NOT QHULL_CPP_LIBRARY)) message(SEND_ERROR "Qhull library not found") endif((NOT QHULL_INCLUDE_PATH) OR (NOT QHULL_CPP_LIBRARY)) -set(QHULL_INCLUDES ${QHULL_INCLUDE_PATH} ${QHULL_CPP_INCLUDE_PATH} ${QHULL_BASE_PATH}/src) +set(QHULL_INCLUDES ${QHULL_INCLUDE_PATH} ${QHULL_INCLUDE_PATH}/.. ${QHULL_CPP_INCLUDE_PATH} ${QHULL_BASE_PATH}/src) set(QHULL_LIBRARIES ${QHULL_CPP_LIBRARY} ${QHULL_P_LIBRARY}) add_definitions(-Dqh_QHpointer) From bd3e494732cec25f9d1bed99a16ef6ea53466b23 Mon Sep 17 00:00:00 2001 From: Guilhem Lavaux Date: Tue, 23 Oct 2012 10:30:13 -0400 Subject: [PATCH 3/5] Opportunity to change the unit of gadget file --- mytools/generateMock.cpp | 12 +++++++++++- mytools/generateMock.ggo | 3 ++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/mytools/generateMock.cpp b/mytools/generateMock.cpp index c1e686b..60675ac 100644 --- a/mytools/generateMock.cpp +++ b/mytools/generateMock.cpp @@ -18,6 +18,8 @@ using namespace CosmoTool; #define LIGHT_SPEED 299792.458 +static double gadgetUnit=1e-3; + SimuData *doLoadRamses(const char *basename, int baseid, int velAxis, bool goRedshift) { SimuData *d, *outd; @@ -65,7 +67,13 @@ SimuData *doLoadRamses(const char *basename, int baseid, int velAxis, bool goRed SimuData *myLoadGadget(const char *fname, int id, int flags) { - return loadGadgetMulti(fname, id, flags); + SimuData *sim = loadGadgetMulti(fname, id, flags); + sim->BoxSize *= gadgetUnit; + for (int j = 0; j < 3; j++) + for (long i = 0; i < sim->NumPart; i++) + sim->Pos[j][i] *= gadgetUnit; + + return sim; } SimuData *doLoadSimulation(const char *gadgetname, int velAxis, bool goRedshift, SimuData *(*loadFunction)(const char *fname, int id, int flags)) @@ -490,6 +498,8 @@ int main(int argc, char **argv) generateMock_conf_print_version(); + gadgetUnit=args_info.gadgetUnit_arg; + if (args_info.ramsesBase_given || args_info.ramsesId_given) { if (args_info.ramsesBase_given && args_info.ramsesId_given) diff --git a/mytools/generateMock.ggo b/mytools/generateMock.ggo index e530df9..c048e20 100644 --- a/mytools/generateMock.ggo +++ b/mytools/generateMock.ggo @@ -29,4 +29,5 @@ option "cosmo" - "Apply cosmological redshift" flag on option "subsample" - "Subsample the input simulation by the specified amount" double optional -option "inputParameter" - "Input geometry (optional, warning!)" string optional \ No newline at end of file +option "inputParameter" - "Input geometry (optional, warning!)" string optional +option "gadgetUnit" - "Unit of length in gadget file in Mpc/h" double optional default="0.001" From 8bd2d8e86c484c66c593ba1d61e830be8981a58a Mon Sep 17 00:00:00 2001 From: Guilhem Lavaux Date: Tue, 23 Oct 2012 10:38:41 -0400 Subject: [PATCH 4/5] Removed post-scaling of length --- mytools/generateMock.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mytools/generateMock.cpp b/mytools/generateMock.cpp index 60675ac..12a4da3 100644 --- a/mytools/generateMock.cpp +++ b/mytools/generateMock.cpp @@ -100,7 +100,7 @@ SimuData *doLoadSimulation(const char *gadgetname, int velAxis, bool goRedshift, outd = new SimuData; outd->NumPart = d->TotalNumPart; - outd->BoxSize = d->BoxSize/1000; + outd->BoxSize = d->BoxSize; outd->TotalNumPart = outd->NumPart; outd->Hubble = d->Hubble; outd->Omega_Lambda = d->Omega_Lambda; @@ -124,7 +124,7 @@ SimuData *doLoadSimulation(const char *gadgetname, int velAxis, bool goRedshift, { assert(d->Id[i] >= 1); assert(d->Id[i] <= outd->TotalNumPart); - outd->Pos[k][d->Id[i]-1] = d->Pos[k][i]/1000; + outd->Pos[k][d->Id[i]-1] = d->Pos[k][i]; outd->Vel[2][d->Id[i]-1] = d->Vel[velAxis][i]; } From 649ff8c1bc4d8c80f453a700707647390fa14a14 Mon Sep 17 00:00:00 2001 From: Guilhem Lavaux Date: Tue, 23 Oct 2012 10:39:35 -0400 Subject: [PATCH 5/5] Reinstated post-scaling of length for compatibility with Flash loader --- mytools/generateMock.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mytools/generateMock.cpp b/mytools/generateMock.cpp index 12a4da3..cd66b14 100644 --- a/mytools/generateMock.cpp +++ b/mytools/generateMock.cpp @@ -68,10 +68,10 @@ SimuData *doLoadRamses(const char *basename, int baseid, int velAxis, bool goRed SimuData *myLoadGadget(const char *fname, int id, int flags) { SimuData *sim = loadGadgetMulti(fname, id, flags); - sim->BoxSize *= gadgetUnit; + sim->BoxSize *= gadgetUnit*1000; for (int j = 0; j < 3; j++) for (long i = 0; i < sim->NumPart; i++) - sim->Pos[j][i] *= gadgetUnit; + sim->Pos[j][i] *= gadgetUnit*1000; return sim; } @@ -100,7 +100,7 @@ SimuData *doLoadSimulation(const char *gadgetname, int velAxis, bool goRedshift, outd = new SimuData; outd->NumPart = d->TotalNumPart; - outd->BoxSize = d->BoxSize; + outd->BoxSize = d->BoxSize/1000; outd->TotalNumPart = outd->NumPart; outd->Hubble = d->Hubble; outd->Omega_Lambda = d->Omega_Lambda; @@ -124,7 +124,7 @@ SimuData *doLoadSimulation(const char *gadgetname, int velAxis, bool goRedshift, { assert(d->Id[i] >= 1); assert(d->Id[i] <= outd->TotalNumPart); - outd->Pos[k][d->Id[i]-1] = d->Pos[k][i]; + outd->Pos[k][d->Id[i]-1] = d->Pos[k][i]/1000; outd->Vel[2][d->Id[i]-1] = d->Vel[velAxis][i]; }