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

Comparing trunk/OOPSE-4/src/lattice/FCCLattice.cpp (file contents):
Revision 2182 by tim, Tue Apr 12 22:07:45 2005 UTC vs.
Revision 2759 by tim, Wed May 17 21:51:42 2006 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 43 | Line 43 | FCCLattice::FCCLattice() : CubicLattice(){
43  
44   namespace oopse {
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  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines