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

Comparing:
trunk/src/minimizers/PRCG.cpp (file contents), Revision 324 by tim, Sun Feb 13 19:10:25 2005 UTC vs.
branches/development/src/minimizers/PRCG.cpp (file contents), Revision 1665 by gezelter, Tue Nov 22 20:38:56 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]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40 + * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
42  
43   #include "minimizers/PRCG.hpp"
44 < namespace oopse {
44 > #ifdef IS_MPI
45 > #include <mpi.h>
46 > #endif
47 >
48 > namespace OpenMD {
49          
50 < void PRCGMinimizer::init(){
50 >  void PRCGMinimizer::init(){
51  
52 <  calcG();
52 >    calcG();
53    
54 <  for(int i = 0; i < direction.size(); i++){    
55 <    direction[i] = -curG[i];
54 >    for(int i = 0; i < direction.size(); i++){    
55 >      direction[i] = -curG[i];
56 >    }
57 >
58    }
59  
60 < }
61 <
55 < int PRCGMinimizer::step(){
56 <  int lsStatus;
60 >  int PRCGMinimizer::step(){
61 >    int lsStatus;
62    
63 <  prevF = curF;
64 <  prevG = curG;
65 <  prevX = curX;
63 >    prevF = curF;
64 >    prevG = curG;
65 >    prevX = curX;
66  
67 <  //optimize along the search direction and reset minimum point value
67 >    //optimize along the search direction and reset minimum point value
68      lsStatus = doLineSearch(direction, stepSize);
69  
70 <  if (lsStatus < 0)
71 <    return -1;
72 <  else
73 <    return 1;
74 < }
70 >    if (lsStatus < 0)
71 >      return -1;
72 >    else
73 >      return 1;
74 >  }
75  
76 < void PRCGMinimizer::prepareStep(){
77 <   std::vector<double> deltaGrad;
78 <  double beta;
79 <  size_t i;
76 >  void PRCGMinimizer::prepareStep(){
77 >    std::vector<RealType> deltaGrad;
78 >    RealType beta;
79 >    size_t i;
80  
81 <  deltaGrad.resize(ndim);
81 >    deltaGrad.resize(ndim);
82      
83 <  //calculate the new direction using Polak-Ribiere Conjugate Gradient
83 >    //calculate the new direction using Polak-Ribiere Conjugate Gradient
84    
85 <  for(i = 0; i < curG.size(); i++)
86 <    deltaGrad[i] = curG[i] - prevG[i];
85 >    for(i = 0; i < curG.size(); i++)
86 >      deltaGrad[i] = curG[i] - prevG[i];
87  
88   #ifndef IS_MPI
89 <  beta = dotProduct(deltaGrad, curG) / dotProduct(prevG, prevG);
89 >    beta = dotProduct(deltaGrad, curG) / dotProduct(prevG, prevG);
90   #else
91 <  double localDP1;
92 <  double localDP2;
93 <  double globalDP1;
94 <  double globalDP2;
91 >    RealType localDP1;
92 >    RealType localDP2;
93 >    RealType globalDP1;
94 >    RealType globalDP2;
95  
96 <  localDP1 =  dotProduct(deltaGrad, curG);
97 <  localDP2 = dotProduct(prevG, prevG);
96 >    localDP1 =  dotProduct(deltaGrad, curG);
97 >    localDP2 = dotProduct(prevG, prevG);
98  
99 <  MPI_Allreduce(&localDP1, &globalDP1, 1, MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
100 <  MPI_Allreduce(&localDP2, &globalDP2, 1, MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
99 >    MPI_Allreduce(&localDP1, &globalDP1, 1, MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
100 >    MPI_Allreduce(&localDP2, &globalDP2, 1, MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
101    
102 <  beta = globalDP1 / globalDP2;
102 >    beta = globalDP1 / globalDP2;
103   #endif
104  
105 <  for(i = 0; i < direction.size(); i++)  
106 <    direction[i] = -curG[i] + beta * direction[i];
105 >    for(i = 0; i < direction.size(); i++)  
106 >      direction[i] = -curG[i] + beta * direction[i];
107  
108 < }
108 >  }
109  
110   }

Comparing:
trunk/src/minimizers/PRCG.cpp (property svn:keywords), Revision 324 by tim, Sun Feb 13 19:10:25 2005 UTC vs.
branches/development/src/minimizers/PRCG.cpp (property svn:keywords), Revision 1665 by gezelter, Tue Nov 22 20:38:56 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines