ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/heatflux/src/UseTheForce/SC_FF.cpp
(Generate patch)

Comparing trunk/src/UseTheForce/SC_FF.cpp (file contents):
Revision 1282 by gezelter, Wed Jul 30 18:11:19 2008 UTC vs.
Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC

# Line 6 | Line 6
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.
# Line 38 | Line 29
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   *
42 *  SC_FF.cpp
43 *  OOPSE-2.0
44 *
41   *  Created by Charles F. Vardeman II on 11/9/05.
42   *  @author  Charles F. Vardeman II
43 < *  @version $Id: SC_FF.cpp,v 1.11 2008-07-30 18:11:18 gezelter Exp $
43 > *  @version $Id: SC_FF.cpp,v 1.12 2009-11-25 20:01:57 gezelter Exp $
44   *
45   */
46  
# Line 60 | Line 56
56   #include "io/SCAtomTypesSectionParser.hpp"
57   #include "UseTheForce/ForceFieldCreator.hpp"
58   #include "utils/simError.h"
59 < namespace oopse {
59 > namespace OpenMD {
60    
61    SC_FF::SC_FF(){
62      
# Line 112 | Line 108 | namespace oopse {
108      // we try to create a second SC force field.
109      destroySCTypes();
110    }
111 < } //end namespace oopse
111 > } //end namespace OpenMD
112  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines