| 6 | 
  | 
 * redistribute this software in source and binary code form, provided | 
| 7 | 
  | 
 * that the following conditions are met: | 
| 8 | 
  | 
 * | 
| 9 | 
< | 
 * 1. Acknowledgement of the program authors must be made in any | 
| 10 | 
< | 
 *    publication of scientific results based in part on use of the | 
| 11 | 
< | 
 *    program.  An acceptable form of acknowledgement is citation of | 
| 12 | 
< | 
 *    the article in which the program was described (Matthew | 
| 13 | 
< | 
 *    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher | 
| 14 | 
< | 
 *    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented | 
| 15 | 
< | 
 *    Parallel Simulation Engine for Molecular Dynamics," | 
| 16 | 
< | 
 *    J. Comput. Chem. 26, pp. 252-271 (2005)) | 
| 17 | 
< | 
 * | 
| 18 | 
< | 
 * 2. Redistributions of source code must retain the above copyright | 
| 9 | 
> | 
 * 1. Redistributions of source code must retain the above copyright | 
| 10 | 
  | 
 *    notice, this list of conditions and the following disclaimer. | 
| 11 | 
  | 
 * | 
| 12 | 
< | 
 * 3. Redistributions in binary form must reproduce the above copyright | 
| 12 | 
> | 
 * 2. Redistributions in binary form must reproduce the above copyright | 
| 13 | 
  | 
 *    notice, this list of conditions and the following disclaimer in the | 
| 14 | 
  | 
 *    documentation and/or other materials provided with the | 
| 15 | 
  | 
 *    distribution. | 
| 28 | 
  | 
 * arising out of the use of or inability to use software, even if the | 
| 29 | 
  | 
 * University of Notre Dame has been advised of the possibility of | 
| 30 | 
  | 
 * such damages. | 
| 31 | 
+ | 
 * | 
| 32 | 
+ | 
 * SUPPORT OPEN SCIENCE!  If you use OpenMD or its source code in your | 
| 33 | 
+ | 
 * research, please cite the appropriate papers when you publish your | 
| 34 | 
+ | 
 * work.  Good starting points are: | 
| 35 | 
+ | 
 *                                                                       | 
| 36 | 
+ | 
 * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).              | 
| 37 | 
+ | 
 * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).           | 
| 38 | 
+ | 
 * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).           | 
| 39 | 
+ | 
 * [4]  Vardeman & Gezelter, in progress (2009).                         | 
| 40 | 
  | 
 */ | 
| 41 | 
  | 
  | 
| 42 | 
  | 
/** | 
| 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 __OOPSE_C | 
| 68 | 
> | 
#define __OPENMD_C | 
| 69 | 
  | 
#include "brains/fSimulation.h" | 
| 70 | 
  | 
 | 
| 71 | 
< | 
namespace oopse{ | 
| 71 | 
> | 
namespace OpenMD{ | 
| 72 | 
  | 
 | 
| 73 | 
  | 
  //forward decalration  | 
| 74 | 
  | 
  class SnapshotManager; | 
| 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 OOPSE, SimInfo maintains a list of molecules. | 
| 81 | 
> | 
   * @brief One of the heavy weight classes of OpenMD, SimInfo maintains a list of molecules. | 
| 82 | 
  | 
    * The Molecule class maintains all of the concrete objects  | 
| 83 | 
  | 
    * (atoms, bond, bend, torsions, inversions, rigid bodies, cutoff groups,  | 
| 84 | 
  | 
    * constraints). In both the single and parallel versions, atoms and | 
| 573 | 
  | 
    RealType rsw_;        /**< radius of switching function*/ | 
| 574 | 
  | 
    RealType rlist_;      /**< neighbor list radius */ | 
| 575 | 
  | 
 | 
| 576 | 
< | 
    bool ljsp_; /**< use shifted potential for LJ*/ | 
| 577 | 
< | 
    bool ljsf_; /**< use shifted force for LJ*/ | 
| 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 */ | 
| 638 | 
  | 
 | 
| 639 | 
  | 
  }; | 
| 640 | 
  | 
 | 
| 641 | 
< | 
} //namespace oopse | 
| 641 | 
> | 
} //namespace OpenMD | 
| 642 | 
  | 
#endif //BRAINS_SIMMODEL_HPP | 
| 643 | 
  | 
 |