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 507 by gezelter, Fri Apr 15 22:04:00 2005 UTC vs.
branches/development/src/minimizers/PRCG.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/PRCG.hpp"
43 < namespace oopse {
43 > #ifdef IS_MPI
44 > #include <mpi.h>
45 > #endif
46 >
47 > namespace OpenMD {
48          
49    void PRCGMinimizer::init(){
50  
# Line 69 | Line 73 | namespace oopse {
73    }
74  
75    void PRCGMinimizer::prepareStep(){
76 <    std::vector<double> deltaGrad;
77 <    double beta;
76 >    std::vector<RealType> deltaGrad;
77 >    RealType beta;
78      size_t i;
79  
80      deltaGrad.resize(ndim);
# Line 83 | Line 87 | namespace oopse {
87   #ifndef IS_MPI
88      beta = dotProduct(deltaGrad, curG) / dotProduct(prevG, prevG);
89   #else
90 <    double localDP1;
91 <    double localDP2;
92 <    double globalDP1;
93 <    double globalDP2;
90 >    RealType localDP1;
91 >    RealType localDP2;
92 >    RealType globalDP1;
93 >    RealType globalDP2;
94  
95      localDP1 =  dotProduct(deltaGrad, curG);
96      localDP2 = dotProduct(prevG, prevG);
97  
98 <    MPI_Allreduce(&localDP1, &globalDP1, 1, MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
99 <    MPI_Allreduce(&localDP2, &globalDP2, 1, MPI_DOUBLE,MPI_SUM, MPI_COMM_WORLD);
98 >    MPI_Allreduce(&localDP1, &globalDP1, 1, MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
99 >    MPI_Allreduce(&localDP2, &globalDP2, 1, MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
100    
101      beta = globalDP1 / globalDP2;
102   #endif

Comparing:
trunk/src/minimizers/PRCG.cpp (property svn:keywords), Revision 507 by gezelter, Fri Apr 15 22:04:00 2005 UTC vs.
branches/development/src/minimizers/PRCG.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