X-Git-Url: https://hackdaworld.org/gitweb/?p=physik%2Fnlsop.git;a=blobdiff_plain;f=nlsop.c;h=07313e43f3e3a39f593ed769b012df62c9a18ebd;hp=11f81f5f569e26c02024a23ebe6fc091713f8c3e;hb=30343b61fc28bccc04af479729a1529fa824a85a;hpb=a04f85207ca9c68e39c6e2f1b0f29eeb062451bd

diff --git a/nlsop.c b/nlsop.c
index 11f81f5..07313e4 100644
--- a/nlsop.c
+++ b/nlsop.c
@@ -78,7 +78,9 @@ int usage(void)
  puts("-S <file> \t save to file");
  puts("-R <file> \t read from random file");
  puts("-P <file> \t specify implantation profile file");
+ puts("-N <file> \t specify nuclear energy loss profile file");
  printf("-H <value> \t collisions per ion in simulation window (default %d)\n",CPI);
+ puts("-m <value> \t specify c->a carbon saturation");
  
  return 1;
 }
@@ -149,7 +151,7 @@ int distrib_c(d3_lattice *d3_l,info *my_info,int step,double c_ratio,u32 rj_m,u3
    {
     offset=i+j*d3_l->max_x+k*d3_l->max_x*d3_l->max_y;
     /* case amorph: amorph <- cryst diffusion */
-    if(*(d3_l->status+offset)&AMORPH)
+    if(*(d3_l->status+offset)&AMORPH && *(d3_l->extra+offset)<my_info->c_sat)
     {
      for(c=-1;c<=1;c++)
      {
@@ -334,7 +336,7 @@ 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;
+ int count,offset;
  char file[16];
 
  if(ac_distr==1) strcpy(file,"a.plot");
@@ -349,6 +351,7 @@ int write_ac_distr(d3_lattice *d3_l,int ac_distr)
 
  for(z=0;z<d3_l->max_z;z++)
  {
+  count=0;
   for(x=0;x<d3_l->max_x;x++)
   {
    for(y=0;y<d3_l->max_y;y++)
@@ -771,6 +774,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
@@ -826,6 +830,7 @@ int main(int argc,char **argv)
  my_info.dr_cc=DR_CC;
  my_info.diff_rate=DIFF_RATE;
  my_info.cpi=CPI;
+ my_info.c_sat=C_SAT;
  nowait=0;
  quit=0;
  escape=0;
@@ -835,6 +840,7 @@ 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;
@@ -928,6 +934,9 @@ int main(int argc,char **argv)
     case 'P':
      strcpy(p_file,argv[++i]);
      break;
+    case 'N':
+     strcpy(n_e_file,argv[++i]);
+     break;
     case 'g':
      strcpy(l_file,argv[++i]);
      if(i<argc-1) if(argv[i+1][0]!='-') c_step=atoi(argv[++i]);
@@ -935,6 +944,9 @@ int main(int argc,char **argv)
     case 'H':
      my_info.cpi=atoi(argv[++i]);
      break;
+    case 'm':
+     my_info.c_sat=atoi(argv[++i]);
+     break;
     default:
      usage();
      return -1;
@@ -1000,12 +1012,12 @@ int main(int argc,char **argv)
  sprintf(s_txt,"steps: %d",my_info.steps);
  sprintf(dose_txt,"dose: %.2fe+17 C/cm²",my_info.steps*1.0/(d3_l.max_x*d3_l.max_y*CELL_LENGTH*CELL_LENGTH*1000));
  sprintf(r_txt,"pressure range: %d",my_info.range);
- sprintf(ap_txt,"a_ap: %.4f  b_ap: %.3f",my_info.a_ap,my_info.b_ap);
- sprintf(el_txt,"a_el: %.3f  b_el: %.3f",my_info.a_el,my_info.b_el);
- sprintf(cd_txt,"a_cd: %.3f  b_cd: %.3f",my_info.a_cd,my_info.b_cd);
- sprintf(cp_txt,"a_cp: %.5f",my_info.a_cp);
- sprintf(dr_ac_txt,"a/c diffusion rate: %.4f",my_info.dr_ac);
- if(my_info.c_diff!=0) sprintf(dr_cc_txt,"c/c diffusion rate: %.4f",my_info.dr_cc);
+ sprintf(ap_txt,"a_ap: %f  b_ap: %f",my_info.a_ap,my_info.b_ap);
+ sprintf(el_txt,"a_el: %f  b_el: %f",my_info.a_el,my_info.b_el);
+ sprintf(cd_txt,"a_cd: %f  b_cd: %f",my_info.a_cd,my_info.b_cd);
+ sprintf(cp_txt,"a_cp: %f",my_info.a_cp);
+ sprintf(dr_ac_txt,"a/c diffusion rate: %f",my_info.dr_ac);
+ if(my_info.c_diff!=0) sprintf(dr_cc_txt,"c/c diffusion rate: %f",my_info.dr_cc);
  else sprintf(dr_cc_txt,"c/c diffusion rate: none");
  sprintf(zdiff_txt,"diffusion in z direction: %c",my_info.z_diff?'y':'n');
  sprintf(diff_txt,"diffusion every %d steps",my_info.diff_rate);
@@ -1057,11 +1069,17 @@ int main(int argc,char **argv)
    return -1;
   }
   ip_max=get_reject_graph(&my_info,&d3_l,p_file,c_profile);
+  ne_max=get_reject_graph(&my_info,&d3_l,n_e_file,n_e_loss);
 
 #ifdef DEBUG_RAND
  while(1)
  {
+#ifdef DEBUG_CP
   printf("%d\n",get_rand_reject(d3_l.max_z,ip_max,c_profile));
+#endif
+#ifdef DEBUG_NEL
+  printf("%d\n",get_rand_reject(d3_l.max_z,ne_max,n_e_loss));
+#endif
  }
 #endif
 
@@ -1072,8 +1090,8 @@ 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);
-    printf("%d\n",z_c);
+    // z_c=get_rand_lgp(d3_l.max_z,my_info.a_el,my_info.b_el);
+    z_c=get_rand_reject(d3_l.max_z,ne_max,n_e_loss);
     process_cell(&d3_l,x_c,y_c,z_c,&my_info);
    }
    distrib_c(&d3_l,&my_info,i,c_ratio,ip_max,c_profile);