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 246 by gezelter, Wed Jan 12 22:41:40 2005 UTC vs.
branches/development/src/minimizers/CGFamilyMinimizer.cpp (file contents), Revision 1627 by gezelter, Tue Sep 13 22:05:04 2011 UTC

# Line 1 | Line 1
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
# 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 <cmath>
# Line 44 | Line 44
44   #include "minimizers/CGFamilyMinimizer.hpp"
45   #include "primitives/Molecule.hpp"
46   #include "utils/Utility.hpp"
47 + #ifdef IS_MPI
48 + #include <mpi.h>
49 + #endif
50  
51 < namespace oopse {
51 > namespace OpenMD {
52  
53 < CGFamilyMinimizer::CGFamilyMinimizer(SimInfo *info) : Minimizer(info){
53 >  CGFamilyMinimizer::CGFamilyMinimizer(SimInfo *info) : Minimizer(info){
54      prevG.resize(ndim);
55      prevX.resize(ndim);
56      direction.resize(ndim);
57  
58      stepSize = paramSet->getStepSize();
59 < }
59 >  }
60  
61 < int CGFamilyMinimizer::checkConvg(){
62 <  double fTol;
63 <  double relativeFTol;  // relative tolerance
64 <  double deltaF;
65 <  double gTol;
66 <  double relativeGTol;
67 <  double gnorm;
61 >  int CGFamilyMinimizer::checkConvg(){
62 >    RealType fTol;
63 >    RealType relativeFTol;  // relative tolerance
64 >    RealType deltaF;
65 >    RealType gTol;
66 >    RealType relativeGTol;
67 >    RealType gnorm;
68    
69  
70 <  // test function tolerance test
71 <  fTol =paramSet->getFTol();
72 <  relativeFTol = fTol * std::max(1.0,fabs(curF));  // relative tolerance
73 <  deltaF = prevF - curF;
70 >    // test function tolerance test
71 >    fTol =paramSet->getFTol();
72 >    relativeFTol = fTol * std::max(1.0,fabs(curF));  // relative tolerance
73 >    deltaF = prevF - curF;
74    
75 <  if (fabs(deltaF) <= relativeFTol) {
75 >    if (fabs(deltaF) <= relativeFTol) {
76  
77 <    if (bVerbose){
78 <      std::cout << "function value tolerance test passed" << std::endl;
79 <      std::cout << "ftol = " << fTol
80 <             << "\tdeltaf = " << deltaF<< std::endl;
77 >      if (bVerbose){
78 >        std::cout << "function value tolerance test passed" << std::endl;
79 >        std::cout << "ftol = " << fTol
80 >                  << "\tdeltaf = " << deltaF<< std::endl;
81 >      }
82 >      return CONVG_FTOL;
83      }
79    return CONVG_FTOL;
80  }
84    
85 < //gradient tolerance test
86 <  gTol = paramSet->getGTol();
87 <  relativeGTol = gTol * std::max(1.0,fabs(curF));
85 >    //gradient tolerance test
86 >    gTol = paramSet->getGTol();
87 >    relativeGTol = gTol * std::max(1.0,fabs(curF));
88  
89   #ifndef IS_MPI
90 <  gnorm = sqrt(dotProduct(curG, curG));
90 >    gnorm = sqrt(dotProduct(curG, curG));
91   #else
92 <  double localDP;
93 <  double globalDP;
92 >    RealType localDP;
93 >    RealType globalDP;
94  
95 <  localDP = dotProduct(curG, curG);
96 <  MPI_Allreduce(&localDP, &globalDP, 1, MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);  
97 <  gnorm  = sqrt(globalDP);
95 >    localDP = dotProduct(curG, curG);
96 >    MPI_Allreduce(&localDP, &globalDP, 1, MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);  
97 >    gnorm  = sqrt(globalDP);
98   #endif
99  
100 <  if (gnorm <= relativeGTol) {
100 >    if (gnorm <= relativeGTol) {
101        std::cout << "gradient tolerance test" << std::endl;
102        std::cout << "gnorm = " << gnorm
103 <             << "\trelativeGTol = " << relativeGTol<< std::endl;
104 <    return CONVG_GTOL;
105 <  }
103 >                << "\trelativeGTol = " << relativeGTol<< std::endl;
104 >      return CONVG_GTOL;
105 >    }
106    
107 <  //absolute gradient tolerance test
107 >    //absolute gradient tolerance test
108  
109 <  if (gnorm <= gTol) {
109 >    if (gnorm <= gTol) {
110        std::cout << "absolute gradient tolerance test" << std::endl;
111        std::cout << "gnorm = " << gnorm
112 <             << "\tgTol = " << gTol<< std::endl;
113 <    return CONVG_ABSGTOL;
112 >                << "\tgTol = " << gTol<< std::endl;
113 >      return CONVG_ABSGTOL;
114 >    }
115 >
116 >    // did not converge yet
117 >    return CONVG_UNCONVG;
118    }
119  
113  // did not converge yet
114  return CONVG_UNCONVG;
120   }
116
117 }

Comparing:
trunk/src/minimizers/CGFamilyMinimizer.cpp (property svn:keywords), Revision 246 by gezelter, Wed Jan 12 22:41:40 2005 UTC vs.
branches/development/src/minimizers/CGFamilyMinimizer.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