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

Comparing:
trunk/src/minimizers/CGFamilyMinimizer.cpp (file contents), Revision 507 by gezelter, Fri Apr 15 22:04:00 2005 UTC vs.
branches/development/src/minimizers/CGFamilyMinimizer.cpp (file contents), Revision 1668 by gezelter, Fri Jan 6 19:03:05 2012 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]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40 + * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
42  
43   #include <cmath>
# Line 44 | Line 45
45   #include "minimizers/CGFamilyMinimizer.hpp"
46   #include "primitives/Molecule.hpp"
47   #include "utils/Utility.hpp"
48 + #ifdef IS_MPI
49 + #include <mpi.h>
50 + #endif
51  
52 < namespace oopse {
52 > namespace OpenMD {
53  
54    CGFamilyMinimizer::CGFamilyMinimizer(SimInfo *info) : Minimizer(info){
55      prevG.resize(ndim);
# Line 56 | Line 60 | namespace oopse {
60    }
61  
62    int CGFamilyMinimizer::checkConvg(){
63 <    double fTol;
64 <    double relativeFTol;  // relative tolerance
65 <    double deltaF;
66 <    double gTol;
67 <    double relativeGTol;
68 <    double gnorm;
65 <  
63 >    RealType fTol;
64 >    RealType relativeFTol;  // relative tolerance
65 >    RealType deltaF;
66 >    RealType gTol;
67 >    RealType relativeGTol;
68 >    RealType gnorm;
69  
70      // test function tolerance test
71      fTol =paramSet->getFTol();
72 <    relativeFTol = fTol * std::max(1.0,fabs(curF));  // relative tolerance
72 >
73 >    relativeFTol = fTol * std::max(RealType(1.0), fabs(curF));  // relative tolerance
74 >
75      deltaF = prevF - curF;
76    
77      if (fabs(deltaF) <= relativeFTol) {
# Line 81 | Line 86 | namespace oopse {
86    
87      //gradient tolerance test
88      gTol = paramSet->getGTol();
89 <    relativeGTol = gTol * std::max(1.0,fabs(curF));
89 >    relativeGTol = gTol * std::max(RealType(1.0), fabs(curF));
90  
91   #ifndef IS_MPI
92      gnorm = sqrt(dotProduct(curG, curG));
93   #else
94 <    double localDP;
95 <    double globalDP;
94 >    RealType localDP;
95 >    RealType globalDP;
96  
97      localDP = dotProduct(curG, curG);
98 <    MPI_Allreduce(&localDP, &globalDP, 1, MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);  
98 >    MPI_Allreduce(&localDP, &globalDP, 1, MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);  
99      gnorm  = sqrt(globalDP);
100   #endif
101  

Comparing:
trunk/src/minimizers/CGFamilyMinimizer.cpp (property svn:keywords), Revision 507 by gezelter, Fri Apr 15 22:04:00 2005 UTC vs.
branches/development/src/minimizers/CGFamilyMinimizer.cpp (property svn:keywords), Revision 1668 by gezelter, Fri Jan 6 19:03:05 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines