-

[physik/nlsop.git] / nlsop.c

diff --git a/nlsop.c b/nlsop.c
index f2acfb4..069f39f 100644 (file)
--- a/nlsop.c
+++ b/nlsop.c
@@ -378,6 +378,7 @@ int main(int argc,char **argv)
  char c_file[MAX_CHARS];
  char convert;
  char r_file[MAX_CHARS];
+#ifdef USE_DFB_API
  char x_txt[MAX_TXT];
  char y_txt[MAX_TXT];
  char z_txt[MAX_TXT];
@@ -396,6 +397,7 @@ int main(int argc,char **argv)
  char el2_txt[MAX_TXT];
  char dr_txt[MAX_TXT];
  char *arg_v[MAX_ARGV];
+#endif
  d3_lattice d3_l;
  info my_info;
 
@@ -519,11 +521,12 @@ int main(int argc,char **argv)
  z=d3_l.max_z/2-1;
 
 #ifdef NODFB
- if(!strcmp(s_file,"")
+ if(!strcmp(s_file,""))
  {
   puts("NODFB defined, run with -S option");
   return -1;
  }
+#endif
 
  if(!strcmp(r_file,"")) rand_init(NULL);
  else rand_init(r_file);
@@ -562,10 +565,11 @@ int main(int argc,char **argv)
 #endif
  }
 
-#ifedef USE_DFB_API
+#ifdef USE_DFB_API
  d3_event_init(&d3_l);
 #endif
 
+#ifdef USE_DFB_API
  strcpy(a_txt,"args:");
  sprintf(s_txt,"steps: %d",my_info.steps);
  sprintf(r_txt,"pressure range: %d",my_info.range);
@@ -600,6 +604,7 @@ int main(int argc,char **argv)
  arg_v[22]=cd_txt;
  arg_v[23]=cd2_txt;
  arg_v[24]=dr_txt;
+#endif
 
  if(!strcmp(l_file,""))
  {
@@ -611,6 +616,7 @@ int main(int argc,char **argv)
    z_c=get_rand_lgp(d3_l.max_z,my_info.a_el,my_info.b_el);
    distrib_c(&d3_l,my_info.d_r,my_info.a_cd,my_info.b_cd);
    process_cell(&d3_l,x_c,y_c,z_c,my_info.range,my_info.a_ap,my_info.b_ap,&(my_info.cc));
+#ifdef USE_DFB_API
    if(i%refresh==0)
    {
     sprintf(x_txt,"x: %d",x+1);
@@ -620,22 +626,28 @@ int main(int argc,char **argv)
     sprintf(conc_txt,"conc: %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);
-#ifdef USE_DFB_API
     d3_lattice_draw(&d3_l,x,y,z,24,arg_v);
-#endif
-    // scan_event(&d3_l,&x,&y,&z,&quit,&escape);
    }
+#endif
    if(i%resave==0 && strcmp(s_file,"") && resave!=0)
    {
     sprintf(s_file_tmp,"%s_%d_of_%d",s_file,i,my_info.steps);
     save_to_file(s_file_tmp,&d3_l,&my_info);
+#ifdef NODFB
+    printf("saved %s\n",s_file_tmp);
+#endif
    }
    i++;
   }
  }
 
- if(strcmp(s_file,"")) save_to_file(s_file,&d3_l,&my_info);
+ if(strcmp(s_file,""))
+ {
+   printf("saved %s\n",s_file);
+   save_to_file(s_file,&d3_l,&my_info);
+ }
 
+#ifdef USE_DFB_API
  while((quit==0) && (escape==0) && (nowait==0))
  {
   sprintf(x_txt,"x: %d",x+1);
@@ -645,13 +657,10 @@ int main(int argc,char **argv)
   sprintf(conc_txt,"conc: %d",*(d3_l.extra+x+y*d3_l.max_x+z*d3_l.max_x*d3_l.max_y));
   strcpy(steps_txt,"step: end!");
   sprintf(cc_txt,"total c: %d",my_info.cc);
-#ifdef USE_DFB_API
   d3_lattice_draw(&d3_l,x,y,z,24,arg_v);
   scan_event(&d3_l,&x,&y,&z,&quit,&escape);
-#endif
  }
 
-#ifdef USE_DFB_API
  d3_lattice_release(&d3_l);
 #endif