--- trunk/src/applications/hydrodynamics/ApproximationModel.cpp 2006/05/25 16:27:27 977 +++ trunk/src/applications/hydrodynamics/ApproximationModel.cpp 2010/05/10 17:28:26 1442 @@ -6,19 +6,10 @@ * redistribute this software in source and binary code form, provided * that the following conditions are met: * - * 1. Acknowledgement of the program authors must be made in any - * publication of scientific results based in part on use of the - * program. An acceptable form of acknowledgement is citation of - * the article in which the program was described (Matthew - * A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher - * J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented - * Parallel Simulation Engine for Molecular Dynamics," - * J. Comput. Chem. 26, pp. 252-271 (2005)) - * - * 2. Redistributions of source code must retain the above copyright + * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * - * 3. Redistributions in binary form must reproduce the above copyright + * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the * distribution. @@ -37,19 +28,28 @@ * arising out of the use of or inability to use software, even if the * University of Notre Dame has been advised of the possibility of * such damages. + * + * SUPPORT OPEN SCIENCE! If you use OpenMD or its source code in your + * research, please cite the appropriate papers when you publish your + * work. Good starting points are: + * + * [1] Meineke, et al., J. Comp. Chem. 26, 252-271 (2005). + * [2] Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006). + * [3] Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008). + * [4] Vardeman & Gezelter, in progress (2009). */ #include "applications/hydrodynamics/ApproximationModel.hpp" #include "math/LU.hpp" #include "math/DynamicRectMatrix.hpp" #include "math/SquareMatrix3.hpp" -#include "utils/OOPSEConstant.hpp" +#include "utils/PhysicalConstants.hpp" #include "hydrodynamics/Sphere.hpp" #include "hydrodynamics/Ellipsoid.hpp" #include "applications/hydrodynamics/CompositeShape.hpp" #include "math/LU.hpp" #include "utils/simError.h" -namespace oopse { +namespace OpenMD { /** * Reference: * Beatriz Carrasco and Jose Gracia de la Torre, Hydrodynamic Properties of Rigid Particles: @@ -72,17 +72,16 @@ namespace oopse { bool ApproximationModel::calcHydroProps(Shape* shape, RealType viscosity, RealType temperature) { bool ret = true; - HydroProps cr; - HydroProps cd; + HydroProp* cr = new HydroProp(); + HydroProp* cd = new HydroProp(); calcHydroPropsAtCR(beads_, viscosity, temperature, cr); - //calcHydroPropsAtCD(beads_, viscosity, temperature, cd); + calcHydroPropsAtCD(beads_, viscosity, temperature, cd); setCR(cr); setCD(cd); - return true; } - bool ApproximationModel::calcHydroPropsAtCR(std::vector& beads, RealType viscosity, RealType temperature, HydroProps& cr) { + bool ApproximationModel::calcHydroPropsAtCR(std::vector& beads, RealType viscosity, RealType temperature, HydroProp* cr) { int nbeads = beads.size(); DynamicRectMatrix B(3*nbeads, 3*nbeads); @@ -103,7 +102,9 @@ namespace oopse { Mat3x3d tmpMat; tmpMat = outProduct(Rij, Rij) / rij2; RealType constant = 8.0 * NumericConstant::PI * viscosity * rij; - Tij = ((1.0 + sumSigma2OverRij2/3.0) * I + (1.0 - sumSigma2OverRij2) * tmpMat ) / constant; + RealType tmp1 = 1.0 + sumSigma2OverRij2/3.0; + RealType tmp2 = 1.0 - sumSigma2OverRij2; + Tij = (tmp1 * I + tmp2 * tmpMat ) / constant; }else { RealType constant = 1.0 / (6.0 * NumericConstant::PI * viscosity * beads[i].radius); Tij(0, 0) = constant; @@ -144,18 +145,18 @@ namespace oopse { Xiott += Cij; Xiotr += U[i] * Cij; - //Xiorr += -U[i] * Cij * U[j] + (6 * viscosity * volume) * I; + // uncorrected here. Volume correction is added after we assemble Xiorr Xiorr += -U[i] * Cij * U[j]; } } + + // add the volume correction + Xiorr += (6.0 * viscosity * volume) * I; - const RealType convertConstant = 6.023; //convert poise.angstrom to amu/fs - Xiott *= convertConstant; - Xiotr *= convertConstant; - Xiorr *= convertConstant; + Xiott *= PhysicalConstants::viscoConvert; + Xiotr *= PhysicalConstants::viscoConvert; + Xiorr *= PhysicalConstants::viscoConvert; - - Mat3x3d tmp; Mat3x3d tmpInv; Vector3d tmpVec; @@ -202,25 +203,32 @@ namespace oopse { Dr6x6.getSubMatrix(0, 3, Drrt); Dr6x6.getSubMatrix(3, 0, Drtr); Dr6x6.getSubMatrix(3, 3, Drrr); - RealType kt = OOPSEConstant::kB * temperature ; + RealType kt = PhysicalConstants::kb * temperature ; // in kcal mol^-1 Drtt *= kt; Drrt *= kt; Drtr *= kt; Drrr *= kt; - Xirtt *= OOPSEConstant::kb * temperature; - Xirtr *= OOPSEConstant::kb * temperature; - Xirrr *= OOPSEConstant::kb * temperature; + //Xirtt *= PhysicalConstants::kb * temperature; + //Xirtr *= PhysicalConstants::kb * temperature; + //Xirrr *= PhysicalConstants::kb * temperature; + Mat6x6d Xi, D; - cr.center = ror; - cr.Xi.setSubMatrix(0, 0, Xirtt); - cr.Xi.setSubMatrix(0, 3, Xirtr); - cr.Xi.setSubMatrix(3, 0, Xirtr); - cr.Xi.setSubMatrix(3, 3, Xirrr); - cr.D.setSubMatrix(0, 0, Drtt); - cr.D.setSubMatrix(0, 3, Drrt); - cr.D.setSubMatrix(3, 0, Drtr); - cr.D.setSubMatrix(3, 3, Drrr); + cr->setCOR(ror); + + Xi.setSubMatrix(0, 0, Xirtt); + Xi.setSubMatrix(0, 3, Xirtr); + Xi.setSubMatrix(3, 0, Xirtr); + Xi.setSubMatrix(3, 3, Xirrr); + + cr->setXi(Xi); + + D.setSubMatrix(0, 0, Drtt); + D.setSubMatrix(0, 3, Drrt); + D.setSubMatrix(3, 0, Drtr); + D.setSubMatrix(3, 3, Drrr); + + cr->setD(D); std::cout << "-----------------------------------------\n"; std::cout << "center of resistance :" << std::endl; @@ -246,7 +254,7 @@ namespace oopse { return true; } - bool ApproximationModel::calcHydroPropsAtCD(std::vector& beads, RealType viscosity, RealType temperature, HydroProps& cr) { + bool ApproximationModel::calcHydroPropsAtCD(std::vector& beads, RealType viscosity, RealType temperature, HydroProp* cd) { int nbeads = beads.size(); DynamicRectMatrix B(3*nbeads, 3*nbeads); @@ -267,7 +275,9 @@ namespace oopse { Mat3x3d tmpMat; tmpMat = outProduct(Rij, Rij) / rij2; RealType constant = 8.0 * NumericConstant::PI * viscosity * rij; - Tij = ((1.0 + sumSigma2OverRij2/3.0) * I + (1.0 - sumSigma2OverRij2) * tmpMat ) / constant; + RealType tmp1 = 1.0 + sumSigma2OverRij2/3.0; + RealType tmp2 = 1.0 - sumSigma2OverRij2; + Tij = (tmp1 * I + tmp2 * tmpMat ) / constant; }else { RealType constant = 1.0 / (6.0 * NumericConstant::PI * viscosity * beads[i].radius); Tij(0, 0) = constant; @@ -308,17 +318,18 @@ namespace oopse { Xitt += Cij; Xitr += U[i] * Cij; - //Xirr += -U[i] * Cij * U[j] + (6 * viscosity * volume) * I; + // uncorrected here. Volume correction is added after we assemble Xiorr Xirr += -U[i] * Cij * U[j]; } } + // add the volume correction here: + Xirr += (6.0 * viscosity * volume) * I; - const RealType convertConstant = 6.023; //convert poise.angstrom to amu/fs - Xitt *= convertConstant; - Xitr *= convertConstant; - Xirr *= convertConstant; + Xitt *= PhysicalConstants::viscoConvert; + Xitr *= PhysicalConstants::viscoConvert; + Xirr *= PhysicalConstants::viscoConvert; - RealType kt = OOPSEConstant::kB * temperature; + RealType kt = PhysicalConstants::kb * temperature; // in kcal mol^-1 Mat3x3d Dott; //translational diffusion tensor at arbitrary origin O Mat3x3d Dorr; //rotational diffusion tensor at arbitrary origin O @@ -391,26 +402,32 @@ namespace oopse { //Xidtt in units of kcal*fs*mol^-1*Ang^-2 - //Xid /= OOPSEConstant::energyConvert; - Xid *= OOPSEConstant::kb * temperature; + //Xid /= PhysicalConstants::energyConvert; + Xid *= PhysicalConstants::kb * temperature; - cr.center = rod; - cr.D.setSubMatrix(0, 0, Ddtt); - cr.D.setSubMatrix(0, 3, Ddtr); - cr.D.setSubMatrix(3, 0, Ddtr); - cr.D.setSubMatrix(3, 3, Ddrr); - cr.Xi = Xid; + Mat6x6d Xi, D; + cd->setCOR(rod); + + cd->setXi(Xid); + + D.setSubMatrix(0, 0, Ddtt); + D.setSubMatrix(0, 3, Ddtr); + D.setSubMatrix(3, 0, Ddtr); + D.setSubMatrix(3, 3, Ddrr); + + cd->setD(D); + std::cout << "viscosity = " << viscosity << std::endl; std::cout << "temperature = " << temperature << std::endl; std::cout << "center of diffusion :" << std::endl; std::cout << rod << std::endl; std::cout << "diffusion tensor at center of diffusion " << std::endl; - std::cout << "translation(A^2/fs) :" << std::endl; + std::cout << "translation(A^2 / fs) :" << std::endl; std::cout << Ddtt << std::endl; - std::cout << "translation-rotation(A^3/fs):" << std::endl; + std::cout << "translation-rotation(A / fs):" << std::endl; std::cout << Ddtr << std::endl; - std::cout << "rotation(A^4/fs):" << std::endl; + std::cout << "rotation(fs^-1):" << std::endl; std::cout << Ddrr << std::endl; std::cout << "resistance tensor at center of diffusion " << std::endl; @@ -426,11 +443,11 @@ namespace oopse { Xid.getSubMatrix(3, 3, Xidrr); std::cout << Xidtt << std::endl; - std::cout << "rotation-translation (kcal*fs*mol^-1*Ang^-3):" << std::endl; + std::cout << "rotation-translation (kcal*fs*mol^-1*Ang^-1):" << std::endl; std::cout << Xidrt << std::endl; - std::cout << "translation-rotation(kcal*fs*mol^-1*Ang^-3):" << std::endl; + std::cout << "translation-rotation(kcal*fs*mol^-1*Ang^-1):" << std::endl; std::cout << Xidtr << std::endl; - std::cout << "rotation(kcal*fs*mol^-1*Ang^-4):" << std::endl; + std::cout << "rotation(kcal*fs*mol^-1):" << std::endl; std::cout << Xidrr << std::endl; return true;