X-Git-Url: https://hackdaworld.org/gitweb/?a=blobdiff_plain;f=nlsop.c;h=c4fc825f28886eb99c75f769dc8674681346b16f;hb=c37618b937c3a61f65eade5efd354927500e8c9f;hp=1d2e6d6320dce6ae2f11b32e95b74dd9b35f9ea2;hpb=cae1c91bf6b8d41d5a436f48f6e18514eeedbfb9;p=physik%2Fnlsop.git

diff --git a/nlsop.c b/nlsop.c
index 1d2e6d6..c4fc825 100644
--- a/nlsop.c
+++ b/nlsop.c
@@ -38,9 +38,11 @@ int usage(void)
  printf("-x <value> \t # x cells (default %d)\n",X);
  printf("-y <value> \t # x cells (default %d)\n",Y);
  printf("-z <value> \t # x cells (default %d)\n",Z);
+ /*
  printf("-X <value> \t display x (default %d)\n",X/2-1);
  printf("-Y <value> \t display y (default %d)\n",Y/2-1);
  printf("-Z <value> \t display z (default %d)\n",Z/2-1);
+ */
  printf("-s <value> \t steps (default %d)\n",STEPS);
  printf("-d <value> \t refresh display (default %d)\n",REFRESH);
  printf("-r <value> \t amorphous influence range (default %d)\n",RANGE);
@@ -48,7 +50,10 @@ int usage(void)
  printf("-p <value> \t pressure offset (default %f)\n",B_AP);
  printf("-A <value> \t slope of linear c distribution (default %f)\n",A_CD);
  printf("-B <value> \t linear c distribution offset (default %f)\n",B_CD);
+ /*
  printf("-C <value> \t initial c concentration (default %d)\n",CC);
+ */
+ printf("-D <value> \t diffusion rate from cryst to amorph cells (default %f)\n",D_R);
  puts("-L <file> \t load from file");
  puts("-S <file> \t save to file");
  puts("-R <file> \t read from random file");
@@ -76,28 +81,115 @@ int process_cell(d3_lattice *d3_l,u32 x,u32 y,u32 z,int r,double a,double b,int
    } 
   }
  }
- p*=*conc;
  if(!(*thiz&AMORPH))
  {
   if(get_rand(URAND_MAX)<=p)
   {
    MAKE_AMORPH(thiz);
-   *t_c=*t_c+1-*conc;
-  } else *t_c+=1;
+   // *t_c=*t_c+1-*conc;
+  } // else *t_c+=1;
  } else
  {
   /* assume 1-p probability */
   if(get_rand(URAND_MAX)>p)
   {
    MAKE_CRYST(thiz);
-   *t_c=*t_c+1+*conc;
-  } else *t_c+=1;
+   // *t_c=*t_c+1+*conc;
+  } // else *t_c+=1;
  }
+ 
+ *t_c+=1;
+
+ return 1;
+}
+
+int distrib_c(d3_lattice *d3_l,double d_r,double a,double b)
+{
+ u32 x,y,z;
+ int i,j,k,c;
+ int offset,off;
+ int carry;
+
+ /* put one c ion somewhere in the lattice */
+ x=get_rand(d3_l->max_x);
+ y=get_rand(d3_l->max_y);
+ z=get_rand_lgp(d3_l->max_z,a,b);
+ *(d3_l->extra+x+y*d3_l->max_x+z*d3_l->max_x*d3_l->max_y)+=1;
+
+ /* diffusion in layer */
+ for(i=0;i<d3_l->max_x;i++)
+ {
+  for(j=0;j<d3_l->max_y;j++)
+  {
+   for(k=0;k<d3_l->max_z;k++)
+   {
+    offset=i+j*d3_l->max_x+k*d3_l->max_x*d3_l->max_y;
+    /* case amorph */
+    if(*(d3_l->status+offset)&AMORPH)
+    {
+     /* look at neighbours and move c ions */
+     for(c=-1;c<=1;c++)
+     {
+      if(c!=0)
+      {
+       off=((i+d3_l->max_x+c)%d3_l->max_x)+j*d3_l->max_x+k*d3_l->max_x*d3_l->max_y;
+       /* case neighbour not amorph */
+       if(!(*(d3_l->status+off)&AMORPH)) carry=(int)(d_r*(*(d3_l->extra+off)));
+       /* case neighbour amorph */
+       else carry=(*(d3_l->extra+off)-*(d3_l->extra+offset))/2;
+       if(carry!=0)
+       {
+        *(d3_l->extra+offset)+=carry;
+        *(d3_l->extra+off)-=carry;
+       }
+      }
+     }
+     for(c=-1;c<=1;c++)
+     {
+      if(c!=0)
+      {
+       off=i+((j+c+d3_l->max_y)%d3_l->max_y)*d3_l->max_x+k*d3_l->max_x*d3_l->max_y;
+       /* case neighbour not amorph */  
+       if(!(*(d3_l->status+off)&AMORPH)) carry=(int)(d_r*(*(d3_l->extra+off)));                             
+       /* case neighbour amorph */
+       else carry=(*(d3_l->extra+off)-*(d3_l->extra+offset))/2;
+       if(carry!=0)
+       {
+        *(d3_l->extra+offset)+=carry; 
+        *(d3_l->extra+off)-=carry; 
+       }
+      }
+     }
+    } else
+    /* case not amorph */
+    {
+     /* look at neighbours and move c ions */     
+     for(c=-1;c<=1;c++) 
+     {
+      if(c!=0)
+      {
+       off=i+((j+c+d3_l->max_y)%d3_l->max_y)*d3_l->max_x+k*d3_l->max_x*d3_l->max_y;
+       /* case neighbour not amorph */
+       if(!(*(d3_l->status+off)&AMORPH))
+       {
+        carry=(*(d3_l->extra+off)-*(d3_l->extra+offset))/2;
+        if(carry!=0)
+        {
+         *(d3_l->extra+offset)+=carry;
+         *(d3_l->extra+off)-=carry;
+        }
+       }
+      }
+     }
+    }
+   } /* for z */
+  } /* for y */
+ } /* for x */
 
  return 1;
 }
 
