X-Git-Url: https://hackdaworld.org/gitweb/?a=blobdiff_plain;f=main.c;h=2ac8d6a9ac86d2331786445218e7eb9199b42066;hb=2fc464b1e03445cd60e9305dc9b75471ebdb04af;hp=2e9cc0c46f0f06189e32fd4719a5de44af903a40;hpb=4dc55f36080bc8cc78c07efe25bf3f222c3d0a9a;p=physik%2Fmorpheus.git

diff --git a/main.c b/main.c
index 2e9cc0c..2ac8d6a 100644
--- a/main.c
+++ b/main.c
@@ -26,6 +26,8 @@
 #include "display.h"
 
 /* global variables */
+u32 *rand_buf,*rand_current;
+char random_file[MAX_CHARS_RANDOM_FILE];
 u32 gr;
 int random_fd; /* /dev/urandom file descriptor */
 
@@ -48,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);
+ puts("-R <file> \t read random datat from file (default not used)");
  return -23;
 }
 
@@ -65,10 +68,8 @@ int make_cryst(cell *cell)
 
 int distrib_c_conc(cell *cell_p,int c_c0,int c_slope,u32 c_conc,u32 x_max,u32 y_max,u32 z_max)
 {
- /* cryst. c to distribute */
-
  int i,j;
- u32 area,c_area,total;
+ u32 area,c_area,total,count;
  u32 x,y,z,sum_c_z;
 
  total=0;
@@ -77,17 +78,22 @@ int distrib_c_conc(cell *cell_p,int c_c0,int c_slope,u32 c_conc,u32 x_max,u32 y_
 
  for(i=0;i<z_max;i++)
  {
+  count=0;
   c_area=(c_conc*(c_c0+(i+1)*c_slope))/sum_c_z;
   for(j=0;j<area;j++)
-  { 
+  {
+   if(!(cell_p+j+i*area)->status&AMORPH) count++; 
+  }
+  for(j=0;j<area;j++)
+  {
    if(!(cell_p+j+i*area)->status&AMORPH)
    { 
-    (cell_p+j+i*area)->conc=c_area/area;
-    total+=c_area/area;
+    (cell_p+j+i*area)->conc=c_area/count;
+    total+=c_area/count;
    }
   }
   j=0;
-  while(j<c_area%area)
+  while(j<c_area%count)
   {
    x=rand_get(x_max);
    y=rand_get(y_max);
@@ -120,8 +126,10 @@ int process_cell(cell *cell_p,u32 x,u32 y,u32 z,u32 x_max,u32 y_max,u32 z_max,in
  cell *this_cell;
  int i,j,k;
  double pressure;
+
  this_cell=cell_p+x+y*x_max+z*x_max*y_max;
  pressure=p0*URAND_2BYTE_MAX;
+
  for(i=-range;i<=range;i++)
  {
   for(j=-range;j<=range;j++)
@@ -136,6 +144,7 @@ int process_cell(cell *cell_p,u32 x,u32 y,u32 z,u32 x_max,u32 y_max,u32 z_max,in
    }
   }
  }
+ pressure*=this_cell->conc;
  if(this_cell->status&AMORPH)
  {
   /* wrong probability! just test by now ...*/
@@ -192,6 +201,7 @@ int main(int argc,char **argv)
  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++)
@@ -252,6 +262,9 @@ int main(int argc,char **argv)
     case 'S':
      c_dist_slope=atoi(argv[++i]);
      break;
+    case 'R':
+     strcpy(random_file,argv[++i]);
+     break;
     default:
      usage();
      return -23;
@@ -260,12 +273,30 @@ int main(int argc,char **argv)
  }
 
  /* open random fd */
- if((random_fd=open("/dev/urandom",O_RDONLY))<0)
+ if(!strcmp(random_file,""))
+ {
+  if((random_fd=open("/dev/urandom",O_RDONLY))<0)
+  {
+   puts("cannot open /dev/urandom");
+   return -23;
+  }
+ } else
  {
-  puts("cannot open /dev/urandom\n");
+  if((random_fd=open(random_file,O_RDONLY))<0)
+  {
+   puts("cannot open random file");
+   return -23;
+  }
+ }
+ /* allocate random number buffer */
+ printf("malloc will free %d bytes now ...\n",RAND_BUF_SIZE);
+ if((rand_buf=(u32 *)malloc(RAND_BUF_SIZE))==NULL)
+ {
+  puts("failed allocating memory for random numbers");
   return -23;
  }
-
+ rand_current=rand_buf+RAND_BUF_SIZE;
+  
  /* calculate gr one time! */
  gr=0;
  for(i=1;i<=z_cell;i++) gr+=i;
@@ -275,7 +306,7 @@ int main(int argc,char **argv)
  printf("malloc will free %d bytes now ...\n",x_cell*y_cell*z_cell*sizeof(cell));
  if((cell_p=(cell *)malloc(x_cell*y_cell*z_cell*sizeof(cell)))==NULL)
  {
-  puts("failed allocating memory for cells\n");
+  puts("failed allocating memory for cells");
   return -23;
  }
  memset(cell_p,0,x_cell*y_cell*z_cell*sizeof(cell));
@@ -286,20 +317,19 @@ int main(int argc,char **argv)
 
  /* 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);
   z=rand_get_lgp(slope_nel,start_nel,z_cell);
 
   /* todo */
-  // distrib_c_conc(cell_p,c_dist_c0,c_dist_slope,c_conc,x_cell,y_cell,z_cell);
+  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 */
-  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");