--- trunk/src/brains/ForceManager.cpp 2015/03/05 15:22:54 2066 +++ trunk/src/brains/ForceManager.cpp 2015/03/07 16:59:57 2070 @@ -68,8 +68,7 @@ namespace OpenMD { using namespace std; namespace OpenMD { - ForceManager::ForceManager(SimInfo * info) : info_(info), - initialized_(false), + ForceManager::ForceManager(SimInfo * info) : initialized_(false), info_(info), switcher_(NULL) { forceField_ = info_->getForceField(); interactionMan_ = new InteractionManager(); @@ -116,7 +115,6 @@ namespace OpenMD { void ForceManager::setupCutoffs() { Globals* simParams_ = info_->getSimParams(); - ForceFieldOptions& forceFieldOptions_ = forceField_->getForceFieldOptions(); int mdFileVersion; rCut_ = 0.0; //Needs a value for a later max() call; @@ -657,7 +655,7 @@ namespace OpenMD { Vector3d d_grp, dag, d, gvel2, vel2; RealType rgrpsq, rgrp, r2, r; RealType electroMult, vdwMult; - RealType vij; + RealType vij(0.0); Vector3d fij, fg, f1; bool in_switching_region; RealType sw, dswdr, swderiv; @@ -723,7 +721,7 @@ namespace OpenMD { } } - for (cg1 = 0; cg1 < point_.size() - 1; cg1++) { + for (cg1 = 0; cg1 < int(point_.size()) - 1; cg1++) { atomListRow = fDecomp_->getAtomsInGroupRow(cg1); newAtom1 = true;