ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE/src/oopse.cpp
(Generate patch)

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 1169 by gezelter, Wed May 12 19:44:54 2004 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 14 | Line 17
17   #include "Integrator.hpp"
18   #include "Thermo.hpp"
19   #include "ReadWrite.hpp"
20 + #include "OOPSEMinimizer.hpp"
21  
22   char* program_name;
23   using namespace std;
24  
25   int main(int argc,char* argv[]){
26    
23  int i;
24  unsigned int n_atoms, eo, xo;
27    char* in_name;
28    SimSetup* startMe;
29    SimInfo* entry_plug;
30 <
29 <  
30 >  
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 50 | Line 55 | int main(int argc,char* argv[]){
55  
56    strcpy( checkPointMsg, "Successful number of arguments" );
57    MPIcheckPoint();
58 <  
54 <  
58 >    
59    // create the simulation objects, and get the show on the road
60      
61    entry_plug = new SimInfo;
62    startMe = new SimSetup;
63    
64    startMe->setSimInfo( entry_plug );
65 +
66 +
67    startMe->parseFile( in_name );
68 +
69 +
70    startMe->createSim();
71  
72    delete startMe;
73 +
74 +  if (!entry_plug->has_minimizer)
75 +    entry_plug->the_integrator->integrate();
76 +  else
77 +    entry_plug->the_minimizer->minimize();
78    
79 <  entry_plug->the_integrator->integrate();
80 <  
79 > #ifdef PROFILE
80 >  writeProfiles();
81 > #endif //profile
82 >
83    strcpy( checkPointMsg, "Oh what a lovely Tea Party!" );
84    MPIcheckPoint();
85    

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines