projects
/
physik
/
morpheus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
cdf203b
)
added amorphous pressure ~1/r^2
author
hackbard
<hackbard>
Fri, 28 Mar 2003 14:34:42 +0000
(14:34 +0000)
committer
hackbard
<hackbard>
Fri, 28 Mar 2003 14:34:42 +0000
(14:34 +0000)
defines.h
patch
|
blob
|
history
main.c
patch
|
blob
|
history
random.c
patch
|
blob
|
history
diff --git
a/defines.h
b/defines.h
index
8305711
..
981ab45
100644
(file)
--- a/
defines.h
+++ b/
defines.h
@@
-9,6
+9,8
@@
#include <directfb.h>
#endif
#include <directfb.h>
#endif
+#define NOT_SPECIFIED 0
+
#define DEFAULT_X_SEG 50
#define DEFAULT_Y_SEG 50
#define DEFAULT_Z_SEG 100
#define DEFAULT_X_SEG 50
#define DEFAULT_Y_SEG 50
#define DEFAULT_Z_SEG 100
@@
-24,7
+26,7
@@
/* program defines, dont touch ;) */
#define URAND_MAX 0xffffffff
/* program defines, dont touch ;) */
#define URAND_MAX 0xffffffff
-#define URAND_2_MAX 0xffff
+#define URAND_2
BYTE
_MAX 0xffff
typedef unsigned int u32;
typedef long long unsigned int u64;
typedef unsigned int u32;
typedef long long unsigned int u64;
diff --git
a/main.c
b/main.c
index
d508e7d
..
9306e60
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-27,6
+27,7
@@
/* global variables */
u32 sum_z_cells;
/* global variables */
u32 sum_z_cells;
+u32 sum_range_rate;
int random_fd; /* /dev/urandom file descriptor */
int usage()
int random_fd; /* /dev/urandom file descriptor */
int usage()
@@
-44,7
+45,8
@@
int usage()
puts("-Z <value> \t display area intercept point z (default # z cells / 2)");
puts("-d <value> \t refresh every <value> loops (default 100)");
puts("-r <value> \t pressure range from amorphous SiCx (default 2)");
puts("-Z <value> \t display area intercept point z (default # z cells / 2)");
puts("-d <value> \t refresh every <value> loops (default 100)");
puts("-r <value> \t pressure range from amorphous SiCx (default 2)");
- puts("-f <value> \t faktor for pressure from amorphous SiCx (default 1)");
+ puts("-f <value> \t (unused) faktor for pressure from amorphous SiCx (default 1)");
+ puts("-p <value> \t p0 for propability of cell getting amorph (default sum_range_rate / 4)");
return -23;
}
return -23;
}
@@
-61,38
+63,34
@@
int make_cryst(u32 *cell)
}
/* look at cell ... */
}
/* look at cell ... */
-int process_cell(void *cell_p,u32 x,u32 y,u32 z,u32 x_max,u32 y_max,u32 z_max,int range,int faktor)
+int process_cell(void *cell_p,u32 x,u32 y,u32 z,u32 x_max,u32 y_max,u32 z_max,int range,int faktor
,int p0
)
{
{
- /* is amorph? */
u32 *cell;
u32 *cell;
- int i,j,k;
- float count;
+ int i,j,k
,count
;
+
//
float count;
cell=(u32 *)(cell_p+x+y*(x_max-1)+z*(x_max-1)*(y_max-1));
cell=(u32 *)(cell_p+x+y*(x_max-1)+z*(x_max-1)*(y_max-1));
- count=0;
+ count=
p
0;
for(i=-range;i<=range;i++)
for(i=-range;i<=range;i++)
+ {
for(j=-range;j<=range;j++)
for(j=-range;j<=range;j++)
+ {
for(k=-range;k<=range;k++)
for(k=-range;k<=range;k++)
- if(!(i==0 && j==0 && k==0) && (x>=range && x<x_max-range) \
- && (y>=range && y<y_max-range) && (z>=range && z<z_max-range))
- if(*(u32 *)(cell_p+(x+i)+(y+j)*(x_max-1)+(z+k)*(x_max-1)*(y_max-1))&AMORPH)
- // total+=range*range-
- count+=0.01*faktor*1.0/(i*i+j*j+k*k);
- /* count is propability of cell getting amorph */
- /* for now assume 1 - ~ is propability of cell getting cryst if allready amorphous */
+ {
+ if(!(i==0 && j==0 && k==0))
+ {
+ if(*(u32 *)(cell_p+((x+x_max+i)%x_max)+((y+j+y_max)%y_max)*(x_max-1)+((z+k+z_max)%z_max)*(x_max-1)*(y_max-1))&AMORPH) count+=(3*range*range-i*i-j*j-k*k);
+ }
+ }
+ }
+ }
+ // count+=faktor*1.0/(i*i+j*j+k*k);
if(*cell&AMORPH)
{
if(*cell&AMORPH)
{
- if((1-count)*URAND_2_MAX<=rand_get(URAND_2_MAX))
- {
- printfd("cell getting cryst. ...(%f)\n",(1-count));
- make_cryst(cell);
- }
+ /* wrong propability! just test by now ...*/
+ if(rand_get(sum_range_rate)>count) make_cryst(cell);
} else
{
} else
{
- if(count*URAND_2_MAX<=rand_get(URAND_2_MAX))
- {
- printfd("cell getting amorph ...(%f)\n",count);
- make_amorph(cell);
- }
+ if(rand_get(sum_range_rate)<=count) make_amorph(cell);
}
return 23;
}
}
return 23;
}
@@
-101,9
+99,9
@@
int main(int argc,char **argv)
{
u32 x_cell,y_cell,z_cell; /* amount of segments */
u32 x,y,z; /* cells */
{
u32 x_cell,y_cell,z_cell; /* amount of segments */
u32 x,y,z; /* cells */
- int i; /* for counting */
+ int i
,j,k
; /* for counting */
int slope_nel,start_nel; /* nuclear energy loss: slope, constant */
int slope_nel,start_nel; /* nuclear energy loss: slope, constant */
- int a_p_range,a_p_faktor
; /* pressure range and faktor from
amorphous sic */
+ int a_p_range,a_p_faktor
,a_p_p0; /* p. range, p0 and faktor of
amorphous sic */
int steps; /* # steps */
void *cell_p;
struct __display display;
int steps; /* # steps */
void *cell_p;
struct __display display;
@@
-118,6
+116,7
@@
int main(int argc,char **argv)
start_nel=DEFAULT_START_NEL;
a_p_range=DEFAULT_A_P_RANGE;
a_p_faktor=DEFAULT_A_P_FAKTOR;
start_nel=DEFAULT_START_NEL;
a_p_range=DEFAULT_A_P_RANGE;
a_p_faktor=DEFAULT_A_P_FAKTOR;
+ a_p_p0=NOT_SPECIFIED;
steps=DEFAULT_STEPS;
display_x=x_cell/2;
display_y=y_cell/2;
steps=DEFAULT_STEPS;
display_x=x_cell/2;
display_y=y_cell/2;
@@
-171,6
+170,9
@@
int main(int argc,char **argv)
case 'f':
a_p_faktor=atoi(argv[++i]);
break;
case 'f':
a_p_faktor=atoi(argv[++i]);
break;
+ case 'p':
+ a_p_p0=atoi(argv[++i]);
+ break;
default:
usage();
return -23;
default:
usage();
return -23;
@@
-185,10
+187,26
@@
int main(int argc,char **argv)
return -23;
}
return -23;
}
- /* calculate sum_z_cells one time! */
+ /* calculate sum_z_cells
, sum_range_rate
one time! */
sum_z_cells=0;
for(i=1;i<=z_cell;i++) sum_z_cells+=(start_nel+i*slope_nel);
sum_z_cells=0;
for(i=1;i<=z_cell;i++) sum_z_cells+=(start_nel+i*slope_nel);
- printfd("debug: sum z cells -> %d\n",sum_z_cells);
+ printfd("debug: sum z cells -> %u\n",sum_z_cells);
+ sum_range_rate=0;
+ for(i=-a_p_range;i<=a_p_range;i++)
+ {
+ for(j=-a_p_range;j<=a_p_range;j++)
+ {
+ for(k=-a_p_range;k<=a_p_range;k++)
+ {
+ if(!(i==0 && j==0 && k==0))
+ sum_range_rate+=((3*a_p_range*a_p_range)-i*i-j*j-k*k);
+ }
+ }
+ }
+ printfd("debug: sum range rate -> %u\n",sum_range_rate);
+ /* add a_p_p0 ... */
+ if(a_p_p0==NOT_SPECIFIED) a_p_p0=sum_range_rate/4;
+ sum_range_rate+=a_p_p0;
/* testing ... */
/* testing ... */
@@
-216,7
+234,7
@@
int main(int argc,char **argv)
// distrib_c_conc(cell_p);
// process_cell((u32 *)(cell_p+x+y*(x_cell-1)+z*(x_cell-1)*(y_cell-1)));
// distrib_c_conc(cell_p);
// process_cell((u32 *)(cell_p+x+y*(x_cell-1)+z*(x_cell-1)*(y_cell-1)));
- process_cell(cell_p,x,y,z,x_cell,y_cell,z_cell,a_p_range,a_p_faktor);
+ process_cell(cell_p,x,y,z,x_cell,y_cell,z_cell,a_p_range,a_p_faktor
,a_p_p0
);
/* display stuff */
if((i%display_refresh_rate)==0)
/* display stuff */
if((i%display_refresh_rate)==0)
diff --git
a/random.c
b/random.c
index
3fbf912
..
51b310b
100644
(file)
--- a/
random.c
+++ b/
random.c
@@
-27,7
+27,8
@@
u32 rand_get(u32 max)
}
/* get z value (linear growth of probability with depths) */
}
/* get z value (linear growth of probability with depths) */
-u32 rand_get_lgp(int slope_nel,int start_nel) {
+u32 rand_get_lgp(int slope_nel,int start_nel)
+{
int z;
u32 i;
z=rand_get(sum_z_cells)+1; /* +1 as rand_get returns values 0...max-1 */
int z;
u32 i;
z=rand_get(sum_z_cells)+1; /* +1 as rand_get returns values 0...max-1 */