runtime schedule adding and injection of c atoms
[physik/posic.git] / moldyn.c
index 070ce69..433be68 100644 (file)
--- a/moldyn.c
+++ b/moldyn.c
@@ -218,6 +218,14 @@ int set_potential_params(t_moldyn *moldyn,void *params) {
        return 0;
 }
 
+int set_avg_skip(t_moldyn *moldyn,int skip) {
+
+       printf("[moldyn] skip %d steps before starting average calc\n",skip);
+       moldyn->avg_skip=skip;
+
+       return 0;
+}
+
 int moldyn_set_log_dir(t_moldyn *moldyn,char *dir) {
 
        strncpy(moldyn->vlsdir,dir,127);
@@ -404,11 +412,14 @@ int moldyn_log_shutdown(t_moldyn *moldyn) {
        if(moldyn->rfd) {
                dprintf(moldyn->rfd,report_end);
                close(moldyn->rfd);
-               snprintf(sc,255,"cd %s && pdflatex report",moldyn->vlsdir);
+               snprintf(sc,255,"cd %s && pdflatex report >/dev/null 2>&1",
+                        moldyn->vlsdir);
                system(sc);
-               snprintf(sc,255,"cd %s && pdflatex report",moldyn->vlsdir);
+               snprintf(sc,255,"cd %s && pdflatex report >/dev/null 2>&1",
+                        moldyn->vlsdir);
                system(sc);
-               snprintf(sc,255,"cd %s && dvipdf report",moldyn->vlsdir);
+               snprintf(sc,255,"cd %s && dvipdf report >/dev/null 2>&1",
+                        moldyn->vlsdir);
                system(sc);
        }
        if(&(moldyn->vis)) visual_tini(&(moldyn->vis));
@@ -501,6 +512,9 @@ int create_lattice(t_moldyn *moldyn,u8 type,double lc,int element,double mass,
                check_per_bound(moldyn,&(atom[ret].r));
        }
 
+       /* update total system mass */
+       total_mass_calc(moldyn);
+
        return ret;
 }
 
@@ -642,6 +656,9 @@ int add_atom(t_moldyn *moldyn,int element,double mass,u8 brand,u8 attr,
        atom[count].tag=count;
        atom[count].attr=attr;
 
+       /* update total system mass */
+       total_mass_calc(moldyn);
+
        return 0;
 }
 
@@ -702,13 +719,23 @@ int thermal_init(t_moldyn *moldyn,u8 equi_init) {
        return 0;
 }
 
+double total_mass_calc(t_moldyn *moldyn) {
+
+       int i;
+
+       moldyn->mass=0.0;
+
+       for(i=0;i<moldyn->count;i++)
+               moldyn->mass+=moldyn->atom[i].mass;
+
+       return moldyn->mass;
+}
+
 double temperature_calc(t_moldyn *moldyn) {
 
        /* assume up to date kinetic energy, which is 3/2 N k_B T */
 
        moldyn->t=(2.0*moldyn->ekin)/(3.0*K_BOLTZMANN*moldyn->count);
-       moldyn->t_sum+=moldyn->t;
-       moldyn->mean_t=moldyn->t_sum/moldyn->total_steps;
 
        return moldyn->t;
 }
@@ -783,48 +810,130 @@ double ideal_gas_law_pressure(t_moldyn *moldyn) {
        return p;
 }
 
-double pressure_calc(t_moldyn *moldyn) {
+double virial_sum(t_moldyn *moldyn) {
 
        int i;
        double v;
        t_virial *virial;
 
+       /* virial (sum over atom virials) */
+       v=0.0;
+       for(i=0;i<moldyn->count;i++) {
+               virial=&(moldyn->atom[i].virial);
+               v+=(virial->xx+virial->yy+virial->zz);
+       }
+       moldyn->virial=v;
+
+       /* global virial (absolute coordinates) */
+       virial=&(moldyn->gvir);
+       moldyn->gv=virial->xx+virial->yy+virial->zz;
+
+       return moldyn->virial;
+}
+
+double pressure_calc(t_moldyn *moldyn) {
+
        /*
         * PV = NkT + <W>
-        * W = 1/3 sum_i f_i r_i
+        * with W = 1/3 sum_i f_i r_i (- skipped!)
         * virial = sum_i f_i r_i
         * 
         * => P = (2 Ekin + virial) / (3V)
         */
 
-       v=0.0;
-       for(i=0;i<moldyn->count;i++) {
-               virial=&(moldyn->atom[i].virial);
-               v+=(virial->xx+virial->yy+virial->zz);
-       }
+       /* assume up to date virial & up to date kinetic energy */
 
-       /* assume up to date kinetic energy */
-       moldyn->p=2.0*moldyn->ekin+v;
+       /* pressure (atom virials) */
+       moldyn->p=2.0*moldyn->ekin+moldyn->virial;
        moldyn->p/=(3.0*moldyn->volume);
-       moldyn->p_sum+=moldyn->p;
-       moldyn->mean_p=moldyn->p_sum/moldyn->total_steps;
 
-       /* pressure from 'absolute coordinates' virial */
-       virial=&(moldyn->virial);
-       v=virial->xx+virial->yy+virial->zz;
-       moldyn->gp=2.0*moldyn->ekin+v;
+       /* pressure (absolute coordinates) */
+       moldyn->gp=2.0*moldyn->ekin+moldyn->gv;
        moldyn->gp/=(3.0*moldyn->volume);
-       moldyn->gp_sum+=moldyn->gp;
-       moldyn->mean_gp=moldyn->gp_sum/moldyn->total_steps;
 
        return moldyn->p;
-}      
+}
+
+int average_and_fluctuation_calc(t_moldyn *moldyn) {
+
+       if(moldyn->total_steps<moldyn->avg_skip)
+               return 0;
+
+       int denom=moldyn->total_steps+1-moldyn->avg_skip;
+
+       /* assume up to date energies, temperature, pressure etc */
+
+       /* kinetic energy */
+       moldyn->k_sum+=moldyn->ekin;
+       moldyn->k2_sum+=(moldyn->ekin*moldyn->ekin);
+       moldyn->k_avg=moldyn->k_sum/denom;
+       moldyn->k2_avg=moldyn->k2_sum/denom;
+       moldyn->dk2_avg=moldyn->k2_avg-(moldyn->k_avg*moldyn->k_avg);
+
+       /* potential energy */
+       moldyn->v_sum+=moldyn->energy;
+       moldyn->v2_sum+=(moldyn->energy*moldyn->energy);
+       moldyn->v_avg=moldyn->v_sum/denom;
+       moldyn->v2_avg=moldyn->v2_sum/denom;
+       moldyn->dv2_avg=moldyn->v2_avg-(moldyn->v_avg*moldyn->v_avg);
+
+       /* temperature */
+       moldyn->t_sum+=moldyn->t;
+       moldyn->t_avg=moldyn->t_sum/denom;
+
+       /* virial */
+       moldyn->virial_sum+=moldyn->virial;
+       moldyn->virial_avg=moldyn->virial_sum/denom;
+       moldyn->gv_sum+=moldyn->gv;
+       moldyn->gv_avg=moldyn->gv_sum/denom;
+
+       /* pressure */
+       moldyn->p_sum+=moldyn->p;
+       moldyn->p_avg=moldyn->p_sum/denom;
+       moldyn->gp_sum+=moldyn->gp;
+       moldyn->gp_avg=moldyn->gp_sum/denom;
+
+       return 0;
+}
+
+int get_heat_capacity(t_moldyn *moldyn) {
+
+       double temp2,ighc;
+
+       /* averages needed for heat capacity calc */
+       if(moldyn->total_steps<moldyn->avg_skip)
+               return 0;
+
+       /* (temperature average)^2 */
+       temp2=moldyn->t_avg*moldyn->t_avg;
+       printf("[moldyn] specific heat capacity for T=%f K [J/(kg K)]\n",
+              moldyn->t_avg);
+
+       /* ideal gas contribution */
+       ighc=3.0*moldyn->count*K_BOLTZMANN/2.0;
+       printf("  ideal gas contribution: %f\n",
+              ighc/moldyn->mass*KILOGRAM/JOULE);
+
+       /* specific heat for nvt ensemble */
+       moldyn->c_v_nvt=moldyn->dv2_avg/(K_BOLTZMANN*temp2)+ighc;
+       moldyn->c_v_nvt/=moldyn->mass;
+
+       /* specific heat for nve ensemble */
+       moldyn->c_v_nve=ighc/(1.0-(moldyn->dv2_avg/(ighc*K_BOLTZMANN*temp2)));
+       moldyn->c_v_nve/=moldyn->mass;
+
+       printf("  NVE: %f\n",moldyn->c_v_nve*KILOGRAM/JOULE);
+       printf("  NVT: %f\n",moldyn->c_v_nvt*KILOGRAM/JOULE);
+printf("  --> <dV2> sim: %f experimental: %f\n",moldyn->dv2_avg,1.5*moldyn->count*K_B2*moldyn->t_avg*moldyn->t_avg*(1.0-1.5*moldyn->count*K_BOLTZMANN/(700*moldyn->mass*JOULE/KILOGRAM)));
+
+       return 0;
+}
 
 double thermodynamic_pressure_calc(t_moldyn *moldyn) {
 
        t_3dvec dim,*tp;
-       double u,p;
-       double scale,dv;
+       double u_up,u_down,dv;
+       double scale,p;
        t_atom *store;
 
        /*
@@ -832,13 +941,11 @@ double thermodynamic_pressure_calc(t_moldyn *moldyn) {
         *
         * => p = - dU/dV
         *
-        * dV: dx,y,z = 0.001 x,y,z
         */
 
-       scale=1.00000000000001;
-printf("\n\nP-DEBUG:\n");
+       scale=0.00001;
+       dv=8*scale*scale*scale*moldyn->volume;
 
-       tp=&(moldyn->tp);
        store=malloc(moldyn->count*sizeof(t_atom));
        if(store==NULL) {
                printf("[moldyn] allocating store mem failed\n");
@@ -846,59 +953,44 @@ printf("\n\nP-DEBUG:\n");
        }
 
        /* save unscaled potential energy + atom/dim configuration */
-       u=moldyn->energy;
        memcpy(store,moldyn->atom,moldyn->count*sizeof(t_atom));
        dim=moldyn->dim;
 
-       /* derivative with respect to x direction */
-       scale_dim(moldyn,scale,TRUE,0,0);
-       scale_atoms(moldyn,scale,TRUE,0,0);
-       dv=0.00000000000001*moldyn->dim.x*moldyn->dim.y*moldyn->dim.z;
+       /* scale up dimension and atom positions */
+       scale_dim(moldyn,SCALE_UP,scale,TRUE,TRUE,TRUE);
+       scale_atoms(moldyn,SCALE_UP,scale,TRUE,TRUE,TRUE);
        link_cell_shutdown(moldyn);
        link_cell_init(moldyn,QUIET);
        potential_force_calc(moldyn);
-       tp->x=(moldyn->energy-u)/dv;
-       p=tp->x*tp->x;
+       u_up=moldyn->energy;
 
        /* restore atomic configuration + dim */
        memcpy(moldyn->atom,store,moldyn->count*sizeof(t_atom));
        moldyn->dim=dim;
 
-       /* derivative with respect to y direction */
-       scale_dim(moldyn,scale,0,TRUE,0);
-       scale_atoms(moldyn,scale,0,TRUE,0);
-       dv=0.00000000000001*moldyn->dim.y*moldyn->dim.x*moldyn->dim.z;
+       /* scale down dimension and atom positions */
+       scale_dim(moldyn,SCALE_DOWN,scale,TRUE,TRUE,TRUE);
+       scale_atoms(moldyn,SCALE_DOWN,scale,TRUE,TRUE,TRUE);
        link_cell_shutdown(moldyn);
        link_cell_init(moldyn,QUIET);
        potential_force_calc(moldyn);
-       tp->y=(moldyn->energy-u)/dv;
-       p+=tp->y*tp->y;
-
-       /* restore atomic configuration + dim */
-       memcpy(moldyn->atom,store,moldyn->count*sizeof(t_atom));
-       moldyn->dim=dim;
-
-       /* derivative with respect to z direction */
-       scale_dim(moldyn,scale,0,0,TRUE);
-       scale_atoms(moldyn,scale,0,0,TRUE);
-       dv=0.00000000000001*moldyn->dim.z*moldyn->dim.x*moldyn->dim.y;
-       link_cell_shutdown(moldyn);
-       link_cell_init(moldyn,QUIET);
-       potential_force_calc(moldyn);
-       tp->z=(moldyn->energy-u)/dv;
-       p+=tp->z*tp->z;
+       u_down=moldyn->energy;
+       
+       /* calculate pressure */
+       p=-(u_up-u_down)/dv;
+printf("-------> %.10f %.10f %f\n",u_up/EV/moldyn->count,u_down/EV/moldyn->count,p/BAR);
 
        /* restore atomic configuration + dim */
        memcpy(moldyn->atom,store,moldyn->count*sizeof(t_atom));
        moldyn->dim=dim;
 
        /* restore energy */
-       moldyn->energy=u;
+       potential_force_calc(moldyn);
 
        link_cell_shutdown(moldyn);
        link_cell_init(moldyn,QUIET);
 
-       return sqrt(p);
+       return p;
 }
 
 double get_pressure(t_moldyn *moldyn) {
@@ -907,12 +999,18 @@ double get_pressure(t_moldyn *moldyn) {
 
 }
 
-int scale_dim(t_moldyn *moldyn,double scale,u8 x,u8 y,u8 z) {
+int scale_dim(t_moldyn *moldyn,u8 dir,double scale,u8 x,u8 y,u8 z) {
 
        t_3dvec *dim;
 
        dim=&(moldyn->dim);
 
+       if(dir==SCALE_UP)
+               scale=1.0+scale;
+
+       if(dir==SCALE_DOWN)
+               scale=1.0-scale;
+
        if(x) dim->x*=scale;
        if(y) dim->y*=scale;
        if(z) dim->z*=scale;
@@ -920,11 +1018,17 @@ int scale_dim(t_moldyn *moldyn,double scale,u8 x,u8 y,u8 z) {
        return 0;
 }
 
-int scale_atoms(t_moldyn *moldyn,double scale,u8 x,u8 y,u8 z) {
+int scale_atoms(t_moldyn *moldyn,u8 dir,double scale,u8 x,u8 y,u8 z) {
 
        int i;
        t_3dvec *r;
 
+       if(dir==SCALE_UP)
+               scale=1.0+scale;
+
+       if(dir==SCALE_DOWN)
+               scale=1.0-scale;
+
        for(i=0;i<moldyn->count;i++) {
                r=&(moldyn->atom[i].r);
                if(x) r->x*=scale;
@@ -956,8 +1060,8 @@ int scale_volume(t_moldyn *moldyn) {
 moldyn->debug=scale;
 
        /* scale the atoms and dimensions */
-       scale_atoms(moldyn,scale,TRUE,TRUE,TRUE);
-       scale_dim(moldyn,scale,TRUE,TRUE,TRUE);
+       scale_atoms(moldyn,SCALE_DIRECT,scale,TRUE,TRUE,TRUE);
+       scale_dim(moldyn,SCALE_DIRECT,scale,TRUE,TRUE,TRUE);
 
        /* visualize dimensions */
        if(vdim->x!=0) {
@@ -1287,7 +1391,8 @@ return 0;
        printf("[moldyn] integration start, go get a coffee ...\n");
 
        /* executing the schedule */
-       for(sched->count=0;sched->count<sched->total_sched;sched->count++) {
+       sched->count=0;
+       while(sched->count<sched->total_sched) {
 
                /* setting amount of runs and finite time step size */
                moldyn->tau=sched->tau[sched->count];
@@ -1304,9 +1409,9 @@ return 0;
                /* calculate kinetic energy, temperature and pressure */
                e_kin_calc(moldyn);
                temperature_calc(moldyn);
+               virial_sum(moldyn);
                pressure_calc(moldyn);
-               //tp=thermodynamic_pressure_calc(moldyn);
-//printf("thermodynamic p: %f %f %f - %f\n",moldyn->tp.x/BAR,moldyn->tp.y/BAR,moldyn->tp.z/BAR,tp/BAR);
+               average_and_fluctuation_calc(moldyn);
 
                /* p/t scaling */
                if(moldyn->pt_scale&(T_SCALE_BERENDSEN|T_SCALE_DIRECT))
@@ -1336,15 +1441,15 @@ return 0;
                        if(!(i%p)) {
                                dprintf(moldyn->pfd,
                                        "%f %f %f %f %f\n",moldyn->time,
-                                        moldyn->p/BAR,moldyn->mean_p/BAR,
-                                        moldyn->gp/BAR,moldyn->mean_gp/BAR);
+                                        moldyn->p/BAR,moldyn->p_avg/BAR,
+                                        moldyn->gp/BAR,moldyn->gp_avg/BAR);
                        }
                }
                if(t) {
                        if(!(i%t)) {
                                dprintf(moldyn->tfd,
                                        "%f %f %f\n",
-                                       moldyn->time,moldyn->t,moldyn->mean_t);
+                                       moldyn->time,moldyn->t,moldyn->t_avg);
                        }
                }
                if(s) {
@@ -1370,13 +1475,12 @@ return 0;
 
                /* display progress */
                if(!(i%10)) {
-                       printf("\rsched: %d, steps: %d, T: %f, P: %f %f V: %f",
-                              sched->count,i,
-                              moldyn->mean_t,
-                              moldyn->mean_p/BAR,
-                              moldyn->mean_gp/BAR,
-                              moldyn->volume);
-                       fflush(stdout);
+       printf("\rsched:%d, steps:%d, T:%3.1f/%3.1f P:%4.1f/%4.1f V:%6.1f",
+              sched->count,i,
+              moldyn->t,moldyn->t_avg,
+              moldyn->p_avg/BAR,moldyn->p/BAR,
+              moldyn->volume);
+       fflush(stdout);
                }
 
                /* increase absolute time */
@@ -1386,11 +1490,15 @@ return 0;
        }
 
                /* check for hooks */
-               if(sched->hook)
+               if(sched->hook) {
+                       printf("\n ## schedule hook %d/%d start ##\n",
+                              sched->count+1,sched->total_sched-1);
                        sched->hook(moldyn,sched->hook_params);
+                       printf(" ## schedule hook end ##\n");
+               }
 
-               /* get a new info line */
-               printf("\n");
+               /* increase the schedule counter */
+               sched->count+=1;
 
        }
 
@@ -1469,7 +1577,7 @@ int potential_force_calc(t_moldyn *moldyn) {
        moldyn->energy=0.0;
 
        /* reset global virial */
-       memset(&(moldyn->virial),0,sizeof(t_virial));
+       memset(&(moldyn->gvir),0,sizeof(t_virial));
 
        /* reset force, site energy and virial of every atom */
        for(i=0;i<count;i++) {
@@ -1498,7 +1606,8 @@ int potential_force_calc(t_moldyn *moldyn) {
 
                /* single particle potential/force */
                if(itom[i].attr&ATOM_ATTR_1BP)
-                       moldyn->func1b(moldyn,&(itom[i]));
+                       if(moldyn->func1b)
+                               moldyn->func1b(moldyn,&(itom[i]));
 
                if(!(itom[i].attr&(ATOM_ATTR_2BP|ATOM_ATTR_3BP)))
                        continue;
@@ -1694,12 +1803,12 @@ int potential_force_calc(t_moldyn *moldyn) {
 
        /* calculate global virial */
        for(i=0;i<count;i++) {
-               moldyn->virial.xx+=moldyn->atom[i].r.x*moldyn->atom[i].f.x;
-               moldyn->virial.yy+=moldyn->atom[i].r.y*moldyn->atom[i].f.y;
-               moldyn->virial.zz+=moldyn->atom[i].r.z*moldyn->atom[i].f.z;
-               moldyn->virial.xy+=moldyn->atom[i].r.y*moldyn->atom[i].f.x;
-               moldyn->virial.xz+=moldyn->atom[i].r.z*moldyn->atom[i].f.x;
-               moldyn->virial.yz+=moldyn->atom[i].r.z*moldyn->atom[i].f.y;
+               moldyn->gvir.xx+=moldyn->atom[i].r.x*moldyn->atom[i].f.x;
+               moldyn->gvir.yy+=moldyn->atom[i].r.y*moldyn->atom[i].f.y;
+               moldyn->gvir.zz+=moldyn->atom[i].r.z*moldyn->atom[i].f.z;
+               moldyn->gvir.xy+=moldyn->atom[i].r.y*moldyn->atom[i].f.x;
+               moldyn->gvir.xz+=moldyn->atom[i].r.z*moldyn->atom[i].f.x;
+               moldyn->gvir.yz+=moldyn->atom[i].r.z*moldyn->atom[i].f.y;
        }
 
        return 0;
@@ -1805,3 +1914,26 @@ int moldyn_bc_check(t_moldyn *moldyn) {
 
        return 0;
 }
+
+/*
+ * post processing functions
+ */
+
+int get_line(int fd,char *line,int max) {
+
+       int count,ret;
+
+       count=0;
+
+       while(1) {
+               if(count==max) return count;
+               ret=read(fd,line+count,1);
+               if(ret<=0) return ret;
+               if(line[count]=='\n') {
+                       line[count]='\0';
+                       return count+1;
+               }
+               count+=1;
+       }
+}
+