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

First steps in purging the tracking of mock particles: no longer present in jovoz2

Browse source
This commit is contained in:
Paul M. Sutter 2025-01-09 18:21:26 +08:00
parent a1d0b675c7
commit 091cf5d1dc
5 changed files with 10 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

15
c_source/jozov2/jozov2.cpp
View file

@ -51,9 +51,7 @@ int main(int argc,char **argv)
double *sorter; double *sorter;
int *iord; int *iord;
int mockIndex; if (argc != 7) {
if (argc != 8) {
printf("Wrong number of arguments.\n"); printf("Wrong number of arguments.\n");
printf("arg1: adjacency file\n"); printf("arg1: adjacency file\n");
printf("arg2: volume file\n"); printf("arg2: volume file\n");
@ -61,7 +59,6 @@ int main(int argc,char **argv)
printf("arg4: output file containing zones in each void\n"); printf("arg4: output file containing zones in each void\n");
printf("arg5: output text file\n"); printf("arg5: output text file\n");
printf("arg6: Density threshold (0 for no threshold)\n"); printf("arg6: Density threshold (0 for no threshold)\n");
printf("arg7: Beginning index of mock galaxies\n\n");
exit(0); exit(0);
} }
adjfile = argv[1]; adjfile = argv[1];
@ -73,10 +70,6 @@ int main(int argc,char **argv)
printf("Bad density threshold.\n"); printf("Bad density threshold.\n");
exit(0); exit(0);
} }
if (sscanf(argv[7],"%d",&mockIndex) == 0) {
printf("Bad mock galaxy index.\n");
exit(0);
}
printf("TOLERANCE: %f\n", voltol); printf("TOLERANCE: %f\n", voltol);
if (voltol <= 0.) { if (voltol <= 0.) {
printf("Proceeding without a density threshold.\n"); printf("Proceeding without a density threshold.\n");
@ -91,13 +84,11 @@ int main(int argc,char **argv)
{ {
return 1; return 1;
} }
if (mockIndex < 0)
mockIndex = np;
/* Check that we got all the pairs */ /* Check that we got all the pairs */
for (int i = 0; i < np; i++) for (int i = 0; i < np; i++)
{ {
if (p[i].ncnt != p[i].nadj && i < mockIndex) { if (p[i].ncnt != p[i].nadj) {
cout cout
<< format("We didn't get all of %d's adj's; %d != %d.") << format("We didn't get all of %d's adj's; %d != %d.")
% i % p[i].ncnt % p[i].nadj % i % p[i].ncnt % p[i].nadj
@ -109,7 +100,7 @@ int main(int argc,char **argv)
/* Volumes */ /* Volumes */
try try
{ {
readVolumeFile(volfile, p, np, mockIndex); readVolumeFile(volfile, p, np);
} }
catch (const FileError& e) catch (const FileError& e)
{ {

3
c_source/jozov2/jozov2.hpp
View file

@ -34,8 +34,7 @@ class FileError: virtual std::exception
void readAdjacencyFile(const std::string& adjfile, PARTICLE*& p, pid_t& np) void readAdjacencyFile(const std::string& adjfile, PARTICLE*& p, pid_t& np)
throw(FileError); throw(FileError);
void readVolumeFile(const std::string& volfile, PARTICLE *p, pid_t np, void readVolumeFile(const std::string& volfile, PARTICLE *p, pid_t np)
pid_t mockIndex)
throw(FileError); throw(FileError);
void buildInitialZones(PARTICLE *p, pid_t np, pid_t* jumped, void buildInitialZones(PARTICLE *p, pid_t np, pid_t* jumped,

5
c_source/jozov2/jozov2_io.cpp
View file

@ -103,8 +103,7 @@ void readAdjacencyFile(const string& adjfile, PARTICLE*& p, pid_t& np)
} }
} }
void readVolumeFile(const std::string& volfile, PARTICLE *p, pid_t np, void readVolumeFile(const std::string& volfile, PARTICLE *p, pid_t np)
pid_t mockIndex)
throw(FileError) throw(FileError)
{ {
ifstream vol(volfile.c_str()); ifstream vol(volfile.c_str());
@ -125,7 +124,7 @@ void readVolumeFile(const std::string& volfile, PARTICLE *p, pid_t np,
for (pid_t i = 0; i < np; i++) { for (pid_t i = 0; i < np; i++) {
vol.read((char*)&p[i].dens, sizeof(float)); vol.read((char*)&p[i].dens, sizeof(float));
if (((p[i].dens < 1e-30) || (p[i].dens > 1e30)) && (i < mockIndex)) { if ((p[i].dens < 1e-30) || (p[i].dens > 1e30)) {
cout << format("Whacked-out volume found, of particle %d: %f") % i % p[i].dens << endl; cout << format("Whacked-out volume found, of particle %d: %f") % i % p[i].dens << endl;
p[i].dens = 1.; p[i].dens = 1.;
} }

4
c_source/zobov/voz.h
View file

@ -1,7 +1,7 @@
#define MAXVERVER 100000 #define MAXVERVER 100000
#define NGUARD 84 /*Actually, the number of SPACES between guard points #define NGUARD 42 /*Actually, the number of SPACES between guard points
##define NGUARD 42 /*Actually, the number of SPACES between guard points
in each dim */ in each dim */
//#define NGUARD 84 /*Actually, the number of SPACES between guard points
typedef int pid_t; typedef int pid_t;

3
python_source/backend/launchers.py
View file

@ -500,7 +500,8 @@ def launchZobov(sample, binPath, outputDir=None, logDir=None, continueRun=None,
outputDir+"/voidPart_"+sampleName+".dat", \ outputDir+"/voidPart_"+sampleName+".dat", \
outputDir+"/voidZone_"+sampleName+".dat", \ outputDir+"/voidZone_"+sampleName+".dat", \
outputDir+"/voidDesc_"+sampleName+".out", \ outputDir+"/voidDesc_"+sampleName+".out", \
str(maxDen), str(maskIndex)] str(maxDen)
]
log = open(logFile, 'a') log = open(logFile, 'a')
subprocess.call(cmd, stdout=log, stderr=log) subprocess.call(cmd, stdout=log, stderr=log)
log.close() log.close()