[ViewVC] Diff of: group/trunk/OOPSE/src/oopse.cpp

Comparing:
branches/mmeineke/OOPSE/src/oopse.cpp (file contents), Revision 377 by mmeineke, Fri Mar 21 17:42:12 2003 UTC vs.
trunk/OOPSE/src/oopse.cpp (file contents), Revision 888 by mmeineke, Fri Dec 19 18:53:43 2003 UTC

#	Line 5 \| Line 5
5		#include <cmath>
6		#include <cstring>
7		#include <mpi.h>
8	–	#include <mpi++.h>
8
9	+	#ifdef PROFILE
10	+	#include "mdProfile.hpp"
11	+	#endif // PROFILE
12	+
13		#include "simError.h"
14		#include "SimSetup.hpp"
15		#include "SimInfo.hpp"
#	Line 20 \| Line 23 \| *int main(int argc,char argv[]){**
23
24		int main(int argc,char* argv[]){
25
23	–	int i;
24	–	unsigned int n_atoms, eo, xo;
26		char* in_name;
27		SimSetup* startMe;
28		SimInfo* entry_plug;
#	Line 30 \| Line 31 \| *int main(int argc,char argv[]){**
31		// first things first, all of the initializations
32
33		MPI_Init( &argc, &argv ); // the MPI communicators
34	+
35		initSimError(); // the error handler
36		srand48( 1337 ); // the random number generator.
37
38	+	#ifdef PROFILE
39	+	initProfile();
40	+	#endif //profile
41
42		// check command line arguments, and set the input file
43
#	Line 58 \| Line 63 \| *int main(int argc,char argv[]){**
63		startMe = new SimSetup;
64
65		startMe->setSimInfo( entry_plug );
66	+
67	+	#ifdef PROFILE
68	+	startProfile( pro1 );
69	+	#endif //profile
70	+
71		startMe->parseFile( in_name );
72	+
73	+	#ifdef PROFILE
74	+	endProfile( pro1 );
75	+
76	+	startProfile( pro2 );
77	+	#endif //profile
78	+
79		startMe->createSim();
80
81		delete startMe;
82	+
83	+	#ifdef PROFILE
84	+	endProfile( pro2 );
85
86	+	startProfile( pro3 );
87	+	#endif //profile
88	+
89		entry_plug->the_integrator->integrate();
90
91	+	#ifdef PROFILE
92	+	endProfile( pro3 );
93	+
94	+	writeProfiles();
95	+	#endif //profile
96	+
97		strcpy( checkPointMsg, "Oh what a lovely Tea Party!" );
98		MPIcheckPoint();
99

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