projects
/
physik
/
nlsop.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mre printf
[physik/nlsop.git]
/
nlsop.c
diff --git
a/nlsop.c
b/nlsop.c
index
de46dc0
..
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("-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);
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);
@@
-373,8
+373,10
@@
int write_ac_distr(d3_lattice *d3_l,int ac_distr)
if(*(d3_l->status+offset)&AMORPH) count+=1;
}
}
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);
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);
}
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)
{
int convert_file(char *cf,d3_lattice *d3_l)
{
+#ifndef MAC
int x,y,z;
int c_fd;
int x,y,z;
int c_fd;
@@
-976,6
+979,7
@@
int convert_file(char *cf,d3_lattice *d3_l)
}
}
close(c_fd);
}
}
close(c_fd);
+#endif
return 1;
}
return 1;
}
@@
-1145,9
+1149,9
@@
int main(int argc,char **argv)
resave=RESAVE;
my_info.z_diff=0;
my_info.c_diff=1;
resave=RESAVE;
my_info.z_diff=0;
my_info.c_diff=1;
- my_info.s=
A_AP
;
- my_info.b=B_
AP
;
- my_info.c=
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.cc=CC;
my_info.dr_ac=DR_AC;
my_info.dr_cc=DR_CC;
@@
-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);
}
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)
{
#endif
if(i%resave==0 && strcmp(s_file,"") && resave!=0 && i!=0)
{