projects
/
physik
/
nlsop.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added tool to convert big endian save files to little endian (dont tell anyone!)
[physik/nlsop.git]
/
nlsop.c
diff --git
a/nlsop.c
b/nlsop.c
index
40803d5
..
2bec6ec
100644
(file)
--- a/
nlsop.c
+++ b/
nlsop.c
@@
-373,8
+373,10
@@
int write_ac_distr(d3_lattice *d3_l,int ac_distr)
if(*(d3_l->status+offset)&AMORPH) count+=1;
}
}
if(*(d3_l->status+offset)&AMORPH) count+=1;
}
}
+#ifndef MAC
if(ac_distr==4) dprintf(fd,"%d %d\n",z*CELL_LENGTH,count);
else dprintf(fd,"%d %f\n",z*CELL_LENGTH,100.0*count/si_count);
if(ac_distr==4) dprintf(fd,"%d %d\n",z*CELL_LENGTH,count);
else dprintf(fd,"%d %f\n",z*CELL_LENGTH,100.0*count/si_count);
+#endif
}
close(fd);
}
close(fd);
@@
-956,6
+958,7
@@
int load_from_file(char *lf,d3_lattice *d3_l,info *my_inf)
int convert_file(char *cf,d3_lattice *d3_l)
{
int convert_file(char *cf,d3_lattice *d3_l)
{
+#ifndef MAC
int x,y,z;
int c_fd;
int x,y,z;
int c_fd;
@@
-976,6
+979,7
@@
int convert_file(char *cf,d3_lattice *d3_l)
}
}
close(c_fd);
}
}
close(c_fd);
+#endif
return 1;
}
return 1;
}
@@
-1170,6
+1174,10
@@
int main(int argc,char **argv)
ne_max=0;
ip_max=0;
ne_max=0;
ip_max=0;
+#ifdef MORE_PRINTF
+ printf("reading argv ...");
+#endif
+
for(i=1;i<argc;i++)
{
if(argv[i][0]=='-')
for(i=1;i<argc;i++)
{
if(argv[i][0]=='-')
@@
-1265,6
+1273,10
@@
int main(int argc,char **argv)
} else usage();
}
} else usage();
}
+#ifdef MORE_PRINTF
+ printf(" done\n");
+#endif
+
x=d3_l.max_x/2-1;
y=d3_l.max_y/2-1;
z=d3_l.max_z/2-1;
x=d3_l.max_x/2-1;
y=d3_l.max_y/2-1;
z=d3_l.max_z/2-1;
@@
-1277,9
+1289,18
@@
int main(int argc,char **argv)
}
#endif
}
#endif
+#ifdef MORE_PRINTF
+ printf("rand init ...");
+#endif
+
if(!strcmp(r_file,"")) rand_init(NULL);
else rand_init(r_file);
if(!strcmp(r_file,"")) rand_init(NULL);
else rand_init(r_file);
+#ifdef MORE_PRINTF
+ printf(" done\n");
+ printf("allocating data ...");
+#endif
+
if(!strcmp(l_file,""))
{
i=d3_l.max_x*d3_l.max_y*d3_l.max_z;
if(!strcmp(l_file,""))
{
i=d3_l.max_x*d3_l.max_y*d3_l.max_z;
@@
-1308,12
+1329,16
@@
int main(int argc,char **argv)
convert_file(c_file,&d3_l);
puts("done");
return 1;
convert_file(c_file,&d3_l);
puts("done");
return 1;
- }
+ }
#ifdef USE_DFB_API
else d3_lattice_init(&argc,argv,&d3_l);
#endif
}
#ifdef USE_DFB_API
else d3_lattice_init(&argc,argv,&d3_l);
#endif
}
+#ifdef MORE_PRINTF
+ printf(" done\n");
+#endif
+
#ifdef USE_DFB_API
d3_event_init(&d3_l);
#endif
#ifdef USE_DFB_API
d3_event_init(&d3_l);
#endif
@@
-1361,6
+1386,10
@@
int main(int argc,char **argv)
arg_v[25]=NULL;
#endif
arg_v[25]=NULL;
#endif
+#ifdef MORE_PRINTF
+ printf("random rejection graphs ...");
+#endif
+
/* compute graphs for random number rejection method */
if((c_profile=(u32 *)malloc(d3_l.max_z*sizeof(unsigned int)))==NULL)
{
/* compute graphs for random number rejection method */
if((c_profile=(u32 *)malloc(d3_l.max_z*sizeof(unsigned int)))==NULL)
{
@@
-1384,6
+1413,10
@@
int main(int argc,char **argv)
return -1;
}
return -1;
}
+#ifdef MORE_PRINTF
+ printf(" done\n");
+#endif
+
#ifdef DEBUG_RAND
i=0;
while(1)
#ifdef DEBUG_RAND
i=0;
while(1)
@@
-1402,9
+1435,16
@@
int main(int argc,char **argv)
}
#endif
}
#endif
+#ifdef MORE_PRINTF
+ printf("starting simulation ... now! :)\n");
+#endif
+
i=(c_step?c_step:0);
while((i<my_info.steps) && (quit==0) && (escape==0))
{
i=(c_step?c_step:0);
while((i<my_info.steps) && (quit==0) && (escape==0))
{
+#ifdef MORE_PRINTF
+ if(i%refresh==0) printf("step: %d\n",i);
+#endif
for(j=0;j<my_info.cpi;j++)
{
x_c=get_rand(d3_l.max_x);
for(j=0;j<my_info.cpi;j++)
{
x_c=get_rand(d3_l.max_x);