projects
/
physik
/
morpheus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
z relaxation, fixed bug in random.c
[physik/morpheus.git]
/
main.c
diff --git
a/main.c
b/main.c
index
c019f0a
..
d171490
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-27,6
+27,7
@@
/* global variables */
u32 *rand_buf,*rand_current;
/* global variables */
u32 *rand_buf,*rand_current;
+char random_file[MAX_CHARS_RANDOM_FILE];
u32 gr;
int random_fd; /* /dev/urandom file descriptor */
u32 gr;
int random_fd; /* /dev/urandom file descriptor */
@@
-49,6
+50,7
@@
int usage()
printf("-p <value> \t p0 for probability of cell getting amorph (default %f)\n",DEFAULT_A_P_P0);
printf("-C <value> \t C start concentration (default %d)\n",DEFAULT_C_DIST_START_CONC);
printf("-S <value> \t slope of linear C distribution (default %d)\n",DEFAULT_C_DIST_SLOPE);
printf("-p <value> \t p0 for probability of cell getting amorph (default %f)\n",DEFAULT_A_P_P0);
printf("-C <value> \t C start concentration (default %d)\n",DEFAULT_C_DIST_START_CONC);
printf("-S <value> \t slope of linear C distribution (default %d)\n",DEFAULT_C_DIST_SLOPE);
+ puts("-R <file> \t read random datat from file (default not used)");
return -23;
}
return -23;
}
@@
-132,14
+134,15
@@
int process_cell(cell *cell_p,u32 x,u32 y,u32 z,u32 x_max,u32 y_max,u32 z_max,in
{
for(j=-range;j<=range;j++)
{
{
for(j=-range;j<=range;j++)
{
- for(k=-range;k<=range;k++)
- {
- if(!(i==0 && j==0 && k==0))
+ // z relaxation, no pressure in z direction
+ // for(k=-range;k<=range;k++)
+ // {
+ if(!(i==0 && j==0)) // && k==0))
{
{
- // if((cell_p+((x+x_max+i)%x_max)+((y+j+y_max)%y_max)*x_max+((z+k+z_max)%z_max)*x_max*y_max)->status&AMORPH) pressure+=
(cell_p+((x+x_max+i)%x_max)+((y+j+y_max)%y_max)*x_max+((z+k+z_max)%z_max)*x_max*y_max)->conc*
faktor*URAND_2BYTE_MAX/(i*i+j*j+k*k);
- if((cell_p+((x+x_max+i)%x_max)+((y+j+y_max)%y_max)*x_max+
((z+k+z_max)%z_max)*x_max*y_max)->status&AMORPH) pressure+=faktor*URAND_2BYTE_MAX/(i*i+j*j+k*k
);
+ // if((cell_p+((x+x_max+i)%x_max)+((y+j+y_max)%y_max)*x_max+((z+k+z_max)%z_max)*x_max*y_max)->status&AMORPH) pressure+=faktor*URAND_2BYTE_MAX/(i*i+j*j+k*k);
+ if((cell_p+((x+x_max+i)%x_max)+((y+j+y_max)%y_max)*x_max+
z*x_max*y_max)->status&AMORPH) pressure+=faktor*URAND_2BYTE_MAX/(i*i+j*j
);
}
}
- }
+
//
}
}
}
pressure*=this_cell->conc;
}
}
pressure*=this_cell->conc;
@@
-199,6
+202,7
@@
int main(int argc,char **argv)
display_y=y_cell/2;
display_z=z_cell/2;
display_refresh_rate=DEFAULT_DISPLAY_REF_RATE;
display_y=y_cell/2;
display_z=z_cell/2;
display_refresh_rate=DEFAULT_DISPLAY_REF_RATE;
+ strcpy(random_file,"");
/* parse command args */
for(i=1;i<argc;i++)
/* parse command args */
for(i=1;i<argc;i++)
@@
-259,6
+263,9
@@
int main(int argc,char **argv)
case 'S':
c_dist_slope=atoi(argv[++i]);
break;
case 'S':
c_dist_slope=atoi(argv[++i]);
break;
+ case 'R':
+ strcpy(random_file,argv[++i]);
+ break;
default:
usage();
return -23;
default:
usage();
return -23;
@@
-267,17
+274,21
@@
int main(int argc,char **argv)
}
/* open random fd */
}
/* open random fd */
- if(
(random_fd=open("/dev/urandom",O_RDONLY))<0
)
+ if(
!strcmp(random_file,"")
)
{
{
- puts("cannot open /dev/urandom\n");
- return -23;
+ if((random_fd=open("/dev/urandom",O_RDONLY))<0)
+ {
+ puts("cannot open /dev/urandom");
+ return -23;
+ }
+ } else
+ {
+ if((random_fd=open(random_file,O_RDONLY))<0)
+ {
+ puts("cannot open random file");
+ return -23;
+ }
}
}
-
- /* calculate gr one time! */
- gr=0;
- for(i=1;i<=z_cell;i++) gr+=i;
- printfd("debug: gr = %d\n",gr);
-
/* allocate random number buffer */
printf("malloc will free %d bytes now ...\n",RAND_BUF_SIZE);
if((rand_buf=(u32 *)malloc(RAND_BUF_SIZE))==NULL)
/* allocate random number buffer */
printf("malloc will free %d bytes now ...\n",RAND_BUF_SIZE);
if((rand_buf=(u32 *)malloc(RAND_BUF_SIZE))==NULL)
@@
-286,6
+297,11
@@
int main(int argc,char **argv)
return -23;
}
rand_current=rand_buf+RAND_BUF_SIZE;
return -23;
}
rand_current=rand_buf+RAND_BUF_SIZE;
+
+ /* calculate gr one time! */
+ gr=0;
+ for(i=1;i<=z_cell;i++) gr+=i;
+ printfd("debug: gr = %d\n",gr);
/* allocate cells */
printf("malloc will free %d bytes now ...\n",x_cell*y_cell*z_cell*sizeof(cell));
/* allocate cells */
printf("malloc will free %d bytes now ...\n",x_cell*y_cell*z_cell*sizeof(cell));
@@
-302,7
+318,7
@@
int main(int argc,char **argv)
/* main routine */
printfd("debug: starting main routine ...\n");
/* main routine */
printfd("debug: starting main routine ...\n");
- for(
i=0;i<steps;i
++)
+ for(
display.step=0;display.step<steps;display.step
++)
{
x=rand_get(x_cell);
y=rand_get(y_cell);
{
x=rand_get(x_cell);
y=rand_get(y_cell);
@@
-311,11
+327,10
@@
int main(int argc,char **argv)
/* todo */
distrib_c_conc(cell_p,c_dist_c0,c_dist_slope,c_conc,x_cell,y_cell,z_cell);
/* todo */
distrib_c_conc(cell_p,c_dist_c0,c_dist_slope,c_conc,x_cell,y_cell,z_cell);
- // process_cell(cell_p+x+y*x_cell+z*x_cell*y_cell);
process_cell(cell_p,x,y,z,x_cell,y_cell,z_cell,a_p_range,a_p_faktor,a_p_p0,&c_conc);
/* display stuff */
process_cell(cell_p,x,y,z,x_cell,y_cell,z_cell,a_p_range,a_p_faktor,a_p_p0,&c_conc);
/* display stuff */
- if((
i
%display_refresh_rate)==0)
+ if((
display.step
%display_refresh_rate)==0)
display_draw(&display,display_x,display_y,display_z);
}
printfd("debug: main routine finished!\n");
display_draw(&display,display_x,display_y,display_z);
}
printfd("debug: main routine finished!\n");