small modifications & addons + introduced am. layout info

diff --git a/TODO b/TODO
index b39ad0ad177d1ff993627f8b39349f4b70088f91..fb2a955ba9de1c145f3b872f203090eb39477f4a 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,10 +1,10 @@
 nlsop TODO
 ----------
 
+- new parameter set!
+
 server,client,gui:
 ##################
 
-- remove jobs! (nlsop_server/nlsop_client)
-- if above is implemented, display step should be possible (nlsop_*)
-- bugfix client channel display (nlsop_server/nlsop_gui?)
-
+- idle clients channel!
+- del jobs possibility

diff --git a/dfbapi.c b/dfbapi.c
index 58510fc03b9b2bba273f3be594db9614a00253cd..da7b5f3730c90ae9d31d22870dac4446bb5c73f8 100644 (file)
--- a/dfbapi.c
+++ b/dfbapi.c
@@ -357,6 +357,8 @@ int scan_event(d3_lattice *d3_l,int *x,int *y,int *z,int *q,int *esc,int *switch
   if(ke.key_id==DIKI_DOWN && *y!=d3_l->max_y-1) *y+=1;
   if(ke.key_id==DIKI_PAGE_UP && *z!=0) *z-=1;
   if(ke.key_id==DIKI_PAGE_DOWN && *z!=d3_l->max_z-1) *z+=1;
+  if(ke.key_id==DIKI_END && *z<=d3_l->max_z-10) *z+=10;
+  if(ke.key_id==DIKI_HOME && *z>=10) *z-=10;
   if(ke.key_id==DIKI_Q) *q=1;
   if(ke.key_id==DIKI_ESCAPE) *esc=1;
   if(ke.key_id==DIKI_M) *switchmode=(*switchmode+1)%4;

diff --git a/nlsop.c b/nlsop.c
index 578a1de6cf6616a373bcc2e7f8387d22b232cccf..f0305616392cf5898b3dcba00ada74465c915746 100644 (file)
--- a/nlsop.c
+++ b/nlsop.c
@@ -347,9 +347,11 @@ 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);
+#ifdef ATPROZ
   else dprintf(fd,"%d %f\n",z*CELL_LENGTH,100.0*count/si_count);
+#else
+  else dprintf(fd,"%d %d\n",z*CELL_LENGTH,count/(d3_l->max_x*d3_l->max_y));
 #endif
  }
  close(fd);
@@ -932,7 +934,6 @@ 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;
 
@@ -953,7 +954,6 @@ int convert_file(char *cf,d3_lattice *d3_l)
   }
  }
  close(c_fd);
-#endif
 
  return 1;
 }
@@ -1066,12 +1066,45 @@ u32 get_reject_graph(info *my_info,d3_lattice *d3_l,char *file,u32 *graph) {
  return max;
 }
 
+int get_amorphous_layer_info(d3_lattice *d3_l,int *sai,int *sacl,int *eacl) {
+  int i,j,a,oend,nend,count;
+  unsigned char sacl_is_set=0;
+  unsigned char eacl_is_set=0;
+  unsigned char sai_is_set=0;
+
+  a=d3_l->max_x*d3_l->max_y;
+  nend=a;
+  oend=0;
+
+  for(i=0;i<d3_l->max_z;i++) {
+    count=0;
+    for(j=oend;j<nend;j++) if(*(d3_l->status+j)&AMORPH) count++;
+    oend=nend;
+    nend+=a;
+    if((count>=A_START*a)&&(!sai_is_set)) {
+      *sai=i;
+      sai_is_set=1;
+    }
+    if((count>=AC_START*a)&&(!sacl_is_set)) {
+      *sacl=i;
+      sacl_is_set=1;
+    }
+    if((count<=A_END*a)&&(sacl_is_set)&&(!eacl_is_set)) {
+      *eacl=i;
+      eacl_is_set=1;
+    }
+    if((eacl_is_set)&&(count>=A_END*a)) eacl_is_set=0;
+  }
+  return 1;
+}
+
 int main(int argc,char **argv)
 {
  u32 x,y,z,x_c,y_c,z_c;
  int i,j,quit,escape,switchmode,nowait,bmp,ac_distr;
  int refresh,resave;
  int c_step;
+ int sai,sacl,eacl;
  char s_file[MAX_CHARS];
  char s_file_tmp[MAX_CHARS];
  char l_file[MAX_CHARS];
@@ -1095,11 +1128,13 @@ int main(int argc,char **argv)
  char zdiff_txt[MAX_TXT];
  char diff_txt[MAX_TXT];
  char dr_ac_txt[MAX_TXT];
- char dr_cc_txt[MAX_TXT];
  char dose_txt[MAX_TXT];
  char mode_txt[MAX_TXT];
  char hpi_txt[MAX_TXT];
- char csat_txt[MAX_TXT];
+ char srate_txt[MAX_TXT];
+ char start_ai_txt[MAX_TXT];
+ char start_acl_txt[MAX_TXT];
+ char end_acl_txt[MAX_TXT];
  char *arg_v[MAX_ARGV];
 #endif
  d3_lattice d3_l;
@@ -1144,6 +1179,9 @@ int main(int argc,char **argv)
  mode=0;
  ne_max=0;
  ip_max=0;
+ sai=0;
+ sacl=0;
+ eacl=0;
 
 #ifdef MORE_PRINTF
  printf("reading argv ...");
@@ -1250,23 +1288,18 @@ int main(int argc,char **argv)
  }
 #endif
 
