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

Comparing trunk/OOPSE-3.0/src/applications/simpleBuilder/BaseLattice.hpp (file contents):
Revision 1681 by tim, Thu Oct 28 22:26:32 2004 UTC vs.
Revision 1930 by gezelter, Wed Jan 12 22:41:40 2005 UTC

# Line 1 | Line 1
1 < #ifndef _BASELATTICE_H_
2 < #define _BASELATTICE_H_
1 > /*
2 > * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
3 > *
4 > * The University of Notre Dame grants you ("Licensee") a
5 > * non-exclusive, royalty free, license to use, modify and
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
19 > *    notice, this list of conditions and the following disclaimer.
20 > *
21 > * 3. Redistributions in binary form must reproduce the above copyright
22 > *    notice, this list of conditions and the following disclaimer in the
23 > *    documentation and/or other materials provided with the
24 > *    distribution.
25 > *
26 > * This software is provided "AS IS," without a warranty of any
27 > * kind. All express or implied conditions, representations and
28 > * warranties, including any implied warranty of merchantability,
29 > * fitness for a particular purpose or non-infringement, are hereby
30 > * excluded.  The University of Notre Dame and its licensors shall not
31 > * be liable for any damages suffered by licensee as a result of
32 > * using, modifying or distributing the software or its
33 > * derivatives. In no event will the University of Notre Dame or its
34 > * licensors be liable for any lost revenue, profit or data, or for
35 > * direct, indirect, special, consequential, incidental or punitive
36 > * damages, however caused and regardless of the theory of liability,
37 > * arising out of the use of or inability to use software, even if the
38 > * University of Notre Dame has been advised of the possibility of
39 > * such damages.
40 > */
41 >
42 > #ifndef APPLICATIONS_SIMPLEBUILDER_BASELATTICE_HPP
43 > #define APPLICATIONS_SIMPLEBUILDER_BASELATTICE_HPP
44  
45   #include <vector>
46   #include "math/Vector3.hpp"
47  
48 < using namespace std;
48 > namespace oopse {
49  
50   class BaseLattice{
51    protected:
52      BaseLattice(){
12      Vector3d zeroVector3d(0.0, 0.0, 0.0);
53        
54 <      setOrigin(zeroVector3d);
54 >      setOrigin(V3Zero);
55      }
56      
57    public:
# Line 20 | Line 60 | class BaseLattice{
60      virtual ~BaseLattice() {}
61  
62      //get lattice type
63 <    virtual const string getLatticeType() = 0;
63 >    virtual const  std::string getLatticeType() = 0;
64      
65      int getNumSitesPerCell() {return nCellSites;}
66  
67 <    void getLatticePointsPos(vector<Vector3d>& latticePos, int nx, int ny, int nz);
67 >    void getLatticePointsPos(std::vector<Vector3d>& latticePos, int nx, int ny, int nz);
68  
69 <    vector<Vector3d> getLatticePointsOrt() {return cellSitesOrt;}
69 >     std::vector<Vector3d> getLatticePointsOrt() {return cellSitesOrt;}
70      
71      //get lattice constant of unit cell
72 <    virtual vector<double> getLatticeConstant() =0;
72 >    virtual  std::vector<double> getLatticeConstant() =0;
73  
74      //set lattice constant of unit cell
75 <    virtual void setLatticeConstant(const vector<double>& lc)=0;
75 >    virtual void setLatticeConstant(const  std::vector<double>& lc)=0;
76  
77      //get origin of unit cell
78      Vector3d getOrigin( ) {return origin;}
# Line 47 | Line 87 | class BaseLattice{
87      
88      int nCellSites;
89      Vector3d origin;    
90 <    vector<Vector3d> cellSitesPos;
91 <    vector<Vector3d> cellSitesOrt;
90 >     std::vector<Vector3d> cellSitesPos;
91 >     std::vector<Vector3d> cellSitesOrt;
92      Vector3d cellLen;
93   };
94  
95  
96 + }
97 +
98   #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines