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

Comparing trunk/src/brains/SimInfo.cpp (file contents):
Revision 292 by tim, Fri Feb 4 22:44:15 2005 UTC vs.
Revision 326 by tim, Sun Feb 13 20:05:42 2005 UTC

# Line 56 | Line 56
56   #include "UseTheForce/notifyCutoffs_interface.h"
57   #include "utils/MemoryUtils.hpp"
58   #include "utils/simError.h"
59 + #include "selection/SelectionManager.hpp"
60  
61   #ifdef IS_MPI
62   #include "UseTheForce/mpiComponentPlan.h"
# Line 138 | Line 139 | SimInfo::SimInfo(std::vector<std::pair<MoleculeStamp*,
139      molToProcMap_.resize(nGlobalMols_);
140   #endif
141  
142 <    selectMan_ = new SelectionManager(nGlobalAtoms_ + nGlobalRigidBodies_);
142 >    selectMan_ = new SelectionManager(this);
143      selectMan_->selectAll();
144   }
145  
# Line 753 | Line 754 | double SimInfo::calcMaxCutoffRadius() {
754      return maxCutoffRadius;
755   }
756  
757 < void SimInfo::setupCutoff() {
757 <    double rcut_;  //cutoff radius
758 <    double rsw_; //switching radius
757 > void SimInfo::getCutoff(double& rcut, double& rsw) {
758      
759      if (fInfo_.SIM_uses_Charges | fInfo_.SIM_uses_Dipoles | fInfo_.SIM_uses_RF) {
760          
# Line 801 | Line 800 | void SimInfo::setupCutoff() {
800          }
801      
802      }
803 <        
803 > }
804 >
805 > void SimInfo::setupCutoff() {
806 >    getCutoff(rcut_, rsw_);    
807      double rnblist = rcut_ + 1; // skin of neighbor list
808  
809      //Pass these cutoff radius etc. to fortran. This function should be called once and only once

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines