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

Comparing branches/development/src/brains/SimInfo.cpp (file contents):
Revision 1535 by gezelter, Fri Dec 31 18:31:56 2010 UTC vs.
Revision 1540 by gezelter, Mon Jan 17 21:34:36 2011 UTC

# Line 55 | Line 55
55   #include "primitives/Molecule.hpp"
56   #include "primitives/StuntDouble.hpp"
57   #include "UseTheForce/DarkSide/neighborLists_interface.h"
58 + #include "UseTheForce/doForces_interface.h"
59   #include "utils/MemoryUtils.hpp"
60   #include "utils/simError.h"
61   #include "selection/SelectionManager.hpp"
# Line 131 | Line 132 | namespace OpenMD {
132      //equal to the total number of atoms minus number of atoms belong to
133      //cutoff group defined in meta-data file plus the number of cutoff
134      //groups defined in meta-data file
135 +    std::cerr << "nGA = " << nGlobalAtoms_ << "\n";
136 +    std::cerr << "nCA = " << nCutoffAtoms << "\n";
137 +    std::cerr << "nG = " << nGroups << "\n";
138 +
139      nGlobalCutoffGroups_ = nGlobalAtoms_ - nCutoffAtoms + nGroups;
140 +
141 +    std::cerr << "nGCG = " << nGlobalCutoffGroups_ << "\n";
142      
143      //every free atom (atom does not belong to rigid bodies) is an
144      //integrable object therefore the total number of integrable objects
# Line 924 | Line 931 | namespace OpenMD {
931      sprintf(checkPointMsg, " mpiRefresh successful.\n");
932      errorCheckPoint();
933   #endif
934 +
935 +    initFortranFF(&isError);
936 +    if (isError) {
937 +      sprintf(painCave.errMsg,
938 +              "initFortranFF errror: fortran didn't like something we gave it.\n");
939 +      painCave.isFatal = 1;
940 +      simError();
941 +    }
942      fortranInitialized_ = true;
943    }
944  
# Line 961 | Line 976 | namespace OpenMD {
976      Molecule* mol;
977      RigidBody* rb;
978      Atom* atom;
979 +    CutoffGroup* cg;
980      SimInfo::MoleculeIterator mi;
981      Molecule::RigidBodyIterator rbIter;
982 <    Molecule::AtomIterator atomIter;;
982 >    Molecule::AtomIterator atomIter;
983 >    Molecule::CutoffGroupIterator cgIter;
984  
985      for (mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
986          
# Line 974 | Line 991 | namespace OpenMD {
991        for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) {
992          rb->setSnapshotManager(sman_);
993        }
994 +
995 +      for (cg = mol->beginCutoffGroup(cgIter); cg != NULL; cg = mol->nextCutoffGroup(cgIter)) {
996 +        cg->setSnapshotManager(sman_);
997 +      }
998      }    
999      
1000    }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines