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

Comparing trunk/OOPSE-3.0/src/types/ShapeAtomType.hpp (file contents):
Revision 1652 by gezelter, Tue Oct 26 22:25:19 2004 UTC vs.
Revision 1930 by gezelter, Wed Jan 12 22:41:40 2005 UTC

# Line 1 | Line 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
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   /**
43   * @file ShapeAtomType.hpp
44   * @author Dan Gezelter
# Line 14 | Line 55 | namespace oopse {
55   #include "types/DirectionalAtomType.hpp"
56  
57   namespace oopse {
17 –  using namespace std;
58    
59 +  
60    class ShapeAtomType : public DirectionalAtomType {
61      
62    public:
# Line 23 | Line 64 | namespace oopse {
64      ShapeAtomType() : DirectionalAtomType() { atp.is_Shape = 1; }
65      ~ShapeAtomType();
66          
67 <    vector<RealSphericalHarmonic*> getContactFuncs(void) {return contactFuncs;}
68 <    vector<RealSphericalHarmonic*> getRangeFuncs(void) {return rangeFuncs;}
69 <    vector<RealSphericalHarmonic*> getStrengthFuncs(void) {return strengthFuncs;}
67 >     std::vector<RealSphericalHarmonic*> getContactFuncs(void) {return contactFuncs;}
68 >     std::vector<RealSphericalHarmonic*> getRangeFuncs(void) {return rangeFuncs;}
69 >     std::vector<RealSphericalHarmonic*> getStrengthFuncs(void) {return strengthFuncs;}
70      
71 <    void setContactFuncs(vector<RealSphericalHarmonic*> cf) {
71 >    void setContactFuncs(std::vector<RealSphericalHarmonic*> cf) {
72        contactFuncs = cf;
73      }
74 <    void setRangeFuncs(vector<RealSphericalHarmonic*> rf) {
74 >    void setRangeFuncs(std::vector<RealSphericalHarmonic*> rf) {
75        rangeFuncs = rf;
76      }
77 <    void setStrengthFuncs(vector<RealSphericalHarmonic*> sf) {
77 >    void setStrengthFuncs(std::vector<RealSphericalHarmonic*> sf) {
78        strengthFuncs = sf;
79      }
80      
# Line 60 | Line 101 | namespace oopse {
101      
102    private:
103      
104 <    vector<RealSphericalHarmonic*> contactFuncs;  // The contact functions
105 <    vector<RealSphericalHarmonic*> rangeFuncs;    // The range functions
106 <    vector<RealSphericalHarmonic*> strengthFuncs; // The strength functions
104 >     std::vector<RealSphericalHarmonic*> contactFuncs;  // The contact functions
105 >     std::vector<RealSphericalHarmonic*> rangeFuncs;    // The range functions
106 >     std::vector<RealSphericalHarmonic*> strengthFuncs; // The strength functions
107      
108    };
109   }

Diff Legend

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