forgot the lattice constant

[physik/posic.git] / moldyn.h

diff --git a/moldyn.h b/moldyn.h
index 1e9db2a..6310416 100644 (file)
--- a/moldyn.h
+++ b/moldyn.h
@@ -45,6 +45,7 @@ typedef struct s_atom {
        u8 brand;               /* brand id */
        int tag;                /* atom unique id (number of atom) */
        u8 attr;                /* attributes */
+       int pbc[3];             /* pb crossing in x, y and z direction */
 } t_atom;
 
 #define ATOM_ATTR_FP   0x01    /* fixed position (bulk material) */
@@ -137,14 +138,22 @@ typedef struct s_moldyn {
        double t_sum;           /* sum over all t */
        double t_avg;           /* average value of t */
 
+       /* for sale! */
        t_virial gvir;          /* global virial (absolute coordinates) */
-       double gv;
-       double gv_sum;
-       double gv_avg;
-
-       double gp;              /* pressure computed from global virial */
-       double gp_sum;          /* sum over all gp */
-       double gp_avg;          /* average value of gp */
+       //double gv;
+       //double gv_sum;
+       //double gv_avg;
+       double sale1;
+       double sale2;
+       double sale3;
+
+       // gp stuff exchanged by kinetic energies
+       //double gp;            /* pressure computed from global virial */
+       //double gp_sum;                /* sum over all gp */
+       //double gp_avg;                /* average value of gp */
+       double ekinx;
+       double ekiny;
+       double ekinz;
 
        t_virial vir;           /* actual virial */
        double virial;
@@ -250,14 +259,42 @@ typedef struct s_vb {
        int fd;
 } t_vb;
 
-typedef struct s_part_vals {
+typedef struct s_part_params {
+       u8 type;
        double r;
        t_3dvec p;
        t_3dvec d;
-} t_part_vals;
+} t_part_params;
 
 #define PART_INSIDE_R   1
 #define PART_OUTSIDE_R  2
+#define PART_INSIDE_D   3
+#define PART_OUTSIDE_D  4
+
+typedef struct s_defect_params {
+       u8 type;
+       u8 stype;
+       double od;
+       double dd;
+       int element;
+       u8 brand;
+       u8 attr;
+} t_defect_params;
+
+#define DEFECT_TYPE_0D 1
+#define DEFECT_TYPE_1D 2
+#define DEFECT_TYPE_2D 3
+#define DEFECT_TYPE_3D 4
+
+#define DEFECT_STYPE_DB_X      1
+#define DEFECT_STYPE_DB_Y      2
+#define DEFECT_STYPE_DB_Z      3
+#define DEFECT_STYPE_DB_R      4
+
+typedef struct s_offset_params {
+       t_3dvec o;
+       u8 use;
+} t_offset_params;
 
 /*
  *
@@ -405,18 +442,18 @@ int moldyn_set_report(t_moldyn *moldyn,char *author,char *title);
 int moldyn_set_log(t_moldyn *moldyn,u8 type,int timer);
 int moldyn_log_shutdown(t_moldyn *moldyn);
 
-int create_lattice(t_moldyn *moldyn,u8 type,double lc,int element,double mass,
+int create_lattice(t_moldyn *moldyn,u8 type,double lc,int element,
                    u8 attr,u8 brand,int a,int b,int c,t_3dvec *origin,
-                   u8 p_type,t_part_vals *p_vals);
-int add_atom(t_moldyn *moldyn,int element,double mass,u8 brand,u8 attr,
+                   t_part_params *p_params,t_defect_params *d_params);
+int add_atom(t_moldyn *moldyn,int element,u8 brand,u8 attr,
              t_3dvec *r,t_3dvec *v);
 int del_atom(t_moldyn *moldyn,int tag);
 int cubic_init(int a,int b,int c,double lc,t_atom *atom,t_3dvec *origin,
-               u8 p_type,t_part_vals *p_vals);
+               t_part_params *p_params,t_defect_params *d_params);
 int fcc_init(int a,int b,int c,double lc,t_atom *atom,t_3dvec *origin,
-             u8 p_type,t_part_vals *p_vals);
+             t_part_params *p_params,t_defect_params *d_params);
 int diamond_init(int a,int b,int c,double lc,t_atom *atom,t_3dvec *origin,
-                 u8 p_type,t_part_vals *p_vals);
+                 t_part_params *p_params,t_defect_params *d_params);
 int destroy_atoms(t_moldyn *moldyn);
 
 int thermal_init(t_moldyn *moldyn,u8 equi_init);
@@ -465,6 +502,7 @@ int virial_calc(t_atom *a,t_3dvec *f,t_3dvec *d);
 //inline int virial_calc(t_atom *a,t_3dvec *f,t_3dvec *d)
 //     __attribute__((always_inline));
 int check_per_bound(t_moldyn *moldyn,t_3dvec *a);
+int check_per_bound_and_care_for_pbc(t_moldyn *moldyn,t_atom *a);
 //inline int check_per_bound(t_moldyn *moldyn,t_3dvec *a)
 //     __attribute__((always_inline));