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

Comparing branches/new_design/OOPSE-3.0/src/applications/oopse/oopse.cpp (file contents):
Revision 1840 by tim, Fri Dec 3 00:26:07 2004 UTC vs.
Revision 1841 by tim, Fri Dec 3 17:59:45 2004 UTC

# Line 65 | Line 65 | int main(int argc,char* argv[]){
65      SimInfo* info = creator.createSim(argv[1]);
66  
67      //create Integrator
68 <    Globals* globals = info->getGlobals();
69 <    if (globals->haveEnsemble()) {
70 <        Integrator* myIntegrator = IntegratorFactory::getInstance()->createIntegrator(globals->getEnsemble(), info);
68 >    Globals* simParams = info->getSimParams();
69 >    if (simParams->haveEnsemble()) {
70 >        Integrator* myIntegrator = IntegratorFactory::getInstance()->createIntegrator(simParams->getEnsemble(), info);
71          
72          //Thermodynamic Integration Method
73          //ForceManager* fman = new ThermodynamicForceManager(info);

Diff Legend

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