| 6 |
|
* redistribute this software in source and binary code form, provided |
| 7 |
|
* that the following conditions are met: |
| 8 |
|
* |
| 9 |
< |
* 1. Acknowledgement of the program authors must be made in any |
| 10 |
< |
* publication of scientific results based in part on use of the |
| 11 |
< |
* program. An acceptable form of acknowledgement is citation of |
| 12 |
< |
* the article in which the program was described (Matthew |
| 13 |
< |
* A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher |
| 14 |
< |
* J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented |
| 15 |
< |
* Parallel Simulation Engine for Molecular Dynamics," |
| 16 |
< |
* J. Comput. Chem. 26, pp. 252-271 (2005)) |
| 17 |
< |
* |
| 18 |
< |
* 2. Redistributions of source code must retain the above copyright |
| 9 |
> |
* 1. Redistributions of source code must retain the above copyright |
| 10 |
|
* notice, this list of conditions and the following disclaimer. |
| 11 |
|
* |
| 12 |
< |
* 3. Redistributions in binary form must reproduce the above copyright |
| 12 |
> |
* 2. Redistributions in binary form must reproduce the above copyright |
| 13 |
|
* notice, this list of conditions and the following disclaimer in the |
| 14 |
|
* documentation and/or other materials provided with the |
| 15 |
|
* distribution. |
| 28 |
|
* arising out of the use of or inability to use software, even if the |
| 29 |
|
* University of Notre Dame has been advised of the possibility of |
| 30 |
|
* such damages. |
| 31 |
+ |
* |
| 32 |
+ |
* SUPPORT OPEN SCIENCE! If you use OpenMD or its source code in your |
| 33 |
+ |
* research, please cite the appropriate papers when you publish your |
| 34 |
+ |
* work. Good starting points are: |
| 35 |
+ |
* |
| 36 |
+ |
* [1] Meineke, et al., J. Comp. Chem. 26, 252-271 (2005). |
| 37 |
+ |
* [2] Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006). |
| 38 |
+ |
* [3] Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008). |
| 39 |
+ |
* [4] Vardeman & Gezelter, in progress (2009). |
| 40 |
|
*/ |
| 41 |
|
|
| 42 |
|
#include <math.h> |
| 49 |
|
#include "brains/Thermo.hpp" |
| 50 |
|
#include "primitives/Molecule.hpp" |
| 51 |
|
#include "utils/simError.h" |
| 52 |
< |
#include "utils/OOPSEConstant.hpp" |
| 52 |
> |
#include "utils/PhysicalConstants.hpp" |
| 53 |
|
|
| 54 |
< |
namespace oopse { |
| 54 |
> |
namespace OpenMD { |
| 55 |
|
|
| 56 |
|
RealType Thermo::getKinetic() { |
| 57 |
|
SimInfo::MoleculeIterator miter; |
| 103 |
|
|
| 104 |
|
#endif //is_mpi |
| 105 |
|
|
| 106 |
< |
kinetic = kinetic * 0.5 / OOPSEConstant::energyConvert; |
| 106 |
> |
kinetic = kinetic * 0.5 / PhysicalConstants::energyConvert; |
| 107 |
|
|
| 108 |
|
return kinetic; |
| 109 |
|
} |
| 139 |
|
|
| 140 |
|
RealType Thermo::getTemperature() { |
| 141 |
|
|
| 142 |
< |
RealType temperature = ( 2.0 * this->getKinetic() ) / (info_->getNdf()* OOPSEConstant::kb ); |
| 142 |
> |
RealType temperature = ( 2.0 * this->getKinetic() ) / (info_->getNdf()* PhysicalConstants::kb ); |
| 143 |
|
return temperature; |
| 144 |
|
} |
| 145 |
|
|
| 158 |
|
|
| 159 |
|
tensor = getPressureTensor(); |
| 160 |
|
|
| 161 |
< |
pressure = OOPSEConstant::pressureConvert * (tensor(0, 0) + tensor(1, 1) + tensor(2, 2)) / 3.0; |
| 161 |
> |
pressure = PhysicalConstants::pressureConvert * (tensor(0, 0) + tensor(1, 1) + tensor(2, 2)) / 3.0; |
| 162 |
|
|
| 163 |
|
return pressure; |
| 164 |
|
} |
| 173 |
|
|
| 174 |
|
tensor = getPressureTensor(); |
| 175 |
|
|
| 176 |
< |
pressure = OOPSEConstant::pressureConvert * tensor(direction, direction); |
| 176 |
> |
pressure = PhysicalConstants::pressureConvert * tensor(direction, direction); |
| 177 |
|
|
| 178 |
|
return pressure; |
| 179 |
|
} |
| 210 |
|
Snapshot* curSnapshot = info_->getSnapshotManager()->getCurrentSnapshot(); |
| 211 |
|
Mat3x3d tau = curSnapshot->statData.getTau(); |
| 212 |
|
|
| 213 |
< |
pressureTensor = (p_global + OOPSEConstant::energyConvert* tau)/volume; |
| 213 |
> |
pressureTensor = (p_global + PhysicalConstants::energyConvert* tau)/volume; |
| 214 |
|
|
| 215 |
|
return pressureTensor; |
| 216 |
|
} |
| 249 |
|
Vector3d pos1, pos2, rab; |
| 250 |
|
|
| 251 |
|
#ifdef IS_MPI |
| 252 |
+ |
std::cerr << "tap = " << tap.first << " " << tap.second << std::endl; |
| 253 |
|
|
| 254 |
< |
mol1 = info_.globalMolMembership_[tap.first]; |
| 255 |
< |
mol2 = info_.globalMolMembership_[tap.second]; |
| 256 |
< |
|
| 254 |
> |
int mol1 = info_->getGlobalMolMembership(tap.first); |
| 255 |
> |
int mol2 = info_->getGlobalMolMembership(tap.second); |
| 256 |
> |
std::cerr << "mols = " << mol1 << " " << mol2 << std::endl; |
| 257 |
> |
|
| 258 |
|
int proc1 = info_->getMolToProc(mol1); |
| 259 |
|
int proc2 = info_->getMolToProc(mol2); |
| 260 |
|
|
| 261 |
+ |
std::cerr << " procs = " << proc1 << " " <<proc2 <<std::endl; |
| 262 |
+ |
|
| 263 |
+ |
RealType data[3]; |
| 264 |
|
if (proc1 == worldRank) { |
| 260 |
– |
RealType data[3]; |
| 265 |
|
StuntDouble* sd1 = info_->getIOIndexToIntegrableObject(tap.first); |
| 266 |
+ |
std::cerr << " on proc " << proc1 << ", sd1 has global index= " << sd1->getGlobalIndex() << std::endl; |
| 267 |
|
pos1 = sd1->getPos(); |
| 268 |
|
data[0] = pos1.x(); |
| 269 |
|
data[1] = pos1.y(); |
| 273 |
|
MPI_Bcast(data, 3, MPI_REALTYPE, proc1, MPI_COMM_WORLD); |
| 274 |
|
pos1 = Vector3d(data); |
| 275 |
|
} |
| 276 |
< |
|
| 276 |
> |
|
| 277 |
> |
|
| 278 |
|
if (proc2 == worldRank) { |
| 273 |
– |
RealType data[3]; |
| 279 |
|
StuntDouble* sd2 = info_->getIOIndexToIntegrableObject(tap.second); |
| 280 |
+ |
std::cerr << " on proc " << proc2 << ", sd2 has global index= " << sd2->getGlobalIndex() << std::endl; |
| 281 |
|
pos2 = sd2->getPos(); |
| 282 |
|
data[0] = pos2.x(); |
| 283 |
|
data[1] = pos2.y(); |
| 304 |
|
|
| 305 |
|
} |
| 306 |
|
|
| 307 |
< |
} //end namespace oopse |
| 307 |
> |
} //end namespace OpenMD |
