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

Comparing:
trunk/src/minimizers/SDMinimizer.cpp (file contents), Revision 507 by gezelter, Fri Apr 15 22:04:00 2005 UTC vs.
branches/development/src/minimizers/SDMinimizer.cpp (file contents), Revision 1627 by gezelter, Tue Sep 13 22:05:04 2011 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   #include "minimizers/SDMinimizer.hpp"
43   #include "utils/Utility.hpp"
44 + #ifdef IS_MPI
45 + #include <mpi.h>
46 + #endif
47  
48 < namespace oopse {
48 >
49 > namespace OpenMD {
50    SDMinimizer::SDMinimizer(SimInfo* info) : Minimizer(info) {
51      direction.resize(ndim);
52      stepSize = paramSet->getStepSize();
# Line 77 | Line 81 | namespace oopse {
81    }
82  
83    int SDMinimizer::checkConvg() {
84 <    double fTol;
85 <    double relativeFTol; // relative tolerance
86 <    double deltaF;
87 <    double gTol;
88 <    double relativeGTol;
89 <    double gnorm;
84 >    RealType fTol;
85 >    RealType relativeFTol; // relative tolerance
86 >    RealType deltaF;
87 >    RealType gTol;
88 >    RealType relativeGTol;
89 >    RealType gnorm;
90  
91      // test function tolerance test
92      fTol = paramSet->getFTol();
# Line 108 | Line 112 | namespace oopse {
112  
113   #else
114  
115 <    double localDP;
116 <    double globalDP;
115 >    RealType localDP;
116 >    RealType globalDP;
117  
118      localDP = dotProduct(curG, curG);
119 <    MPI_Allreduce(&localDP, &globalDP, 1, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
119 >    MPI_Allreduce(&localDP, &globalDP, 1, MPI_REALTYPE, MPI_SUM, MPI_COMM_WORLD);
120      gnorm = sqrt(globalDP);
121  
122   #endif

Comparing:
trunk/src/minimizers/SDMinimizer.cpp (property svn:keywords), Revision 507 by gezelter, Fri Apr 15 22:04:00 2005 UTC vs.
branches/development/src/minimizers/SDMinimizer.cpp (property svn:keywords), Revision 1627 by gezelter, Tue Sep 13 22:05:04 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines