[ViewVC] Diff of: OpenMD/branches/development/src/applications/openmd/openmd.cpp

Comparing branches/development/src/applications/openmd/openmd.cpp (file contents):
Revision 1746 by gezelter, Wed Jun 6 02:18:54 2012 UTC vs.
Revision 1767 by gezelter, Fri Jul 6 22:01:58 2012 UTC

#	Line 74 \| Line 74 \| *int main(int argc,char argv[]){**
74		#endif
75
76		initSimError(); // the error handler
77	<	srand48( 1337 ); // the random number generator.
77	>	//srand48( 1337 ); // the random number generator.
78
79		std::string svnrev;
80		//convert a macro from compiler to a string in c++
#	Line 142 \| Line 142 \| *int main(int argc,char argv[]){**
142		Globals* simParams = info->getSimParams();
143		MinimizerParameters* miniPars = simParams->getMinimizerParameters();
144
145	<	if (miniPars->haveUseMinimizer() && simParams->haveEnsemble()) {
145	>	if (miniPars->getUseMinimizer() && simParams->haveEnsemble()) {
146		sprintf(painCave.errMsg, "Ensemble keyword can not co-exist with useMinimizer = \"true\" in the minimizer block\n");
147		painCave.isFatal = 1;
148		simError();
149		}
150
151	<	if (miniPars->haveUseMinimizer()) {
151	>	if (miniPars->getUseMinimizer()) {
152		//create minimizer
153		OptimizationMethod* myMinimizer =OptimizationFactory::getInstance()->createOptimization(toUpperCopy(miniPars->getMethod()), info);
154

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines