}
}
// only rand mode by now
- if(word[8][0]=='t')
+ if(word[8][0]=='t') {
iap.type=INS_TOTAL;
+ iap.cr=atof(word[9]);
+ }
else {
iap.type=INS_REGION;
iap.x0=atof(word[8]);
iap.x1=atof(word[11]);
iap.y1=atof(word[12]);
iap.z1=atof(word[13]);
+ iap.cr=atof(word[14]);
}
add_stage(mdrun,STAGE_INSERT_ATOMS,&iap);
}
}
add_atom(moldyn,iap->element,pse_mass[iap->element],
iap->brand,iap->attr,&r,&v);
- printf("%s atom inserted: %f %f %f | d squared = %f\n",
- ME,r.x,r.y,r.z,dmin);
+ printf("%s atom inserted (%d/%d): %f %f %f\n",
+ ME,(iap->cnt_steps+1)*iap->ins_atoms,
+ iap->ins_steps*iap->ins_atoms,r.x,r.y,r.z);
+ printf(" -> d2 = %f/%f\n",dmin,iap->cr*iap->cr);
cnt+=1;
}
}
if(csp->type&CHSATTR_AVGRST) {
if(csp->avgrst)
- mdrun->sattr|=CHSATTR_AVGRST;
+ mdrun->sattr|=SATTR_AVGRST;
else
- mdrun->sattr&=(~(CHSATTR_AVGRST));
+ mdrun->sattr&=(~(SATTR_AVGRST));
}
if(csp->type&CHSATTR_RSTEPS) {
mdrun->relax_steps=csp->rsteps;