From f1bbe659469a69c510e9f66d15e91fff31a8f960 Mon Sep 17 00:00:00 2001 From: Guilhem Lavaux Date: Mon, 27 May 2013 08:30:44 +0200 Subject: [PATCH 1/2] Multidark requires SDF. Mark it so in CMake. --- c_tools/mock/generateMock.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/c_tools/mock/generateMock.cpp b/c_tools/mock/generateMock.cpp index 819ef84..d909b23 100644 --- a/c_tools/mock/generateMock.cpp +++ b/c_tools/mock/generateMock.cpp @@ -668,11 +668,11 @@ int main(int argc, char **argv) { loader = flashLoader(args_info.flash_arg, NEED_POSITION|NEED_VELOCITY|NEED_GADGET_ID, preselector); } +#ifdef SDF_SUPPORT else if (args_info.multidark_given) { loader = multidarkLoader(args_info.multidark_arg, preselector); } -#ifdef SDF_SUPPORT else if (args_info.sdf_given) { loader = sdfLoader(args_info.sdf_arg, NEED_POSITION|NEED_VELOCITY|NEED_GADGET_ID, args_info.sdf_splitting_arg, preselector); From 10d38b6d0ac6162c5d16226f3b89335664765001 Mon Sep 17 00:00:00 2001 From: Guilhem Lavaux Date: Mon, 27 May 2013 05:07:04 -0400 Subject: [PATCH 2/2] Added zone structure initialization. --- c_tools/zobov2/jozov2_zones.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/c_tools/zobov2/jozov2_zones.cpp b/c_tools/zobov2/jozov2_zones.cpp index ebfc974..19d3357 100644 --- a/c_tools/zobov2/jozov2_zones.cpp +++ b/c_tools/zobov2/jozov2_zones.cpp @@ -178,6 +178,13 @@ void buildZones(PARTICLE *p, pid_t np, pid_t *&jumped, { if (numinh[i] > 0) { z[h].core = i; + z[h].vol = 0; + z[h].np = z[h].npjoin = z[h].nadj = z[h].nhl = 0; + z[h].leak = 0; + z[h].adj = 0; + z[h].slv = 0; + z[h].denscontrast = 0; + z[h].vol = z[h].voljoin = 0; zonenum[i] = h; h++; } else {