X-Git-Url: https://hackdaworld.org/gitweb/?p=physik%2Fnlsop.git;a=blobdiff_plain;f=nlsop.c;h=ca83572cdfcea830f02b4b51a2e44dd1455bee20;hp=7463054c5d7d35066728262a61293a13bed61037;hb=2f0a0704e6130f73821429779da3161ff0ae2434;hpb=88002523f694c507c86dfe13c95553e66c2f8647 diff --git a/nlsop.c b/nlsop.c index 7463054..ca83572 100644 --- a/nlsop.c +++ b/nlsop.c @@ -61,9 +61,9 @@ int usage(void) 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); - printf("-f \t pressure = * 1/distance^2 (default %f)\n",A_AP); - printf("-p \t pressure offset (default %f)\n",B_AP); - printf("-F \t proportionality constant between c conc and ability to get amorphous (default %f)\n",A_CP); + printf("-f \t stress induced amorphization influence (default %f)\n",S_D); + printf("-p \t ballistic amorphization influence (default %f)\n",B_D); + printf("-F \t carbon induced amorphization influence (default %f)\n",C_D); printf("-D \t diffusion rate from cryst to amorph cells (default %f)\n",DR_AC); printf("-c \t diffusion rate in cryst cells (default %f)\n",DR_CC); printf("-e \t do diffusion every steps (default %d)\n",DIFF_RATE); @@ -91,7 +91,7 @@ int process_cell(d3_lattice *d3_l,u32 x,u32 y,u32 z,info *my_info,u32 nel_z) 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=my_info->b_ap*nel_z; + p=my_info->b*nel_z; for(i=-(my_info->range);i<=my_info->range;i++) { for(j=-(my_info->range);j<=my_info->range;j++) @@ -99,11 +99,11 @@ int process_cell(d3_lattice *d3_l,u32 x,u32 y,u32 z,info *my_info,u32 nel_z) if(!(i==0 && j==0)) { off=((x+d3_l->max_x+i)%d3_l->max_x)+((y+d3_l->max_y+j)%d3_l->max_x)*d3_l->max_x+z*d3_l->max_x*d3_l->max_y; - if(*(d3_l->status+off)&AMORPH) p+=my_info->a_ap*(*(d3_l->extra+off))*URAND_MAX/(i*i+j*j); + if(*(d3_l->status+off)&AMORPH) p+=my_info->s*(*(d3_l->extra+off))*URAND_MAX/(i*i+j*j); } } } - p+=*conc*my_info->a_cp*URAND_MAX; + p+=*conc*my_info->c*URAND_MAX; if(!(*thiz&AMORPH)) { if(get_rand(URAND_MAX)<=p) MAKE_AMORPH(thiz); @@ -341,11 +341,14 @@ int write_ac_distr(d3_lattice *d3_l,int ac_distr) { int fd,x,y,z; int count,offset; - char file[16]; - - if(ac_distr==1) strcpy(file,"a.plot"); - if(ac_distr==2) strcpy(file,"c.plot"); - if(ac_distr==3) strcpy(file,"b.plot"); + char file[32]; + int si_count; + + si_count=d3_l->max_x*d3_l->max_y*SI_PER_VOLUME; + if(ac_distr==1) strcpy(file,"carbon_in_av.plot"); + if(ac_distr==2) strcpy(file,"carbon_in_cv.plot"); + if(ac_distr==3) strcpy(file,"carbon.plot"); + if(ac_distr==4) strcpy(file,"amorphous_volumes.plot"); if((fd=open(file,O_WRONLY|O_CREAT))<0) { @@ -366,9 +369,14 @@ int write_ac_distr(d3_lattice *d3_l,int ac_distr) if(ac_distr==2) if(!(*(d3_l->status+offset)&AMORPH)) count+=*(d3_l->extra+offset); if(ac_distr==3) count+=*(d3_l->extra+offset); + if(ac_distr==4) + if(*(d3_l->status+offset)&AMORPH) count+=1; } } - dprintf(fd,"%d %d\n",z,count); +#ifndef MAC + if(ac_distr==4) dprintf(fd,"%d %d\n",z*CELL_LENGTH,count); + else dprintf(fd,"%d %f\n",z*CELL_LENGTH,100.0*count/si_count); +#endif } close(fd); @@ -950,6 +958,7 @@ int load_from_file(char *lf,d3_lattice *d3_l,info *my_inf) int convert_file(char *cf,d3_lattice *d3_l) { +#ifndef MAC int x,y,z; int c_fd; @@ -970,6 +979,7 @@ int convert_file(char *cf,d3_lattice *d3_l) } } close(c_fd); +#endif return 1; } @@ -1075,7 +1085,7 @@ u32 get_reject_graph(info *my_info,d3_lattice *d3_l,char *file,u32 *graph) { free(flag); #ifdef DEBUG_INTERPOL_PROFILE - printf("debug: (interpolated profile)\n"); + printf("debug: %s (interpolated profile)\n",file); for(i=0;imax_z;i++) printf("%d %d\n",i,graph[i]); #endif @@ -1139,9 +1149,9 @@ int main(int argc,char **argv) resave=RESAVE; my_info.z_diff=0; my_info.c_diff=1; - my_info.a_ap=A_AP; - my_info.b_ap=B_AP; - my_info.a_cp=A_CP; + my_info.s=S_D; + my_info.b=B_D; + my_info.c=C_D; my_info.cc=CC; my_info.dr_ac=DR_AC; my_info.dr_cc=DR_CC; @@ -1164,6 +1174,10 @@ int main(int argc,char **argv) ne_max=0; ip_max=0; +#ifdef MORE_PRINTF + printf("reading argv ..."); +#endif + for(i=1;i