-#ifdef MORE_PRINTF
- printf("rand init ...");
-#endif
-
+ printf("random api init ...");
  if(!strcmp(r_file,"")) rand_init(NULL);
  else rand_init(r_file);
-
-#ifdef MORE_PRINTF
  printf(" done\n");
- printf("allocating data ...");
-#endif
 
  if(!strcmp(l_file,""))
  {
   i=d3_l.max_x*d3_l.max_y*d3_l.max_z;
 #ifdef USE_DFB_API
+  printf("d3 lattice init ...");
   d3_lattice_init(&argc,argv,&d3_l);
+  printf(" done\n");
 #endif
   if((d3_l.status=(unsigned char *)malloc(i*sizeof(unsigned char)))==NULL)
   {
@@ -1282,7 +1315,9 @@ int main(int argc,char **argv)
   memset(d3_l.extra,0,i*sizeof(int));
  } else
  {
+  printf("loading file ...");
   load_from_file(l_file,&d3_l,&my_info);
+  printf(" done\n");
   if(convert) 
   {   
    if(!strcmp(c_file,"")) sprintf(c_file,"%s_gnuplot",l_file);
@@ -1292,23 +1327,23 @@ int main(int argc,char **argv)
    return 1;
   }
 #ifdef USE_DFB_API
-  else d3_lattice_init(&argc,argv,&d3_l);
+  printf("d3 lattice init ...");
+  d3_lattice_init(&argc,argv,&d3_l);
+  printf(" done\n");
 #endif
  }
 
-#ifdef MORE_PRINTF
- printf(" done\n");
-#endif
-
 #ifdef USE_DFB_API
+ printf("event init ...");
  d3_event_init(&d3_l);
+ printf(" done\n");
 #endif
 
 #ifdef USE_DFB_API
  strcpy(a_txt,"args:");
  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(r_txt,"stress influence range: %d",my_info.range);
  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);
@@ -1317,7 +1352,11 @@ int main(int argc,char **argv)
  sprintf(diff_txt,"diffusion every %d steps",my_info.diff_rate);
  strcpy(mode_txt,"view: a/c mode");
  sprintf(hpi_txt,"hits per ion: %d",my_info.cpi);
- sprintf(csat_txt,"sputter rate (3nm/#c): %d",my_info.s_rate);
+ sprintf(srate_txt,"sputter rate (3nm/#c): %d",my_info.s_rate);
+ get_amorphous_layer_info(&d3_l,&sai,&sacl,&eacl);
+ sprintf(start_ai_txt,"start of a-inclusions: %d nm (%d)",3*sai,sai);
+ sprintf(start_acl_txt,"start of a-layer: %d nm (%d)",3*sacl,sacl);
+ sprintf(end_acl_txt,"end of a-layer: %d nm (%d)",3*eacl,eacl);
  arg_v[1]=mode_txt;
  arg_v[2]=xyz_txt;
  arg_v[3]=status_txt;
@@ -1331,25 +1370,22 @@ int main(int argc,char **argv)
  arg_v[11]=dose_txt;
  arg_v[12]=diff_txt;
  arg_v[13]=zdiff_txt;
- arg_v[14]=r_txt;
+ arg_v[14]=dr_ac_txt;
  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;
+ arg_v[18]=r_txt;
+ arg_v[19]=hpi_txt;
+ arg_v[20]=srate_txt;
+ arg_v[21]=NULL;
+ arg_v[22]=start_ai_txt;
+ arg_v[23]=start_acl_txt;
+ arg_v[24]=end_acl_txt;
  arg_v[25]=NULL;
 #endif
 
-#ifdef MORE_PRINTF
- printf("random rejection graphs ...");
-#endif
-
  /* compute graphs for random number rejection method */
+ printf("random rejection graphs ...");
  if((c_profile=(u32 *)malloc(d3_l.max_z*sizeof(unsigned int)))==NULL)
  {
   puts("failed allocating memory for carbon profile graph");
@@ -1362,11 +1398,7 @@ int main(int argc,char **argv)
  }
  ip_max=get_reject_graph(&my_info,&d3_l,p_file,c_profile);
  ne_max=get_reject_graph(&my_info,&d3_l,n_e_file,n_e_loss);
-
-#ifdef MORE_PRINTF
  printf(" done\n");
-#endif
-
 
  if((!strcmp(l_file,""))||(c_step))
  {
@@ -1429,11 +1461,15 @@ int main(int argc,char **argv)
 #ifdef USE_DFB_API
    if(i%refresh==0)
    {
-    sprintf(xyz_txt,"x: %d  y: %d  z: %d",x+1,y+1,z+1);
+    sprintf(xyz_txt,"x: %d  y: %d  z: %d (%d nm)",x+1,y+1,z+1,z*3);
     sprintf(status_txt,"status: %c",(*(d3_l.status+x+y*d3_l.max_x+z*d3_l.max_x*d3_l.max_y)&AMORPH)?'a':'c');
-    sprintf(conc_txt,"conc: %d",*(d3_l.extra+x+y*d3_l.max_x+z*d3_l.max_x*d3_l.max_y));
+    sprintf(conc_txt,"carbon: %d",*(d3_l.extra+x+y*d3_l.max_x+z*d3_l.max_x*d3_l.max_y));
     sprintf(steps_txt,"step: %d",i);
     sprintf(cc_txt,"total c: %d",my_info.cc);
+    get_amorphous_layer_info(&d3_l,&sai,&sacl,&eacl);
+    sprintf(start_ai_txt,"start of a-inclusions: %d nm (%d)",3*sai,sai);
+    sprintf(start_acl_txt,"start of a-layer: %d nm (%d)",3*sacl,sacl);
+    sprintf(end_acl_txt,"end of a-layer: %d nm (%d)",3*eacl,eacl);
     d3_lattice_draw(&d3_l,x,y,z,25,arg_v,mode,0,NULL,0,NULL,0);
    }
 #endif
@@ -1458,14 +1494,20 @@ int main(int argc,char **argv)
 
 #ifdef USE_DFB_API
  /* allocating buffer for pressure values */
+ printf("allocating buffer for preassure values ...");
  if((d3_l.v_ptr=malloc(d3_l.max_x*d3_l.max_y*d3_l.max_z*sizeof(unsigned char)))==NULL)
  {
   puts("cannot allocate buffer for pressure values");
   return -1;
  }
+ printf(" done\n");
  /* calc values */
+ printf("calculating preassure values ...");
  calc_pressure(&d3_l,my_info.range);
+ printf(" done\n");
+ printf("finding maximum carbon concentration ...");
  max_extra=calc_max_extra(&d3_l);
+ printf(" done\n");
 
  while((quit==0) && (escape==0) && (nowait==0))
  {
@@ -1475,9 +1517,9 @@ int main(int argc,char **argv)
   if(switchmode==2) mode=2;
   if(switchmode==3) mode=3;
   /* end of bahh! */
-  sprintf(xyz_txt,"x: %d  y: %d  z: %d",x+1,y+1,z+1);
+  sprintf(xyz_txt,"x: %d  y: %d  z: %d (%d nm)",x+1,y+1,z+1,z*3);
   sprintf(status_txt,"status: %c",(*(d3_l.status+x+y*d3_l.max_x+z*d3_l.max_x*d3_l.max_y)&AMORPH)?'a':'c');
-  sprintf(conc_txt,"conc: %d",*(d3_l.extra+x+y*d3_l.max_x+z*d3_l.max_x*d3_l.max_y));
+  sprintf(conc_txt,"carbon: %d",*(d3_l.extra+x+y*d3_l.max_x+z*d3_l.max_x*d3_l.max_y));
   sprintf(steps_txt,"step: end");
   sprintf(cc_txt,"total c: %d",my_info.cc);
   if(switchmode==0) strcpy(mode_txt,"view: a/c mode");

diff --git a/nlsop.h b/nlsop.h
index d63a507262dc7d8913f27b833a723a828170d0f2..5fffea65d66b5fdf18771980657d0d5a8ffda819 100644 (file)
--- a/nlsop.h
+++ b/nlsop.h
@@ -40,7 +40,7 @@ typedef struct __info
 #define C_D .005
 
 #define MAX_CHARS 128
-#define MAX_TXT 32
+#define MAX_TXT 40
 #define MAX_ARGV 27
 
 #define IMP_PROFILE "imp-profile.txt"
@@ -53,6 +53,10 @@ typedef struct __info
 #define S_RATE ((2*3*STEPS)/100)
 #define SI_PER_VOLUME (168*8)
 
+#define A_START 0.1
+#define AC_START 0.89
+#define A_END 0.84
+
 #define FFT_HEIGHT 64
 
 #endif /* NLSOP_H */