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 3 by tim, Fri Sep 24 16:27:58 2004 UTC vs.
branches/development/src/minimizers/PRCG.cpp (file contents), Revision 1465 by chuckv, Fri Jul 9 23:08:25 2010 UTC

# Line 1 | Line 1
1 < #include "minimizers/OOPSEMinimizer.hpp"
2 < #include "utils/Utility.hpp"
3 < void PRCGMinimizer::init(){
1 > /*
2 > * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
3 > *
4 > * The University of Notre Dame grants you ("Licensee") a
5 > * non-exclusive, royalty free, license to use, modify and
6 > * redistribute this software in source and binary code form, provided
7 > * that the following conditions are met:
8 > *
9 > * 1. Redistributions of source code must retain the above copyright
10 > *    notice, this list of conditions and the following disclaimer.
11 > *
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.
16 > *
17 > * This software is provided "AS IS," without a warranty of any
18 > * kind. All express or implied conditions, representations and
19 > * warranties, including any implied warranty of merchantability,
20 > * fitness for a particular purpose or non-infringement, are hereby
21 > * excluded.  The University of Notre Dame and its licensors shall not
22 > * be liable for any damages suffered by licensee as a result of
23 > * using, modifying or distributing the software or its
24 > * derivatives. In no event will the University of Notre Dame or its
25 > * licensors be liable for any lost revenue, profit or data, or for
26 > * direct, indirect, special, consequential, incidental or punitive
27 > * damages, however caused and regardless of the theory of liability,
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/PRCG.hpp"
43 > namespace OpenMD {
44 >        
45 >  void PRCGMinimizer::init(){
46  
47 <  calcG();
47 >    calcG();
48    
49 <  for(int i = 0; i < direction.size(); i++){    
50 <    direction[i] = -curG[i];
49 >    for(int i = 0; i < direction.size(); i++){    
50 >      direction[i] = -curG[i];
51 >    }
52 >
53    }
54  
55 < }
56 <
13 < int PRCGMinimizer::step(){
14 <  int lsStatus;
55 >  int PRCGMinimizer::step(){
56 >    int lsStatus;
57    
58 <  prevF = curF;
59 <  prevG = curG;
60 <  prevX = curX;
58 >    prevF = curF;
59 >    prevG = curG;
60 >    prevX = curX;
61  
62 <  //optimize along the search direction and reset minimum point value
62 >    //optimize along the search direction and reset minimum point value
63      lsStatus = doLineSearch(direction, stepSize);
64  
65 <  if (lsStatus < 0)
66 <    return -1;
67 <  else
68 <    return 1;
69 < }
65 >    if (lsStatus < 0)
66 >      return -1;
67 >    else
68 >      return 1;
69 >  }
70  
71 < void PRCGMinimizer::prepareStep(){
72 <  vector<double> deltaGrad;
73 <  double beta;
74 <  size_t i;
71 >  void PRCGMinimizer::prepareStep(){
72 >    std::vector<RealType> deltaGrad;
73 >    RealType beta;
74 >    size_t i;
75  
76 <  deltaGrad.resize(ndim);
76 >    deltaGrad.resize(ndim);
77      
78 <  //calculate the new direction using Polak-Ribiere Conjugate Gradient
78 >    //calculate the new direction using Polak-Ribiere Conjugate Gradient
79    
80 <  for(i = 0; i < curG.size(); i++)
81 <    deltaGrad[i] = curG[i] - prevG[i];
80 >    for(i = 0; i < curG.size(); i++)
81 >      deltaGrad[i] = curG[i] - prevG[i];
82  
83   #ifndef IS_MPI
84 <  beta = dotProduct(deltaGrad, curG) / dotProduct(prevG, prevG);
84 >    beta = dotProduct(deltaGrad, curG) / dotProduct(prevG, prevG);
85   #else
86 <  double localDP1;
87 <  double localDP2;
88 <  double globalDP1;
89 <  double globalDP2;
86 >    RealType localDP1;
87 >    RealType localDP2;
88 >    RealType globalDP1;
89 >    RealType globalDP2;
90  
91 <  localDP1 =  dotProduct(deltaGrad, curG);
92 <  localDP2 = dotProduct(prevG, prevG);
91 >    localDP1 =  dotProduct(deltaGrad, curG);
92 >    localDP2 = dotProduct(prevG, prevG);
93  
94 <  MPI_Allreduce(&localDP1, &globalDP1, 1, MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
95 <  MPI_Allreduce(&localDP2, &globalDP2, 1, MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
94 >    MPI_Allreduce(&localDP1, &globalDP1, 1, MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
95 >    MPI_Allreduce(&localDP2, &globalDP2, 1, MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
96    
97 <  beta = globalDP1 / globalDP2;
97 >    beta = globalDP1 / globalDP2;
98   #endif
99  
100 <  for(i = 0; i < direction.size(); i++)  
101 <    direction[i] = -curG[i] + beta * direction[i];
100 >    for(i = 0; i < direction.size(); i++)  
101 >      direction[i] = -curG[i] + beta * direction[i];
102  
103 +  }
104 +
105   }

Comparing:
trunk/src/minimizers/PRCG.cpp (property svn:keywords), Revision 3 by tim, Fri Sep 24 16:27:58 2004 UTC vs.
branches/development/src/minimizers/PRCG.cpp (property svn:keywords), Revision 1465 by chuckv, Fri Jul 9 23:08:25 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines