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

diff --git a/nlsop.c b/nlsop.c
index ab29fd1..de46dc0 100644
--- a/nlsop.c
+++ b/nlsop.c
@@ -91,7 +91,7 @@ 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_ap*nel_z;
+ p=my_info->b*nel_z;
  for(i=-(my_info->range);i<=my_info->range;i++)
  {
   for(j=-(my_info->range);j<=my_info->range;j++)
@@ -99,11 +99,11 @@ int process_cell(d3_lattice *d3_l,u32 x,u32 y,u32 z,info *my_info,u32 nel_z)
    if(!(i==0 && j==0))
    {
     off=((x+d3_l->max_x+i)%d3_l->max_x)+((y+d3_l->max_y+j)%d3_l->max_x)*d3_l->max_x+z*d3_l->max_x*d3_l->max_y;
-    if(*(d3_l->status+off)&AMORPH) p+=my_info->a_ap*(*(d3_l->extra+off))*URAND_MAX/(i*i+j*j);
+    if(*(d3_l->status+off)&AMORPH) p+=my_info->s*(*(d3_l->extra+off))*URAND_MAX/(i*i+j*j);
    } 
   }
  }
- p+=*conc*my_info->a_cp*URAND_MAX;
+ p+=*conc*my_info->c*URAND_MAX;
  if(!(*thiz&AMORPH))
  {
   if(get_rand(URAND_MAX)<=p) MAKE_AMORPH(thiz);
@@ -1081,7 +1081,7 @@ u32 get_reject_graph(info *my_info,d3_lattice *d3_l,char *file,u32 *graph) {
  free(flag);
 
 #ifdef DEBUG_INTERPOL_PROFILE
- printf("debug: (interpolated profile)\n");
+ printf("debug: %s (interpolated profile)\n",file);
  for(i=0;i<d3_l->max_z;i++) printf("%d %d\n",i,graph[i]);
 #endif
 
@@ -1145,9 +1145,9 @@ int main(int argc,char **argv)
  resave=RESAVE;
  my_info.z_diff=0;
  my_info.c_diff=1;
- my_info.a_ap=A_AP;
- my_info.b_ap=B_AP;
- my_info.a_cp=A_CP;
+ my_info.s=A_AP;
+ my_info.b=B_AP;
+ my_info.c=A_CP;
  my_info.cc=CC;
  my_info.dr_ac=DR_AC;
  my_info.dr_cc=DR_CC;
@@ -1208,13 +1208,13 @@ int main(int argc,char **argv)
      my_info.range=atoi(argv[++i]);
      break;
     case 'f':
-     my_info.a_ap=atof(argv[++i]);
+     my_info.s=atof(argv[++i]);
      break;
     case 'p':
-     my_info.b_ap=atof(argv[++i]);
+     my_info.b=atof(argv[++i]);
      break;
     case 'F':
-     my_info.a_cp=atof(argv[++i]);
+     my_info.c=atof(argv[++i]);
      break;
     case 'W':
      resave=atoi(argv[++i]);
@@ -1323,9 +1323,9 @@ int main(int argc,char **argv)
  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(stress_txt,"stress term: %f",my_info.a_ap);
- sprintf(ballistic_txt,"ballistic term: %f",my_info.b_ap);
- sprintf(carbon_txt,"carbon term: %f",my_info.a_cp);
+ 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);
  sprintf(dr_ac_txt,"a/c diffusion rate: %f",my_info.dr_ac);
  if(my_info.c_diff!=0) sprintf(dr_cc_txt,"c/c diffusion rate: %f",my_info.dr_cc);
  else sprintf(dr_cc_txt,"c/c diffusion rate: none");
@@ -1361,6 +1361,20 @@ int main(int argc,char **argv)
  arg_v[25]=NULL;
 #endif
 
+ /* compute graphs for random number rejection method */
+ if((c_profile=(u32 *)malloc(d3_l.max_z*sizeof(unsigned int)))==NULL)
+ {
+  puts("failed allocating memory for carbon profile graph");
+  return -1;
+ }
+ if((n_e_loss=(u32 *)malloc(d3_l.max_z*sizeof(unsigned int)))==NULL)
+ {
+  puts("failed allocating memory for nuclear energy loss graph");
+  return -1;
+ }
+ 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);
+
  if((!strcmp(l_file,""))||(c_step))
  {
   /* calculate ratio of c_simwindow / c_total */
@@ -1369,19 +1383,6 @@ int main(int argc,char **argv)
    puts("failed calculating ratio");
    return -1;
   }
-  /* compute graphs for random number rejection method */
-  if((c_profile=(u32 *)malloc(d3_l.max_z*sizeof(unsigned int)))==NULL)
-  {
-   puts("failed allocating memory for carbon profile graph");
-   return -1;
-  }
-  if((n_e_loss=(u32 *)malloc(d3_l.max_z*sizeof(unsigned int)))==NULL)
-  {
-   puts("failed allocating memory for nuclear energy loss graph");
-   return -1;
-  }
-  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 DEBUG_RAND
  i=0;
@@ -1422,7 +1423,7 @@ 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);
-    d3_lattice_draw(&d3_l,x,y,z,25,arg_v,mode,0);
+    d3_lattice_draw(&d3_l,x,y,z,25,arg_v,mode,0,NULL,0,NULL,0);
    }
 #endif
    if(i%resave==0 && strcmp(s_file,"") && resave!=0 && i!=0)
@@ -1460,6 +1461,7 @@ int main(int argc,char **argv)
   if(switchmode==0) mode=0;
   if(switchmode==1) mode=1;
   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(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');
@@ -1469,7 +1471,8 @@ int main(int argc,char **argv)
   if(switchmode==0) strcpy(mode_txt,"view: a/c mode");
   if(switchmode==1) strcpy(mode_txt,"view: c conc mode");
   if(switchmode==2) strcpy(mode_txt,"view: a pressure mode");
-  d3_lattice_draw(&d3_l,x,y,z,25,arg_v,mode,max_extra);
+  if(switchmode==3) strcpy(mode_txt,"view: a/c + profiles mode");
+  d3_lattice_draw(&d3_l,x,y,z,25,arg_v,mode,max_extra,c_profile,ip_max,n_e_loss,ne_max);
   bmp=0;
   ac_distr=0;
   scan_event(&d3_l,&x,&y,&z,&quit,&escape,&switchmode,&bmp,&ac_distr);