Merge branch 'master' of bitbucket.org:cosmicvoids/void_identification

This commit is contained in:
P.M. Sutter 2013-05-27 07:41:31 -05:00
commit 4e8038b5e8
2 changed files with 8 additions and 1 deletions

View file

@ -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);

View file

@ -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 {