ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-3.0/src/applications/nanoRodBuilder/nanorodBuilder.cpp
(Generate patch)

Comparing trunk/OOPSE-3.0/src/applications/nanoRodBuilder/nanorodBuilder.cpp (file contents):
Revision 2190 by gezelter, Wed Apr 13 22:30:22 2005 UTC vs.
Revision 2196 by chuckv, Thu Apr 14 16:10:57 2005 UTC

# Line 111 | Line 111 | int main(int argc, char *argv []) {
111      exit(1);
112    
113    
114 <  
114 >        // Check for lib CGAL, if we don't have it, we should exit....
115 >        
116 > #ifndef HAVE_CGAL
117 >                 std::cerr << "nanoRodBuilder requires libCGAL to function, please rebuild OOPSE with libCGAL."
118 >                 << std::endl;
119 >                 exit(1);
120 > #endif
121 >        
122 >        
123 >        
124    //get lattice type
125    latticeType = UpperCase(args_info.latticetype_arg);
126    
# Line 194 | Line 203 | int main(int argc, char *argv []) {
203    
204    
205    // Create geometry for nanocrystal
206 < #ifdef HAVE_GCAL
206 > #ifdef HAVE_CGAL
207    GeometryBuilder myGeometry(rodLength,rodDiameter);
208   #endif
209    
# Line 244 | Line 253 | int main(int argc, char *argv []) {
253          
254          for(int l = 0; l < numMolPerCell; l++) {
255  
256 < #ifdef HAVE_GCAL
256 > #ifdef HAVE_CGAL
257            if (myGeometry.isInsidePolyhedron(latticePos[l][0],latticePos[l][1],latticePos[l][2])){
258              numMol++;
259            }
251 – #else
252 –          numMol++;
260   #endif
261          }
262        }

Diff Legend

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