X-Git-Url: https://hackdaworld.org/gitweb/?p=physik%2Fnlsop.git;a=blobdiff_plain;f=nlsop_client.c;h=8a1c81c72f48aecf44771a577db60a463bb8adb7;hp=c6358924de5083ac5e82ca2872c3e44db0392de8;hb=acc832c81063b8dd02cf97ff78989127f6caed7b;hpb=3d8104a33fb2ddca332dcb5a640885a33195b101

diff --git a/nlsop_client.c b/nlsop_client.c
index c635892..8a1c81c 100644
--- a/nlsop_client.c
+++ b/nlsop_client.c
@@ -49,13 +49,11 @@
 #include "network.h"
 #include "event.h"
 
+#include "nlsop_general.h"
+
 #define MAKE_AMORPH(N) *(N)|=AMORPH
 #define MAKE_CRYST(N) *(N)&=~AMORPH
 
-#define NLSOP_CLIENT 'c'
-#define NLSOP_NJOB 'N'
-#define NLSOP_CJOB 'C'
-
 /* globals */
 
 char p_file[MAX_CHARS];
@@ -66,13 +64,15 @@ d3_lattice *gd3_l;
 info *gmy_info;
 int *gi;
 unsigned char dc;
+unsigned char shut_down;
 
 int get_data_and_calc(t_event *event,void *allineed);
+int nop(t_event *event,void *allineed);
 
 int usage(char *prog)
 {
  puts("usage:");
- printf("%s <server ip>\n",prog);
+ printf("%s -i ip -p port -r/P/n random/profile/neloss file\n",prog);
  return 1;
 }
 
@@ -112,7 +112,8 @@ int process_cell(d3_lattice *d3_l,u32 x,u32 y,u32 z,info *my_info,u32 nel_z)
 
  thiz=d3_l->status+x+y*d3_l->max_x+z*d3_l->max_x*d3_l->max_y;
  conc=d3_l->extra+x+y*d3_l->max_x+z*d3_l->max_x*d3_l->max_y;
- p=my_info->b*nel_z;
+ //p=my_info->b*nel_z; // energieuebertrag prop zu nukl. bk
+ p=my_info->b*URAND_MAX; // konstanter energieuebertrag
  for(i=-(my_info->range);i<=my_info->range;i++)
  {
   for(j=-(my_info->range);j<=my_info->range;j++)
@@ -125,24 +126,28 @@ int process_cell(d3_lattice *d3_l,u32 x,u32 y,u32 z,info *my_info,u32 nel_z)
   }
  }
  p+=*conc*my_info->c*URAND_MAX;
- if(!(*thiz&AMORPH))
- {
-  if(get_rand(URAND_MAX)<=p) MAKE_AMORPH(thiz);
- } else
- {
-  /* assume 1-p probability */
-  /* also look for neighbours ! */
-  q=(URAND_MAX-p)>0?URAND_MAX-p:0;
-  j=0;
-  j+=(*(d3_l->status+((x+d3_l->max_x+1)%d3_l->max_x)+y*d3_l->max_x+z*d3_l->max_x*d3_l->max_y)&AMORPH)?1:0;
-  j+=(*(d3_l->status+((x+d3_l->max_x-1)%d3_l->max_x)+y*d3_l->max_x+z*d3_l->max_x*d3_l->max_y)&AMORPH)?1:0;
-  j+=(*(d3_l->status+x+((y+1+d3_l->max_y)%d3_l->max_y)*d3_l->max_x+z*d3_l->max_x*d3_l->max_y)&AMORPH)?1:0;
-  j+=(*(d3_l->status+x+((y-1+d3_l->max_y)%d3_l->max_y)*d3_l->max_x+z*d3_l->max_x*d3_l->max_y)&AMORPH)?1:0;
-  j+=(*(d3_l->status+x+y*d3_l->max_x+((z+1+d3_l->max_z)%d3_l->max_z)*d3_l->max_x*d3_l->max_y)&AMORPH)?1:0;
-  j+=(*(d3_l->status+x+y*d3_l->max_x+((z-1+d3_l->max_z)%d3_l->max_z)*d3_l->max_x*d3_l->max_y)&AMORPH)?1:0;
-
-  p+=((q/6)*j);
-  if(get_rand(URAND_MAX)>p) MAKE_CRYST(thiz);
+ if(p>=URAND_MAX) MAKE_AMORPH(thiz);
+ else {
+  if(!(*thiz&AMORPH)) {
+   if(get_rand(URAND_MAX)<=p) MAKE_AMORPH(thiz);
+  }
+  else {
+   /* assume 1-p probability */
+   /* also look for neighbours ! */
+   q=(URAND_MAX-p)>0?URAND_MAX-p:0;
+   j=0;
+   j+=(*(d3_l->status+((x+d3_l->max_x+1)%d3_l->max_x)+y*d3_l->max_x+z*d3_l->max_x*d3_l->max_y)&AMORPH)?1:0;
+   j+=(*(d3_l->status+((x+d3_l->max_x-1)%d3_l->max_x)+y*d3_l->max_x+z*d3_l->max_x*d3_l->max_y)&AMORPH)?1:0;
+   j+=(*(d3_l->status+x+((y+1+d3_l->max_y)%d3_l->max_y)*d3_l->max_x+z*d3_l->max_x*d3_l->max_y)&AMORPH)?1:0;
+   j+=(*(d3_l->status+x+((y-1+d3_l->max_y)%d3_l->max_y)*d3_l->max_x+z*d3_l->max_x*d3_l->max_y)&AMORPH)?1:0;
+   j+=(*(d3_l->status+x+y*d3_l->max_x+((z+1+d3_l->max_z)%d3_l->max_z)*d3_l->max_x*d3_l->max_y)&AMORPH)?1:0;
+   j+=(*(d3_l->status+x+y*d3_l->max_x+((z-1+d3_l->max_z)%d3_l->max_z)*d3_l->max_x*d3_l->max_y)&AMORPH)?1:0;
+ 
+   p+=((q/6)*j);
+   if(p<=URAND_MAX) {
+    if(get_rand(URAND_MAX)>p) MAKE_CRYST(thiz);
+   }
+  }
  }
  
  return 1;
@@ -203,31 +208,29 @@ int distrib_c(d3_lattice *d3_l,info *my_info,int step,u32 rj_m,u32 *rj_g)
        }
       }
      }
-     if(my_info->z_diff)
+     /* diff in z direction */
+     if(k!=0)
      {
-      if(k!=0)
+      off=i+j*d3_l->max_x+(k-1)*d3_l->max_x*d3_l->max_y;
+      carry=0;
+      if(!*(d3_l->status+off)&AMORPH) carry=(int)(my_info->dr_ac*(*(d3_l->extra+off)));
+      if(carry!=0)
       {
-       off=i+j*d3_l->max_x+(k-1)*d3_l->max_x*d3_l->max_y;
-       carry=0;
-       if(!*(d3_l->status+off)&AMORPH) carry=(int)(my_info->dr_ac*(*(d3_l->extra+off)));
-       if(carry!=0)
-       {
-        *(d3_l->extra+off)-=carry;
-        *(d3_l->extra+offset)+=carry;
-       }
+       *(d3_l->extra+off)-=carry;
+       *(d3_l->extra+offset)+=carry;
       }
-      if(k!=d3_l->max_z-1)
+     }
+     if(k!=d3_l->max_z-1)
+     {
+      off=i+j*d3_l->max_x+(k+1)*d3_l->max_x*d3_l->max_y;
+      carry=0;
+      if(!*(d3_l->status+off)&AMORPH) carry=(int)(my_info->dr_ac*(*(d3_l->extra+off)));
+      if(carry!=0)
       {
-       off=i+j*d3_l->max_x+(k+1)*d3_l->max_x*d3_l->max_y;
-       carry=0;
-       if(!*(d3_l->status+off)&AMORPH) carry=(int)(my_info->dr_ac*(*(d3_l->extra+off)));
-       if(carry!=0)
-       {
-        *(d3_l->extra+off)-=carry;
-        *(d3_l->extra+offset)+=carry;
-       }
+       *(d3_l->extra+off)-=carry;
+       *(d3_l->extra+offset)+=carry;
       }
-     }  
+     }
     }
    } /* for z */
   } /* for y */
@@ -238,59 +241,6 @@ int distrib_c(d3_lattice *d3_l,info *my_info,int step,u32 rj_m,u32 *rj_g)
  return 1;
 }
 
-/* save to file --> send to server :)  --> T O D O <-- */
-void send_data(int signum) {
-
-  int c;
-
-  c=gd3_l->max_x*gd3_l->max_y*gd3_l->max_z;
-
-  network_send(gnet->connection[0].fd,&dc,1);
-  network_send(gnet->connection[0].fd,(unsigned char *)gd3_l,
-               sizeof(d3_lattice));
-  network_send(gnet->connection[0].fd,(unsigned char *)gmy_info,sizeof(info));
-  network_send(gnet->connection[0].fd,gd3_l->status,c*sizeof(unsigned char));
-  network_send(gnet->connection[0].fd,(unsigned char *)gd3_l->extra,
-               c*sizeof(int));
-  network_send(gnet->connection[0].fd,(unsigned char *)gi,sizeof(int));
-
-}
-
-int save_to_file(char *sf,d3_lattice *d3_l,info *my_inf)
-{
- int sf_fd,c;
-
- if((sf_fd=open(sf,O_WRONLY|O_CREAT))<0)
- {
-  puts("cannot open save file");
-  return -1;
- }
- if(write(sf_fd,d3_l,sizeof(d3_lattice))<sizeof(d3_lattice))
- {
-  puts("failed saving d3 lattice struct");
-  return -1;
- }
- if(write(sf_fd,my_inf,sizeof(info))<sizeof(info))
- {
-  puts("failed saving info struct");
-  return-1;
- }
- c=d3_l->max_x*d3_l->max_y*d3_l->max_z;
- if(write(sf_fd,d3_l->status,c*sizeof(unsigned char))<c*sizeof(unsigned char))
- {
-  puts("failed saving status of d3 lattice sites");
-  return -1;
- }
- if(write(sf_fd,d3_l->extra,c*sizeof(int))<c*sizeof(int))
- {
-  puts("failed saving sites concentration");
-  return -1;
- }
- close(sf_fd);
-
- return 1;
-}
-
 u32 get_reject_graph(info *my_info,d3_lattice *d3_l,char *file,u32 *graph) {
  double a,b;
  int i,j,k;
@@ -358,6 +308,23 @@ u32 get_reject_graph(info *my_info,d3_lattice *d3_l,char *file,u32 *graph) {
  return max;
 }
 
+void send_data(int signum) {
+
+  int c;
+  unsigned char ack=DATA_OK;
+
+  c=gd3_l->max_x*gd3_l->max_y*gd3_l->max_z;
+
+  network_send_chan(gnet,0,&dc,1);
+  network_send_chan(gnet,0,(unsigned char *)gd3_l,sizeof(d3_lattice));
+  network_send_chan(gnet,0,(unsigned char *)gmy_info,sizeof(info));
+  network_send_chan(gnet,0,gd3_l->status,c*sizeof(unsigned char));
+  network_send_chan(gnet,0,(unsigned char *)gd3_l->extra,c*sizeof(int));
+  network_send_chan(gnet,0,(unsigned char *)gi,sizeof(int));
+  network_send_chan(gnet,0,&ack,sizeof(unsigned char));
+
+  if(dc==DC_QUIT) shut_down=1;
+}
 
 
 /*
@@ -377,7 +344,7 @@ int main(int argc,char **argv)
   gnet=&net;
 
   /* default values */
-  strcpy(server_ip,"");
+  strcpy(server_ip,"137.250.82.105");
   strcpy(p_file,IMP_PROFILE);
   strcpy(n_e_file,NEL_PROFILE);
   strcpy(r_file,"");
@@ -435,7 +402,17 @@ int main(int argc,char **argv)
 
   /* wait for job */
   event_math(net.connection[0].fd,&event,READ,ADD);
-  event_start(&event,NULL,get_data_and_calc,NULL);
+  printf("idle, waiting for jobs ...\n");
+  event_start(&event,NULL,get_data_and_calc,nop);
+
+  network_shutdown(&net);
+
+  return 1;
+}
+
+int nop(t_event *event,void *allineed) {
+
+  printf("\ni did a nop :)\n");
 
   return 1;
 }
