X-Git-Url: https://hackdaworld.org/gitweb/?p=physik%2Fnlsop.git;a=blobdiff_plain;f=nlsop.c;h=d61d2aca2868b7a95b4941198adcabb7c996ffb3;hp=81f408de60d8ccde2bbcd974f77d2277abb5a3ae;hb=f271c1142da782420ef76f1f85750949094e4269;hpb=eedf79d33f24f1163cdadea0eb27c8f0b75c1d92 diff --git a/nlsop.c b/nlsop.c index 81f408d..d61d2ac 100644 --- a/nlsop.c +++ b/nlsop.c @@ -34,6 +34,7 @@ int usage(void) puts("usage:"); puts("-h \t\t help"); puts("-n \t\t no user interaction"); + puts("-Z \t\t cryst -> amorph c diffusion in z direction"); printf("-a \t slope of nuclear energy loss (default %f)\n",A_EL); printf("-b \t nuclear energy loss offset (default %f)\n",B_EL); printf("-x \t # x cells (default %d)\n",X); @@ -101,7 +102,7 @@ int process_cell(d3_lattice *d3_l,u32 x,u32 y,u32 z,int r,double a,double b,int return 1; } -int distrib_c(d3_lattice *d3_l,double d_r,double a,double b) +int distrib_c(d3_lattice *d3_l,double d_r,double a,double b,char z_diff) { u32 x,y,z; int i,j,k,c; @@ -191,6 +192,39 @@ int distrib_c(d3_lattice *d3_l,double d_r,double a,double b) } } } + for(c=-1;c<=1;c++) + { + if(c!=0) + { + off=((i+c+d3_l->max_x)%d3_l->max_x)+j*d3_l->max_x+k*d3_l->max_x*d3_l->max_y; + carry=0; + /* 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; + } + } + } + } + /* cryst -> amorph diffusion in z direction */ + if(z_diff) + { + for(c=1;c>=-1;c--) + { + off=i+j*d3_l->max_x+((k+c+d3_l->max_z)%d3_l->max_z)*d3_l->max_x*d3_l->max_y; + carry=0; + if(*(d3_l->status+off)&AMORPH) carry=(int)(d_r*(*(d3_l->extra+offset))); + if(carry!=0) + { + *(d3_l->extra+offset)-=carry; + *(d3_l->extra+off)+=carry; + } + } + } /* if z_diff */ } } /* for z */ } /* for y */ @@ -369,15 +403,17 @@ int convert_file(char *cf,d3_lattice *d3_l) int main(int argc,char **argv) { - u32 max_x,max_y,max_z,x,y,z,x_c,y_c,z_c; + u32 x,y,z,x_c,y_c,z_c; int i,quit,escape,nowait; int refresh,resave; + char z_diff; char s_file[MAX_CHARS]; char s_file_tmp[MAX_CHARS]; char l_file[MAX_CHARS]; char c_file[MAX_CHARS]; char convert; char r_file[MAX_CHARS]; +#ifdef USE_DFB_API char x_txt[MAX_TXT]; char y_txt[MAX_TXT]; char z_txt[MAX_TXT]; @@ -396,16 +432,18 @@ int main(int argc,char **argv) char el2_txt[MAX_TXT]; char dr_txt[MAX_TXT]; char *arg_v[MAX_ARGV]; +#endif d3_lattice d3_l; info my_info; - max_x=X; - max_y=Y; - max_z=Z; + d3_l.max_x=X; + d3_l.max_y=Y; + d3_l.max_z=Z; my_info.steps=STEPS; my_info.range=RANGE; refresh=REFRESH; resave=RESAVE; + z_diff=0; my_info.a_el=A_EL; my_info.b_el=B_EL; my_info.a_cd=A_CD; @@ -442,13 +480,13 @@ int main(int argc,char **argv) my_info.b_el=atof(argv[++i]); break; case 'x': - max_x=atoi(argv[++i]); + d3_l.max_x=atoi(argv[++i]); break; case 'y': - max_y=atoi(argv[++i]); + d3_l.max_y=atoi(argv[++i]); break; case 'z': - max_z=atoi(argv[++i]); + d3_l.max_z=atoi(argv[++i]); break; /* case 'X': @@ -457,10 +495,11 @@ int main(int argc,char **argv) case 'Y': y=atoi(argv[++i]); break; + */ case 'Z': - z=atoi(argv[++i]); + z_diff=1; break; - */ + /* */ case 's': my_info.steps=atoi(argv[++i]); break; @@ -514,19 +553,27 @@ int main(int argc,char **argv) } else usage(); } - x=max_x/2-1; - y=max_y/2-1; - z=max_z/2-1; - + x=d3_l.max_x/2-1; + y=d3_l.max_y/2-1; + z=d3_l.max_z/2-1; +#ifdef NODFB + if(!strcmp(s_file,"")) + { + puts("NODFB defined, run with -S option"); + return -1; + } +#endif if(!strcmp(r_file,"")) rand_init(NULL); else rand_init(r_file); if(!strcmp(l_file,"")) { - i=max_x*max_y*max_z; - d3_lattice_init(&argc,argv,&d3_l,max_x,max_y,max_z); + i=d3_l.max_x*d3_l.max_y*d3_l.max_z; +#ifdef USE_DFB_API + d3_lattice_init(&argc,argv,&d3_l); +#endif if((d3_l.status=(unsigned char *)malloc(i*sizeof(unsigned char)))==NULL) { puts("failed allocating status buffer"); @@ -549,11 +596,17 @@ int main(int argc,char **argv) convert_file(c_file,&d3_l); puts("done"); return 1; - } else d3_lattice_init(&argc,argv,&d3_l,d3_l.max_x,d3_l.max_y,d3_l.max_z); + } +#ifdef USE_DFB_API + else d3_lattice_init(&argc,argv,&d3_l); +#endif } - + +#ifdef USE_DFB_API d3_event_init(&d3_l); +#endif +#ifdef USE_DFB_API strcpy(a_txt,"args:"); sprintf(s_txt,"steps: %d",my_info.steps); sprintf(r_txt,"pressure range: %d",my_info.range); @@ -588,6 +641,7 @@ int main(int argc,char **argv) arg_v[22]=cd_txt; arg_v[23]=cd2_txt; arg_v[24]=dr_txt; +#endif if(!strcmp(l_file,"")) { @@ -597,8 +651,9 @@ int main(int argc,char **argv) 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,my_info.a_el,my_info.b_el); - distrib_c(&d3_l,my_info.d_r,my_info.a_cd,my_info.b_cd); + distrib_c(&d3_l,my_info.d_r,my_info.a_cd,my_info.b_cd,z_diff); process_cell(&d3_l,x_c,y_c,z_c,my_info.range,my_info.a_ap,my_info.b_ap,&(my_info.cc)); +#ifdef USE_DFB_API if(i%refresh==0) { sprintf(x_txt,"x: %d",x+1); @@ -609,19 +664,27 @@ int main(int argc,char **argv) sprintf(steps_txt,"step: %d",i); 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); } +#endif if(i%resave==0 && strcmp(s_file,"") && resave!=0) { sprintf(s_file_tmp,"%s_%d_of_%d",s_file,i,my_info.steps); save_to_file(s_file_tmp,&d3_l,&my_info); +#ifdef NODFB + printf("saved %s\n",s_file_tmp); +#endif } i++; } } - if(strcmp(s_file,"")) save_to_file(s_file,&d3_l,&my_info); + if(strcmp(s_file,"")) + { + printf("saved %s\n",s_file); + save_to_file(s_file,&d3_l,&my_info); + } +#ifdef USE_DFB_API while((quit==0) && (escape==0) && (nowait==0)) { sprintf(x_txt,"x: %d",x+1); @@ -636,6 +699,7 @@ int main(int argc,char **argv) } d3_lattice_release(&d3_l); +#endif return 1; }