X-Git-Url: https://hackdaworld.org/gitweb/?p=physik%2Fnlsop.git;a=blobdiff_plain;f=nlsop.c;h=041fac0151d440c8a0c48aaa7b12a59033796797;hp=d646cdf9bc3af78a6c4de752edd12625c051ab45;hb=c71815b4b5dc67546a9ca407c256d18a4abb3aff;hpb=72a665941269353574e0fd9effb31c19cdac68e3 diff --git a/nlsop.c b/nlsop.c index d646cdf..041fac0 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,7 +97,7 @@ 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 temp,left; @@ -135,16 +135,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)+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; @@ -164,7 +165,7 @@ int distrib_c(3d_lattice *3d_l,int t_c,double a,double b) 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 +174,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))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))status,c*sizeof(unsigned char))status,c*sizeof(unsigned char))extra,c*sizeof(int))extra,c*sizeof(int))