-int distrib_c(d3_lattice *d3_l,int t_c,double a,double b)
+int distrib_c_old(d3_lattice *d3_l,int t_c,double a,double b)
 {
  int i,j,k,total,area;
  double sum;
@@ -121,15 +213,12 @@ int distrib_c(d3_lattice *d3_l,int t_c,double a,double b)
    }
   }
   temp=(int)((i+1)*a+b)*t_c/(sum*area_h[i]);
-  if(temp)
+  for(j=0;j<area;j++)
   {
-   for(j=0;j<area;j++)
+   if(!(*(d3_l->status+(i*area)+j)&AMORPH))
    {
-    if(!(*(d3_l->status+(i*area)+j)&AMORPH))
-    {
-     *(d3_l->extra+(i*area)+j)=temp;
-     total+=temp;
-    }
+    *(d3_l->extra+(i*area)+j)=temp;
+    total+=temp;
    }
   }
   left=(int)(((i+1)*a+b)*t_c/sum)%area_h[i];
@@ -137,7 +226,7 @@ int distrib_c(d3_lattice *d3_l,int t_c,double a,double b)
   {
    x=get_rand(d3_l->max_x);
    y=get_rand(d3_l->max_y);
-   if(!(*(d3_l->status+(i*area)+j)&AMORPH))
+   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;
@@ -151,9 +240,9 @@ int distrib_c(d3_lattice *d3_l,int t_c,double a,double b)
   x=get_rand(d3_l->max_x);
   y=get_rand(d3_l->max_y);
   z=get_rand_lgp(d3_l->max_z,a,b);
-  if(!(*(d3_l->status+x+y*d3_l->max_x+z*d3_l->max_x*d3_l->max_y)&AMORPH))
+  if(!(*(d3_l->status+x+y*d3_l->max_x+z*area)&AMORPH))
   {
-   *(d3_l->extra+x+y*d3_l->max_x+z*d3_l->max_x*d3_l->max_y)+=1;
+   *(d3_l->extra+x+y*d3_l->max_x+z*area)+=1;
    left-=1;
   }
  }
@@ -162,7 +251,7 @@ int distrib_c(d3_lattice *d3_l,int t_c,double a,double b)
  return 1;
 }
 
-int save_to_file(char *sf,d3_lattice *d3_l)
+int save_to_file(char *sf,d3_lattice *d3_l,info *my_inf)
 {
  int sf_fd,c;
 
@@ -176,6 +265,11 @@ int save_to_file(char *sf,d3_lattice *d3_l)
   puts("failed saving d3 lattice struct");
   return -1;
  }
+ if(write(sf_fd,my_inf,sizeof(info))<sizeof(info))
+ {
+  puts("failed saving info struct");
+  return-1;
+ }
  c=d3_l->max_x*d3_l->max_y*d3_l->max_z;
  if(write(sf_fd,d3_l->status,c*sizeof(unsigned char))<c*sizeof(unsigned char))
  {
@@ -192,7 +286,7 @@ int save_to_file(char *sf,d3_lattice *d3_l)
  return 1;
 }
 
-int load_from_file(char *lf,d3_lattice *d3_l)
+int load_from_file(char *lf,d3_lattice *d3_l,info *my_inf)
 {
  int lf_fd,c;
 
@@ -206,6 +300,11 @@ int load_from_file(char *lf,d3_lattice *d3_l)
   puts("failed reading d3 lattice struct");
   return -1;
  }
+ if(read(lf_fd,my_inf,sizeof(info))<sizeof(info))
+ {
+  puts("failed reading info struct");
+  return-1;
+ }
  c=d3_l->max_x*d3_l->max_y*d3_l->max_z;
  if((d3_l->status=(unsigned char*)malloc(c*sizeof(unsigned char)))==NULL)
  {
@@ -236,8 +335,7 @@ int main(int argc,char **argv)
 {
  u32 max_x,max_y,max_z,x,y,z,x_c,y_c,z_c;
  int i,quit,escape,nowait;
- double a_el,b_el,a_cd,b_cd,a_ap,b_ap;
- int cc,steps,range,refresh;
+ int refresh;
  char s_file[MAX_CHARS];
  char l_file[MAX_CHARS];
  char r_file[MAX_CHARS];
@@ -248,25 +346,34 @@ int main(int argc,char **argv)
  char conc_txt[MAX_TXT];
  char steps_txt[MAX_TXT];
  char cc_txt[MAX_TXT];
+ char a_txt[MAX_TXT];
+ char s_txt[MAX_TXT];
+ char ap_txt[MAX_TXT];
+ char el_txt[MAX_TXT];
+ char cd_txt[MAX_TXT];
+ char r_txt[MAX_TXT];
+ char ap2_txt[MAX_TXT];
+ char cd2_txt[MAX_TXT];
+ char el2_txt[MAX_TXT];
+ char dr_txt[MAX_TXT];
  char *arg_v[MAX_ARGV];
  d3_lattice d3_l;
+ info my_info;
 
  max_x=X;
  max_y=Y;
  max_z=Z;
- x=X/2-1;
- y=Y/2-1;
- z=Z/2-1;
- steps=STEPS;
- range=RANGE;
+ my_info.steps=STEPS;
+ my_info.range=RANGE;
  refresh=REFRESH;
- a_el=A_EL;
- b_el=B_EL;
- a_cd=A_CD;
- b_cd=B_CD;
- a_ap=A_AP;
- b_ap=B_AP;
- cc=CC;
+ my_info.a_el=A_EL;
+ my_info.b_el=B_EL;
+ my_info.a_cd=A_CD;
+ my_info.b_cd=B_CD;
+ my_info.a_ap=A_AP;
+ my_info.b_ap=B_AP;
+ my_info.cc=CC;
+ my_info.d_r=D_R;
  nowait=0;
  quit=0;
  escape=0;
@@ -287,10 +394,10 @@ int main(int argc,char **argv)
      nowait=1;
      break;
     case 'a':
-     a_el=atof(argv[++i]);
+     my_info.a_el=atof(argv[++i]);
      break;
     case 'b':
-     b_el=atof(argv[++i]);
+     my_info.b_el=atof(argv[++i]);
      break;
     case 'x':
      max_x=atoi(argv[++i]);
@@ -301,6 +408,7 @@ int main(int argc,char **argv)
     case 'z':
      max_z=atoi(argv[++i]);
      break;
+    /*
     case 'X':
      x=atoi(argv[++i]);
      break;
@@ -310,29 +418,35 @@ int main(int argc,char **argv)
     case 'Z':
      z=atoi(argv[++i]);
      break;
+    */
     case 's':
-     steps=atoi(argv[++i]);
+     my_info.steps=atoi(argv[++i]);
      break;
     case 'd':
      refresh=atoi(argv[++i]);
      break;
     case 'r':
-     range=atoi(argv[++i]);
+     my_info.range=atoi(argv[++i]);
      break;
     case 'f':
-     a_ap=atof(argv[++i]);
+     my_info.a_ap=atof(argv[++i]);
      break;
     case 'p':
-     b_ap=atof(argv[++i]);
+     my_info.b_ap=atof(argv[++i]);
      break;
     case 'A':
-     a_cd=atof(argv[++i]);
+     my_info.a_cd=atof(argv[++i]);
      break;
     case 'B':
-     b_cd=atof(argv[++i]);
+     my_info.b_cd=atof(argv[++i]);
      break;
+    /*
     case 'C':
-     cc=atoi(argv[++i]);
+     my_info.cc=atoi(argv[++i]);
+     break;
+    */
+    case 'D':
+     my_info.d_r=atof(argv[++i]);
      break;
     case 'L':
      strcpy(l_file,argv[++i]);
@@ -350,6 +464,12 @@ int main(int argc,char **argv)
   } else usage();
  }
 
+ x=max_x/2-1;
+ y=max_y/2-1;
+ z=max_z/2-1;
+
+
+
  if(!strcmp(r_file,"")) rand_init(NULL);
  else rand_init(r_file);
 
@@ -371,22 +491,57 @@ int main(int argc,char **argv)
   memset(d3_l.extra,0,i*sizeof(int));
  } else
  {
-  load_from_file(l_file,&d3_l);
+  load_from_file(l_file,&d3_l,&my_info);
   d3_lattice_init(&argc,argv,&d3_l,d3_l.max_x,d3_l.max_y,d3_l.max_z);
  }
 
  d3_event_init(&d3_l);
 
+ strcpy(a_txt,"args:");
+ sprintf(s_txt,"steps: %d",my_info.steps);
+ sprintf(r_txt,"pressure range: %d",my_info.range);
+ sprintf(ap_txt,"pressure faktor: %.2f",my_info.a_ap);
+ sprintf(ap2_txt,"pressure offset: %.2f",my_info.b_ap);
+ sprintf(el_txt,"energy loss slope: %.2f",my_info.a_el);
+ sprintf(el2_txt,"energy loss offset: %.2f",my_info.b_el);
+ sprintf(cd_txt,"c distrib slope: %.2f",my_info.a_cd);
+ sprintf(cd2_txt,"c distrib offset: %.2f",my_info.b_cd);
+ sprintf(dr_txt,"diffusion rate: %.2f",my_info.d_r);
+ arg_v[1]=x_txt;
+ arg_v[2]=y_txt;
+ arg_v[3]=z_txt;
+ arg_v[4]=NULL;
+ arg_v[5]=status_txt;
+ arg_v[6]=conc_txt;
+ arg_v[7]=NULL;
+ arg_v[8]=NULL;
+ arg_v[9]=NULL;
+ arg_v[10]=steps_txt;;
+ arg_v[11]=cc_txt;
+ arg_v[12]=NULL;
+ arg_v[13]=NULL;
+ arg_v[14]=a_txt;
+ arg_v[15]=NULL;
+ arg_v[16]=s_txt;
+ arg_v[17]=r_txt;
+ arg_v[18]=ap_txt;
+ arg_v[19]=ap2_txt;
+ arg_v[20]=el_txt;
+ arg_v[21]=el2_txt;
+ arg_v[22]=cd_txt;
+ arg_v[23]=cd2_txt;
+ arg_v[24]=dr_txt;
+
  if(!strcmp(l_file,""))
  {
   i=0;
-  while((i<steps) && (quit==0) && (escape==0))
+  while((i<my_info.steps) && (quit==0) && (escape==0))
   {
    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);
+   z_c=get_rand_lgp(d3_l.max_z,my_info.a_el,my_info.b_el);
+   distrib_c(&d3_l,my_info.d_r,my_info.a_cd,my_info.b_cd);
+   process_cell(&d3_l,x_c,y_c,z_c,my_info.range,my_info.a_ap,my_info.b_ap,&(my_info.cc));
    if(i%refresh==0)
    {
     sprintf(x_txt,"x: %d",x+1);
@@ -395,48 +550,30 @@ int main(int argc,char **argv)
     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;
-    arg_v[2]=y_txt;
-    arg_v[3]=z_txt;
-    arg_v[4]=NULL;
-    arg_v[5]=status_txt;
-    arg_v[6]=conc_txt;
-    arg_v[7]=NULL;
-    arg_v[8]=NULL;
-    arg_v[9]=steps_txt;
-    arg_v[10]=cc_txt;
-    d3_lattice_draw(&d3_l,x,y,z,10,arg_v);
-    scan_event(&d3_l,&x,&y,&z,&quit,&escape);
+    sprintf(cc_txt,"total c: %d",my_info.cc);
+    d3_lattice_draw(&d3_l,x,y,z,24,arg_v);
+    // scan_event(&d3_l,&x,&y,&z,&quit,&escape);
    }
    i++;
   }
  }
 
- if(strcmp(s_file,"")) save_to_file(s_file,&d3_l);
+ if(strcmp(s_file,"")) save_to_file(s_file,&d3_l,&my_info);
 
  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(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));
   strcpy(steps_txt,"step: end!");
-  sprintf(cc_txt,"total c: %d",cc);
-  arg_v[1]=x_txt;
-  arg_v[2]=y_txt;
-  arg_v[3]=z_txt;
-  arg_v[4]=NULL;
-  arg_v[5]=status_txt;
-  arg_v[6]=conc_txt;
-  arg_v[7]=NULL;
-  arg_v[8]=NULL;
-  arg_v[9]=steps_txt;
-  arg_v[10]=cc_txt;
-  d3_lattice_draw(&d3_l,x,y,z,10,arg_v);
+  sprintf(cc_txt,"total c: %d",my_info.cc);
+  d3_lattice_draw(&d3_l,x,y,z,24,arg_v);
   scan_event(&d3_l,&x,&y,&z,&quit,&escape);
  }
 
+ d3_lattice_release(&d3_l);
+
  return 1;
 }