@@ -450,16 +427,11 @@ int get_data_and_calc(t_event *event,void *allineed) {
   u32 *nel_z;
   u32 x_c,y_c,z_c;
   int i,j;
-  int resave;
   int c_step;
-#define DC_QUIT (1<<0)
-#define DC_OK (1<<1)
-#define DC_END (1<<2)
-  unsigned char data[256];
+  unsigned char data;
 
   t_net *net;
 
-  resave=RESAVE;
   c_step=0;
   ne_max=0;
   ip_max=0;
@@ -469,10 +441,13 @@ int get_data_and_calc(t_event *event,void *allineed) {
   gmy_info=&my_info;
   gi=&i;
   dc=0;
+  shut_down=0;
+
+  printf("got a new job ...\n");
   
   /* get info (+data) */
-  network_receive(net->connection[0].fd,data,1);
-  if(data[0]==NLSOP_NJOB || data[0]==NLSOP_CJOB) {
+  network_receive(net->connection[0].fd,&data,sizeof(unsigned char));
+  if(data==NLSOP_NJOB || data==NLSOP_CJOB) {
     network_receive(net->connection[0].fd,(unsigned char *)&d3_l,
                     sizeof(d3_lattice));
     network_receive(net->connection[0].fd,(unsigned char *)&my_info,
@@ -489,15 +464,35 @@ int get_data_and_calc(t_event *event,void *allineed) {
       printf("extra malloc failed\n");
       return -1;
     }
-    if(data[0]==NLSOP_CJOB) {
+    if(data==NLSOP_CJOB) {
+      data=DATA_OK;
       network_receive(net->connection[0].fd,d3_l.status,
                       j*sizeof(unsigned char));
+      network_send(net->connection[0].fd,&data,sizeof(unsigned char));
       network_receive(net->connection[0].fd,(unsigned char *)d3_l.extra,
                       j*sizeof(int));
+      network_send(net->connection[0].fd,&data,sizeof(unsigned char));
       network_receive(net->connection[0].fd,(unsigned char *)&c_step,
                       sizeof(int));
+      network_send(net->connection[0].fd,&data,sizeof(unsigned char));
+    }
+    if(c_step==0) {
+      printf("important: clear status/conc data!\n");
+      memset(d3_l.status,0,j*sizeof(unsigned char));
+      memset(d3_l.extra,0,j*sizeof(int));
     }
   }
+  else {
+    printf("unknown instruction, restarting ...\n");
+    return -1;
+  }
+
+  printf("starting simulation with following parameters:\n");
+  printf("b = %f | c = %f | s = %f\n",my_info.b,my_info.c,my_info.s);
+  printf("diff every %d steps | diff rate = %f\n",my_info.diff_rate,
+                                                  my_info.dr_ac);
+  printf("current step: %d | total steps: %d\n",c_step,my_info.steps);
+  printf("...\n");
 
   /* care for signals */
   dc=DC_QUIT;
@@ -547,18 +542,26 @@ int get_data_and_calc(t_event *event,void *allineed) {
     for(j=0;j<my_info.cpi;j++) {
       x_c=get_rand(d3_l.max_x);
       y_c=get_rand(d3_l.max_y);
-      // z_c=get_rand_reject(d3_l.max_z,ne_max,n_e_loss);
-      z_c=get_rand(d3_l.max_z);
+      z_c=get_rand_reject(d3_l.max_z,ne_max,n_e_loss);
+      //z_c=get_rand(d3_l.max_z);
       process_cell(&d3_l,x_c,y_c,z_c,&my_info,nel_z[z_c]);
     }
     distrib_c(&d3_l,&my_info,i,ip_max,c_profile);
-    if(i%resave==0 && i!=0) {
+    i++;
+    if(i%my_info.save_rate==0) {
       dc=DC_OK;
       send_data(0);
       dc=DC_QUIT;
     }
-    i++;
     if(i%my_info.s_rate==0) sputter(&d3_l);
+    if(shut_down) {
+      free(d3_l.status);
+      free(d3_l.extra);
+      free(c_profile);
+      free(n_e_loss);
+      free(nel_z);
+      event_stop(event); 
+    }
   }
 
   /* finished */
@@ -567,6 +570,11 @@ int get_data_and_calc(t_event *event,void *allineed) {
   dc=DC_QUIT;
 
   /* shutdown/free/close everything now ... */
+  free(d3_l.status);
+  free(d3_l.extra);
+  free(c_profile);
+  free(n_e_loss);
+  free(nel_z);
 
   return 1;
 }