ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/applications/openmd/openmd.cpp
(Generate patch)

Comparing branches/development/src/applications/openmd/openmd.cpp (file contents):
Revision 1746 by gezelter, Wed Jun 6 02:18:54 2012 UTC vs.
Revision 1747 by gezelter, Wed Jun 6 15:52:25 2012 UTC

# Line 142 | Line 142 | int main(int argc,char* argv[]){
142    Globals* simParams = info->getSimParams();
143    MinimizerParameters* miniPars = simParams->getMinimizerParameters();
144  
145 <  if (miniPars->haveUseMinimizer() && simParams->haveEnsemble()) {
145 >  if (miniPars->getUseMinimizer() && simParams->haveEnsemble()) {
146      sprintf(painCave.errMsg, "Ensemble keyword can not co-exist with useMinimizer = \"true\" in the minimizer block\n");
147      painCave.isFatal = 1;
148      simError();        
149    }
150  
151 <  if (miniPars->haveUseMinimizer()) {
151 >  if (miniPars->getUseMinimizer()) {
152      //create minimizer
153      OptimizationMethod* myMinimizer =OptimizationFactory::getInstance()->createOptimization(toUpperCopy(miniPars->getMethod()), info);
154  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines