projects
/
physik
/
morpheus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
46b1c51
)
-
author
hackbard
<hackbard>
Wed, 2 Apr 2003 15:54:56 +0000
(15:54 +0000)
committer
hackbard
<hackbard>
Wed, 2 Apr 2003 15:54:56 +0000
(15:54 +0000)
defines.h
patch
|
blob
|
history
display.c
patch
|
blob
|
history
main.c
patch
|
blob
|
history
diff --git
a/defines.h
b/defines.h
index
60befa5
..
713e9cc
100644
(file)
--- a/
defines.h
+++ b/
defines.h
@@
-22,6
+22,9
@@
#define DEFAULT_A_P_FAKTOR 0.2
#define DEFAULT_A_P_P0 0.2
#define DEFAULT_A_P_FAKTOR 0.2
#define DEFAULT_A_P_P0 0.2
+#define DEFAULT_C_START_CONC 5000
+#define DEFAULT_C_SLOPE 1
+
#define DEFAULT_STEPS 5000
/* program defines, dont touch ;) */
#define DEFAULT_STEPS 5000
/* program defines, dont touch ;) */
@@
-32,6
+35,11
@@
typedef unsigned int u32;
typedef long long unsigned int u64;
typedef unsigned int u32;
typedef long long unsigned int u64;
+typedef struct __cell {
+ unsigned char status; /* amorph or cryst status */
+ double conc; /* c concentration */
+} cell;
+
#ifdef DEBUG
#define DEBUG_IT 1
#else
#ifdef DEBUG
#define DEBUG_IT 1
#else
@@
-43,7
+51,7
@@
typedef long long unsigned int u64;
/* display stuff */
typedef struct __display {
u32 max_x,max_y,max_z; /* dimensions */
/* display stuff */
typedef struct __display {
u32 max_x,max_y,max_z; /* dimensions */
-
void
*cell_p; /* pointer to cell data */
+
cell
*cell_p; /* pointer to cell data */
#ifdef USE_DFB_API
IDirectFB *dfb; /* pointer to dfb main construct */
IDirectFBSurface *primary_surface; /* pointer to dfb primary surface */
#ifdef USE_DFB_API
IDirectFB *dfb; /* pointer to dfb main construct */
IDirectFBSurface *primary_surface; /* pointer to dfb primary surface */
@@
-63,9
+71,9
@@
typedef struct __display {
#define MAX_TXT 20
/* masks for u32 cell */
#define MAX_TXT 20
/* masks for u32 cell */
-#define AMORPH 0x0
000000
1
-#define CRYSTAL 0x00
000000
-#define NAMORPH 0xf
ffffff
e
-#define NCRYSTAL 0xff
ffffff
-#define C_CONC_MASK 0xfffffff
e
+#define AMORPH 0x01
+#define CRYSTAL 0x00
+#define NAMORPH 0xfe
+#define NCRYSTAL 0xff
+#define C_CONC_MASK 0xfffffff
f
diff --git
a/display.c
b/display.c
index
16f379a
..
bb2eccb
100644
(file)
--- a/
display.c
+++ b/
display.c
@@
-8,7
+8,7
@@
#include "defines.h"
#include "defines.h"
-int display_init(u32 x,u32 y,u32 z,display *display,
void
*cell,int *argc,char **argv)
+int display_init(u32 x,u32 y,u32 z,display *display,
cell
*cell,int *argc,char **argv)
{
#ifdef USE_DFB_API
DFBSurfaceDescription surface_dsc;
{
#ifdef USE_DFB_API
DFBSurfaceDescription surface_dsc;
@@
-47,9
+47,9
@@
int display_release(display *display)
}
#ifdef USE_DFB_API
}
#ifdef USE_DFB_API
-int dfb_choose_color(
u32
*cell_p,unsigned char *r,unsigned char *g,unsigned char *b)
+int dfb_choose_color(
cell
*cell_p,unsigned char *r,unsigned char *g,unsigned char *b)
{
{
- if(
(*cell_p&AMORPH)==
AMORPH)
+ if(
cell_p->status&
AMORPH)
{
*r=0xff;
*g=0x00;
{
*r=0xff;
*g=0x00;
@@
-91,7
+91,7
@@
int display_draw(display *display,u32 x,u32 y,u32 z)
{
for(z_c=0;z_c<display->max_z;z_c++)
{
{
for(z_c=0;z_c<display->max_z;z_c++)
{
- dfb_choose_color(
(u32 *)(display->cell_p+x_c+y_c*(display->max_x-1)+z_c*(display->max_x-1)*(display->max_y-1))
,&r,&g,&b);
+ dfb_choose_color(
display->cell_p+x_c+y_c*display->max_x+z_c*display->max_x*display->max_y
,&r,&g,&b);
if(x_c==x && z_c==z)
display->primary_surface->SetColor(display->primary_surface,0xff,0xff,0,0);
else
if(x_c==x && z_c==z)
display->primary_surface->SetColor(display->primary_surface,0xff,0xff,0,0);
else
@@
-105,7
+105,7
@@
int display_draw(display *display,u32 x,u32 y,u32 z)
{
for(z_c=0;z_c<display->max_z;z_c++)
{
{
for(z_c=0;z_c<display->max_z;z_c++)
{
- dfb_choose_color(
(u32 *)(display->cell_p+x_c+y_c*(display->max_x-1)+z_c*(display->max_x-1)*(display->max_y-1))
,&r,&g,&b);
+ dfb_choose_color(
display->cell_p+x_c+y_c*display->max_x+z_c*display->max_x*display->max_y
,&r,&g,&b);
if(y_c==y && z_c==z)
display->primary_surface->SetColor(display->primary_surface,0xff,0xff,0,0);
else
if(y_c==y && z_c==z)
display->primary_surface->SetColor(display->primary_surface,0xff,0xff,0,0);
else
@@
-119,7
+119,7
@@
int display_draw(display *display,u32 x,u32 y,u32 z)
{
for(y_c=0;y_c<display->max_y;y_c++)
{
{
for(y_c=0;y_c<display->max_y;y_c++)
{
- dfb_choose_color(
(u32 *)(display->cell_p+x_c+y_c*(display->max_x-1)+z_c*(display->max_x-1)*(display->max_y-1))
,&r,&g,&b);
+ dfb_choose_color(
display->cell_p+x_c+y_c*display->max_x+z_c*display->max_x*display->max_y
,&r,&g,&b);
if(x_c==x && y_c==y)
display->primary_surface->SetColor(display->primary_surface,0xff,0xff,0,0);
else
if(x_c==x && y_c==y)
display->primary_surface->SetColor(display->primary_surface,0xff,0xff,0,0);
else
@@
-151,9
+151,9
@@
int display_draw(display *display,u32 x,u32 y,u32 z)
display->primary_surface->DrawString(display->primary_surface,text,-1,menu_x+display_faktor_x,menu_y+display_faktor_y*2+menu_h/10*2,DSTF_LEFT);
sprintf(text,"z: %u",z);
display->primary_surface->DrawString(display->primary_surface,text,-1,menu_x+display_faktor_x,menu_y+display_faktor_y*3+menu_h/10*3,DSTF_LEFT);
display->primary_surface->DrawString(display->primary_surface,text,-1,menu_x+display_faktor_x,menu_y+display_faktor_y*2+menu_h/10*2,DSTF_LEFT);
sprintf(text,"z: %u",z);
display->primary_surface->DrawString(display->primary_surface,text,-1,menu_x+display_faktor_x,menu_y+display_faktor_y*3+menu_h/10*3,DSTF_LEFT);
- sprintf(text,"status: %c",
*(u32 *)(display->cell_p+x+y*(display->max_x-1)+z*(display->max_x-1)*(display->max_y-1))
&AMORPH?'a':'c');
+ sprintf(text,"status: %c",
((display->cell_p+x+y*display->max_x+z*display->max_x*display->max_y))->status
&AMORPH?'a':'c');
display->primary_surface->DrawString(display->primary_surface,text,-1,menu_x+display_faktor_x,menu_y+display_faktor_y*5+menu_h/10*5,DSTF_LEFT);
display->primary_surface->DrawString(display->primary_surface,text,-1,menu_x+display_faktor_x,menu_y+display_faktor_y*5+menu_h/10*5,DSTF_LEFT);
- sprintf(text,"
C conc.: %u",(*(u32 *)(display->cell_p+x+y*(display->max_x-1)+z*(display->max_x-1)*(display->max_y-1))&C_CONC_MASK)>>1
);
+ sprintf(text,"
c conc.: %f",(display->cell_p+x+y*display->max_x+z*display->max_x*display->max_y)->conc
);
display->primary_surface->DrawString(display->primary_surface,text,-1,menu_x+display_faktor_x,menu_y+display_faktor_y*6+menu_h/10*6,DSTF_LEFT);
/* flip all to surface */
display->primary_surface->Flip(display->primary_surface,NULL,0);
display->primary_surface->DrawString(display->primary_surface,text,-1,menu_x+display_faktor_x,menu_y+display_faktor_y*6+menu_h/10*6,DSTF_LEFT);
/* flip all to surface */
display->primary_surface->Flip(display->primary_surface,NULL,0);
diff --git
a/main.c
b/main.c
index
3c81200
..
4ff223b
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-26,7
+26,7
@@
#include "display.h"
/* global variables */
#include "display.h"
/* global variables */
-u32 sum_z_cells;
+u32 sum_z_cells
,sum_c_dist
;
int random_fd; /* /dev/urandom file descriptor */
int usage()
int random_fd; /* /dev/urandom file descriptor */
int usage()
@@
-46,28
+46,46
@@
int usage()
printf("-r <value> \t pressure range from amorphous SiCx (default %d)\n",DEFAULT_A_P_RANGE);
printf("-f <value> \t faktor for pressure from amorphous SiCx (default %f)\n",DEFAULT_A_P_FAKTOR);
printf("-p <value> \t p0 for probability of cell getting amorph (default %f)\n",DEFAULT_A_P_P0);
printf("-r <value> \t pressure range from amorphous SiCx (default %d)\n",DEFAULT_A_P_RANGE);
printf("-f <value> \t faktor for pressure from amorphous SiCx (default %f)\n",DEFAULT_A_P_FAKTOR);
printf("-p <value> \t p0 for probability of cell getting amorph (default %f)\n",DEFAULT_A_P_P0);
+ printf("-C <value> \t C start concentration (default %d)\n",DEFAULT_C_START_CONC);
+ printf("-S <value> \t slope of linear C distribution (default %d)\n",DEFAULT_C_SLOPE);
return -23;
}
return -23;
}
-int make_amorph(
u32
*cell)
+int make_amorph(
cell
*cell)
{
{
-
*cell
|=AMORPH;
+
cell->status
|=AMORPH;
return 23;
}
return 23;
}
-int make_cryst(
u32
*cell)
+int make_cryst(
cell
*cell)
{
{
- *cell&=~AMORPH;
+ cell->status&=~AMORPH;
+ return 23;
+}
+
+int distrib_c_conc(cell *cell_p,u32 c_c0,u32 c_slope,int add_c,u32 x_max,u32 y_max,u32 z_max)
+{
+ /* cryst. c to distribute */
+ int i,j,k;
+ double cryst_c;
+ cryst_c=0;
+ for(i=0;i<x_max*y_max*z_max;i++) if(!(cell_p+i)->status&AMORPH) cryst_c+=(cell_p+i)->conc;
+ for(i=0;i<z_max;i++)
+ {
+ for(j=0;j<x_max*y_max;j++)
+ {
+ if(!(cell_p+j+i*x_max*y_max)->status&AMORPH)
+
return 23;
}
/* look at cell ... */
return 23;
}
/* 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,double faktor,double p0)
+int process_cell(
cell
*cell_p,u32 x,u32 y,u32 z,u32 x_max,u32 y_max,u32 z_max,int range,double faktor,double p0)
{
{
-
u32 *
cell;
+
cell *this_
cell;
int i,j,k;
double pressure;
int i,j,k;
double pressure;
-
cell=(u32 *)(cell_p+x+y*(x_max-1)+z*(x_max-1)*(y_max-1))
;
+
this_cell=cell_p+x+y*x_max+z*x_max*y_max
;
pressure=p0*URAND_2BYTE_MAX;
for(i=-range;i<=range;i++)
{
pressure=p0*URAND_2BYTE_MAX;
for(i=-range;i<=range;i++)
{
@@
-77,18
+95,18
@@
int process_cell(void *cell_p,u32 x,u32 y,u32 z,u32 x_max,u32 y_max,u32 z_max,in
{
if(!(i==0 && j==0 && k==0))
{
{
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) pressure+=faktor*URAND_2BYTE_MAX/(i*i+j*j+k*k);
+ if(
(cell_p+((x+x_max+i)%x_max)+((y+j+y_max)%y_max)*x_max+((z+k+z_max)%z_max)*x_max*y_max)->status
&AMORPH) pressure+=faktor*URAND_2BYTE_MAX/(i*i+j*j+k*k);
}
}
}
}
}
}
}
}
- if(
*cell
&AMORPH)
+ if(
this_cell->status
&AMORPH)
{
/* wrong probability! just test by now ...*/
{
/* wrong probability! just test by now ...*/
- if(rand_get(URAND_2BYTE_MAX)>pressure) make_cryst(cell);
+ if(rand_get(URAND_2BYTE_MAX)>pressure) make_cryst(
this_
cell);
} else
{
} else
{
- if(rand_get(URAND_2BYTE_MAX)<=pressure) make_amorph(cell);
+ if(rand_get(URAND_2BYTE_MAX)<=pressure) make_amorph(
this_
cell);
}
return 23;
}
}
return 23;
}
@@
-97,17
+115,21
@@
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
,gr
; /* for counting */
int slope_nel,start_nel; /* nuclear energy loss: slope, constant */
int a_p_range; /* p. range of amorphous sic */
double a_p_faktor,a_p_p0; /* p0 and faktor of amorphous sic */
int slope_nel,start_nel; /* nuclear energy loss: slope, constant */
int a_p_range; /* p. range of amorphous sic */
double a_p_faktor,a_p_p0; /* p0 and faktor of amorphous sic */
+ u32 c_c0,c_slope; /* c start concentration and linear slope of c distribution */
int steps; /* # steps */
int steps; /* # steps */
-
void
*cell_p;
+
cell
*cell_p;
struct __display display;
u32 display_x,display_y,display_z; /* intercept point of diplayed areas */
u32 display_refresh_rate; /* refresh rate for display */
int quit=0; /* continue/quit status */
struct __display display;
u32 display_x,display_y,display_z; /* intercept point of diplayed areas */
u32 display_refresh_rate; /* refresh rate for display */
int quit=0; /* continue/quit status */
+ printfd("debug: sizeof my u32 variable: %d\n",sizeof(u32));
+ printfd("debug: sizeof my cell struct: %d\n",sizeof(cell));
+
/* default values */
x_cell=DEFAULT_X_SEG;
y_cell=DEFAULT_Y_SEG;
/* default values */
x_cell=DEFAULT_X_SEG;
y_cell=DEFAULT_Y_SEG;
@@
-117,6
+139,8
@@
int main(int argc,char **argv)
a_p_range=DEFAULT_A_P_RANGE;
a_p_faktor=DEFAULT_A_P_FAKTOR;
a_p_p0=DEFAULT_A_P_P0;
a_p_range=DEFAULT_A_P_RANGE;
a_p_faktor=DEFAULT_A_P_FAKTOR;
a_p_p0=DEFAULT_A_P_P0;
+ c_c0=DEFAULT_C_START_CONC;
+ c_slope=DEFAULT_C_SLOPE;
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;
@@
-173,6
+197,12
@@
int main(int argc,char **argv)
case 'p':
a_p_p0=atof(argv[++i]);
break;
case 'p':
a_p_p0=atof(argv[++i]);
break;
+ case 'C':
+ c_c0=atoi(argv[++i]);
+ break;
+ case 'S':
+ c_slope=atoi(argv[++i]);
+ break;
default:
usage();
return -23;
default:
usage();
return -23;
@@
-188,20
+218,22
@@
int main(int argc,char **argv)
}
/* calculate sum_z_cells one time! */
}
/* calculate sum_z_cells one time! */
- sum_z_cells=0;
- for(i=1;i<=z_cell;i++) sum_z_cells+=(start_nel+i*slope_nel);
- printfd("debug: sum z cells -> %u\n",sum_z_cells);
+ gr=0;
+ for(i=1;i<=z_cell;i++) gr+=i;
+ sum_z_cells=z_cell*start_nel+slope_nel*gr;
+ sum_c_dist=z_cell*c_c0+c_slope*gr;
+ printfd("debug: sum_z_cells -> %u\ndebug: sum_c_dist -> %u\n",sum_z_cells,sum_c_dist);
/* testing ... */
/* allocate cells */
/* testing ... */
/* allocate cells */
- printf("malloc will free %d bytes now ...\n",x_cell*y_cell*z_cell*sizeof(
u32
));
- if((cell_p=
malloc(x_cell*y_cell*z_cell*sizeof(u32
)))==NULL)
+ printf("malloc will free %d bytes now ...\n",x_cell*y_cell*z_cell*sizeof(
cell
));
+ if((cell_p=
(cell *)malloc(x_cell*y_cell*z_cell*sizeof(cell
)))==NULL)
{
puts("failed allocating memory for cells\n");
return -23;
}
{
puts("failed allocating memory for cells\n");
return -23;
}
- memset(cell_p,0,x_cell*y_cell*z_cell*sizeof(
u32
));
+ memset(cell_p,0,x_cell*y_cell*z_cell*sizeof(
cell
));
/* init display */
display_init(x_cell,y_cell,z_cell,&display,cell_p,&argc,argv);
/* init display */
display_init(x_cell,y_cell,z_cell,&display,cell_p,&argc,argv);
@@
-214,15
+246,10
@@
int main(int argc,char **argv)
z=rand_get_lgp(slope_nel,start_nel);
/* todo */
z=rand_get_lgp(slope_nel,start_nel);
/* todo */
-
// distrib_c_conc(cell_p
);
+
distrib_c_conc(cell_p,c_c0,c_slope,i,x_cell,y_cell,z_cell
);
- // process_cell(
(u32 *)(cell_p+x+y*(x_cell-1)+z*(x_cell-1)*(y_cell-1))
);
+ // process_cell(
cell_p+x+y*x_cell+z*x_cell*y_cell
);
process_cell(cell_p,x,y,z,x_cell,y_cell,z_cell,a_p_range,a_p_faktor,a_p_p0);
process_cell(cell_p,x,y,z,x_cell,y_cell,z_cell,a_p_range,a_p_faktor,a_p_p0);
-
- if(*(u32 *)(cell_p+x+y*(x_cell-1)+z*(x_cell-1)*(y_cell-1)) && *(u32 *)(cell_p+x+y*(x_cell-1)+z*(x_cell-1)*(y_cell-1))!=1)
- {
- printfd("debug: x: %u y: %u z: %u -> %x\n",x,y,z,*(u32 *)(cell_p+x+y*(x_cell-1)+z*(x_cell-1)*(y_cell-1)));
- }
/* display stuff */
if((i%display_refresh_rate)==0)
/* display stuff */
if((i%display_refresh_rate)==0)