projects
/
physik
/
nlsop.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
finished random reject method
[physik/nlsop.git]
/
nlsop.c
diff --git
a/nlsop.c
b/nlsop.c
index
10a3f2f
..
11f81f5
100644
(file)
--- a/
nlsop.c
+++ b/
nlsop.c
@@
-118,7
+118,7
@@
int process_cell(d3_lattice *d3_l,u32 x,u32 y,u32 z,info *my_info)
return 1;
}
return 1;
}
-int distrib_c(d3_lattice *d3_l,info *my_info,int step,double c_ratio)
+int distrib_c(d3_lattice *d3_l,info *my_info,int step,double c_ratio
,u32 rj_m,u32 *rj_g
)
{
u32 x,y,z;
int i,j,k,c;
{
u32 x,y,z;
int i,j,k,c;
@@
-131,8
+131,9
@@
int distrib_c(d3_lattice *d3_l,info *my_info,int step,double c_ratio)
x=get_rand(d3_l->max_x);
y=get_rand(d3_l->max_y);
// printf("nd: %d %d\n",x,y);
x=get_rand(d3_l->max_x);
y=get_rand(d3_l->max_y);
// printf("nd: %d %d\n",x,y);
- z=get_rand_lgp(d3_l->max_z,my_info->a_cd,my_info->b_cd);
- // printf("ld: %d\n",z);
+ // z=get_rand_lgp(d3_l->max_z,my_info->a_cd,my_info->b_cd);
+ z=get_rand_reject(d3_l->max_z,rj_m,rj_g);
+ // printf("%d\n",z);
*(d3_l->extra+x+y*d3_l->max_x+z*d3_l->max_x*d3_l->max_y)+=1;
(my_info->cc)++;
}
*(d3_l->extra+x+y*d3_l->max_x+z*d3_l->max_x*d3_l->max_y)+=1;
(my_info->cc)++;
}
@@
-747,13
+748,15
@@
u32 get_reject_graph(info *my_info,d3_lattice *d3_l,char *file,u32 *graph) {
j=i;
i++;
while(flag[i]==0&&i<d3_l->max_z) i++;
j=i;
i++;
while(flag[i]==0&&i<d3_l->max_z) i++;
- printf("debug: i = %d j = %d\n",i,j);
for(k=j+1;k<i;k++) graph[k]=(int)((k-j)*((int)graph[i]-(int)graph[j])/(i-j))+graph[j];
if(graph[i]>max) max=graph[i];
}
free(flag);
for(k=j+1;k<i;k++) graph[k]=(int)((k-j)*((int)graph[i]-(int)graph[j])/(i-j))+graph[j];
if(graph[i]>max) max=graph[i];
}
free(flag);
+ // printf("debug: (interpolated c profile)\n");
+ // for(i=0;i<d3_l->max_z;i++) printf("%d %d\n",i,graph[i]);
+
return max;
}
return max;
}
@@
-800,6
+803,7
@@
int main(int argc,char **argv)
#endif
u32 *c_profile;
u32 *n_e_loss;
#endif
u32 *c_profile;
u32 *n_e_loss;
+ u32 ne_max,ip_max;
d3_l.max_x=X;
d3_l.max_y=Y;
d3_l.max_x=X;
d3_l.max_y=Y;
@@
-834,7
+838,8
@@
int main(int argc,char **argv)
convert=0;
strcpy(r_file,"");
mode=0;
convert=0;
strcpy(r_file,"");
mode=0;
- u32 ne_max;
+ ne_max=0;
+ ip_max=0;
for(i=1;i<argc;i++)
{
for(i=1;i<argc;i++)
{
@@
-1051,10
+1056,14
@@
int main(int argc,char **argv)
puts("failed allocating memory for nuclear energy loss graph");
return -1;
}
puts("failed allocating memory for nuclear energy loss graph");
return -1;
}
-
ne
_max=get_reject_graph(&my_info,&d3_l,p_file,c_profile);
+
ip
_max=get_reject_graph(&my_info,&d3_l,p_file,c_profile);
- /* break here for testing ... */
- return 23;
+#ifdef DEBUG_RAND
+ while(1)
+ {
+ printf("%d\n",get_rand_reject(d3_l.max_z,ip_max,c_profile));
+ }
+#endif
i=(c_step?c_step:0);
while((i<my_info.steps) && (quit==0) && (escape==0))
i=(c_step?c_step:0);
while((i<my_info.steps) && (quit==0) && (escape==0))
@@
-1064,9
+1073,10
@@
int main(int argc,char **argv)
x_c=get_rand(d3_l.max_x);
y_c=get_rand(d3_l.max_y);
z_c=get_rand_lgp(d3_l.max_z,my_info.a_el,my_info.b_el);
x_c=get_rand(d3_l.max_x);
y_c=get_rand(d3_l.max_y);
z_c=get_rand_lgp(d3_l.max_z,my_info.a_el,my_info.b_el);
+ printf("%d\n",z_c);
process_cell(&d3_l,x_c,y_c,z_c,&my_info);
}
process_cell(&d3_l,x_c,y_c,z_c,&my_info);
}
- distrib_c(&d3_l,&my_info,i,c_ratio);
+ distrib_c(&d3_l,&my_info,i,c_ratio
,ip_max,c_profile
);
#ifdef USE_DFB_API
if(i%refresh==0)
{
#ifdef USE_DFB_API
if(i%refresh==0)
{