| 151 |
|
} |
| 152 |
|
|
| 153 |
|
double Thermo::getVolume() { |
| 154 |
< |
double theBox[3]; |
| 155 |
< |
|
| 156 |
< |
entry_plug->getBox(theBox); |
| 157 |
< |
return (theBox[0] * theBox[1] * theBox[2]); |
| 154 |
> |
return entry_plug->boxVol; |
| 155 |
|
} |
| 156 |
|
|
| 157 |
|
double Thermo::getPressure() { |
| 181 |
|
double vcom[3]; |
| 182 |
|
double p_local[9], p_global[9]; |
| 183 |
|
double theBox[3]; |
| 184 |
< |
double* tau; |
| 184 |
> |
//double* tau; |
| 185 |
|
int i, nMols; |
| 186 |
|
Molecule* molecules; |
| 187 |
|
|
| 188 |
|
nMols = entry_plug->n_mol; |
| 189 |
|
molecules = entry_plug->molecules; |
| 190 |
< |
tau = entry_plug->tau; |
| 190 |
> |
//tau = entry_plug->tau; |
| 191 |
|
|
| 192 |
|
// use velocities of molecular centers of mass and molecular masses: |
| 193 |
|
for (i=0; i < 9; i++) { |
| 219 |
|
} |
| 220 |
|
#endif // is_mpi |
| 221 |
|
|
| 222 |
< |
entry_plug->getBox(theBox); |
| 222 |
> |
volume = entry_plug->boxVol; |
| 223 |
|
|
| 227 |
– |
volume = theBox[0] * theBox[1] * theBox[2]; |
| 228 |
– |
|
| 224 |
|
for(i=0; i<9; i++) { |
| 225 |
< |
press[i] = (p_global[i] - tau[i]*e_convert) / volume; |
| 225 |
> |
press[i] = (p_global[i] - entry_plug->tau[i]*e_convert) / volume; |
| 226 |
|
} |
| 227 |
|
} |
| 228 |
|
|
