--- trunk/src/flucq/FluctuatingChargeConstraints.cpp 2013/07/29 17:55:17 1915 +++ trunk/src/flucq/FluctuatingChargeConstraints.cpp 2013/10/31 18:18:57 1939 @@ -40,18 +40,17 @@ * [5] Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011). */ -#include "FluctuatingChargeConstraints.hpp" -#include "primitives/Molecule.hpp" - #ifdef IS_MPI #include #endif +#include "FluctuatingChargeConstraints.hpp" +#include "primitives/Molecule.hpp" + namespace OpenMD { FluctuatingChargeConstraints::FluctuatingChargeConstraints(SimInfo* info) : info_(info), constrainRegions_(false), hasFlucQ_(false), initialized_(false) { - } void FluctuatingChargeConstraints::initialize(){ @@ -100,6 +99,7 @@ namespace OpenMD { void FluctuatingChargeConstraints::applyConstraints() { if (!initialized_) initialize(); if (!hasFlucQ_) return; + SimInfo::MoleculeIterator i; Molecule::FluctuatingChargeIterator j; Molecule* mol; @@ -152,7 +152,7 @@ namespace OpenMD { // do the same in the regions: if (constrainRegions_) { - for (int i = 0; i < regionForce_.size(); ++i) { + for (unsigned int i = 0; i < regionForce_.size(); ++i) { regionForce_[ i ] /= regionCharges_[ i ]; } }