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

Comparing:
branches/mmeineke/OOPSE/src/oose.cpp (file contents), Revision 377 by mmeineke, Fri Mar 21 17:42:12 2003 UTC vs.
trunk/OOPSE/src/oose.cpp (file contents), Revision 1173 by gezelter, Wed May 12 20:14:21 2004 UTC

# Line 5 | Line 5
5   #include <cmath>
6   #include <cstring>
7  
8 + #ifdef PROFILE
9 + #include "mdProfile.hpp"
10 + #endif // PROFILE
11 +
12   #include "simError.h"
13   #include "SimSetup.hpp"
14   #include "SimInfo.hpp"
# Line 12 | Line 16
16   #include "Integrator.hpp"
17   #include "Thermo.hpp"
18   #include "ReadWrite.hpp"
19 + #include "OOPSEMinimizer.hpp"
20  
21   char* program_name;
22   using namespace std;
# Line 21 | Line 26 | int main(int argc,char* argv[]){
26    char* in_name;
27    SimSetup* startMe;
28    SimInfo* entry_plug;
29 <
25 <  
29 >  
30    // first things first, all of the initializations
31  
28  printf("Initializing stuff ....\n");
29  srand48( 1337 );          // the random number generator.
32    initSimError();           // the error handler
33 +  srand48( 1337 );          // the random number generator.
34 +  
35 + #ifdef PROFILE
36 +  initProfile();
37 + #endif //profile
38 +
39 +  std::cerr <<
40 +    "+--------------------------------------------------------------------+\n" <<
41 +    "|    ____  ____  ____  _____ ______  The OpenSource, Object-oriented |\n" <<
42 +    "|   / __ \\/ __ \\/ __ \\/ ___// ____/  Parallel Simulation Engine.     |\n" <<
43 +    "|  / / / / / / / /_/ /\\__ \\/ __/                                     |\n" <<
44 +    "| / /_/ / /_/ / ____/___/ / /___     Copyright 2004 by the           |\n" <<
45 +    "| \\____/\\____/_/    /____/_____/     University of Notre Dame.       |\n" <<
46 +    "|                                    http://maul.chem.nd.edu/OOPSE   |\n" <<
47 +    "+--------------------------------------------------------------------+\n" <<
48 +    "\n";
49 +
50 +  // check command line arguments, and set the input file
51    
52 <  program_name = argv[0]; /*save the program name in case we need it*/
52 >  program_name = argv[0]; // save the program name in case we need it
53 >
54    if( argc < 2 ){
55      sprintf( painCave.errMsg,
56               "Error, bass file is needed to run.\n" );
57      painCave.isFatal = 1;
58      simError();
59    }
60 <  
40 <  
60 >    
61    in_name = argv[1];
62 +
63 +  // create the simulation objects, and get the show on the road
64 +
65    entry_plug = new SimInfo();
43  
66    startMe = new SimSetup();
67 +
68    startMe->setSimInfo( entry_plug );
69 +
70 + #ifdef PROFILE
71 +  startProfile( pro1 );
72 + #endif //profile
73 +
74    startMe->parseFile( in_name );
47  startMe->createSim();
75  
76 + #ifdef PROFILE
77 +  endProfile( pro1 );
78 +  
79 +  startProfile( pro2 );
80 + #endif //profile
81 +
82 +  startMe->createSim();
83    delete startMe;
84  
85 <  entry_plug->the_integrator->integrate();
85 > #ifdef PROFILE
86 >  endProfile( pro2 );
87 >  
88 >  startProfile( pro3 );
89 > #endif //profile
90  
91 +  if (!entry_plug->has_minimizer)
92 +    entry_plug->the_integrator->integrate();
93 +  else
94 +    entry_plug->the_minimizer->minimize();
95 + #ifdef PROFILE
96 +  endProfile( pro3 );
97 +
98 +  writeProfiles();
99 + #endif //profile
100 +
101    return 0 ;
102   }
103  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines