-#define LC_SI 0.543105e-9 /* m */
-#define M_SI (28.085*AMU) /* kg */
-#define LJ_SIGMA_SI ((0.25*sqrt(3.0)*LC_SI)/1.122462) /* m */
-#define LJ_EPSILON_SI (2.1678*1.60e-19) /* Nm */
-
-/* function prototypes */
-
-int moldyn_usage(char **argv);
-int moldyn_parse_argv(t_moldyn *moldyn,int argc,char **argv);
-int moldyn_log_init(t_moldyn *moldyn);
-
-int create_lattice(unsigned char type,int element,double mass,double lc,
- int a,int b,int c,t_atom **atom);
-int destroy_lattice(t_atom *atom);
-int thermal_init(t_moldyn *moldyn,t_random *random,int count);
-int scale_velocity(t_moldyn *moldyn,int count);
-double get_e_kin(t_atom *atom,int count);
-double get_e_pot(t_moldyn *moldyn);
+#define LC_SI 5.43105 /* A */
+#define M_SI 28.08553 /* amu */
+
+#define LC_3C_SIC 4.3596 /* A */
+
+/*
+ * lattice types
+ */
+
+#define CUBIC 0x01
+#define FCC 0x02
+#define DIAMOND 0x04
+#define ZINCBLENDE 0x08
+#define NONE 0x80
+
+/*
+ * more includes
+ */
+
+#include "pse.h"
+
+/*
+ *
+ * function prototypes
+ *
+ */
+
+int moldyn_init(t_moldyn *moldyn,int argc,char **argv);
+int moldyn_shutdown(t_moldyn *moldyn);
+
+int set_int_alg(t_moldyn *moldyn,u8 algo);
+int set_cutoff(t_moldyn *moldyn,double cutoff);
+int set_temperature(t_moldyn *moldyn,double t_ref);
+int set_pressure(t_moldyn *moldyn,double p_ref);
+int set_p_scale(t_moldyn *moldyn,u8 ptype,double ptc);
+int set_t_scale(t_moldyn *moldyn,u8 ttype,double ttc);
+int set_pt_scale(t_moldyn *moldyn,u8 ptype,double ptc,u8 ttype,double ttc);
+int set_dim(t_moldyn *moldyn,double x,double y,double z,u8 visualize);
+int set_nn_dist(t_moldyn *moldyn,double dist);
+int set_pbc(t_moldyn *moldyn,u8 x,u8 y,u8 z);
+int set_potential(t_moldyn *moldyn,u8 type);
+
+int set_avg_skip(t_moldyn *moldyn,int skip);
+
+int moldyn_set_log_dir(t_moldyn *moldyn,char *dir);
+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,
+ u8 attr,u8 brand,int a,int b,int c,t_3dvec *origin);
+int add_atom(t_moldyn *moldyn,int element,double mass,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);
+int fcc_init(int a,int b,int c,double lc,t_atom *atom,t_3dvec *origin);
+int diamond_init(int a,int b,int c,double lc,t_atom *atom,t_3dvec *origin);
+int destroy_atoms(t_moldyn *moldyn);
+
+int thermal_init(t_moldyn *moldyn,u8 equi_init);
+double total_mass_calc(t_moldyn *moldyn);
+double temperature_calc(t_moldyn *moldyn);
+double get_temperature(t_moldyn *moldyn);
+int scale_velocity(t_moldyn *moldyn,u8 equi_init);
+double virial_sum(t_moldyn *moldyn);
+double pressure_calc(t_moldyn *moldyn);
+int average_reset(t_moldyn *moldyn);
+int average_and_fluctuation_calc(t_moldyn *moldyn);
+int get_heat_capacity(t_moldyn *moldyn);
+double thermodynamic_pressure_calc(t_moldyn *moldyn);
+double get_pressure(t_moldyn *moldyn);
+int scale_volume(t_moldyn *moldyn);
+int scale_dim(t_moldyn *moldyn,u8 dir,double scale,u8 x,u8 y,u8 z);
+int scale_atoms(t_moldyn *moldyn,u8 dir,double scale,u8 x,u8 y,u8 z);
+
+double e_kin_calc(t_moldyn *moldyn);