X-Git-Url: https://hackdaworld.org/gitweb/?p=physik%2Fnlsop.git;a=blobdiff_plain;f=nlsop.c;h=4ff1d6e55f0cfbfa63109cb64dbd400818f536e2;hp=d646cdf9bc3af78a6c4de752edd12625c051ab45;hb=40dfea76e1d7217b798999a5ffdca318ee951b81;hpb=72a665941269353574e0fd9effb31c19cdac68e3 diff --git a/nlsop.c b/nlsop.c index d646cdf..4ff1d6e 100644 --- a/nlsop.c +++ b/nlsop.c @@ -38,9 +38,11 @@ int usage(void) printf("-x \t # x cells (default %d)\n",X); printf("-y \t # x cells (default %d)\n",Y); printf("-z \t # x cells (default %d)\n",Z); + /* printf("-X \t display x (default %d)\n",X/2-1); printf("-Y \t display y (default %d)\n",Y/2-1); printf("-Z \t display z (default %d)\n",Z/2-1); + */ printf("-s \t steps (default %d)\n",STEPS); printf("-d \t refresh display (default %d)\n",REFRESH); printf("-r \t amorphous influence range (default %d)\n",RANGE); @@ -56,15 +58,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++) { @@ -76,10 +78,9 @@ 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 +88,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 +98,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 +110,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;imax_z;i++) { area_h[i]=0; @@ -116,35 +118,29 @@ 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;imax_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]); + for(j=0;jstatus+(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=(((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)+x+y*d3_l->max_x)&AMORPH)) + { + *(d3_l->extra+(i*area)+x+y*d3_l->max_x)+=1; + total+=1; + left-=1; + } } } left=t_c-total; @@ -153,18 +149,18 @@ int distrib_c(3d_lattice *3d_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; - 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,info *my_inf) { int sf_fd,c; @@ -173,18 +169,23 @@ 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))max_x*d3_l->max_y*d3_l->max_z; - if(write(sf_fd,3d_l->status,c*sizeof(unsigned char)status,c*sizeof(unsigned char))extra,c*sizeof(int)extra,c*sizeof(int))max_x*d3_l->max_y*d3_l->max_z; if((d3_l->status=(unsigned char*)malloc(c*sizeof(unsigned char)))==NULL) { @@ -219,12 +225,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))status,c*sizeof(unsigned char))extra,c*sizeof(int))extra,c*sizeof(int))