X-Git-Url: https://hackdaworld.org/gitweb/?a=blobdiff_plain;f=nlsop.c;h=1d2e6d6320dce6ae2f11b32e95b74dd9b35f9ea2;hb=32e1326e444624d858bf29c1f7891e3e9d6adf82;hp=9e4c3bf1bdb22104cd4f4316fa68564936c0ee6f;hpb=e28fcecc54036e7258172b96e97df4a8131f0d9a;p=physik%2Fnlsop.git

diff --git a/nlsop.c b/nlsop.c
index 9e4c3bf..1d2e6d6 100644
--- a/nlsop.c
+++ b/nlsop.c
@@ -56,15 +56,15 @@ int usage(void)
  return 1;
 }
 
-int process_cell(3d_lattice *3d_l,u32 x,u32 y,u32 z,int r,double a,double b,int *t_c)
+int process_cell(d3_lattice *d3_l,u32 x,u32 y,u32 z,int r,double a,double b,int *t_c)
 {
  unsigned char *thiz;
  int *conc;
  int i,j;
  double p;
 
- thiz=3d_l->status+x+y*d3_l->max_x+z*d3_l->max_x*d3_l->max_y;
- conc=3d_l->extra+x+y*d3_l->max_x+z*d3_l->max_x*d3_l->max_y;
+ thiz=d3_l->status+x+y*d3_l->max_x+z*d3_l->max_x*d3_l->max_y;
+ conc=d3_l->extra+x+y*d3_l->max_x+z*d3_l->max_x*d3_l->max_y;
  p=b*URAND_MAX;
  for(i=-r;i<=r;i++)
  {
@@ -79,7 +79,7 @@ int process_cell(3d_lattice *3d_l,u32 x,u32 y,u32 z,int r,double a,double b,int
  p*=*conc;
  if(!(*thiz&AMORPH))
  {
-  if(rand_get(URAND_MAX)<=p)
+  if(get_rand(URAND_MAX)<=p)
   {
    MAKE_AMORPH(thiz);
    *t_c=*t_c+1-*conc;
@@ -87,7 +87,7 @@ int process_cell(3d_lattice *3d_l,u32 x,u32 y,u32 z,int r,double a,double b,int
  } else
  {
   /* assume 1-p probability */
-  if(rand_get(URAND_MAX)>p)
+  if(get_rand(URAND_MAX)>p)
   {
    MAKE_CRYST(thiz);
    *t_c=*t_c+1+*conc;
@@ -97,9 +97,10 @@ int process_cell(3d_lattice *3d_l,u32 x,u32 y,u32 z,int r,double a,double b,int
  return 1;
 }
 
-int distrib_c(3d_lattice *3d_l,int t_c,double a,double b)
+int distrib_c(d3_lattice *d3_l,int t_c,double a,double b)
 {
- int i,j,k,total,area,sum;
+ int i,j,k,total,area;
+ double sum;
  int temp,left;
  int *area_h;
  u32 x,y,z;
@@ -108,7 +109,7 @@ int distrib_c(3d_lattice *3d_l,int t_c,double a,double b)
  area_h=(int *)malloc(d3_l->max_z*sizeof(int));
 
  total=0;
- sum=0;
+ sum=b*d3_l->max_z+a*d3_l->max_z*(d3_l->max_z+1)/2;
  for(i=0;i<d3_l->max_z;i++)
  {
   area_h[i]=0;
@@ -116,15 +117,11 @@ int distrib_c(3d_lattice *3d_l,int t_c,double a,double b)
   {
    if(!(*(d3_l->status+(i*area)+j)&AMORPH))
    {
-    sum+=(i+1)*a+b;
     area_h[i]+=1;
    }
   }
- }
- for(i=0;i<d3_l->max_z;i++)
- {
-  temp=((i+1)*a+b)*t_c/(sum+area_h[i]);
-  if(temp>1)
+  temp=(int)((i+1)*a+b)*t_c/(sum*area_h[i]);
+  if(temp)
   {
    for(j=0;j<area;j++)
    {
@@ -135,16 +132,17 @@ int distrib_c(3d_lattice *3d_l,int t_c,double a,double b)
     }
    }
   }
-  left=(((i+1)*a+b)*t_c/sum)%area_h[i];
+  left=(int)(((i+1)*a+b)*t_c/sum)%area_h[i];
   while(left)
   {
-  x=get_rand(d3_l->max_x);
-  y=get_rand(d3_l->max_y);
-  if(!(*(d3_l->status+(i*area)+x+y*d3_l->max_x)&AMORPH))
-  {
-   *(d3_l->extra+(i*area)+x+y*d3_l->max_x)+=1;
-   total+=1;
-   left-=1;
+   x=get_rand(d3_l->max_x);
+   y=get_rand(d3_l->max_y);
+   if(!(*(d3_l->status+(i*area)+j)&AMORPH))
+   {
+    *(d3_l->extra+(i*area)+x+y*d3_l->max_x)+=1;
+    total+=1;
+    left-=1;
+   }
   }
  }
  left=t_c-total;
@@ -157,14 +155,14 @@ int distrib_c(3d_lattice *3d_l,int t_c,double a,double b)
   {
    *(d3_l->extra+x+y*d3_l->max_x+z*d3_l->max_x*d3_l->max_y)+=1;
    left-=1;
-   total+=1;
   }
  }
+ free(area_h);
 
  return 1;
 }
 
-int save_to_file(char *sf,3d_lattice *3d_l)
+int save_to_file(char *sf,d3_lattice *d3_l)
 {
  int sf_fd,c;
 
@@ -173,18 +171,18 @@ int save_to_file(char *sf,3d_lattice *3d_l)
   puts("cannot open save file");
   return -1;
  }
- if(write(sf_fd,3d_l,sizeof(3d_lattice))<sizeof(3d_lattice))
+ if(write(sf_fd,d3_l,sizeof(d3_lattice))<sizeof(d3_lattice))
  {
-  puts("failed saving 3d lattice struct");
+  puts("failed saving d3 lattice struct");
   return -1;
  }
  c=d3_l->max_x*d3_l->max_y*d3_l->max_z;
- if(write(sf_fd,3d_l->status,c*sizeof(unsigned char)<c*sizeof(unsigned char))
+ if(write(sf_fd,d3_l->status,c*sizeof(unsigned char))<c*sizeof(unsigned char))
  {
-  puts("failed saving status of 3d lattice sites");
+  puts("failed saving status of d3 lattice sites");
   return -1;
  }
- if(write(sf_fd,3d_l->extra,c*sizeof(int)<c*sizeof(int))
+ if(write(sf_fd,d3_l->extra,c*sizeof(int))<c*sizeof(int))
  {
   puts("failed saving sites concentration");
   return -1;
@@ -194,7 +192,7 @@ int save_to_file(char *sf,3d_lattice *3d_l)
  return 1;
 }
 
-int load_from_file(char *lf,3d_lattice *3d_l)
+int load_from_file(char *lf,d3_lattice *d3_l)
 {
  int lf_fd,c;
 
@@ -203,7 +201,7 @@ int load_from_file(char *lf,3d_lattice *3d_l)
   puts("cannot open load file");
   return -1;
  }
- if(read(lf_fd,3d_l,sizeof(3d_lattice))<sizeof(3d_lattice))
+ if(read(lf_fd,d3_l,sizeof(d3_lattice))<sizeof(d3_lattice))
  {
   puts("failed reading d3 lattice struct");
   return -1;
@@ -219,12 +217,12 @@ int load_from_file(char *lf,3d_lattice *3d_l)
   puts("cannot allocate concentration buffer");
   return -1;
  }
- if(read(lf_fd,3d_l->status,c*sizeof(unsigned char))<c*sizeof(unsigned char))
+ if(read(lf_fd,d3_l->status,c*sizeof(unsigned char))<c*sizeof(unsigned char))
  {
-  puts("failed reading status of 3d lattice sites");
+  puts("failed reading status of d3 lattice sites");
   return -1;
  }
- if(read(lf_fd,3d_l->extra,c*sizeof(int))<c*sizeof(int))
+ if(read(lf_fd,d3_l->extra,c*sizeof(int))<c*sizeof(int))
  {
   puts("failed reading sites concentration");
   return -1;
@@ -243,14 +241,14 @@ int main(int argc,char **argv)
  char s_file[MAX_CHARS];
  char l_file[MAX_CHARS];
  char r_file[MAX_CHARS];
- x_txt[MAX_TXT];
- y_txt[MAX_TXT];
- z_txt[MAX_TXT];
- status_txt[MAX_TXT];
- conc_txt[MAX_TXT];
- steps_txt[MAX_TXT];
- cc_txt[MAX_TXT];
- **arg_v;
+ char x_txt[MAX_TXT];
+ char y_txt[MAX_TXT];
+ char z_txt[MAX_TXT];
+ char status_txt[MAX_TXT];
+ char conc_txt[MAX_TXT];
+ char steps_txt[MAX_TXT];
+ char cc_txt[MAX_TXT];
+ char *arg_v[MAX_ARGV];
  d3_lattice d3_l;
 
  max_x=X;
@@ -270,11 +268,13 @@ int main(int argc,char **argv)
  b_ap=B_AP;
  cc=CC;
  nowait=0;
+ quit=0;
+ escape=0;
  strcpy(s_file,"");
  strcpy(l_file,"");
  strcpy(r_file,"");
 
- for(i=1,i<argc,i++)
+ for(i=1;i<argc;i++)
  {
   if(argv[i][0]=='-')
   {
@@ -357,42 +357,43 @@ int main(int argc,char **argv)
  {
   i=max_x*max_y*max_z;
   d3_lattice_init(&argc,argv,&d3_l,max_x,max_y,max_z);
-  if((d3_l->status=(unsigned char *)malloc(i*sizeof(unsigned char)))==NULL)
+  if((d3_l.status=(unsigned char *)malloc(i*sizeof(unsigned char)))==NULL)
   {
    puts("failed allocating status buffer");
    return -1;
   }
-  memset(d3_l->status,0,i*sizeof(unsigned char));
-  if((d3_l->extra=(int *)malloc(i*sizeof(int)))==NULL)
+  memset(d3_l.status,0,i*sizeof(unsigned char));
+  if((d3_l.extra=(int *)malloc(i*sizeof(int)))==NULL)
   {
    puts("failed allocating concentration buffer");
    return -1;
   }
-  memset(d3_l->extra,0,i*sizeof(int));
+  memset(d3_l.extra,0,i*sizeof(int));
  } else
  {
   load_from_file(l_file,&d3_l);
-  d3_lattice_init(&argc,argv,&d3_l,d3_l->max_x,d3_l->max_y,d3_l->max_z);
+  d3_lattice_init(&argc,argv,&d3_l,d3_l.max_x,d3_l.max_y,d3_l.max_z);
  }
 
  d3_event_init(&d3_l);
 
  if(!strcmp(l_file,""))
  {
+  i=0;
   while((i<steps) && (quit==0) && (escape==0))
   {
-   x_c=rand_get(d3_l->max_x);
-   y_c=rand_get(d3_l->max_y);
-   z_c=rand_get_lgp(d3_l->max_z,a_el,b_el);
-   distrib_c(&3d_l,cc,a_cd,b_cd);
-   process_cell(&3d_l,x_c,y_c,z_c,range,a_ap,b_ap,&cc);
+   x_c=get_rand(d3_l.max_x);
+   y_c=get_rand(d3_l.max_y);
+   z_c=get_rand_lgp(d3_l.max_z,a_el,b_el);
+   distrib_c(&d3_l,cc,a_cd,b_cd);
+   process_cell(&d3_l,x_c,y_c,z_c,range,a_ap,b_ap,&cc);
    if(i%refresh==0)
    {
-    sprintf(x_txt,"x: %d",x);
-    sprintf(y_txt,"y: %d",y);
-    sprintf(z_txt,"z: %d",z);
-    sprintf(status_txt,"status: %c",(*(d3_l->status+x+y*d3_l->max_x+z*d3_l->max_x*d3_l->max_y)&AMORPH)?'a':'c');
-    sprintf(conc_txt,"conc: %d",*(d3_l->extra+x+y*d3_l->max_x+z*d3_l->max_x*d3_l->max_y));
+    sprintf(x_txt,"x: %d",x+1);
+    sprintf(y_txt,"y: %d",y+1);
+    sprintf(z_txt,"z: %d",z+1);
+    sprintf(status_txt,"status: %c",(*(d3_l.status+x+y*d3_l.max_x+z*d3_l.max_x*d3_l.max_y)&AMORPH)?'a':'c');
+    sprintf(conc_txt,"conc: %d",*(d3_l.extra+x+y*d3_l.max_x+z*d3_l.max_x*d3_l.max_y));
     sprintf(steps_txt,"step: %d",i);
     sprintf(cc_txt,"total c: %d",cc);
     arg_v[1]=x_txt;
@@ -408,17 +409,19 @@ int main(int argc,char **argv)
     d3_lattice_draw(&d3_l,x,y,z,10,arg_v);
     scan_event(&d3_l,&x,&y,&z,&quit,&escape);
    }
-   ++i;
+   i++;
   }
  }
 
+ if(strcmp(s_file,"")) save_to_file(s_file,&d3_l);
+
  while((quit==0) && (escape==0) && (nowait==0))
  {
   sprintf(x_txt,"x: %d",x);
   sprintf(y_txt,"y: %d",y);
   sprintf(z_txt,"z: %d",z);
-  sprintf(status_txt,"status: %c",(*(d3_l->status+x+y*d3_l->max_x+z*d3_l->max_x*d3_l->max_y)&AMORPH)?'a':'c');
-  sprintf(conc_txt,"conc: %d",*(d3_l->extra+x+y*d3_l->max_x+z*d3_l->max_x*d3_l->max_y));
+  sprintf(status_txt,"status: %c",(*(d3_l.status+x+y*d3_l.max_x+z*d3_l.max_x*d3_l.max_y)&AMORPH)?'a':'c');
+  sprintf(conc_txt,"conc: %d",*(d3_l.extra+x+y*d3_l.max_x+z*d3_l.max_x*d3_l.max_y));
   strcpy(steps_txt,"step: end!");
   sprintf(cc_txt,"total c: %d",cc);
   arg_v[1]=x_txt;