--- trunk/src/restraints/ThermoIntegrationForceManager.cpp 2005/04/15 22:04:00 507 +++ trunk/src/restraints/ThermoIntegrationForceManager.cpp 2006/06/22 15:21:01 993 @@ -55,8 +55,8 @@ namespace oopse { currSnapshot_ = info_->getSnapshotManager()->getCurrentSnapshot(); simParam = info_->getSimParams(); - if (simParam->haveThermIntLambda()){ - tIntLambda_ = simParam->getThermIntLambda(); + if (simParam->haveThermodynamicIntegrationLambda()){ + tIntLambda_ = simParam->getThermodynamicIntegrationLambda(); } else{ tIntLambda_ = 1.0; @@ -69,8 +69,8 @@ namespace oopse { simError(); } - if (simParam->haveThermIntK()){ - tIntK_ = simParam->getThermIntK(); + if (simParam->haveThermodynamicIntegrationK()){ + tIntK_ = simParam->getThermodynamicIntegrationK(); } else{ tIntK_ = 1.0; @@ -144,7 +144,7 @@ namespace oopse { tempTau = curSnapshot->statData.getTau(); tempTau *= factor_; curSnapshot->statData.setTau(tempTau); - + // do crystal restraint forces for thermodynamic integration if (simParam->getUseSolidThermInt()) {