mre printf

[physik/nlsop.git] / nlsop.c

diff --git a/nlsop.c b/nlsop.c
index 350868e..09b1666 100644 (file)
--- a/nlsop.c
+++ b/nlsop.c
@@ -61,9 +61,9 @@ int usage(void)
  printf("-s <value> \t steps (default %d)\n",STEPS);
  printf("-d <value> \t refresh display (default %d)\n",REFRESH);
  printf("-r <value> \t amorphous influence range (default %d)\n",RANGE);
- printf("-f <value> \t pressure = <value> * 1/distance^2 (default %f)\n",A_AP);
- printf("-p <value> \t pressure offset (default %f)\n",B_AP);
- printf("-F <value> \t proportionality constant between c conc and ability to get amorphous (default %f)\n",A_CP);
+ printf("-f <value> \t stress induced amorphization influence (default %f)\n",S_D);
+ printf("-p <value> \t ballistic amorphization influence (default %f)\n",B_D);
+ printf("-F <value> \t carbon induced amorphization influence (default %f)\n",C_D);
  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);
@@ -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);
@@ -373,8 +373,10 @@ int write_ac_distr(d3_lattice *d3_l,int ac_distr)
      if(*(d3_l->status+offset)&AMORPH) count+=1;
    }
   }
+#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);
  
@@ -956,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;
 
@@ -976,6 +979,7 @@ int convert_file(char *cf,d3_lattice *d3_l)
   }
  }
  close(c_fd);
+#endif
 
  return 1;
 }
@@ -1145,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;
@@ -1208,13 +1212,13 @@ int main(int argc,char **argv)
      my_info.range=atoi(argv[++i]);
      break;
     case 'f':
-     my_info.a_ap=atof(argv[++i]);
+     my_info.s=atof(argv[++i]);
      break;
     case 'p':
-     my_info.b_ap=atof(argv[++i]);
+     my_info.b=atof(argv[++i]);
      break;
     case 'F':
-     my_info.a_cp=atof(argv[++i]);
+     my_info.c=atof(argv[++i]);
      break;
     case 'W':
      resave=atoi(argv[++i]);
@@ -1323,9 +1327,9 @@ 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(stress_txt,"stress term: %f",my_info.a_ap);
- sprintf(ballistic_txt,"ballistic term: %f",my_info.b_ap);
- sprintf(carbon_txt,"carbon term: %f",my_info.a_cp);
+ sprintf(stress_txt,"stress term: %f",my_info.s);
+ sprintf(ballistic_txt,"ballistic term: %f",my_info.b);
+ sprintf(carbon_txt,"carbon term: %f",my_info.c);
  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");
@@ -1425,6 +1429,9 @@ int main(int argc,char **argv)
     sprintf(cc_txt,"total c: %d",my_info.cc);
     d3_lattice_draw(&d3_l,x,y,z,25,arg_v,mode,0,NULL,0,NULL,0);
    }
+#endif
+#ifdef MORE_PRINTF
+   if(i%refresh==0) printf("step: %d\n",i);
 #endif
    if(i%resave==0 && strcmp(s_file,"") && resave!=0 && i!=0)
    {