X-Git-Url: https://hackdaworld.org/gitweb/?a=blobdiff_plain;f=nlsop.c;h=ab29fd1257165d092327952c72d23a732dbc7629;hb=d936b3be3859d8b08e54ae5b7cb1986eaa7c29f6;hp=7463054c5d7d35066728262a61293a13bed61037;hpb=88002523f694c507c86dfe13c95553e66c2f8647;p=physik%2Fnlsop.git

diff --git a/nlsop.c b/nlsop.c
index 7463054..ab29fd1 100644
--- a/nlsop.c
+++ b/nlsop.c
@@ -341,11 +341,14 @@ int write_ac_distr(d3_lattice *d3_l,int ac_distr)
 {
  int fd,x,y,z;
  int count,offset;
- char file[16];
-
- if(ac_distr==1) strcpy(file,"a.plot");
- if(ac_distr==2) strcpy(file,"c.plot");
- if(ac_distr==3) strcpy(file,"b.plot");
+ char file[32];
+ int si_count;
+ 
+ si_count=d3_l->max_x*d3_l->max_y*SI_PER_VOLUME;
+ if(ac_distr==1) strcpy(file,"carbon_in_av.plot");
+ if(ac_distr==2) strcpy(file,"carbon_in_cv.plot");
+ if(ac_distr==3) strcpy(file,"carbon.plot");
+ if(ac_distr==4) strcpy(file,"amorphous_volumes.plot");
 
  if((fd=open(file,O_WRONLY|O_CREAT))<0)
  {
@@ -366,9 +369,12 @@ int write_ac_distr(d3_lattice *d3_l,int ac_distr)
     if(ac_distr==2)
      if(!(*(d3_l->status+offset)&AMORPH)) count+=*(d3_l->extra+offset);
     if(ac_distr==3) count+=*(d3_l->extra+offset);
+    if(ac_distr==4)
+     if(*(d3_l->status+offset)&AMORPH) count+=1;
    }
   }
-  dprintf(fd,"%d %d\n",z,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);
  }
  close(fd);
  
@@ -1378,6 +1384,7 @@ int main(int argc,char **argv)
   ne_max=get_reject_graph(&my_info,&d3_l,n_e_file,n_e_loss);
 
 #ifdef DEBUG_RAND
+ i=0;
  while(1)
  {
 #ifdef DEBUG_CP
@@ -1389,6 +1396,8 @@ int main(int argc,char **argv)
 #ifdef DEBUG_NORM
   printf("%d\n",get_rand(d3_l.max_z));
 #endif
+ if(i==10000000) return 1;
+ i++;
  }
 #endif