mirror of
https://bitbucket.org/cosmicvoids/vide_public.git
synced 2025-07-04 23:31:12 +00:00
Merge branch 'master' of /home/guilhem/Dropbox/gitRoot/zobovPerso
This commit is contained in:
commit
37a1741809
3 changed files with 4 additions and 3 deletions
|
@ -22,7 +22,7 @@ double gslIntegrate(FunT& v, double a, double b, double prec, int NPTS = 1024)
|
|||
f.function = &gslSpecialFunction<FunT>;
|
||||
f.params = &v;
|
||||
|
||||
gsl_integration_qag(&f, a, b, 0, prec, NPTS, GSL_INTEG_GAUSS61,
|
||||
gsl_integration_qag(&f, a, b, prec, 0, NPTS, GSL_INTEG_GAUSS61,
|
||||
w, &result, &abserr);
|
||||
|
||||
gsl_integration_workspace_free(w);
|
||||
|
|
|
@ -148,6 +148,7 @@ int main(int argc, char *argv[]) {
|
|||
}
|
||||
}
|
||||
}
|
||||
fprintf(scr,"wait\n");
|
||||
fprintf(scr,"./voztie %d %s\n",numdiv,suffix);
|
||||
fclose(scr);
|
||||
|
||||
|
|
4
voztie.c
4
voztie.c
|
@ -93,8 +93,8 @@ int main(int argc, char *argv[]) {
|
|||
for (p=0;p<nvp;p++) {
|
||||
fread(&volstemp,1,sizeof(float),part);
|
||||
if (vols[orig[p]] > -1.)
|
||||
if (fabs(vols[orig[p]]-volstemp)/volstemp > 1e-3) {
|
||||
printf("Inconsistent volumes for p. %d: (%g,%g)!\n",
|
||||
if (fabs(vols[orig[p]]-volstemp)/volstemp > 1.1e-3) {
|
||||
printf("Inconsistent volumes for p. %d: (%10g,%10g)!\n",
|
||||
orig[p],vols[orig[p]],volstemp);
|
||||
exit(0);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue