implemented saturation value of carbon in amorph cells

diff --git a/nlsop.c b/nlsop.c
index 0e06c77432cb0385ba0298cb7e1382341ce2e3af..07313e43f3e3a39f593ed769b012df62c9a18ebd 100644 (file)
--- a/nlsop.c
+++ b/nlsop.c
@@ -80,6 +80,7 @@ int usage(void)
  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;
 }
@@ -150,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++)
      {
@@ -829,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;
@@ -942,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;

diff --git a/nlsop.h b/nlsop.h
index 8b4b63a62dfa3bc7a0bde16f992cd434957332ed..80ce82bf163e89f8ee33869b4e339b389f669da0 100644 (file)
--- a/nlsop.h
+++ b/nlsop.h
@@ -12,7 +12,7 @@ typedef unsigned int u32;
 
 typedef struct __info
 {
- int cc,steps,range,diff_rate,cpi;
+ int cc,steps,range,diff_rate,cpi,c_sat;
  double a_el,b_el,a_cd,b_cd,a_ap,b_ap,a_cp,dr_ac,dr_cc;
  char z_diff,c_diff;
 } info;
@@ -56,6 +56,8 @@ typedef struct __info
 
 #define CPI 20
 
+#define C_SAT (6*6*6)
+
 #define FFT_HEIGHT 64
 
 #endif /* NLSOP_H */