ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/math/Polynomial.hpp
(Generate patch)

Comparing trunk/src/math/Polynomial.hpp (file contents):
Revision 1358 by gezelter, Thu Aug 13 21:21:51 2009 UTC vs.
Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC

# 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, 24107 (2008).          
39 + * [4]  Vardeman & Gezelter, in progress (2009).                        
40   */
41  
42   /**
# Line 57 | Line 57
57   #include "config.h"
58   #include "math/Eigenvalue.hpp"
59  
60 < namespace oopse {
60 > namespace OpenMD {
61    
62    template<typename Real> Real fastpow(Real x, int N) {
63      Real result(1); //or 1.0?
# Line 316 | Line 316 | namespace oopse {
316        
317        std::vector<complex<Real> > roots;
318        for (int i = 0; i < rank; i++) {
319 <        roots.push_back(complex(reals(i), imags(i)));
319 >        roots.push_back(complex<Real>(reals(i), imags(i)));
320        }
321  
322        return roots;
# Line 633 | Line 633 | namespace oopse {
633      Polynomial<Real> p();
634      
635      typename Polynomial<Real>::const_iterator i;
636 <    ExponentType exponent;
637 <    CoefficientType coefficient;
636 >    int exponent;
637 >    Real coefficient;
638      
639      for (i =  p1.begin(); i  != p1.end(); ++i) {
640        exponent = i->first;
# Line 675 | Line 675 | namespace oopse {
675  
676    typedef Polynomial<RealType> DoublePolynomial;
677  
678 < } //end namespace oopse
678 > } //end namespace OpenMD
679   #endif //MATH_POLYNOMIAL_HPP

Diff Legend

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