From: hackbard <hackbard>
Date: Wed, 2 Apr 2003 21:38:47 +0000 (+0000)
Subject: first c conc distribution implementation (slow and commented out)
X-Git-Url: https://hackdaworld.org/gitweb/?a=commitdiff_plain;h=4dc55f36080bc8cc78c07efe25bf3f222c3d0a9a;p=physik%2Fmorpheus.git

first c conc distribution implementation (slow and commented out)
---

diff --git a/defines.h b/defines.h
index 713e9cc..58befa1 100644
--- a/defines.h
+++ b/defines.h
@@ -22,8 +22,9 @@
 #define DEFAULT_A_P_FAKTOR 0.2
 #define DEFAULT_A_P_P0 0.2
 
-#define DEFAULT_C_START_CONC 5000
-#define DEFAULT_C_SLOPE 1
+#define DEFAULT_C_DIST_START_CONC 0
+#define DEFAULT_C_DIST_SLOPE 1
+#define DEFAULT_C_C0 5000
 
 #define DEFAULT_STEPS 5000
 
@@ -37,7 +38,7 @@ typedef long long unsigned int u64;
 
 typedef struct __cell {
  unsigned char status; /* amorph or cryst status */
- double conc; /* c concentration */
+ u32 conc; /* c concentration */
 } cell;
 
 #ifdef DEBUG
diff --git a/display.c b/display.c
index bb2eccb..9509276 100644
--- a/display.c
+++ b/display.c
@@ -153,7 +153,7 @@ int display_draw(display *display,u32 x,u32 y,u32 z)
  display->primary_surface->DrawString(display->primary_surface,text,-1,menu_x+display_faktor_x,menu_y+display_faktor_y*3+menu_h/10*3,DSTF_LEFT);
  sprintf(text,"status: %c",((display->cell_p+x+y*display->max_x+z*display->max_x*display->max_y))->status&AMORPH?'a':'c');
  display->primary_surface->DrawString(display->primary_surface,text,-1,menu_x+display_faktor_x,menu_y+display_faktor_y*5+menu_h/10*5,DSTF_LEFT);
- sprintf(text,"c conc.: %f",(display->cell_p+x+y*display->max_x+z*display->max_x*display->max_y)->conc);
+ sprintf(text,"c conc.: %u",(display->cell_p+x+y*display->max_x+z*display->max_x*display->max_y)->conc);
  display->primary_surface->DrawString(display->primary_surface,text,-1,menu_x+display_faktor_x,menu_y+display_faktor_y*6+menu_h/10*6,DSTF_LEFT);
  /* flip all to surface */
  display->primary_surface->Flip(display->primary_surface,NULL,0);
diff --git a/main.c b/main.c
index 4ff223b..2e9cc0c 100644
--- a/main.c
+++ b/main.c
@@ -26,7 +26,7 @@
 #include "display.h"
 
 /* global variables */
-u32 sum_z_cells,sum_c_dist;
+u32 gr;
 int random_fd; /* /dev/urandom file descriptor */
 
 int usage()
@@ -46,8 +46,8 @@ int usage()
  printf("-r <value> \t pressure range from amorphous SiCx (default %d)\n",DEFAULT_A_P_RANGE);
  printf("-f <value> \t faktor for pressure from amorphous SiCx (default %f)\n",DEFAULT_A_P_FAKTOR);
  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_START_CONC);
- printf("-S <value> \t slope of linear C distribution (default %d)\n",DEFAULT_C_SLOPE);
+ 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);
  return -23;
 }
 
@@ -63,24 +63,59 @@ int make_cryst(cell *cell)
  return 23;
 }
 
-int distrib_c_conc(cell *cell_p,u32 c_c0,u32 c_slope,int add_c,u32 x_max,u32 y_max,u32 z_max)
+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,k;
- double cryst_c;
- cryst_c=0;
- for(i=0;i<x_max*y_max*z_max;i++) if(!(cell_p+i)->status&AMORPH) cryst_c+=(cell_p+i)->conc;
+
+ int i,j;
+ u32 area,c_area,total;
+ u32 x,y,z,sum_c_z;
+
+ total=0;
+ area=x_max*y_max;
+ sum_c_z=c_c0*z_max+c_slope*gr;
+
  for(i=0;i<z_max;i++)
  {
-  for(j=0;j<x_max*y_max;j++)
+  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)
+   { 
+    (cell_p+j+i*area)->conc=c_area/area;
+    total+=c_area/area;
+   }
+  }
+  j=0;
+  while(j<c_area%area)
   {
-   if(!(cell_p+j+i*x_max*y_max)->status&AMORPH) 
- 
+   x=rand_get(x_max);
+   y=rand_get(y_max);
+   if(!(cell_p+x+y*x_max+i*area)->status&AMORPH)
+   {
+    (cell_p+x+y*x_max+i*area)->conc+=1;
+    total++;
+    j++;
+   }
+  }
+ }
+ i=0;
+ while(i<c_conc-total)
+ {
+  x=rand_get(x_max);
+  y=rand_get(y_max);
+  z=rand_get_lgp(c_slope,c_c0,z_max);
+  if(!(cell_p+x+y*x_max+z*area)->status&AMORPH)
+  {
+   (cell_p+x+y*x_max+z*area)->conc+=1;
+   i++;
+  }
+ }
  return 23;
 }
 
 /* look at cell ... */
-int process_cell(cell *cell_p,u32 x,u32 y,u32 z,u32 x_max,u32 y_max,u32 z_max,int range,double faktor,double p0)
+int process_cell(cell *cell_p,u32 x,u32 y,u32 z,u32 x_max,u32 y_max,u32 z_max,int range,double faktor,double p0,u32 *c_conc)
 {
  cell *this_cell;
  int i,j,k;
@@ -95,6 +130,7 @@ int process_cell(cell *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((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);
     }
    }
@@ -103,10 +139,18 @@ int process_cell(cell *cell_p,u32 x,u32 y,u32 z,u32 x_max,u32 y_max,u32 z_max,in
  if(this_cell->status&AMORPH)
  {
   /* wrong probability! just test by now ...*/
-  if(rand_get(URAND_2BYTE_MAX)>pressure) make_cryst(this_cell);
+  if(rand_get(URAND_2BYTE_MAX)>pressure)
+  {
+    make_cryst(this_cell);
+    *c_conc=*c_conc+1+this_cell->conc;
+  } else *c_conc+=1;
  } else
  {
-  if(rand_get(URAND_2BYTE_MAX)<=pressure) make_amorph(this_cell);
+  if(rand_get(URAND_2BYTE_MAX)<=pressure)
+  {
+   make_amorph(this_cell);
+   *c_conc=*c_conc+1-this_cell->conc;
+  } else *c_conc+=1;
  }
  return 23;
 }
@@ -115,11 +159,12 @@ int main(int argc,char **argv)
 {
  u32 x_cell,y_cell,z_cell; /* amount of segments */
  u32 x,y,z; /* cells */
- int i,gr; /* for counting */
+ int i; /* for counting */
  int slope_nel,start_nel; /* nuclear energy loss: slope, constant */
  int a_p_range; /* p. range of amorphous sic */
  double a_p_faktor,a_p_p0; /* p0 and faktor of amorphous sic */
- u32 c_c0,c_slope; /* c start concentration and linear slope of c distribution */
+ int c_dist_c0,c_dist_slope; /* c start concentration and linear slope of c distribution */
+ u32 c_conc;
  int steps; /* # steps */
  cell *cell_p;
  struct __display display;
@@ -139,8 +184,9 @@ int main(int argc,char **argv)
  a_p_range=DEFAULT_A_P_RANGE;
  a_p_faktor=DEFAULT_A_P_FAKTOR;
  a_p_p0=DEFAULT_A_P_P0;
- c_c0=DEFAULT_C_START_CONC;
- c_slope=DEFAULT_C_SLOPE;
+ c_dist_c0=DEFAULT_C_DIST_START_CONC;
+ c_dist_slope=DEFAULT_C_DIST_SLOPE;
+ c_conc=DEFAULT_C_C0;
  steps=DEFAULT_STEPS;
  display_x=x_cell/2;
  display_y=y_cell/2;
@@ -197,11 +243,14 @@ int main(int argc,char **argv)
     case 'p':
      a_p_p0=atof(argv[++i]);
      break;
+    case 'b':
+     c_conc=atoi(argv[++i]);
+     break;
     case 'C':
-     c_c0=atoi(argv[++i]);
+     c_dist_c0=atoi(argv[++i]);
      break;
     case 'S':
-     c_slope=atoi(argv[++i]);
+     c_dist_slope=atoi(argv[++i]);
      break;
     default:
      usage();
@@ -217,14 +266,10 @@ int main(int argc,char **argv)
   return -23;
  }
 
- /* calculate sum_z_cells one time! */
+ /* calculate gr one time! */
  gr=0;
  for(i=1;i<=z_cell;i++) gr+=i;
- sum_z_cells=z_cell*start_nel+slope_nel*gr;
- sum_c_dist=z_cell*c_c0+c_slope*gr;
- printfd("debug: sum_z_cells -> %u\ndebug: sum_c_dist -> %u\n",sum_z_cells,sum_c_dist);
-
- /* testing ... */
+ printfd("debug: gr = %d\n",gr);
 
  /* allocate cells */
  printf("malloc will free %d bytes now ...\n",x_cell*y_cell*z_cell*sizeof(cell));
@@ -236,25 +281,28 @@ int main(int argc,char **argv)
  memset(cell_p,0,x_cell*y_cell*z_cell*sizeof(cell));
 
  /* init display */
+ printfd("debug: init display now ...\n");
  display_init(x_cell,y_cell,z_cell,&display,cell_p,&argc,argv);
 
  /* main routine */
+ printfd("debug: starting main routine ...\n");
  for(i=0;i<steps;i++)
  {
   x=rand_get(x_cell);
   y=rand_get(y_cell);
-  z=rand_get_lgp(slope_nel,start_nel);
+  z=rand_get_lgp(slope_nel,start_nel,z_cell);
 
   /* todo */
-  distrib_c_conc(cell_p,c_c0,c_slope,i,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);
+  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)
    display_draw(&display,display_x,display_y,display_z);
  }
+ printfd("debug: main routine finished!\n");
   
  /* display again and listen for events */
  display_draw(&display,display_x,display_y,display_z);
diff --git a/random.c b/random.c
index 51b310b..51f6774 100644
--- a/random.c
+++ b/random.c
@@ -10,7 +10,7 @@
 #include "defines.h"
 
 /* global and extern variables */
-extern u32 sum_z_cells;
+extern u32 gr;
 extern int random_fd;
 
 /* return random integer between 0 - max-1 */
@@ -27,11 +27,12 @@ u32 rand_get(u32 max)
 }
 
 /* get z value (linear growth of probability with depths) */
-u32 rand_get_lgp(int slope_nel,int start_nel)
+u32 rand_get_lgp(int slope_nel,int start_nel,u32 z_max)
 {
  int z;
- u32 i;
- z=rand_get(sum_z_cells)+1; /* +1 as rand_get returns values 0...max-1 */
+ u32 i,weighted_sum_z;
+ weighted_sum_z=z_max*start_nel+slope_nel*gr;
+ z=rand_get(weighted_sum_z)+1; /* +1 as rand_get returns values 0...max-1 */
  for(i=1;;i++) {
   z-=(start_nel+i*slope_nel);
   if(z<=0) break;
diff --git a/random.h b/random.h
index df01296..25cc835 100644
--- a/random.h
+++ b/random.h
@@ -6,4 +6,4 @@
 /* function prototypes */
 
 u32 rand_get(u32 max);
-u32 rand_get_lgp(int slope_nel,int start_nel);
+u32 rand_get_lgp(int slope_nel,int start_nel,u32 z_max);