added test: no c diff (-i option)

diff --git a/nlsop.c b/nlsop.c
index 5b160bc..efd7f91 100644 (file)
--- a/nlsop.c
+++ b/nlsop.c
@@ -32,6 +32,7 @@
 /* test globals - get removed or included in my_info struct later */
 int amorph_count;
 int cryst_count;
+unsigned char c_diff;
 
 int usage(void)
 {
@@ -39,6 +40,7 @@ int usage(void)
  puts("-h \t\t help");
  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 <value> \t slope of nuclear energy loss (default %f)\n",A_EL);
  printf("-b <value> \t nuclear energy loss offset (default %f)\n",B_EL);
  printf("-x <value> \t # x cells (default %d)\n",X);
@@ -55,7 +57,7 @@ int usage(void)
  printf("-D <value> \t diffusion rate from cryst to amorph cells (default %f)\n",DR_AC);
  printf("-c <value> \t diffusion rate in cryst cells (default %f)\n",DR_CC);
  printf("-e <value> \t do diffusion every <value> steps (default %d)\n",DIFF_RATE);
- puts("-g <file> <step> \t continue simulation from file and step (step > 0)!");
+ puts("-g <file> <step> continue simulation from file and step (step > 0)!");
  printf("-W <value> \t write every <value> steps to save file (default %d)\n",RESAVE);
  puts("-C <file> \t convert file to gnuplot format");
  puts("-L <file> \t load from file");
@@ -136,7 +138,7 @@ int distrib_c(d3_lattice *d3_l,info *my_info,int step,double c_ratio)
    for(k=0;k<d3_l->max_z;k++)
    {
     offset=i+j*d3_l->max_x+k*d3_l->max_x*d3_l->max_y;
-    /* case amorph - amorph <-> cryst diffusion */
+    /* case amorph: amorph <- cryst diffusion */
     if(*(d3_l->status+offset)&AMORPH)
     {
      for(c=-1;c<=1;c++)
@@ -185,7 +187,11 @@ int distrib_c(d3_lattice *d3_l,info *my_info,int step,double c_ratio)
       }
      }  
     } else
-    /* case not amorph - cryst <-> cryst diffusion */
+    /* case not amorph: cryst <-> cryst diffusion */
+
+    /* test ! */
+    if(c_diff) {
+    /* */
     {
      for(c=-1;c<=1;c++) 
      {
@@ -222,6 +228,9 @@ int distrib_c(d3_lattice *d3_l,info *my_info,int step,double c_ratio)
       }
      }
     }
+    /* end test */
+    }
+    /* */
    } /* for z */
   } /* for y */
  } /* for x */
@@ -658,6 +667,7 @@ int main(int argc,char **argv)
  refresh=REFRESH;
  resave=RESAVE;
  my_info.z_diff=0;
+ c_diff=1;
  my_info.a_el=A_EL;
  my_info.b_el=B_EL;
  my_info.a_cd=A_CD;
@@ -715,6 +725,9 @@ int main(int argc,char **argv)
     case 'Z':
      my_info.z_diff=1;
      break;
+    case 'i':
+     c_diff=0;
+     break;
     case 's':
      my_info.steps=atoi(argv[++i]);
      break;