X-Git-Url: https://hackdaworld.org/gitweb/?p=physik%2Fmorpheus.git;a=blobdiff_plain;f=main.c;h=9438a327d452ee07d62090f56cf7b51bb16b8966;hp=66503eeda10ef9ba2e783f058eb2d7a6f91ef446;hb=dcc213e7fef0a79e92d8548bd9a37461e91c9a5c;hpb=eecd9c34f43a4ee119595dd00261d1bff2fdf859

diff --git a/main.c b/main.c
index 66503ee..9438a32 100644
--- a/main.c
+++ b/main.c
@@ -45,8 +45,8 @@ int usage()
  puts("-Z <value> \t display area intercept point z (default # z cells / 2)");
  puts("-d <value> \t refresh every <value> loops (default 100)");
  puts("-r <value> \t pressure range from amorphous SiCx (default 2)");
- puts("-f <value> \t (unused) faktor for pressure from amorphous SiCx (default 1)");
- puts("-p <value> \t p0 for probability of cell getting amorph (default sum_range_rate / 4)");
+ puts("-f <value> \t faktor for pressure from amorphous SiCx (default 0.2)");
+ puts("-p <value> \t p0 for probability of cell getting amorph (default 0.2)");
  return -23;
 }
 
@@ -67,6 +67,7 @@ int process_cell(void *cell_p,u32 x,u32 y,u32 z,u32 x_max,u32 y_max,u32 z_max,in
 {
  u32 *cell;
  int i,j,k,count;
+ double pressure;
  // float count;
  cell=(u32 *)(cell_p+x+y*(x_max-1)+z*(x_max-1)*(y_max-1));
  count=p0;
@@ -78,7 +79,8 @@ int process_cell(void *cell_p,u32 x,u32 y,u32 z,u32 x_max,u32 y_max,u32 z_max,in
    {
     if(!(i==0 && j==0 && k==0))
     {
-     if(*(u32 *)(cell_p+((x+x_max+i)%x_max)+((y+j+y_max)%y_max)*(x_max-1)+((z+k+z_max)%z_max)*(x_max-1)*(y_max-1))&AMORPH) count+=(3*range*range-i*i-j*j-k*k);
+     if(*(u32 *)(cell_p+((x+x_max+i)%x_max)+((y+j+y_max)%y_max)*(x_max-1)+((z+k+z_max)%z_max)*(x_max-1)*(y_max-1))&AMORPH) pressure+=faktor*URAND_2BYTE_MAX/(i*i+j*j+k*k);
+		// count+=(3*range*range-i*i-j*j-k*k);
     }
    }
   }
@@ -99,14 +101,16 @@ int main(int argc,char **argv)
 {
  u32 x_cell,y_cell,z_cell; /* amount of segments */
  u32 x,y,z; /* cells */
- int i,j,k; /* for counting */
+ int i; /* for counting */
  int slope_nel,start_nel; /* nuclear energy loss: slope, constant */
- int a_p_range,a_p_faktor,a_p_p0; /* p. range, p0 and faktor of amorphous sic */
+ int a_p_range; /* p. range of amorphous sic */
+ double a_p_faktor,a_p_p0; /* p0 and faktor of amorphous sic */
  int steps; /* # steps */
  void *cell_p;
  struct __display display;
  u32 display_x,display_y,display_z; /* intercept point of diplayed areas */
  u32 display_refresh_rate; /* refresh rate for display */
+ int quit=0; /* continue/quit status */
 
  /* default values */
  x_cell=DEFAULT_X_SEG;
@@ -168,10 +172,10 @@ int main(int argc,char **argv)
      a_p_range=atoi(argv[++i]);
      break;
     case 'f':
-     a_p_faktor=atoi(argv[++i]);
+     a_p_faktor=atof(argv[++i]);
      break;
     case 'p':
-     a_p_p0=atoi(argv[++i]);
+     a_p_p0=atof(argv[++i]);
      break;
     default:
      usage();
@@ -191,22 +195,22 @@ int main(int argc,char **argv)
  sum_z_cells=0;
  for(i=1;i<=z_cell;i++) sum_z_cells+=(start_nel+i*slope_nel);
  printfd("debug: sum z cells -> %u\n",sum_z_cells);
- sum_range_rate=0;
- for(i=-a_p_range;i<=a_p_range;i++)
- {
-  for(j=-a_p_range;j<=a_p_range;j++)
-  {
-   for(k=-a_p_range;k<=a_p_range;k++)
-   {
-    if(!(i==0 && j==0 && k==0))
-     sum_range_rate+=((3*a_p_range*a_p_range)-i*i-j*j-k*k);
-   }
-  }
- }
- printfd("debug: sum range rate -> %u\n",sum_range_rate);
- /* add a_p_p0 ... */
- if(a_p_p0==NOT_SPECIFIED) a_p_p0=sum_range_rate/4;
- sum_range_rate+=a_p_p0;
+ // sum_range_rate=0;
+ // for(i=-a_p_range;i<=a_p_range;i++)
+ // {
+ //  for(j=-a_p_range;j<=a_p_range;j++)
+ //  {
+ //   for(k=-a_p_range;k<=a_p_range;k++)
+ //   {
+ //    if(!(i==0 && j==0 && k==0))
+ //     sum_range_rate+=((3*a_p_range*a_p_range)-i*i-j*j-k*k);
+ //   }
+ //  }
+ // }
+ // printfd("debug: sum range rate -> %u\n",sum_range_rate);
+ // /* add a_p_p0 ... */
+ // if(a_p_p0==NOT_SPECIFIED) a_p_p0=sum_range_rate/4;
+ // sum_range_rate+=a_p_p0;
 
 
  /* testing ... */
@@ -237,14 +241,19 @@ int main(int argc,char **argv)
   process_cell(cell_p,x,y,z,x_cell,y_cell,z_cell,a_p_range,a_p_faktor,a_p_p0);
 
   /* display stuff */
-  if((i%display_refresh_rate)==0) 
+  if((i%display_refresh_rate)==0)
    display_draw(&display,display_x,display_y,display_z);
  }
   
- /* display again and quit when button hit */
+ /* display again and listen for events */
  display_draw(&display,display_x,display_y,display_z);
- puts("hit button to quit ...");
- getchar();
+ display_event_init(&display);
+
+ while(!quit)
+ {
+  display_scan_event(&display,&display_x,&display_y,&display_z,&quit);
+  display_draw(&display,display_x,display_y,display_z);
+ }
 
  display_release(&display);