ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/OpenMD/branches/development/src/brains/SimInfo.hpp

Comparing:
trunk/src/brains/SimInfo.hpp (file contents), Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC vs.
branches/development/src/brains/SimInfo.hpp (file contents), Revision 1503 by gezelter, Sat Oct 2 19:54:41 2010 UTC

#	Line 62 | Line 62
62		#include "UseTheForce/ForceField.hpp"
63		#include "utils/PropertyMap.hpp"
64		#include "utils/LocalIndexManager.hpp"
65	+	#include "nonbonded/Electrostatic.hpp"
66
67		//another nonsense macro declaration
68		#define __OPENMD_C
#	Line 74 | Line 75 | namespace OpenMD{
75		class Molecule;
76		class SelectionManager;
77		class StuntDouble;
78	+	class Electrostatic;
79		/**
80		* @class SimInfo SimInfo.hpp "brains/SimInfo.hpp"
81		* @brief One of the heavy weight classes of OpenMD, SimInfo maintains a list of molecules.
#	Line 574 | Line 576 | namespace OpenMD{
576		int ljsp_; /**< use shifted potential for LJ*/
577		int ljsf_; /**< use shifted force for LJ*/
578
579	<	bool fortranInitialized_; /**< flag indicate whether fortran side
578	<	is initialized */
579	>	bool fortranInitialized_; /** flag to indicate whether the fortran side is initialized */
580
581		bool calcBoxDipole_; /**< flag to indicate whether or not we calculate
582		the simulation box dipole moment */

Comparing:
trunk/src/brains/SimInfo.hpp (property svn:keywords), Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC vs.
branches/development/src/brains/SimInfo.hpp (property svn:keywords), Revision 1503 by gezelter, Sat Oct 2 19:54:41 2010 UTC

#	Line 0 | Line 1
1	+	Author Id Revision Date

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines