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 1794 by gezelter, Thu Sep 6 19:44:06 2012 UTC

# Line 46 | Line 46
46   #endif
47  
48   #include <fstream>
49 + #include <iostream>
50 + #include <locale>
51   #include "utils/simError.h"
52   #include "utils/CaseConversion.hpp"
53   #include "brains/Register.hpp"
# Line 74 | Line 76 | int main(int argc,char* argv[]){
76   #endif
77    
78    initSimError();           // the error handler
79 <  srand48( 1337 );          // the random number generator.
79 >  //srand48( 1337 );          // the random number generator.
80  
81    std::string svnrev;
82    //convert a macro from compiler to a string in c++
# Line 142 | Line 144 | int main(int argc,char* argv[]){
144    Globals* simParams = info->getSimParams();
145    MinimizerParameters* miniPars = simParams->getMinimizerParameters();
146  
147 <  if (miniPars->haveUseMinimizer() && simParams->haveEnsemble()) {
147 >  if (miniPars->getUseMinimizer() && simParams->haveEnsemble()) {
148      sprintf(painCave.errMsg, "Ensemble keyword can not co-exist with useMinimizer = \"true\" in the minimizer block\n");
149      painCave.isFatal = 1;
150      simError();        
151    }
152  
153 <  if (miniPars->haveUseMinimizer()) {
153 >  if (miniPars->getUseMinimizer()) {
154      //create minimizer
155      OptimizationMethod* myMinimizer =OptimizationFactory::getInstance()->createOptimization(toUpperCopy(miniPars->getMethod()), info);
156  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines