[ViewVC] Diff of: OpenMD/trunk/src/applications/oopse/oopse.cpp

Comparing trunk/src/applications/oopse/oopse.cpp (file contents):
Revision 665 by tim, Thu Oct 13 22:26:47 2005 UTC vs.
Revision 704 by chrisfen, Tue Nov 1 19:13:23 2005 UTC

#	Line 44 \| Line 44
44		#endif
45
46		#include "utils/simError.h"
47	+	#include "utils/CaseConversion.hpp"
48		#include "brains/Register.hpp"
49		#include "brains/SimCreator.hpp"
50		#include "brains/SimInfo.hpp"
#	Line 122 \| Line 123 \| *int main(int argc,char argv[]){**
123
124		if (simParams->haveMinimizer()) {
125		//create minimizer
126	<	Minimizer* myMinimizer = MinimizerFactory::getInstance()->createMinimizer(simParams->getMinimizer(), info);
126	>	Minimizer* myMinimizer = MinimizerFactory::getInstance()->createMinimizer(toUpperCopy(simParams->getMinimizer()), info);
127
128		if (myMinimizer == NULL) {
129		sprintf(painCave.errMsg, "Minimizer Factory can not create %s Minimizer\n",
#	Line 136 \| Line 137 \| *int main(int argc,char argv[]){**
137		} else if (simParams->haveEnsemble()) {
138		//create Integrator
139
140	<	Integrator* myIntegrator = IntegratorFactory::getInstance()->createIntegrator(simParams->getEnsemble(), info);
141	<
140	>	Integrator* myIntegrator = IntegratorFactory::getInstance()->createIntegrator(toUpperCopy(simParams->getEnsemble()), info);
141	>
142		if (myIntegrator == NULL) {
143		sprintf(painCave.errMsg, "Integrator Factory can not create %s Integrator\n",
144		simParams->getEnsemble().c_str());
#	Line 171 \| Line 172 \| *int main(int argc,char argv[]){**
172		delete info;
173
174		#ifdef IS_MPI
175	<	strcpy( checkPointMsg, "Oh what a lovely Tea Party!" );
175	>	strcpy( checkPointMsg, "Yoikes! It worked!" );
176		MPIcheckPoint();
177
178		MPI_Finalize();

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