[ViewVC] Diff of: group/branches/new_design/OOPSE-2.0/src/applications/oopse/oopse.cpp

Comparing branches/new_design/OOPSE-2.0/src/applications/oopse/oopse.cpp (file contents):
Revision 1842 by tim, Fri Dec 3 17:59:45 2004 UTC vs.
Revision 1843 by tim, Fri Dec 3 21:30:30 2004 UTC

#	Line 7 \| Line 7
7		#include "brains/SimCreator.hpp"
8		#include "brains/SimInfo.hpp"
9		#include "integrators/IntegratorFactory.hpp"
10	+	#include "integrators/IntegratorCreator.hpp"
11		#include "integrators/Integrator.hpp"
12	+	#include "integrators/NVE.hpp"
13		#include "UseTheForce/DUFF.hpp"
14	+	#include "UseTheForce/ForceFieldCreator.hpp"
15	+
16		using namespace oopse;
17
18		int main(int argc,char* argv[]){
#	Line 57 \| Line 61 \| *int main(int argc,char argv[]){**
61		strcpy( checkPointMsg, "Successful number of arguments" );
62		MPIcheckPoint();
63		#endif
60	–	ForceFieldBuilder<DUFF>* DUFFCreator = new ForceFieldBuilder<DUFF>("DUFF");
61	–	//ForceFieldFactory::getInstance()->registerForceField("DUFF", createDUFF);
64
65	+	static ForceFieldBuilder<DUFF>* DUFFCreator = new ForceFieldBuilder<DUFF>("DUFF");
66	+	static IntegratorBuilder<NVE>* NVECreator = new IntegratorBuilder<NVE>("NVE");
67	+
68		//create simulation model
69		SimCreator creator;
70		SimInfo* info = creator.createSim(argv[1]);
#	Line 78 \| Line 83 \| *int main(int argc,char argv[]){**
83		//ForceManager* fman = new ZconstraintForceManager(info);
84		//myIntegrator->setForceManager(fman);
85
86	+	if (myIntegrator == NULL) {
87	+	sprintf(painCave.errMsg, "Integrator Factory can not create %s Integrator\n",
88	+	simParams->getEnsemble());
89	+	painCave.isFatal = 1;
90	+	simError();
91	+	}
92	+
93		myIntegrator->integrate();
94		delete myIntegrator;
95		}

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