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

Comparing:
branches/development/src/applications/nanoparticleBuilder/shapedLatticePentRod.cpp (file contents), Revision 1767 by gezelter, Fri Jul 6 22:01:58 2012 UTC vs.
trunk/src/applications/nanoparticleBuilder/shapedLatticePentRod.cpp (file contents), Revision 1796 by gezelter, Mon Sep 10 18:38:44 2012 UTC

# Line 58 | Line 58 | namespace OpenMD {
58      
59      rodRadius_= radius;
60      rodLength_= length;
61 –    double x, y, z, new_x, new_y, new_z, new_x72, new_z72, left_newx, right_newx, left_newx72, right_newx72;
62 –    int z_int;                                  
61      Vector3d dimension;
62      dimension[0] = 2.0*length;
63      dimension[1] = 2.0*length;
# Line 83 | Line 81 | namespace OpenMD {
81    bool shapedLatticePentRod::isInterior(Vector3d point){
82  
83      RealType x, y, z, new_x, new_y, left_newx, right_newx;
84 <    int z_int;
84 >    // int z_int;
85  
86      bool isIT=false;
87  
# Line 91 | Line 89 | namespace OpenMD {
89      y = point[1];
90      z = point[2];
91  
92 <    z_int = z/2.04;
92 >    // z_int = int(z/2.04);
93  
94      //Rotate by 45 degrees around z-axis so length of rod lies along y axis
95      new_x = (sqrt(2.0)/2)*(x - y);

Diff Legend

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