ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/lattice/FCCLattice.cpp
(Generate patch)

Comparing trunk/src/lattice/FCCLattice.cpp (file contents):
Revision 485 by tim, Tue Apr 12 22:07:45 2005 UTC vs.
Revision 1442 by gezelter, Mon May 10 17:28:26 2010 UTC

# Line 1 | Line 1
1 < /*
1 > /*
2   * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
3   *
4   * The University of Notre Dame grants you ("Licensee") a
# 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 37 | Line 28
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   #include "lattice/FCCLattice.hpp"
43  
44 < namespace oopse {
44 > namespace OpenMD {
45  
46 < FCCLattice::FCCLattice() : CubicLattice(){
47 <  nCellSites = 4;
48 <  cellSitesPos.resize(nCellSites);
49 <  cellSitesOrt.resize(nCellSites);
50 <  update();
46 >  FCCLattice::FCCLattice() : CubicLattice(){
47 >    nCellSites = 4;
48 >    cellSitesPos.resize(nCellSites);
49 >    cellSitesOrt.resize(nCellSites);
50 >    update();
51  
52 < }
52 >  }
53  
54 < void FCCLattice::update(){
54 >  void FCCLattice::update(){
55  
56 <  double cellLenOver2;
57 <  double oneOverRoot3;
56 >    RealType cellLenOver2;
57 >    RealType oneOverRoot3;
58  
59 <  cellLenOver2  = 0.5 * latticeParam;
60 <  oneOverRoot3 = 1.0 / sqrt(3.0);
59 >    cellLenOver2  = 0.5 * latticeParam;
60 >    oneOverRoot3 = 1.0 / sqrt(3.0);
61  
62 <  // Molecule 1
63 <  cellSitesPos[0][0] = 0.0;
64 <  cellSitesPos[0][1] = 0.0;
65 <  cellSitesPos[0][2] = 0.0;
62 >    // Molecule 1
63 >    cellSitesPos[0][0] = 0.0;
64 >    cellSitesPos[0][1] = 0.0;
65 >    cellSitesPos[0][2] = 0.0;
66    
67 <   cellSitesOrt[0][0] = oneOverRoot3;
68 <   cellSitesOrt[0][1] = oneOverRoot3;
69 <   cellSitesOrt[0][2] = oneOverRoot3;
67 >    cellSitesOrt[0][0] = oneOverRoot3;
68 >    cellSitesOrt[0][1] = oneOverRoot3;
69 >    cellSitesOrt[0][2] = oneOverRoot3;
70  
71 <  // Molecule 2  
72 <  cellSitesPos[1][0]   = 0.0;
73 <  cellSitesPos[1][1]   = cellLenOver2;
74 <  cellSitesPos[1][2]   = cellLenOver2;
71 >    // Molecule 2  
72 >    cellSitesPos[1][0]   = 0.0;
73 >    cellSitesPos[1][1]   = cellLenOver2;
74 >    cellSitesPos[1][2]   = cellLenOver2;
75  
76 <  cellSitesOrt[1][0] = -oneOverRoot3;
77 <  cellSitesOrt[1][1] = oneOverRoot3;
78 <  cellSitesOrt[1][2] = -oneOverRoot3;
76 >    cellSitesOrt[1][0] = -oneOverRoot3;
77 >    cellSitesOrt[1][1] = oneOverRoot3;
78 >    cellSitesOrt[1][2] = -oneOverRoot3;
79    
80 <  // Molecule 3
81 <  cellSitesPos[2][0]   = cellLenOver2;
82 <  cellSitesPos[2][1]   = cellLenOver2;
83 <  cellSitesPos[2][2]   = 0.0;
80 >    // Molecule 3
81 >    cellSitesPos[2][0]   = cellLenOver2;
82 >    cellSitesPos[2][1]   = cellLenOver2;
83 >    cellSitesPos[2][2]   = 0.0;
84  
85 <  cellSitesOrt[2][0] = oneOverRoot3;
86 <  cellSitesOrt[2][1] = -oneOverRoot3;
87 <  cellSitesOrt[2][2] = -oneOverRoot3;
85 >    cellSitesOrt[2][0] = oneOverRoot3;
86 >    cellSitesOrt[2][1] = -oneOverRoot3;
87 >    cellSitesOrt[2][2] = -oneOverRoot3;
88  
89 <  // Molecule 4
89 >    // Molecule 4
90  
91 <  cellSitesPos[3][0]   = cellLenOver2;
92 <  cellSitesPos[3][1]   = 0.0;
93 <  cellSitesPos[3][2]   = cellLenOver2;
91 >    cellSitesPos[3][0]   = cellLenOver2;
92 >    cellSitesPos[3][1]   = 0.0;
93 >    cellSitesPos[3][2]   = cellLenOver2;
94  
95 <  cellSitesOrt[3][0] = -oneOverRoot3;
96 <  cellSitesOrt[3][1] = oneOverRoot3;
97 <  cellSitesOrt[3][2] = oneOverRoot3;
98 < }
95 >    cellSitesOrt[3][0] = -oneOverRoot3;
96 >    cellSitesOrt[3][1] = oneOverRoot3;
97 >    cellSitesOrt[3][2] = oneOverRoot3;
98 >  }
99  
100   }
101  

Comparing trunk/src/lattice/FCCLattice.cpp (property svn:keywords):
Revision 485 by tim, Tue Apr 12 22:07:45 2005 UTC vs.
Revision 1442 by gezelter, Mon May 10 17:28:26 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines