| 95 |  | * @param simParams | 
| 96 |  | * @note | 
| 97 |  | */ | 
| 98 | < | SimInfo(MakeStamps* stamps, std::vector<std::pair<MoleculeStamp*, int> >& molStampPairs, ForceField* ff, Globals* simParams); | 
| 98 | > | SimInfo(ForceField* ff, Globals* simParams); | 
| 99 |  | virtual ~SimInfo(); | 
| 100 |  |  | 
| 101 |  | /** | 
| 298 |  |  | 
| 299 |  | return i != molecules_.end() ? i->second : NULL; | 
| 300 |  | } | 
| 301 | – |  | 
| 302 | – | /** Calculate the maximum cutoff radius based on the atom types */ | 
| 303 | – | double calcMaxCutoffRadius(); | 
| 301 |  |  | 
| 302 |  | double getRcut() { | 
| 303 |  | return rcut_; | 
| 306 |  | double getRsw() { | 
| 307 |  | return rsw_; | 
| 308 |  | } | 
| 309 | + |  | 
| 310 | + | double getList() { | 
| 311 | + | return rlist_; | 
| 312 | + | } | 
| 313 |  |  | 
| 314 |  | std::string getFinalConfigFileName() { | 
| 315 |  | return finalConfigFileName_; | 
| 440 |  | void setupCutoff(); | 
| 441 |  |  | 
| 442 |  | /** Figure out which coulombic correction method to use and pass to fortran */ | 
| 443 | < | void setupCoulombicCorrection( int isError ); | 
| 443 | > | void setupElectrostaticSummationMethod( int isError ); | 
| 444 | > |  | 
| 445 | > | /** Figure out which polynomial type to use for the switching function */ | 
| 446 | > | void setupSwitchingFunction(); | 
| 447 |  |  | 
| 448 |  | /** Calculates the number of degress of freedom in the whole system */ | 
| 449 |  | void calcNdf(); | 
| 450 |  | void calcNdfRaw(); | 
| 451 |  | void calcNdfTrans(); | 
| 452 |  |  | 
| 453 | + | ForceField* forceField_; | 
| 454 | + | Globals* simParams_; | 
| 455 | + |  | 
| 456 | + | std::map<int, Molecule*>  molecules_; /**< Molecule array */ | 
| 457 | + |  | 
| 458 |  | /** | 
| 459 |  | * Adds molecule stamp and the total number of the molecule with same molecule stamp in the whole | 
| 460 |  | * system. | 
| 461 |  | */ | 
| 462 |  | void addMoleculeStamp(MoleculeStamp* molStamp, int nmol); | 
| 454 | – |  | 
| 455 | – | MakeStamps* stamps_; | 
| 456 | – | ForceField* forceField_; | 
| 457 | – | Globals* simParams_; | 
| 458 | – |  | 
| 459 | – | std::map<int, Molecule*>  molecules_; /**< Molecule array */ | 
| 463 |  |  | 
| 464 |  | //degress of freedom | 
| 465 |  | int ndf_;           /**< number of degress of freedom (excludes constraints),  ndf_ is local */ | 
| 522 |  |  | 
| 523 |  | double rcut_;       /**< cutoff radius*/ | 
| 524 |  | double rsw_;        /**< radius of switching function*/ | 
| 525 | + | double rlist_;      /**< neighbor list radius */ | 
| 526 |  |  | 
| 527 |  | bool fortranInitialized_; /**< flag indicate whether fortran side is initialized */ | 
| 528 |  |  |