From 1c1c8b778ea3a6907cf2bbae37f92cbcbf187a2f Mon Sep 17 00:00:00 2001 From: Guilhem Lavaux Date: Tue, 5 Mar 2013 14:56:44 +0100 Subject: [PATCH] Fixes to SDF loader --- c_tools/mock/generateMock.cpp | 2 +- c_tools/mock/loaders/sdf_loader.cpp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/c_tools/mock/generateMock.cpp b/c_tools/mock/generateMock.cpp index 72670f6..ffbe1e1 100644 --- a/c_tools/mock/generateMock.cpp +++ b/c_tools/mock/generateMock.cpp @@ -645,7 +645,7 @@ int main(int argc, char **argv) #ifdef SDF_SUPPORT else if (args_info.sdf_given) { - loader = sdfLoader(args_info.sdf_arg, args_info.sdf_splitting_arg, NEED_POSITION|NEED_VELOCITY|NEED_GADGET_ID, preselector); + loader = sdfLoader(args_info.sdf_arg, NEED_POSITION|NEED_VELOCITY|NEED_GADGET_ID, args_info.sdf_splitting_arg, preselector); } #endif else diff --git a/c_tools/mock/loaders/sdf_loader.cpp b/c_tools/mock/loaders/sdf_loader.cpp index 28ad3a3..5023507 100644 --- a/c_tools/mock/loaders/sdf_loader.cpp +++ b/c_tools/mock/loaders/sdf_loader.cpp @@ -193,6 +193,7 @@ SimulationLoader *sdfLoader(const std::string& snapshot, int flags, { return 0; } + cout << "Loading SDF with artificial splitting " << num_splitting << endl; SDFgetintOrDefault(sdfp, "version", &fileversion, 1); if (fileversion == 1) @@ -215,7 +216,8 @@ SimulationLoader *sdfLoader(const std::string& snapshot, int flags, } double h0; - h0 = hdr->Hubble*10.0*(one_kpc/one_Gyr); + hdr->Hubble *= 10.0; + h0 = hdr->Hubble*(one_kpc/one_Gyr); if (SDFhasname("R0", sdfp)) {