--- trunk/OOPSE-2.0/src/integrators/NPTf.cpp 2005/01/12 22:41:40 1930 +++ trunk/OOPSE-2.0/src/integrators/NPTf.cpp 2005/04/15 22:04:00 2204 @@ -1,4 +1,4 @@ - /* +/* * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved. * * The University of Notre Dame grants you ("Licensee") a @@ -49,200 +49,200 @@ namespace oopse { namespace oopse { -// Basic non-isotropic thermostating and barostating via the Melchionna -// modification of the Hoover algorithm: -// -// Melchionna, S., Ciccotti, G., and Holian, B. L., 1993, -// Molec. Phys., 78, 533. -// -// and -// -// Hoover, W. G., 1986, Phys. Rev. A, 34, 2499. + // Basic non-isotropic thermostating and barostating via the Melchionna + // modification of the Hoover algorithm: + // + // Melchionna, S., Ciccotti, G., and Holian, B. L., 1993, + // Molec. Phys., 78, 533. + // + // and + // + // Hoover, W. G., 1986, Phys. Rev. A, 34, 2499. -void NPTf::evolveEtaA() { + void NPTf::evolveEtaA() { - int i, j; + int i, j; for(i = 0; i < 3; i ++){ - for(j = 0; j < 3; j++){ - if( i == j) { - eta(i, j) += dt2 * instaVol * (press(i, j) - targetPressure/OOPSEConstant::pressureConvert) / (NkBT*tb2); - } else { - eta(i, j) += dt2 * instaVol * press(i, j) / (NkBT*tb2); - } - } + for(j = 0; j < 3; j++){ + if( i == j) { + eta(i, j) += dt2 * instaVol * (press(i, j) - targetPressure/OOPSEConstant::pressureConvert) / (NkBT*tb2); + } else { + eta(i, j) += dt2 * instaVol * press(i, j) / (NkBT*tb2); + } + } } for(i = 0; i < 3; i++) { - for (j = 0; j < 3; j++) { + for (j = 0; j < 3; j++) { oldEta(i, j) = eta(i, j); - } + } } -} + } -void NPTf::evolveEtaB() { + void NPTf::evolveEtaB() { int i; int j; for(i = 0; i < 3; i++) { - for (j = 0; j < 3; j++) { - prevEta(i, j) = eta(i, j); - } + for (j = 0; j < 3; j++) { + prevEta(i, j) = eta(i, j); + } } for(i = 0; i < 3; i ++){ - for(j = 0; j < 3; j++){ - if( i == j) { - eta(i, j) = oldEta(i, j) + dt2 * instaVol * - (press(i, j) - targetPressure/OOPSEConstant::pressureConvert) / (NkBT*tb2); - } else { - eta(i, j) = oldEta(i, j) + dt2 * instaVol * press(i, j) / (NkBT*tb2); - } - } + for(j = 0; j < 3; j++){ + if( i == j) { + eta(i, j) = oldEta(i, j) + dt2 * instaVol * + (press(i, j) - targetPressure/OOPSEConstant::pressureConvert) / (NkBT*tb2); + } else { + eta(i, j) = oldEta(i, j) + dt2 * instaVol * press(i, j) / (NkBT*tb2); + } + } } -} + } -void NPTf::calcVelScale(){ + void NPTf::calcVelScale(){ - for (int i = 0; i < 3; i++ ) { - for (int j = 0; j < 3; j++ ) { - vScale(i, j) = eta(i, j); + for (int i = 0; i < 3; i++ ) { + for (int j = 0; j < 3; j++ ) { + vScale(i, j) = eta(i, j); - if (i == j) { - vScale(i, j) += chi; + if (i == j) { + vScale(i, j) += chi; + } } } } -} -void NPTf::getVelScaleA(Vector3d& sc, const Vector3d& vel){ + void NPTf::getVelScaleA(Vector3d& sc, const Vector3d& vel){ sc = vScale * vel; -} + } -void NPTf::getVelScaleB(Vector3d& sc, int index ) { - sc = vScale * oldVel[index]; -} + void NPTf::getVelScaleB(Vector3d& sc, int index ) { + sc = vScale * oldVel[index]; + } -void NPTf::getPosScale(const Vector3d& pos, const Vector3d& COM, int index, Vector3d& sc) { + void NPTf::getPosScale(const Vector3d& pos, const Vector3d& COM, int index, Vector3d& sc) { /**@todo */ Vector3d rj = (oldPos[index] + pos)/2.0 -COM; sc = eta * rj; -} + } -void NPTf::scaleSimBox(){ + void NPTf::scaleSimBox(){ - int i; - int j; - int k; - Mat3x3d scaleMat; - double eta2ij; - double bigScale, smallScale, offDiagMax; - Mat3x3d hm; - Mat3x3d hmnew; + int i; + int j; + int k; + Mat3x3d scaleMat; + double eta2ij; + double bigScale, smallScale, offDiagMax; + Mat3x3d hm; + Mat3x3d hmnew; - // Scale the box after all the positions have been moved: + // Scale the box after all the positions have been moved: - // Use a taylor expansion for eta products: Hmat = Hmat . exp(dt * etaMat) - // Hmat = Hmat . ( Ident + dt * etaMat + dt^2 * etaMat*etaMat / 2) + // Use a taylor expansion for eta products: Hmat = Hmat . exp(dt * etaMat) + // Hmat = Hmat . ( Ident + dt * etaMat + dt^2 * etaMat*etaMat / 2) - bigScale = 1.0; - smallScale = 1.0; - offDiagMax = 0.0; + bigScale = 1.0; + smallScale = 1.0; + offDiagMax = 0.0; - for(i=0; i<3; i++){ - for(j=0; j<3; j++){ + for(i=0; i<3; i++){ + for(j=0; j<3; j++){ - // Calculate the matrix Product of the eta array (we only need - // the ij element right now): + // Calculate the matrix Product of the eta array (we only need + // the ij element right now): - eta2ij = 0.0; - for(k=0; k<3; k++){ - eta2ij += eta(i, k) * eta(k, j); - } + eta2ij = 0.0; + for(k=0; k<3; k++){ + eta2ij += eta(i, k) * eta(k, j); + } - scaleMat(i, j) = 0.0; - // identity matrix (see above): - if (i == j) scaleMat(i, j) = 1.0; - // Taylor expansion for the exponential truncated at second order: - scaleMat(i, j) += dt*eta(i, j) + 0.5*dt*dt*eta2ij; + scaleMat(i, j) = 0.0; + // identity matrix (see above): + if (i == j) scaleMat(i, j) = 1.0; + // Taylor expansion for the exponential truncated at second order: + scaleMat(i, j) += dt*eta(i, j) + 0.5*dt*dt*eta2ij; - if (i != j) - if (fabs(scaleMat(i, j)) > offDiagMax) - offDiagMax = fabs(scaleMat(i, j)); + if (i != j) + if (fabs(scaleMat(i, j)) > offDiagMax) + offDiagMax = fabs(scaleMat(i, j)); + } + + if (scaleMat(i, i) > bigScale) bigScale = scaleMat(i, i); + if (scaleMat(i, i) < smallScale) smallScale = scaleMat(i, i); } - if (scaleMat(i, i) > bigScale) bigScale = scaleMat(i, i); - if (scaleMat(i, i) < smallScale) smallScale = scaleMat(i, i); - } + if ((bigScale > 1.01) || (smallScale < 0.99)) { + sprintf( painCave.errMsg, + "NPTf error: Attempting a Box scaling of more than 1 percent.\n" + " Check your tauBarostat, as it is probably too small!\n\n" + " scaleMat = [%lf\t%lf\t%lf]\n" + " [%lf\t%lf\t%lf]\n" + " [%lf\t%lf\t%lf]\n" + " eta = [%lf\t%lf\t%lf]\n" + " [%lf\t%lf\t%lf]\n" + " [%lf\t%lf\t%lf]\n", + scaleMat(0, 0),scaleMat(0, 1),scaleMat(0, 2), + scaleMat(1, 0),scaleMat(1, 1),scaleMat(1, 2), + scaleMat(2, 0),scaleMat(2, 1),scaleMat(2, 2), + eta(0, 0),eta(0, 1),eta(0, 2), + eta(1, 0),eta(1, 1),eta(1, 2), + eta(2, 0),eta(2, 1),eta(2, 2)); + painCave.isFatal = 1; + simError(); + } else if (offDiagMax > 0.01) { + sprintf( painCave.errMsg, + "NPTf error: Attempting an off-diagonal Box scaling of more than 1 percent.\n" + " Check your tauBarostat, as it is probably too small!\n\n" + " scaleMat = [%lf\t%lf\t%lf]\n" + " [%lf\t%lf\t%lf]\n" + " [%lf\t%lf\t%lf]\n" + " eta = [%lf\t%lf\t%lf]\n" + " [%lf\t%lf\t%lf]\n" + " [%lf\t%lf\t%lf]\n", + scaleMat(0, 0),scaleMat(0, 1),scaleMat(0, 2), + scaleMat(1, 0),scaleMat(1, 1),scaleMat(1, 2), + scaleMat(2, 0),scaleMat(2, 1),scaleMat(2, 2), + eta(0, 0),eta(0, 1),eta(0, 2), + eta(1, 0),eta(1, 1),eta(1, 2), + eta(2, 0),eta(2, 1),eta(2, 2)); + painCave.isFatal = 1; + simError(); + } else { - if ((bigScale > 1.01) || (smallScale < 0.99)) { - sprintf( painCave.errMsg, - "NPTf error: Attempting a Box scaling of more than 1 percent.\n" - " Check your tauBarostat, as it is probably too small!\n\n" - " scaleMat = [%lf\t%lf\t%lf]\n" - " [%lf\t%lf\t%lf]\n" - " [%lf\t%lf\t%lf]\n" - " eta = [%lf\t%lf\t%lf]\n" - " [%lf\t%lf\t%lf]\n" - " [%lf\t%lf\t%lf]\n", - scaleMat(0, 0),scaleMat(0, 1),scaleMat(0, 2), - scaleMat(1, 0),scaleMat(1, 1),scaleMat(1, 2), - scaleMat(2, 0),scaleMat(2, 1),scaleMat(2, 2), - eta(0, 0),eta(0, 1),eta(0, 2), - eta(1, 0),eta(1, 1),eta(1, 2), - eta(2, 0),eta(2, 1),eta(2, 2)); - painCave.isFatal = 1; - simError(); - } else if (offDiagMax > 0.01) { - sprintf( painCave.errMsg, - "NPTf error: Attempting an off-diagonal Box scaling of more than 1 percent.\n" - " Check your tauBarostat, as it is probably too small!\n\n" - " scaleMat = [%lf\t%lf\t%lf]\n" - " [%lf\t%lf\t%lf]\n" - " [%lf\t%lf\t%lf]\n" - " eta = [%lf\t%lf\t%lf]\n" - " [%lf\t%lf\t%lf]\n" - " [%lf\t%lf\t%lf]\n", - scaleMat(0, 0),scaleMat(0, 1),scaleMat(0, 2), - scaleMat(1, 0),scaleMat(1, 1),scaleMat(1, 2), - scaleMat(2, 0),scaleMat(2, 1),scaleMat(2, 2), - eta(0, 0),eta(0, 1),eta(0, 2), - eta(1, 0),eta(1, 1),eta(1, 2), - eta(2, 0),eta(2, 1),eta(2, 2)); - painCave.isFatal = 1; - simError(); - } else { - - Mat3x3d hmat = currentSnapshot_->getHmat(); - hmat = hmat *scaleMat; - currentSnapshot_->setHmat(hmat); + Mat3x3d hmat = currentSnapshot_->getHmat(); + hmat = hmat *scaleMat; + currentSnapshot_->setHmat(hmat); + } } -} -bool NPTf::etaConverged() { + bool NPTf::etaConverged() { int i; double diffEta, sumEta; sumEta = 0; for(i = 0; i < 3; i++) { - sumEta += pow(prevEta(i, i) - eta(i, i), 2); + sumEta += pow(prevEta(i, i) - eta(i, i), 2); } diffEta = sqrt( sumEta / 3.0 ); return ( diffEta <= etaTolerance ); -} + } -double NPTf::calcConservedQuantity(){ + double NPTf::calcConservedQuantity(){ chi= currentSnapshot_->getChi(); integralOfChidt = currentSnapshot_->getIntegralOfChiDt(); @@ -280,13 +280,13 @@ double NPTf::calcConservedQuantity(){ barostat_potential = (targetPressure * thermo.getVolume() / OOPSEConstant::pressureConvert) /OOPSEConstant::energyConvert; conservedQuantity = totalEnergy + thermostat_kinetic + thermostat_potential + - barostat_kinetic + barostat_potential; + barostat_kinetic + barostat_potential; return conservedQuantity; -} + } -void NPTf::loadEta() { + void NPTf::loadEta() { eta= currentSnapshot_->getEta(); //if (!eta.isDiagonal()) { @@ -295,10 +295,10 @@ void NPTf::loadEta() { // painCave.isFatal = 1; // simError(); //} -} + } -void NPTf::saveEta() { + void NPTf::saveEta() { currentSnapshot_->setEta(eta); -} + } }