ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/flucq/FluctuatingChargeNVT.cpp
(Generate patch)

Comparing:
branches/development/src/integrators/FluctuatingChargeNVT.cpp (file contents), Revision 1716 by gezelter, Wed May 23 01:26:15 2012 UTC vs.
branches/development/src/flucq/FluctuatingChargeNVT.cpp (file contents), Revision 1731 by gezelter, Thu May 31 12:25:30 2012 UTC

# Line 52 | Line 52 | namespace OpenMD {
52      thermo(info),
53      currentSnapshot_(info->getSnapshotManager()->getCurrentSnapshot()) {
54  
55 +
56      if (info_->usesFluctuatingCharges()) {
57        if (info_->getNFluctuatingCharges() > 0) {
58  
59          hasFlucQ_ = true;
60          Globals* simParams = info_->getSimParams();
61 +        FluctuatingChargeParameters* fqParams = simParams->getFluctuatingChargeParameters();
62  
63          if (simParams->haveDt()) {
64            dt_ = simParams->getDt();
# Line 73 | Line 75 | namespace OpenMD {
75            currentSnapshot_->setIntegralOfChiElectronicDt(0.0);
76          }
77          
78 <        if (!simParams->haveFlucQTargetTemp()) {
78 >        if (!fqParams->haveTargetTemp()) {
79            sprintf(painCave.errMsg, "You can't use the FluctuatingChargeNVT "
80                    "propagator without a flucQ.targetTemp!\n");
81            painCave.isFatal = 1;
82            painCave.severity = OPENMD_ERROR;
83            simError();
84          } else {
85 <          targetTemp_ = simParams->getFlucQTargetTemp();
85 >          targetTemp_ = fqParams->getTargetTemp();
86          }
87          
88          // We must set tauThermostat.
89          
90 <        if (!simParams->haveFlucQtauThermostat()) {
90 >        if (!fqParams->haveTauThermostat()) {
91            sprintf(painCave.errMsg, "If you use the FluctuatingChargeNVT\n"
92                    "\tpropagator, you must set flucQ.tauThermostat .\n");
93            
# Line 93 | Line 95 | namespace OpenMD {
95            painCave.isFatal = 1;
96            simError();
97          } else {
98 <          tauThermostat_ = simParams->getFlucQtauThermostat();
98 >          tauThermostat_ = fqParams->getTauThermostat();
99          }
100          updateSizes();
101        }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines