--- trunk/OOPSE-4/src/integrators/Integrator.hpp 2005/02/13 19:10:25 2008 +++ trunk/OOPSE-4/src/integrators/Integrator.hpp 2005/03/10 15:10:24 2101 @@ -51,8 +51,10 @@ #define INTEGRATORS_INTEGRATOR_HPP #include "brains/ForceManager.hpp" +#include "restraints/ThermoIntegrationForceManager.hpp" #include "io/DumpWriter.hpp" #include "io/StatWriter.hpp" +#include "io/RestWriter.hpp" #include "integrators/Velocitizer.hpp" namespace oopse { @@ -104,6 +106,7 @@ class Integrator { } SimInfo* info_; + Globals* simParams; ForceManager* forceMan_; bool needPotential; bool needStress; @@ -112,8 +115,9 @@ class Integrator { bool needVelocityScaling; double targetScalingTemp; - DumpWriter*dumpWriter; + DumpWriter* dumpWriter; StatWriter* statWriter; + RestWriter* restWriter; Thermo thermo; double runTime;