X-Git-Url: https://hackdaworld.org/gitweb/?a=blobdiff_plain;f=nlsop.c;h=069f39fe74327828212c5e8540edd447aca75926;hb=7f53759aa108a74dde1be1ccfba9b7a72a89fe00;hp=81f408de60d8ccde2bbcd974f77d2277abb5a3ae;hpb=eedf79d33f24f1163cdadea0eb27c8f0b75c1d92;p=physik%2Fnlsop.git

diff --git a/nlsop.c b/nlsop.c
index 81f408d..069f39f 100644
--- a/nlsop.c
+++ b/nlsop.c
@@ -369,7 +369,7 @@ int convert_file(char *cf,d3_lattice *d3_l)
 
 int main(int argc,char **argv)
 {
- u32 max_x,max_y,max_z,x,y,z,x_c,y_c,z_c;
+ u32 x,y,z,x_c,y_c,z_c;
  int i,quit,escape,nowait;
  int refresh,resave;
  char s_file[MAX_CHARS];
@@ -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,12 +397,13 @@ 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;
 
- max_x=X;
- max_y=Y;
- max_z=Z;
+ d3_l.max_x=X;
+ d3_l.max_y=Y;
+ d3_l.max_z=Z;
  my_info.steps=STEPS;
  my_info.range=RANGE;
  refresh=REFRESH;
@@ -442,13 +444,13 @@ int main(int argc,char **argv)
      my_info.b_el=atof(argv[++i]);
      break;
     case 'x':
-     max_x=atoi(argv[++i]);
+     d3_l.max_x=atoi(argv[++i]);
      break;
     case 'y':
-     max_y=atoi(argv[++i]);
+     d3_l.max_y=atoi(argv[++i]);
      break;
     case 'z':
-     max_z=atoi(argv[++i]);
+     d3_l.max_z=atoi(argv[++i]);
      break;
     /*
     case 'X':
@@ -514,19 +516,27 @@ int main(int argc,char **argv)
   } else usage();
  }
 
- x=max_x/2-1;
- y=max_y/2-1;
- z=max_z/2-1;
-
+ x=d3_l.max_x/2-1;
+ y=d3_l.max_y/2-1;
+ z=d3_l.max_z/2-1;
 
+#ifdef NODFB
+ 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);
 
  if(!strcmp(l_file,""))
  {
-  i=max_x*max_y*max_z;
-  d3_lattice_init(&argc,argv,&d3_l,max_x,max_y,max_z);
+  i=d3_l.max_x*d3_l.max_y*d3_l.max_z;
+#ifdef USE_DFB_API
+  d3_lattice_init(&argc,argv,&d3_l);
+#endif
   if((d3_l.status=(unsigned char *)malloc(i*sizeof(unsigned char)))==NULL)
   {
    puts("failed allocating status buffer");
@@ -549,11 +559,17 @@ int main(int argc,char **argv)
    convert_file(c_file,&d3_l);
    puts("done");
    return 1;
-  } else d3_lattice_init(&argc,argv,&d3_l,d3_l.max_x,d3_l.max_y,d3_l.max_z);
+  } 
+#ifdef USE_DFB_API
+    else d3_lattice_init(&argc,argv,&d3_l);
+#endif
  }
- 
+
+#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);
@@ -588,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,""))
  {
@@ -599,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);
@@ -609,19 +627,27 @@ int main(int argc,char **argv)
     sprintf(steps_txt,"step: %d",i);
     sprintf(cc_txt,"total c: %d",my_info.cc);
     d3_lattice_draw(&d3_l,x,y,z,24,arg_v);
-    // 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);
@@ -636,6 +662,7 @@ int main(int argc,char **argv)
  }
 
  d3_lattice_release(&d3_l);
+#endif
 
  return 1;
 }