X-Git-Url: https://hackdaworld.org/gitweb/?p=physik%2Fnlsop.git;a=blobdiff_plain;f=nlsop.c;h=fc34c8ad36801e84f69f681d904fae9bad24d29f;hp=10a3f2f067d1638fd07c69417e1729586da4ae33;hb=c5b9953db14e79a0c8457b2f7ca7bbc54e35d619;hpb=f74b482d7bd66fe861621276c6564c55e394f209 diff --git a/nlsop.c b/nlsop.c index 10a3f2f..fc34c8a 100644 --- a/nlsop.c +++ b/nlsop.c @@ -10,7 +10,7 @@ * selforganizing lamella structure in the observed behaviour. * * refs: - * - J. K. N. Lindner. Habilationsschrift, Universitaet Augsburg. + * - J. K. N. Lindner. Habil.Schrift, Universitaet Augsburg. * - Maik Haeberlen. Diplomarbeit, Universitaet Augsburg. * * Copyright (C) 2004 Frank Zirkelbach @@ -55,19 +55,15 @@ int usage(void) puts("-n \t\t no user interaction"); puts("-Z \t\t cryst -> amorph c diffusion in z direction"); puts("-i \t\t no cryst to cryst diffusion"); - 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); printf("-y \t # y cells (default %d)\n",Y); printf("-z \t # z cells (default %d)\n",Z); 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("-A \t slope of linear c distribution (default %f)\n",A_CD); - printf("-B \t linear c distribution offset (default %f)\n",B_CD); + 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); @@ -78,22 +74,46 @@ int usage(void) puts("-S \t save to file"); puts("-R \t read from random file"); puts("-P \t specify implantation profile file"); + puts("-N \t specify nuclear energy loss profile file"); printf("-H \t collisions per ion in simulation window (default %d)\n",CPI); + printf("-m \t number of ion hits sputtering 3nm (default %d)\n",S_RATE); return 1; } -int process_cell(d3_lattice *d3_l,u32 x,u32 y,u32 z,info *my_info) +int sputter(d3_lattice *d3_l) +{ + int i,size; + int offh,offl; + + size=d3_l->max_x*d3_l->max_y; + offl=0; + offh=size; + + for(i=0;imax_z-1;i++) + { + memcpy(d3_l->status+offl,d3_l->status+offh,size); + memcpy(d3_l->extra+offl,d3_l->extra+offh,size*sizeof(int)); + offl=offh; + offh+=size; + } + memset(d3_l->status+offl,0,size); + memset(d3_l->extra+offl,0,size); + + return 1; +} + +int process_cell(d3_lattice *d3_l,u32 x,u32 y,u32 z,info *my_info,u32 nel_z) { unsigned char *thiz; int *conc; int i,j; int off; - double p; + double p,q; 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*URAND_MAX; + 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++) @@ -101,24 +121,35 @@ int process_cell(d3_lattice *d3_l,u32 x,u32 y,u32 z,info *my_info) 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); } else { /* assume 1-p probability */ + /* also look for neighbours ! */ + q=(URAND_MAX-p)>0?URAND_MAX-p:0; + j=0; + j+=(*(d3_l->status+((x+d3_l->max_x+1)%d3_l->max_x)+y*d3_l->max_x+z*d3_l->max_x*d3_l->max_y)&AMORPH)?1:0; + j+=(*(d3_l->status+((x+d3_l->max_x-1)%d3_l->max_x)+y*d3_l->max_x+z*d3_l->max_x*d3_l->max_y)&AMORPH)?1:0; + j+=(*(d3_l->status+x+((y+1+d3_l->max_y)%d3_l->max_y)*d3_l->max_x+z*d3_l->max_x*d3_l->max_y)&AMORPH)?1:0; + j+=(*(d3_l->status+x+((y-1+d3_l->max_y)%d3_l->max_y)*d3_l->max_x+z*d3_l->max_x*d3_l->max_y)&AMORPH)?1:0; + j+=(*(d3_l->status+x+y*d3_l->max_x+((z+1+d3_l->max_z)%d3_l->max_z)*d3_l->max_x*d3_l->max_y)&AMORPH)?1:0; + j+=(*(d3_l->status+x+y*d3_l->max_x+((z-1+d3_l->max_z)%d3_l->max_z)*d3_l->max_x*d3_l->max_y)&AMORPH)?1:0; + + p+=((q/6)*j); if(get_rand(URAND_MAX)>p) MAKE_CRYST(thiz); } return 1; } -int distrib_c(d3_lattice *d3_l,info *my_info,int step,double c_ratio) +int distrib_c(d3_lattice *d3_l,info *my_info,int step,u32 rj_m,u32 *rj_g) { u32 x,y,z; int i,j,k,c; @@ -126,16 +157,11 @@ int distrib_c(d3_lattice *d3_l,info *my_info,int step,double c_ratio) int carry; /* put one c ion somewhere in the lattice */ - if(my_info->ccmax_x); - y=get_rand(d3_l->max_y); - // printf("nd: %d %d\n",x,y); - z=get_rand_lgp(d3_l->max_z,my_info->a_cd,my_info->b_cd); - // printf("ld: %d\n",z); - *(d3_l->extra+x+y*d3_l->max_x+z*d3_l->max_x*d3_l->max_y)+=1; - (my_info->cc)++; - } + x=get_rand(d3_l->max_x); + y=get_rand(d3_l->max_y); + z=get_rand_reject(d3_l->max_z,rj_m,rj_g); + *(d3_l->extra+x+y*d3_l->max_x+z*d3_l->max_x*d3_l->max_y)+=1; + (my_info->cc)++; if(step%my_info->diff_rate==0) { @@ -333,12 +359,15 @@ int calc_max_extra(d3_lattice *d3_l) int write_ac_distr(d3_lattice *d3_l,int ac_distr) { int fd,x,y,z; - int count=0,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"); + int count,offset; + 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) { @@ -348,6 +377,7 @@ int write_ac_distr(d3_lattice *d3_l,int ac_distr) for(z=0;zmax_z;z++) { + count=0; for(x=0;xmax_x;x++) { for(y=0;ymax_y;y++) @@ -358,61 +388,41 @@ 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); return 1; } -int write_bmp(d3_lattice *d3_l,int window,u32 x,u32 y,u32 z) +int write_bmp(d3_lattice *d3_l,int window,u32 x,u32 y,u32 z,int max) { - int fd,i,j,size=0,foo=0,end=0; + int fd,i,j,size=0,foo=0,k,sum; int width=0,height=0; char bmpfile[MAX_CHARS]; char buf[128]; - if(((window==4)||(window==5))&&(d3_l->max_zmax_x; - if(window==1) - { - size=(foo+(4-foo%4))*d3_l->max_z; - height=d3_l->max_z; - } - else - { - size=(foo+(4-foo%4))*FFT_HEIGHT; - end=d3_l->max_z-FFT_HEIGHT; - height=FFT_HEIGHT; - } + size=(foo+(4-foo%4))*d3_l->max_z; + height=d3_l->max_z; width=d3_l->max_x; } - if(window%3==2) + if(window==2) { sprintf(bmpfile,"y-z_%d.bmp",x); foo=3*d3_l->max_y; - if(window==2) - { - size=(foo+(4-foo%4))*d3_l->max_z; - height=d3_l->max_z; - } - else - { - size=(foo+(4-foo%4))*FFT_HEIGHT; - end=d3_l->max_z-FFT_HEIGHT; - height=FFT_HEIGHT; - } + size=(foo+(4-foo%4))*d3_l->max_z; + height=d3_l->max_z; width=d3_l->max_y; } if(window==3) @@ -423,7 +433,78 @@ int write_bmp(d3_lattice *d3_l,int window,u32 x,u32 y,u32 z) width=d3_l->max_x; height=d3_l->max_y; } - + if(window==4) + { + sprintf(bmpfile,"x-z_cdistr_%d.bmp",y); + foo=3*d3_l->max_x; + size=(foo+(4-foo%4))*d3_l->max_z; + height=d3_l->max_z; + width=d3_l->max_x; + } + if(window==5) + { + sprintf(bmpfile,"y-z_cdistr_%d.bmp",x); + foo=3*d3_l->max_y; + size=(foo+(4-foo%4))*d3_l->max_z; + height=d3_l->max_z; + width=d3_l->max_y; + } + if(window==6) + { + sprintf(bmpfile,"x-y_cdistr_%d.bmp",z); + foo=3*d3_l->max_x; + size=(foo+(4-foo%4))*d3_l->max_y; + width=d3_l->max_x; + height=d3_l->max_y; + } + if(window==7) + { + sprintf(bmpfile,"x-z_a_cdistr_%d.bmp",y); + foo=3*d3_l->max_x; + size=(foo+(4-foo%4))*d3_l->max_z; + height=d3_l->max_z; + width=d3_l->max_x; + } + if(window==8) + { + sprintf(bmpfile,"y-z_a_cdistr_%d.bmp",x); + foo=3*d3_l->max_y; + size=(foo+(4-foo%4))*d3_l->max_z; + height=d3_l->max_z; + width=d3_l->max_y; + } + if(window==9) + { + sprintf(bmpfile,"x-y_a_cdistr_%d.bmp",z); + foo=3*d3_l->max_x; + size=(foo+(4-foo%4))*d3_l->max_y; + height=d3_l->max_y; + width=d3_l->max_x; + } + if(window==10) + { + sprintf(bmpfile,"x-z_c_cdistr_%d.bmp",y); + foo=3*d3_l->max_x; + size=(foo+(4-foo%4))*d3_l->max_z; + height=d3_l->max_z; + width=d3_l->max_x; + } + if(window==11) + { + sprintf(bmpfile,"y-z_c_cdistr_%d.bmp",x); + foo=3*d3_l->max_y; + size=(foo+(4-foo%4))*d3_l->max_z; + height=d3_l->max_z; + width=d3_l->max_y; + } + if(window==12) + { + sprintf(bmpfile,"x-y_c_cdistr_%d.bmp",z); + foo=3*d3_l->max_x; + size=(foo+(4-foo%4))*d3_l->max_y; + height=d3_l->max_y; + width=d3_l->max_x; + } if((fd=open(bmpfile,O_WRONLY|O_CREAT))<0) { puts("cannot open bmp file"); @@ -467,14 +548,17 @@ int write_bmp(d3_lattice *d3_l,int window,u32 x,u32 y,u32 z) puts("failed writing bmp header"); return -1; } - if(window%3==1) + if(window==1) { - for(j=0;jmax_z-end;j++) + for(j=0;jmax_z;j++) { for(i=0;imax_x;i++) { - if(*(d3_l->status+i+y*d3_l->max_x+(d3_l->max_z-j-1)*d3_l->max_x*d3_l->max_y)&RED) memset(buf,0xff,3); - else memset(buf,0,3); + sum=0; + for(k=-2;k<=2;k++) + if(*(d3_l->status+i+(((y+k+d3_l->max_y)%d3_l->max_y)*d3_l->max_x)+(d3_l->max_z-j-1)*d3_l->max_x*d3_l->max_y)&RED) sum+=0xff; + sum/=5; + memset(buf,(unsigned char)sum,3); if(write(fd,buf,3)<3) { puts("failed writing rgb values to bmp file"); @@ -492,14 +576,17 @@ int write_bmp(d3_lattice *d3_l,int window,u32 x,u32 y,u32 z) } } } - if(window%3==2) + if(window==2) { - for(j=0;jmax_z-end;j++) + for(j=0;jmax_z;j++) { for(i=0;imax_y;i++) { - if(*(d3_l->status+x+i*d3_l->max_x+(d3_l->max_z-j-1)*d3_l->max_x*d3_l->max_y)&RED) memset(buf,0xff,3); - else memset(buf,0,3); + sum=0; + for(k=-2;k<=2;k++) + if(*(d3_l->status+((x+k+d3_l->max_x)%d3_l->max_x)+i*d3_l->max_x+(d3_l->max_z-j-1)*d3_l->max_x*d3_l->max_y)&RED) sum+=0xff; + sum/=5; + memset(buf,(unsigned char)sum,3); if(write(fd,buf,3)<3) { puts("failed writing rgb values to bmp file"); @@ -542,6 +629,246 @@ int write_bmp(d3_lattice *d3_l,int window,u32 x,u32 y,u32 z) } } } + if(window==4) + { + for(j=0;jmax_z;j++) + { + for(i=0;imax_x;i++) + { + sum=*(d3_l->extra+i+y*d3_l->max_x+(d3_l->max_z-j-1)*d3_l->max_x*d3_l->max_y); + sum=sum*255/max; + memset(buf,(unsigned char)sum,3); + if(write(fd,buf,3)<3) + { + puts("failed writing rgb values to bmp file"); + return-1; + } + } + if(foo%4) + { + memset(buf,0,4-foo%4); + if(write(fd,buf,4-foo%4)<4-foo%4) + { + puts("failed writing 4 byte ending"); + return -1; + } + } + } + } + if(window==5) + { + for(j=0;jmax_z;j++) + { + for(i=0;imax_x;i++) + { + sum=*(d3_l->extra+x+i*d3_l->max_x+(d3_l->max_z-j-1)*d3_l->max_x*d3_l->max_y); + sum=sum*255/max; + memset(buf,(unsigned char)sum,3); + if(write(fd,buf,3)<3) + { + puts("failed writing rgb values to bmp file"); + return-1; + } + } + if(foo%4) + { + memset(buf,0,4-foo%4); + if(write(fd,buf,4-foo%4)<4-foo%4) + { + puts("failed writing 4 byte ending"); + return -1; + } + } + } + } + if(window==6) + { + for(j=0;jmax_y;j++) + { + for(i=0;imax_x;i++) + { + sum=*(d3_l->extra+i+(d3_l->max_y-j-1)*d3_l->max_x+z*d3_l->max_x*d3_l->max_y); + sum=sum*255/max; + memset(buf,(unsigned char)sum,3); + if(write(fd,buf,3)<3) + { + puts("failed writing rgb values to bmp file"); + return-1; + } + } + if(foo%4) + { + memset(buf,0,4-foo%4); + if(write(fd,buf,4-foo%4)<4-foo%4) + { + puts("failed writing 4 byte ending"); + return -1; + } + } + } + } + if(window==7) + { + for(j=0;jmax_z;j++) + { + for(i=0;imax_x;i++) + { + if(*(d3_l->status+i+y*d3_l->max_x+(d3_l->max_z-j-1)*d3_l->max_x*d3_l->max_y)&RED) sum=*(d3_l->extra+i+y*d3_l->max_x+(d3_l->max_z-j-1)*d3_l->max_x*d3_l->max_y); + else sum=0; + sum=sum*255/max; + memset(buf,(unsigned char)sum,3); + if(write(fd,buf,3)<3) + { + puts("failed writing rgb values to bmp file"); + return-1; + } + } + if(foo%4) + { + memset(buf,0,4-foo%4); + if(write(fd,buf,4-foo%4)<4-foo%4) + { + puts("failed writing 4 byte ending"); + return -1; + } + } + } + } + if(window==8) + { + for(j=0;jmax_z;j++) + { + for(i=0;imax_x;i++) + { + if(*(d3_l->status+x+i*d3_l->max_x+(d3_l->max_z-j-1)*d3_l->max_x*d3_l->max_y)&RED) sum=*(d3_l->extra+x+i*d3_l->max_x+(d3_l->max_z-j-1)*d3_l->max_x*d3_l->max_y); + else sum=0; + sum=sum*255/max; + memset(buf,(unsigned char)sum,3); + if(write(fd,buf,3)<3) + { + puts("failed writing rgb values to bmp file"); + return-1; + } + } + if(foo%4) + { + memset(buf,0,4-foo%4); + if(write(fd,buf,4-foo%4)<4-foo%4) + { + puts("failed writing 4 byte ending"); + return -1; + } + } + } + } + if(window==9) + { + for(j=0;jmax_y;j++) + { + for(i=0;imax_x;i++) + { + if(*(d3_l->status+i+(d3_l->max_y-j-1)*d3_l->max_x+z*d3_l->max_x*d3_l->max_y)&RED) sum=*(d3_l->extra+i+(d3_l->max_y-j-1)*d3_l->max_x+z*d3_l->max_x*d3_l->max_y); + else sum=0; + sum=sum*255/max; + memset(buf,(unsigned char)sum,3); + if(write(fd,buf,3)<3) + { + puts("failed writing rgb values to bmp file"); + return-1; + } + } + if(foo%4) + { + memset(buf,0,4-foo%4); + if(write(fd,buf,4-foo%4)<4-foo%4) + { + puts("failed writing 4 byte ending"); + return -1; + } + } + } + } + if(window==10) + { + for(j=0;jmax_z;j++) + { + for(i=0;imax_x;i++) + { + if(!(*(d3_l->status+i+y*d3_l->max_x+(d3_l->max_z-j-1)*d3_l->max_x*d3_l->max_y)&RED)) sum=*(d3_l->extra+i+y*d3_l->max_x+(d3_l->max_z-j-1)*d3_l->max_x*d3_l->max_y); + else sum=0; + sum=sum*255/max; + memset(buf,(unsigned char)sum,3); + if(write(fd,buf,3)<3) + { + puts("failed writing rgb values to bmp file"); + return-1; + } + } + if(foo%4) + { + memset(buf,0,4-foo%4); + if(write(fd,buf,4-foo%4)<4-foo%4) + { + puts("failed writing 4 byte ending"); + return -1; + } + } + } + } + if(window==11) + { + for(j=0;jmax_z;j++) + { + for(i=0;imax_x;i++) + { + if(!(*(d3_l->status+x+i*d3_l->max_x+(d3_l->max_z-j-1)*d3_l->max_x*d3_l->max_y)&RED)) sum=*(d3_l->extra+x+i*d3_l->max_x+(d3_l->max_z-j-1)*d3_l->max_x*d3_l->max_y); + else sum=0; + sum=sum*255/max; + memset(buf,(unsigned char)sum,3); + if(write(fd,buf,3)<3) + { + puts("failed writing rgb values to bmp file"); + return-1; + } + } + if(foo%4) + { + memset(buf,0,4-foo%4); + if(write(fd,buf,4-foo%4)<4-foo%4) + { + puts("failed writing 4 byte ending"); + return -1; + } + } + } + } + if(window==12) + { + for(j=0;jmax_y;j++) + { + for(i=0;imax_x;i++) + { + if(!(*(d3_l->status+i+(d3_l->max_y-j-1)*d3_l->max_x+z*d3_l->max_x*d3_l->max_y)&RED)) sum=*(d3_l->extra+i+(d3_l->max_y-j-1)*d3_l->max_x+z*d3_l->max_x*d3_l->max_y); + else sum=0; + sum=sum*255/max; + memset(buf,(unsigned char)sum,3); + if(write(fd,buf,3)<3) + { + puts("failed writing rgb values to bmp file"); + return-1; + } + } + if(foo%4) + { + memset(buf,0,4-foo%4); + if(write(fd,buf,4-foo%4)<4-foo%4) + { + puts("failed writing 4 byte ending"); + return -1; + } + } + } + } close(fd); return 1; @@ -584,7 +911,8 @@ int save_to_file(char *sf,d3_lattice *d3_l,info *my_inf) int load_from_file(char *lf,d3_lattice *d3_l,info *my_inf) { - int lf_fd,c; + + int lf_fd,c,pos,end,data,data_len,strip; if((lf_fd=open(lf,O_RDONLY))<0) { @@ -596,11 +924,31 @@ int load_from_file(char *lf,d3_lattice *d3_l,info *my_inf) puts("failed reading d3 lattice struct"); return -1; } - if(read(lf_fd,my_inf,sizeof(info))max_x*d3_l->max_y*d3_l->max_z; + data_len=data*(sizeof(int)+sizeof(unsigned char)); + printf("there are %d volumes so we need %d of bytes\n",data,data_len); + end=lseek(lf_fd,0,SEEK_END); + c=end-pos-data_len; + printf("end: %d => length: %d => guessed info size: %d bytes\n",end,end-pos,c); + strip=sizeof(info)-c; + printf("as real programs info size is %d, we strip %d bytes\n",sizeof(info),strip); + lseek(lf_fd,pos,SEEK_SET); + c=sizeof(info); + if(strip>0) c-=strip; + if(c<0) + { + puts("info smaller then strip size"); + return -1; + } + if(read(lf_fd,my_inf,c)0) memset(my_inf+c,0,strip); + if(strip<0) lseek(lf_fd,(-1*strip),SEEK_CUR); c=d3_l->max_x*d3_l->max_y*d3_l->max_z; if((d3_l->status=(unsigned char*)malloc(c*sizeof(unsigned char)))==NULL) { @@ -629,6 +977,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; @@ -649,6 +998,7 @@ int convert_file(char *cf,d3_lattice *d3_l) } } close(c_fd); +#endif return 1; } @@ -684,7 +1034,7 @@ int get_c_ratio(double *c_ratio,char *pfile,info *my_info,d3_lattice *d3_l) a=atof(p)/10; /* nm */ p=strtok(NULL," "); b=atof(p); - if(a>my_info->b_cd*CELL_LENGTH && a<(my_info->b_cd+d3_l->max_z)*CELL_LENGTH) d+=b; + if(a<=d3_l->max_z*CELL_LENGTH) d+=b; all+=b; } } @@ -733,7 +1083,7 @@ u32 get_reject_graph(info *my_info,d3_lattice *d3_l,char *file,u32 *graph) { if(a>d3_l->max_z*CELL_LENGTH) k=0; else { - graph[(int)(a/CELL_LENGTH)]=(int)(URAND_MAX*b); + graph[(int)(a/CELL_LENGTH)]=(int)(URAND_MAX/100*b); flag[(int)(a/CELL_LENGTH)]=1; } } @@ -747,13 +1097,17 @@ u32 get_reject_graph(info *my_info,d3_lattice *d3_l,char *file,u32 *graph) { j=i; i++; while(flag[i]==0&&imax_z) i++; - printf("debug: i = %d j = %d\n",i,j); for(k=j+1;kmax) max=graph[i]; } free(flag); +#ifdef DEBUG_INTERPOL_PROFILE + printf("debug: %s (interpolated profile)\n",file); + for(i=0;imax_z;i++) printf("%d %d\n",i,graph[i]); +#endif + return max; } @@ -768,6 +1122,7 @@ int main(int argc,char **argv) char l_file[MAX_CHARS]; char c_file[MAX_CHARS]; char p_file[MAX_CHARS]; + char n_e_file[MAX_CHARS]; char convert; char r_file[MAX_CHARS]; #ifdef USE_DFB_API @@ -778,28 +1133,31 @@ int main(int argc,char **argv) char cc_txt[MAX_TXT]; char a_txt[MAX_TXT]; char s_txt[MAX_TXT]; - char ap_txt[MAX_TXT]; - char el_txt[MAX_TXT]; - char cd_txt[MAX_TXT]; + char ballistic_txt[MAX_TXT]; + char carbon_txt[MAX_TXT]; + char stress_txt[MAX_TXT]; char r_txt[MAX_TXT]; - char cp_txt[MAX_TXT]; char zdiff_txt[MAX_TXT]; char diff_txt[MAX_TXT]; char dr_ac_txt[MAX_TXT]; char dr_cc_txt[MAX_TXT]; char dose_txt[MAX_TXT]; char mode_txt[MAX_TXT]; + char hpi_txt[MAX_TXT]; + char csat_txt[MAX_TXT]; char *arg_v[MAX_ARGV]; #endif d3_lattice d3_l; info my_info; unsigned char mode; - double c_ratio; + //double c_ratio; #ifdef USE_DFB_API int max_extra; #endif u32 *c_profile; u32 *n_e_loss; + u32 ne_max,ip_max; + u32 nel_z; d3_l.max_x=X; d3_l.max_y=Y; @@ -810,18 +1168,15 @@ int main(int argc,char **argv) resave=RESAVE; my_info.z_diff=0; my_info.c_diff=1; - my_info.a_el=A_EL; - my_info.b_el=B_EL; - my_info.a_cd=A_CD; - my_info.b_cd=B_CD; - 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; my_info.diff_rate=DIFF_RATE; my_info.cpi=CPI; + my_info.s_rate=S_RATE; nowait=0; quit=0; escape=0; @@ -831,10 +1186,16 @@ int main(int argc,char **argv) strcpy(l_file,""); strcpy(c_file,""); strcpy(p_file,IMP_PROFILE); + strcpy(n_e_file,NEL_PROFILE); convert=0; strcpy(r_file,""); mode=0; - u32 ne_max; + ne_max=0; + ip_max=0; + +#ifdef MORE_PRINTF + printf("reading argv ..."); +#endif for(i=1;i