From: hackbard Date: Mon, 21 Jul 2003 13:24:24 +0000 (+0000) Subject: display all 25 arg_v's , added amorph and cryst counter (global by now) X-Git-Tag: fpb~21 X-Git-Url: https://hackdaworld.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5c23d407ff5052877f38fa4f6ff4edf047b2a76;p=physik%2Fnlsop.git display all 25 arg_v's , added amorph and cryst counter (global by now) --- diff --git a/nlsop.c b/nlsop.c index d57cc04..3dafd1b 100644 --- a/nlsop.c +++ b/nlsop.c @@ -29,6 +29,10 @@ #define MAKE_AMORPH(N) *(N)|=AMORPH #define MAKE_CRYST(N) *(N)&=~AMORPH +/* test globals - get removed or included in my_info struct later */ +int amorph_count; +int cryst_count; + int usage(void) { puts("usage:"); @@ -84,14 +88,21 @@ int process_cell(d3_lattice *d3_l,u32 x,u32 y,u32 z,info *my_info) } } p+=*conc*my_info->a_cp*URAND_MAX; - printf("debug: %f - %u\n",p,URAND_MAX); if(!(*thiz&AMORPH)) { - if(get_rand(URAND_MAX)<=p) MAKE_AMORPH(thiz); + if(get_rand(URAND_MAX)<=p) + { + MAKE_AMORPH(thiz); + amorph_count++; + } } else { /* assume 1-p probability */ - if(get_rand(URAND_MAX)>p) MAKE_CRYST(thiz); + if(get_rand(URAND_MAX)>p) + { + MAKE_CRYST(thiz); + cryst_count++; + } } return 1; @@ -465,6 +476,9 @@ int main(int argc,char **argv) strcpy(r_file,""); mode=0; + amorph_count=0; + cryst_count=0; + for(i=1;i