nel_z bugfix ; new runs

diff --git a/nlsop.c b/nlsop.c
index ae629256ef3fb40ee25b56e95d16345d4e0b38c7..deb65c9f208c6cb334a19ee2dd414e44020d7d06 100644 (file)
--- a/nlsop.c
+++ b/nlsop.c
@@ -119,6 +119,7 @@ int process_cell(d3_lattice *d3_l,u32 x,u32 y,u32 z,info *my_info,u32 nel_z)
   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);
  }
@@ -1168,7 +1169,7 @@ int main(int argc,char **argv)
     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);
-    nel_z=(URAND_MAX*n_e_loss[z_c])/ne_max;
+    nel_z=URAND_MAX*(1.0*n_e_loss[z_c]/ne_max);
     process_cell(&d3_l,x_c,y_c,z_c,&my_info,nel_z);
    }
    distrib_c(&d3_l,&my_info,i,c_ratio,ip_max,c_profile);

diff --git a/runs.txt b/runs.txt
index 111c026fe524d05aa63a83e1494b142b51b6d71b..570b5ee8572ca5d00c9ce9f09124207e7ee61cb9 100644 (file)
--- a/runs.txt
+++ b/runs.txt
@@ -25,6 +25,7 @@
 
 ./nlsop -S data_23_07_2004/default_e100000.save -e 100000 -n -i -Z
 
-/nlsop -S data_28_07_2004/default_p0.01.save -p 0.01 -n -i -Z > /dev/null 2>&1 &
+./nlsop -S data_28_07_2004/default_p0.0001.save -p 0.0001 -n -i -Z > /dev/null 2>&1 &
+
+./nlsop -S data_28_07_2004/default_p0.001.save -p 0.001 -n -i -Z > /dev/null 2>&1 &
 
-./nlsop -S data_28_07_2004/default.save -n -i -Z > /dev/null 2>&1 &