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

now supports single subdivisions in zobov

Browse source
This commit is contained in:
P.M. Sutter 2016-01-19 12:58:00 -06:00
parent add61229cb
commit d3cf95bec3
3 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
python_tools/void_python_tools/backend/launchers.py
View file

@ -339,6 +339,8 @@ def launchZobov(sample, binPath, zobovDir=None, logDir=None, continueRun=None,
else: else:
maskIndex = -1 maskIndex = -1
maxDen = 0.2 maxDen = 0.2
if numZobovDivisions == 1:
print " WARNING! You are using a single ZOBOV division with a simulation. Periodic boundaries will not be respected!"
if not (continueRun and jobSuccessful(logFile, "Done!\n")): if not (continueRun and jobSuccessful(logFile, "Done!\n")):
for fileName in glob.glob(zobovDir+"/part._"+sampleName+".*"): for fileName in glob.glob(zobovDir+"/part._"+sampleName+".*"):

6
zobov/vozinit.c
View file

@ -59,9 +59,9 @@ int main(int argc, char *argv[]) {
printf("That's no number of divisions; try again.\n"); printf("That's no number of divisions; try again.\n");
exit(0); exit(0);
} }
if (numdiv < 2) { if (numdiv < 1) {
printf("Cannot have a number of divisions less than 2. Resetting to 2:\n"); printf("Cannot have a number of divisions less than 1. Resetting to 1:\n");
numdiv = 2; numdiv = 1;
} }
suffix = argv[5]; suffix = argv[5];

7
zobov/voztie.c
View file

@ -50,10 +50,11 @@ int main(int argc, char *argv[]) {
printf("That's no number of divisions; try again.\n"); printf("That's no number of divisions; try again.\n");
exit(0); exit(0);
} }
if (numdiv < 2) { if (numdiv < 1) {
printf("Cannot have a number of divisions less than 2. Resetting to 2:\n"); printf("Cannot have a number of divisions less than 1. Resetting to 1:\n");
numdiv = 2; numdiv = 1;
} }
suffix = argv[2]; suffix = argv[2];
outDir = argv[3]; outDir = argv[3];
if (sscanf(argv[4],"%d",&mockIndex) != 1) { if (sscanf(argv[4],"%d",&mockIndex) != 1) {