ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/OpenMD/branches/development/src/minimizers/CGFamilyMinimizer.cpp

Comparing:
trunk/src/minimizers/CGFamilyMinimizer.cpp (file contents), Revision 2 by gezelter, Fri Sep 24 04:16:43 2004 UTC vs.
branches/development/src/minimizers/CGFamilyMinimizer.cpp (file contents), Revision 1665 by gezelter, Tue Nov 22 20:38:56 2011 UTC

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

Comparing:
trunk/src/minimizers/CGFamilyMinimizer.cpp (property svn:keywords), Revision 2 by gezelter, Fri Sep 24 04:16:43 2004 UTC vs.
branches/development/src/minimizers/CGFamilyMinimizer.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