fp.lz=atoi(word[++i]);
fp.lc=atof(word[++i]);
mdrun->lc=fp.lc;
+ continue;
}
if(!strncmp(word[i],"eb",2)) {
fp.fill_element=atoi(word[++i]);
fp.fill_brand=atoi(word[++i]);
+ continue;
}
if(word[i][0]=='p') {
i+=1;
fp.p_params.d.y=atof(word[++i]);
fp.p_params.d.z=atof(word[++i]);
}
+ continue;
}
if(word[i][0]=='d') {
switch(word[++i][0]) {
default:
break;
}
+ continue;
}
i+=1;
csp.type=0;
for(i=1;i<wcnt;i++) {
if(!strncmp(word[i],"pctrl",5)) {
- csp.ptau=0.01/(atof(word[++i])*GPA);
+ csp.ptau=atof(word[++i]);
+ if(csp.ptau>0)
+ csp.ptau=0.01/(csp.ptau*GPA);
csp.type|=CHSATTR_PCTRL;
}
if(!strncmp(word[i],"tctrl",5)) {
if(csp->ptau>0)
set_p_scale(moldyn,P_SCALE_BERENDSEN,csp->ptau);
else
- set_p_scale(moldyn,P_SCALE_BERENDSEN,csp->ptau);
+ set_p_scale(moldyn,P_SCALE_NONE,1.0);
}
if(csp->type&CHSATTR_TCTRL) {
if(csp->ttau>0)
set_t_scale(moldyn,T_SCALE_BERENDSEN,csp->ttau);
else
- set_t_scale(moldyn,T_SCALE_BERENDSEN,csp->ttau);
+ set_t_scale(moldyn,T_SCALE_NONE,1.0);
}
if(csp->type&CHSATTR_PRELAX) {
if(csp->dp<0)
create_lattice(moldyn,
fp->lattice,fp->lc,
- mdrun->element1,
- DEFAULT_ATOM_ATTR,0,
+ fp->fill_element,
+ DEFAULT_ATOM_ATTR,
+ fp->fill_brand,
fp->lx,fp->ly,fp->lz,
NULL,
&(fp->p_params),