added debug aattr print + initialize nnd for 'none' lattice manually
[physik/posic.git] / mdrun.c
diff --git a/mdrun.c b/mdrun.c
index bd045fe..af8a352 100644 (file)
--- a/mdrun.c
+++ b/mdrun.c
@@ -96,6 +96,9 @@ int add_stage(t_mdrun *mdrun,u8 type,void *params) {
                case STAGE_INSERT_ATOMS:
                        psize=sizeof(t_insert_atoms_params);
                        break;
+               case STAGE_INSERT_MIXED_ATOMS:
+                       psize=sizeof(t_insert_mixed_atoms_params);
+                       break;
                case STAGE_CONTINUE:
                        psize=sizeof(t_continue_params);
                        break;
@@ -141,12 +144,13 @@ int mdrun_parse_config(t_mdrun *mdrun) {
        char error[128];
        char line[128];
        char *wptr;
-       char word[16][32];
+       char word[16][64];
        int wcnt;
        int i,o;
 
        t_displace_atom_params dap;
        t_insert_atoms_params iap;
+       t_insert_mixed_atoms_params imp;
        t_continue_params cp;
        t_anneal_params ap;
        t_chaattr_params cap;
@@ -175,6 +179,7 @@ int mdrun_parse_config(t_mdrun *mdrun) {
 
                // reset
                memset(&iap,0,sizeof(t_insert_atoms_params));
+               memset(&imp,0,sizeof(t_insert_mixed_atoms_params));
                memset(&cp,0,sizeof(t_continue_params));
                memset(&ap,0,sizeof(t_anneal_params));
                memset(&cap,0,sizeof(t_chaattr_params));
@@ -189,7 +194,7 @@ int mdrun_parse_config(t_mdrun *mdrun) {
                                wptr=strtok(line," \t");
                        if(wptr==NULL)
                                break;
-                       strncpy(word[wcnt],wptr,32);
+                       strncpy(word[wcnt],wptr,64);
                        wcnt+=1;
                }
 
@@ -203,6 +208,8 @@ int mdrun_parse_config(t_mdrun *mdrun) {
                        if(!strncmp(word[1],"lj",2))
                                mdrun->potential=MOLDYN_POTENTIAL_LJ;
                }
+               else if(!strncmp(word[0],"continue",8))
+                       strncpy(mdrun->continue_file,word[1],128);
                else if(!strncmp(word[0],"cutoff",6))
                        mdrun->cutoff=atof(word[1]);
                else if(!strncmp(word[0],"nnd",3))
@@ -245,6 +252,8 @@ int mdrun_parse_config(t_mdrun *mdrun) {
                                mdrun->lattice=FCC;
                        if(!strncmp(word[1],"diamond",7))
                                mdrun->lattice=DIAMOND;
+                       if(!strncmp(word[1],"none",4))
+                               mdrun->lattice=NONE;
                }
                else if(!strncmp(word[0],"element1",8)) {
                        mdrun->element1=atoi(word[1]);
@@ -439,6 +448,57 @@ int mdrun_parse_config(t_mdrun *mdrun) {
                                }
                                add_stage(mdrun,STAGE_INSERT_ATOMS,&iap);
                        }
+
+
+                       // HERE WE GO ...
+
+                       else if(!strncmp(word[1],"ins_m_atoms",11)) {
+                               imp.element1=atoi(word[2]);
+                               imp.element2=atoi(word[3]);
+                               imp.amount1=atoi(word[4]);
+                               imp.amount2=atoi(word[5]);
+                               imp.brand1=atoi(word[6]);
+                               imp.brand2=atoi(word[7]);
+                               imp.crmin=atof(word[8]);
+                               imp.crmax=atof(word[9]);
+                               /* do this later ...
+                               for(i=0;i<strlen(word[8]);i++) {
+                                       switch(word[8][i]) {
+                                               case 'b':
+                                                       imp.attr|=ATOM_ATTR_VB;
+                                                       break;
+                                               case 'h':
+                                                       imp.attr|=ATOM_ATTR_HB;
+                                                       break;
+                                               case 'v':
+                                                       imp.attr|=ATOM_ATTR_VA;
+                                                       break;
+                                               case 'f':
+                                                       imp.attr|=ATOM_ATTR_FP;
+                                                       break;
+                                               case '1':
+                                                       imp.attr|=ATOM_ATTR_1BP;
+                                                       break;
+                                               case '2':
+                                                       imp.attr|=ATOM_ATTR_2BP;
+                                                       break;
+                                               case '3':
+                                                       imp.attr|=ATOM_ATTR_3BP;
+                                                       break;
+                                               default:
+                                                       break;
+                                       }
+                               }
+                               */
+                               imp.attr1=ATOM_ATTR_HB|ATOM_ATTR_VA|ATOM_ATTR_1BP|ATOM_ATTR_2BP|ATOM_ATTR_3BP|ATOM_ATTR_FP;
+                               imp.attr2=ATOM_ATTR_HB|ATOM_ATTR_VA|ATOM_ATTR_1BP|ATOM_ATTR_2BP|ATOM_ATTR_3BP|ATOM_ATTR_FP;
+                               add_stage(mdrun,STAGE_INSERT_MIXED_ATOMS,&imp);
+                       }
+
+
+
+
+
                        else if(!strncmp(word[1],"continue",8)) {
                                cp.runs=atoi(word[2]);
                                add_stage(mdrun,STAGE_CONTINUE,&cp);
@@ -641,6 +701,109 @@ int insert_atoms(t_moldyn *moldyn,t_mdrun *mdrun) {
        return 0;
 }
 
+int insert_mixed_atoms(t_moldyn *moldyn,t_mdrun *mdrun) {
+
+       t_stage *stage;
+       t_insert_mixed_atoms_params *imp;
+       t_atom *atom;
+       double x,x0,y,y0,z,z0;
+       double dmin,d,cmin,cmax;
+       u8 retry;
+       t_3dvec r,v,dist;
+       int i;
+       
+
+       stage=mdrun->stage.current->data;
+       imp=stage->params;
+
+       x=moldyn->dim.x;
+       x0=-x/2.0;
+       y=moldyn->dim.y;
+       y0=-y/2.0;
+       z=moldyn->dim.z;
+       z0=-z/2.0;
+
+       v.x=0.0;
+       v.y=0.0;
+       v.z=0.0;
+
+       cmin=imp->crmin*imp->crmin;
+       cmax=imp->crmax*imp->crmax;
+
+       while(imp->amount1|imp->amount2) {
+               if(imp->amount1) {
+                       retry=1;
+                       while(retry) {
+                               retry=0;
+                               r.x=rand_get_double(&(moldyn->random))*x;
+                               r.y=rand_get_double(&(moldyn->random))*y;
+                               r.z=rand_get_double(&(moldyn->random))*z;
+                               r.x+=x0;
+                               r.y+=y0;
+                               r.z+=z0;
+                               dmin=1000.0;    // for sure too high!
+                               for(i=0;i<moldyn->count;i++) {
+                                       atom=&(moldyn->atom[i]);
+                                       v3_sub(&dist,&(atom->r),&r);
+                                       check_per_bound(moldyn,&dist);
+                                       d=v3_absolute_square(&dist);
+                                       if(d<cmin) {
+                                               retry=1;
+                                               break;
+                                       }
+                                       if(d<dmin)
+                                               dmin=d;
+                               }
+                               if(dmin!=1000.0)
+                                       if(dmin>cmax)
+                                               retry=1;
+                       }
+                       add_atom(moldyn,imp->element1,pse_mass[imp->element1],
+                                 imp->brand1,imp->attr1,&r,&v);
+                       printf("%s (mixed) atom inserted (%d): %f %f %f\n",
+                               ME,imp->amount1,r.x,r.y,r.z);
+                       printf("  -> d2 = %f/%f/%f\n",dmin,cmin,cmax);
+                       imp->amount1-=1;
+               }
+               if(imp->amount2) {
+                       retry=1;
+                       while(retry) {
+                               retry=0;
+                               r.x=rand_get_double(&(moldyn->random))*x;
+                               r.y=rand_get_double(&(moldyn->random))*y;
+                               r.z=rand_get_double(&(moldyn->random))*z;
+                               r.x+=x0;
+                               r.y+=y0;
+                               r.z+=z0;
+                               dmin=1000.0;    // for sure too high!
+                               for(i=0;i<moldyn->count;i++) {
+                                       atom=&(moldyn->atom[i]);
+                                       v3_sub(&dist,&(atom->r),&r);
+                                       check_per_bound(moldyn,&dist);
+                                       d=v3_absolute_square(&dist);
+                                       if(d<cmin) {
+                                               retry=1;
+                                               break;
+                                       }
+                                       if(d<dmin)
+                                               dmin=d;
+                               }
+                               if(dmin!=1000.0)
+                                       if(dmin>cmax)
+                                               retry=1;
+                       }
+                       add_atom(moldyn,imp->element2,pse_mass[imp->element2],
+                                 imp->brand2,imp->attr2,&r,&v);
+                       printf("%s (mixed) atom inserted (%d): %f %f %f\n",
+                               ME,imp->amount2,r.x,r.y,r.z);
+                       printf("  -> d2 = %f/%f/%f\n",dmin,cmin,cmax);
+                       imp->amount2-=1;
+               }
+       }
+
+       return 0;
+}
+
 int chaatr(t_moldyn *moldyn,t_mdrun *mdrun) {
 
        t_stage *stage;
@@ -673,6 +836,7 @@ int chaatr(t_moldyn *moldyn,t_mdrun *mdrun) {
                }
                atom->attr=cap->attr;
        }
+       printf("     atom attributes: %02x\n\n",cap->attr);
 
        return 0;
 }
@@ -738,6 +902,7 @@ int mdrun_hook(void *ptr1,void *ptr2) {
        u8 change_stage;
 
        t_insert_atoms_params *iap;
+       t_insert_mixed_atoms_params *imp;
        t_continue_params *cp;
        t_anneal_params *ap;
 
@@ -785,6 +950,18 @@ int mdrun_hook(void *ptr1,void *ptr2) {
                                insert_atoms(moldyn,mdrun);
                                iap->cnt_steps+=1;
                                break;
+
+
+
+                       case STAGE_INSERT_MIXED_ATOMS:
+                               stage_print("  -> insert mixed atoms\n\n");
+                               imp=stage->params;
+                               insert_mixed_atoms(moldyn,mdrun);
+                               change_stage=TRUE;
+                               break;
+
+
+
                        case STAGE_CONTINUE:
                                stage_print("  -> continue\n\n");
                                if(stage->executed==TRUE) {
@@ -876,9 +1053,24 @@ int main(int argc,char **argv) {
        /* sanity check! */
 
        /* prepare simulation */
-       moldyn_init(&moldyn,argc,argv);
+
+       if(mdrun.continue_file[0]) {
+               // read the save file
+               moldyn_read_save_file(&moldyn,mdrun.continue_file);
+               // manualaadjusting some stuff
+               moldyn.argc=argc;
+               moldyn.args=argv;
+               rand_init(&(moldyn.random),NULL,1);
+               moldyn.random.status|=RAND_STAT_VERBOSE;
+       }
+       else {
+               moldyn_init(&moldyn,argc,argv);
+       }
+       
        if(set_int_alg(&moldyn,mdrun.intalgo)<0)
                return -1;
+
+       /* potential */
        set_cutoff(&moldyn,mdrun.cutoff);
        if(set_potential(&moldyn,mdrun.potential)<0)
                return -1;
@@ -904,6 +1096,14 @@ int main(int argc,char **argv) {
                               ME,mdrun.potential);
                        return -1;
        }
+
+       /* if it is a continue run, reset schedule and skip lattice init */
+       if(mdrun.continue_file[0]) {
+               memset(&(moldyn.schedule),0,sizeof(t_moldyn_schedule));
+               goto addsched;
+       }
+
+       /* initial lattice and dimensions */
        set_dim(&moldyn,mdrun.dim.x,mdrun.dim.y,mdrun.dim.z,mdrun.vis);
        set_pbc(&moldyn,mdrun.pbcx,mdrun.pbcy,mdrun.pbcz);
        switch(mdrun.lattice) {
@@ -927,16 +1127,26 @@ int main(int argc,char **argv) {
                                       mdrun.m2,DEFAULT_ATOM_ATTR,1,mdrun.lx,
                                       mdrun.ly,mdrun.lz,&o);
                        break;
+               case NONE:
+                       set_nn_dist(&moldyn,mdrun.nnd);
+                       break;
                default:
                        printf("%s unknown lattice type: %02x\n",
                               ME,mdrun.lattice);
                        return -1;
        }
        moldyn_bc_check(&moldyn);
+
+       /* temperature and pressure */
        set_temperature(&moldyn,mdrun.temperature);
        set_pressure(&moldyn,mdrun.pressure);
        thermal_init(&moldyn,TRUE);
+
+addsched:
+       /* first schedule */
        moldyn_add_schedule(&moldyn,mdrun.prerun,mdrun.timestep);
+
+       /* log */
        moldyn_set_log_dir(&moldyn,mdrun.sdir);
        moldyn_set_report(&moldyn,"CHANGE ME","CHANGE ME TOO");
        if(mdrun.elog)