# | Line 1349 | Line 1349 | void SimSetup::makeIntegrator(void){ | |
---|---|---|
1349 | int k; | |
1350 | ||
1351 | NVT<RealIntegrator>* myNVT = NULL; | |
1352 | < | NPTi<RealIntegrator>* myNPTi = NULL; |
1352 | > | NPTi<NPT<RealIntegrator> >* myNPTi = NULL; |
1353 | NPTf<RealIntegrator>* myNPTf = NULL; | |
1354 | NPTim<RealIntegrator>* myNPTim = NULL; | |
1355 | NPTfm<RealIntegrator>* myNPTfm = NULL; | |
# | Line 1389 | Line 1389 | void SimSetup::makeIntegrator(void){ | |
1389 | case NPTi_ENS: | |
1390 | if (globals->haveZconstraints()){ | |
1391 | setupZConstraint(info[k]); | |
1392 | < | myNPTi = new ZConstraint<NPTi<RealIntegrator> >(&(info[k]), the_ff); |
1392 | > | myNPTi = new ZConstraint<NPTi<NPT <RealIntegrator> > >(&(info[k]), the_ff); |
1393 | } | |
1394 | else | |
1395 | < | myNPTi = new NPTi<RealIntegrator>(&(info[k]), the_ff); |
1395 | > | myNPTi = new NPTi<NPT<RealIntegrator> >(&(info[k]), the_ff); |
1396 | ||
1397 | myNPTi->setTargetTemp(globals->getTargetTemp()); | |
1398 |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |