implemented strip mechanism + changed amorphization terms names

diff --git a/nlsop.c b/nlsop.c
index 683803e..d51d24c 100644 (file)
--- a/nlsop.c
+++ b/nlsop.c
@@ -675,7 +675,8 @@ int save_to_file(char *sf,d3_lattice *d3_l,info *my_inf)
 
 int load_from_file(char *lf,d3_lattice *d3_l,info *my_inf)
 {
- int lf_fd,c;
+
+ int lf_fd,c,pos,end,data,data_len,strip;
 
  if((lf_fd=open(lf,O_RDONLY))<0)
  {
@@ -687,11 +688,31 @@ int load_from_file(char *lf,d3_lattice *d3_l,info *my_inf)
   puts("failed reading d3 lattice struct");
   return -1;
  }
- if(read(lf_fd,my_inf,sizeof(info))<sizeof(info))
+ pos=lseek(lf_fd,0,SEEK_CUR);
+ printf("psition: %d (%d)\n",pos,sizeof(d3_lattice));
+ data=d3_l->max_x*d3_l->max_y*d3_l->max_z;
+ data_len=data*(sizeof(int)+sizeof(unsigned char));
+ printf("there are %d volumes so we need %d of bytes\n",data,data_len);
+ end=lseek(lf_fd,0,SEEK_END);
+ c=end-pos-data_len;
+ printf("end: %d => length: %d => guessed info size: %d bytes\n",end,end-pos,c);
+ strip=sizeof(info)-c;
+ printf("as real programs info size is %d, we strip %d bytes\n",sizeof(info),strip);
+ lseek(lf_fd,pos,SEEK_SET);
+ c=sizeof(info);
+ if(strip>0) c-=strip;
+ if(c<0)
+ {
+  puts("info smaller then strip size");
+  return -1;
+ }
+ if(read(lf_fd,my_inf,c)<c)
  {
   puts("failed reading info struct");
   return-1;
  }
+ if(strip>0) memset(my_inf+c,0,strip);
+ if(strip<0) lseek(lf_fd,(-1*strip),SEEK_CUR);
  c=d3_l->max_x*d3_l->max_y*d3_l->max_z;
  if((d3_l->status=(unsigned char*)malloc(c*sizeof(unsigned char)))==NULL)
  {
@@ -874,9 +895,10 @@ int main(int argc,char **argv)
  char cc_txt[MAX_TXT];
  char a_txt[MAX_TXT];
  char s_txt[MAX_TXT];
- char ap_txt[MAX_TXT];
+ char ballistic_txt[MAX_TXT];
+ char carbon_txt[MAX_TXT];
+ char stress_txt[MAX_TXT];
  char r_txt[MAX_TXT];
- char cp_txt[MAX_TXT];
  char zdiff_txt[MAX_TXT];
  char diff_txt[MAX_TXT];
  char dr_ac_txt[MAX_TXT];
@@ -1086,8 +1108,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(ap_txt,"a_ap: %f  b_ap: %f",my_info.a_ap,my_info.b_ap);
- sprintf(cp_txt,"a_cp: %f",my_info.a_cp);
+ 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(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");
@@ -1110,13 +1133,13 @@ int main(int argc,char **argv)
  arg_v[12]=diff_txt;
  arg_v[13]=zdiff_txt;
  arg_v[14]=r_txt;
- arg_v[15]=ap_txt;
- arg_v[16]=cp_txt;
- arg_v[17]=dr_ac_txt;
- arg_v[18]=dr_cc_txt;
- arg_v[19]=hpi_txt;
- arg_v[20]=csat_txt;
- arg_v[21]=NULL;
+ arg_v[15]=ballistic_txt;
+ arg_v[16]=carbon_txt;
+ arg_v[17]=stress_txt;
+ arg_v[18]=dr_ac_txt;
+ arg_v[19]=dr_cc_txt;
+ arg_v[20]=hpi_txt;
+ arg_v[21]=csat_txt;
  arg_v[22]=NULL;
  arg_v[23]=NULL;
  arg_v[24]=NULL;