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

Comparing:
trunk/src/lattice/CubicLattice.cpp (file contents), Revision 485 by tim, Tue Apr 12 22:07:45 2005 UTC vs.
branches/development/src/lattice/CubicLattice.cpp (file contents), Revision 1875 by gezelter, Fri May 17 14:41:42 2013 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, 234107 (2008).          
39 + * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40 + * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
42 <
42 >
43 > #include <cstdlib>
44   #include "lattice/CubicLattice.hpp"
45  
46 < namespace oopse {
46 > namespace OpenMD {
47  
48 < CubicLattice::CubicLattice(){
49 <  latticeParam = 1.0;
48 >  CubicLattice::CubicLattice(){
49 >    latticeParam = 1.0;
50    
51 <  cellLen[0] = latticeParam;
52 <  cellLen[1] = latticeParam;
53 <  cellLen[2] = latticeParam;
51 >    cellLen[0] = latticeParam;
52 >    cellLen[1] = latticeParam;
53 >    cellLen[2] = latticeParam;
54    
55 < }
55 >  }
56  
57 < std::vector<double> CubicLattice::getLatticeConstant(){
58 <   std::vector<double> lc;
57 >  std::vector<RealType> CubicLattice::getLatticeConstant(){
58 >    std::vector<RealType> lc;
59    
60 <  lc.push_back(cellLen.x());
61 <  return lc;
62 < }
60 >    lc.push_back(cellLen.x());
61 >    return lc;
62 >  }
63  
64 < void CubicLattice::setLatticeConstant(const  std::vector<double>& lc){
64 >  void CubicLattice::setLatticeConstant(const  std::vector<RealType>& lc){
65    
66 <  if(lc.size() < 1){
67 <    std::cerr << "CubicLattice::setLatticeConstant Error: the size of lattice constant vector  is 0" << std::endl;
68 <    exit(1);
69 <  }
70 <  else if (lc.size() > 1){
71 <    std::cerr << "CubicLattice::setLatticeConstant Warning: the size of lattice constant vector  is " << lc.size() << std::endl;
72 <  }
66 >    if(lc.empty()){
67 >      std::cerr << "CubicLattice::setLatticeConstant Error: the lattice constant vector is empty" << std::endl;
68 >      exit(1);
69 >    }
70 >    else if (lc.size() > 1){
71 >      std::cerr << "CubicLattice::setLatticeConstant Warning: the size of lattice constant vector  is " << lc.size() << std::endl;
72 >    }
73    
74 <  latticeParam = lc[0];
74 >    latticeParam = lc[0];
75    
76 <  cellLen[0] = latticeParam;
77 <  cellLen[1] = latticeParam;
78 <  cellLen[2] = latticeParam;
76 >    cellLen[0] = latticeParam;
77 >    cellLen[1] = latticeParam;
78 >    cellLen[2] = latticeParam;
79    
80 <  update();
81 < }
80 >    update();
81 >  }
82  
83   }

Comparing:
trunk/src/lattice/CubicLattice.cpp (property svn:keywords), Revision 485 by tim, Tue Apr 12 22:07:45 2005 UTC vs.
branches/development/src/lattice/CubicLattice.cpp (property svn:keywords), Revision 1875 by gezelter, Fri May 17 14:41:42 2013 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines