X-Git-Url: https://hackdaworld.org/gitweb/?p=physik%2Fnlsop.git;a=blobdiff_plain;f=nlsop.c;h=1d2e6d6320dce6ae2f11b32e95b74dd9b35f9ea2;hp=4eb641085d8f03b5d6b51d25ac01917dc12bf48a;hb=cae1c91bf6b8d41d5a436f48f6e18514eeedbfb9;hpb=c2cf344605eb715f5b6524b1a05317ff319f7dd7 diff --git a/nlsop.c b/nlsop.c index 4eb6410..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;imax_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;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]); + if(temp) { for(j=0;jmax_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,9 +155,79 @@ 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,d3_lattice *d3_l) +{ + int sf_fd,c; + + if((sf_fd=open(sf,O_WRONLY|O_CREAT))<0) + { + puts("cannot open save file"); + return -1; + } + if(write(sf_fd,d3_l,sizeof(d3_lattice))max_x*d3_l->max_y*d3_l->max_z; + if(write(sf_fd,d3_l->status,c*sizeof(unsigned char))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) + { + puts("cannot allocate status buffer"); + return -1; + } + if((d3_l->extra=(int *)malloc(c*sizeof(int)))==NULL) + { + puts("cannot allocate concentration buffer"); + return -1; + } + if(read(lf_fd,d3_l->status,c*sizeof(unsigned char))extra,c*sizeof(int))