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

Comparing:
trunk/src/brains/MoleculeCreator.cpp (file contents), Revision 647 by tim, Wed Oct 5 19:34:01 2005 UTC vs.
branches/development/src/brains/MoleculeCreator.cpp (file contents), Revision 1715 by gezelter, Tue May 22 21:55:31 2012 UTC

# Line 6 | Line 6
6   * redistribute this software in source and binary code form, provided
7   * that the following conditions are met:
8   *
9 < * 1. Acknowledgement of the program authors must be made in any
10 < *    publication of scientific results based in part on use of the
11 < *    program.  An acceptable form of acknowledgement is citation of
12 < *    the article in which the program was described (Matthew
13 < *    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
14 < *    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
15 < *    Parallel Simulation Engine for Molecular Dynamics,"
16 < *    J. Comput. Chem. 26, pp. 252-271 (2005))
17 < *
18 < * 2. Redistributions of source code must retain the above copyright
9 > * 1. Redistributions of source code must retain the above copyright
10   *    notice, this list of conditions and the following disclaimer.
11   *
12 < * 3. Redistributions in binary form must reproduce the above copyright
12 > * 2. Redistributions in binary form must reproduce the above copyright
13   *    notice, this list of conditions and the following disclaimer in the
14   *    documentation and/or other materials provided with the
15   *    distribution.
# Line 37 | Line 28
28   * arising out of the use of or inability to use software, even if the
29   * University of Notre Dame has been advised of the possibility of
30   * such damages.
31 + *
32 + * SUPPORT OPEN SCIENCE!  If you use OpenMD or its source code in your
33 + * research, please cite the appropriate papers when you publish your
34 + * work.  Good starting points are:
35 + *                                                                      
36 + * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).            
37 + * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
38 + * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
39 + * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40 + * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
42    
43   /**
# Line 48 | Line 49
49   */
50  
51   #include <cassert>
52 + #include <typeinfo>
53   #include <set>
54  
55   #include "brains/MoleculeCreator.hpp"
56   #include "primitives/GhostBend.hpp"
57   #include "primitives/GhostTorsion.hpp"
58 < #include "types/DirectionalAtomType.hpp"
58 > #include "types/AtomType.hpp"
59   #include "types/FixedBondType.hpp"
60   #include "utils/simError.h"
61   #include "utils/StringUtils.hpp"
62  
63 < namespace oopse {
63 > namespace OpenMD {
64    
65 <  Molecule* MoleculeCreator::createMolecule(ForceField* ff, MoleculeStamp *molStamp,
66 <                                            int stampId, int globalIndex, LocalIndexManager* localIndexMan) {
65 >  Molecule* MoleculeCreator::createMolecule(ForceField* ff,
66 >                                            MoleculeStamp *molStamp,
67 >                                            int stampId, int globalIndex,
68 >                                            LocalIndexManager* localIndexMan) {
69 >    Molecule* mol = new Molecule(stampId, globalIndex, molStamp->getName());
70  
66    Molecule* mol = new Molecule(stampId, globalIndex, molStamp->getID());
67    
71      //create atoms
72      Atom* atom;
73      AtomStamp* currentAtomStamp;
74      int nAtom = molStamp->getNAtoms();
75      for (int i = 0; i < nAtom; ++i) {
76 <      currentAtomStamp = molStamp->getAtom(i);
76 >      currentAtomStamp = molStamp->getAtomStamp(i);
77        atom = createAtom(ff, mol, currentAtomStamp, localIndexMan);
78        mol->addAtom(atom);
79      }
# Line 81 | Line 84 | namespace oopse {
84      int nRigidbodies = molStamp->getNRigidBodies();
85  
86      for (int i = 0; i < nRigidbodies; ++i) {
87 <      currentRigidBodyStamp = molStamp->getRigidBody(i);
88 <      rb = createRigidBody(molStamp, mol, currentRigidBodyStamp, localIndexMan);
87 >      currentRigidBodyStamp = molStamp->getRigidBodyStamp(i);
88 >      rb = createRigidBody(molStamp, mol, currentRigidBodyStamp,
89 >                           localIndexMan);
90        mol->addRigidBody(rb);
91      }
92 <
92 >    
93      //create bonds
94      Bond* bond;
95      BondStamp* currentBondStamp;
96      int nBonds = molStamp->getNBonds();
97  
98      for (int i = 0; i < nBonds; ++i) {
99 <      currentBondStamp = molStamp->getBond(i);
99 >      currentBondStamp = molStamp->getBondStamp(i);
100        bond = createBond(ff, mol, currentBondStamp);
101        mol->addBond(bond);
102      }
# Line 102 | Line 106 | namespace oopse {
106      BendStamp* currentBendStamp;
107      int nBends = molStamp->getNBends();
108      for (int i = 0; i < nBends; ++i) {
109 <      currentBendStamp = molStamp->getBend(i);
109 >      currentBendStamp = molStamp->getBendStamp(i);
110        bend = createBend(ff, mol, currentBendStamp);
111        mol->addBend(bend);
112      }
# Line 112 | Line 116 | namespace oopse {
116      TorsionStamp* currentTorsionStamp;
117      int nTorsions = molStamp->getNTorsions();
118      for (int i = 0; i < nTorsions; ++i) {
119 <      currentTorsionStamp = molStamp->getTorsion(i);
119 >      currentTorsionStamp = molStamp->getTorsionStamp(i);
120        torsion = createTorsion(ff, mol, currentTorsionStamp);
121        mol->addTorsion(torsion);
122      }
123  
124 +    //create inversions
125 +    Inversion* inversion;
126 +    InversionStamp* currentInversionStamp;
127 +    int nInversions = molStamp->getNInversions();
128 +    for (int i = 0; i < nInversions; ++i) {
129 +      currentInversionStamp = molStamp->getInversionStamp(i);
130 +      inversion = createInversion(ff, mol, currentInversionStamp);
131 +      if (inversion != NULL ) {
132 +        mol->addInversion(inversion);
133 +      }
134 +    }
135 +
136      //create cutoffGroups
137      CutoffGroup* cutoffGroup;
138      CutoffGroupStamp* currentCutoffGroupStamp;
139      int nCutoffGroups = molStamp->getNCutoffGroups();
140      for (int i = 0; i < nCutoffGroups; ++i) {
141 <      currentCutoffGroupStamp = molStamp->getCutoffGroup(i);
142 <      cutoffGroup = createCutoffGroup(mol, currentCutoffGroupStamp);
141 >      currentCutoffGroupStamp = molStamp->getCutoffGroupStamp(i);
142 >      cutoffGroup = createCutoffGroup(mol, currentCutoffGroupStamp, localIndexMan);
143        mol->addCutoffGroup(cutoffGroup);
144      }
145  
# Line 140 | Line 156 | namespace oopse {
156      Molecule::CutoffGroupIterator ci;
157      CutoffGroup* cg;
158      
159 <    for (cg = mol->beginCutoffGroup(ci); cg != NULL; cg = mol->nextCutoffGroup(ci)) {
160 <
159 >    for (cg = mol->beginCutoffGroup(ci); cg != NULL;
160 >         cg = mol->nextCutoffGroup(ci)) {
161 >      
162        for(atom = cg->beginAtom(ai); atom != NULL; atom = cg->nextAtom(ai)) {
163 <           //erase the atoms belong to cutoff groups from freeAtoms vector
164 <           freeAtoms.erase(std::remove(freeAtoms.begin(), freeAtoms.end(), atom), freeAtoms.end());
165 <      }
166 <
163 >        //erase the atoms belong to cutoff groups from freeAtoms vector
164 >        freeAtoms.erase(std::remove(freeAtoms.begin(), freeAtoms.end(), atom),
165 >                        freeAtoms.end());
166 >      }      
167      }      
168      
169 <    //loop over the free atoms and then create one cutoff group for every single free atom
169 >    // loop over the free atoms and then create one cutoff group for
170 >    // every single free atom
171      
172      for (fai = freeAtoms.begin(); fai != freeAtoms.end(); ++fai) {
173 <      cutoffGroup = createCutoffGroup(mol, *fai);
173 >      cutoffGroup = createCutoffGroup(mol, *fai, localIndexMan);
174        mol->addCutoffGroup(cutoffGroup);
175      }
176      //create constraints
177      createConstraintPair(mol);
178      createConstraintElem(mol);
179      
180 +    // Does this molecule stamp define a total constrained charge value?
181 +    // If so, let the created molecule know about it.
182 +
183 +    if (molStamp->haveConstrainedCharge() ) {
184 +      mol->setConstrainedCharge( molStamp->getConstrainedCharge() );
185 +    }
186 +
187      //the construction of this molecule is finished
188      mol->complete();
189 <
189 >    
190      return mol;
191    }    
192  
193  
194 <  Atom* MoleculeCreator::createAtom(ForceField* ff, Molecule* mol, AtomStamp* stamp,
195 <                                    LocalIndexManager* localIndexMan) {
194 >  Atom* MoleculeCreator::createAtom(ForceField* ff, Molecule* mol,
195 >                                    AtomStamp* stamp,
196 >                                    LocalIndexManager* localIndexMan) {
197      AtomType * atomType;
198      Atom* atom;
199  
200      atomType =  ff->getAtomType(stamp->getType());
201 <
201 >    
202      if (atomType == NULL) {
203        sprintf(painCave.errMsg, "Can not find Matching Atom Type for[%s]",
204 <              stamp->getType());
204 >              stamp->getType().c_str());
205  
206        painCave.isFatal = 1;
207        simError();
# Line 183 | Line 209 | namespace oopse {
209      
210      //below code still have some kind of hard-coding smell
211      if (atomType->isDirectional()){
186    
187      DirectionalAtomType* dAtomType = dynamic_cast<DirectionalAtomType*>(atomType);
188        
189      if (dAtomType == NULL) {
190        sprintf(painCave.errMsg, "Can not cast AtomType to DirectionalAtomType");
191
192        painCave.isFatal = 1;
193        simError();
194      }
195
212        DirectionalAtom* dAtom;
213 <      dAtom = new DirectionalAtom(dAtomType);
213 >      dAtom = new DirectionalAtom(atomType);
214        atom = dAtom;    
215      }
216      else{
# Line 205 | Line 221 | namespace oopse {
221  
222      return atom;
223    }
224 <
225 <  RigidBody* MoleculeCreator::createRigidBody(MoleculeStamp *molStamp, Molecule* mol,
224 >  
225 >  RigidBody* MoleculeCreator::createRigidBody(MoleculeStamp *molStamp,
226 >                                              Molecule* mol,
227                                                RigidBodyStamp* rbStamp,
228                                                LocalIndexManager* localIndexMan) {
229      Atom* atom;
# Line 217 | Line 234 | namespace oopse {
234      RigidBody* rb = new RigidBody();
235      nAtoms = rbStamp->getNMembers();    
236      for (int i = 0; i < nAtoms; ++i) {
237 <      //rbStamp->getMember(i) return the local index of current atom inside the molecule.
238 <      //It is not the same as local index of atom which is the index of atom at DataStorage class
239 <      atom = mol->getAtomAt(rbStamp->getMember(i));
240 <      atomStamp= molStamp->getAtom(rbStamp->getMember(i));    
237 >      //rbStamp->getMember(i) return the local index of current atom
238 >      //inside the molecule.  It is not the same as local index of
239 >      //atom which is the index of atom at DataStorage class
240 >      atom = mol->getAtomAt(rbStamp->getMemberAt(i));
241 >      atomStamp= molStamp->getAtomStamp(rbStamp->getMemberAt(i));    
242        rb->addAtom(atom, atomStamp);
243      }
244  
245 <    //after all of the atoms are added, we need to calculate the reference coordinates
245 >    //after all of the atoms are added, we need to calculate the
246 >    //reference coordinates
247      rb->calcRefCoords();
248  
249      //set the local index of this rigid body, global index will be set later
# Line 236 | Line 255 | namespace oopse {
255      //The third part is the index of the rigidbody defined in meta-data file
256      //For example, Butane_RB_0 is a valid rigid body name of butane molecule
257      /**@todo replace itoa by lexi_cast */
258 <    std::string s = OOPSE_itoa(mol->getNRigidBodies(), 10);
258 >    std::string s = OpenMD_itoa(mol->getNRigidBodies(), 10);
259      rb->setType(mol->getType() + "_RB_" + s.c_str());
260  
261      return rb;
262    }    
263  
264 <  Bond* MoleculeCreator::createBond(ForceField* ff, Molecule* mol, BondStamp* stamp) {
264 >  Bond* MoleculeCreator::createBond(ForceField* ff, Molecule* mol,
265 >                                    BondStamp* stamp) {
266      BondType* bondType;
267      Atom* atomA;
268      Atom* atomB;
269 <
269 >    
270      atomA = mol->getAtomAt(stamp->getA());
271      atomB = mol->getAtomAt(stamp->getB());
272 <
272 >    
273      assert( atomA && atomB);
274      
275      bondType = ff->getBondType(atomA->getType(), atomB->getType());
# Line 258 | Line 278 | namespace oopse {
278        sprintf(painCave.errMsg, "Can not find Matching Bond Type for[%s, %s]",
279                atomA->getType().c_str(),
280                atomB->getType().c_str());
281 <
281 >      
282        painCave.isFatal = 1;
283        simError();
284      }
285      return new Bond(atomA, atomB, bondType);    
286    }    
287 <
288 <  Bend* MoleculeCreator::createBend(ForceField* ff, Molecule* mol, BendStamp* stamp) {
289 <    bool isGhostBend = false;
290 <    int ghostIndex;
291 <
292 <    
293 <    //
294 <    if (stamp->haveExtras()){
295 <      LinkedAssign* extras = stamp->getExtras();
296 <      LinkedAssign* currentExtra = extras;
297 <
298 <      while (currentExtra != NULL){
299 <        if (!strcmp(currentExtra->getlhs(), "ghostVectorSource")){
300 <          switch (currentExtra->getType()){
301 <          case 0:
302 <            ghostIndex = currentExtra->getInt();
303 <            isGhostBend = true;
304 <            break;
305 <
306 <          default:
307 <            sprintf(painCave.errMsg,
288 <                    "SimSetup Error: ghostVectorSource must be an int.\n");
289 <            painCave.isFatal = 1;
290 <            simError();
291 <          }
292 <        } else{
293 <          sprintf(painCave.errMsg,
294 <                  "SimSetup Error: unhandled bend assignment:\n");
295 <          painCave.isFatal = 1;
296 <          simError();
297 <        }
298 <        currentExtra = currentExtra->getNext();
299 <      }
287 >  
288 >  Bend* MoleculeCreator::createBend(ForceField* ff, Molecule* mol,
289 >                                    BendStamp* stamp) {
290 >    Bend* bend = NULL;
291 >    std::vector<int> bendAtoms = stamp->getMembers();
292 >    if (bendAtoms.size() == 3) {
293 >      Atom* atomA = mol->getAtomAt(bendAtoms[0]);
294 >      Atom* atomB = mol->getAtomAt(bendAtoms[1]);
295 >      Atom* atomC = mol->getAtomAt(bendAtoms[2]);
296 >      
297 >      assert( atomA && atomB && atomC);
298 >      
299 >      BendType* bendType = ff->getBendType(atomA->getType().c_str(),
300 >                                           atomB->getType().c_str(),
301 >                                           atomC->getType().c_str());
302 >      
303 >      if (bendType == NULL) {
304 >        sprintf(painCave.errMsg, "Can not find Matching Bend Type for[%s, %s, %s]",
305 >                atomA->getType().c_str(),
306 >                atomB->getType().c_str(),
307 >                atomC->getType().c_str());
308          
309 <    }
310 <
303 <    if (isGhostBend) {
304 <
305 <      int indexA = stamp->getA();
306 <      int indexB= stamp->getB();
307 <
308 <      assert(indexA != indexB);
309 <
310 <      int normalIndex;
311 <      if (indexA == ghostIndex) {
312 <        normalIndex = indexB;
313 <      } else if (indexB == ghostIndex) {
314 <        normalIndex = indexA;
309 >        painCave.isFatal = 1;
310 >        simError();
311        }
312 <        
312 >      
313 >      bend = new Bend(atomA, atomB, atomC, bendType);
314 >    } else if ( bendAtoms.size() == 2 && stamp->haveGhostVectorSource()) {
315 >      int ghostIndex = stamp->getGhostVectorSource();
316 >      int normalIndex = ghostIndex != bendAtoms[0] ? bendAtoms[0] : bendAtoms[1];
317        Atom* normalAtom = mol->getAtomAt(normalIndex) ;        
318        DirectionalAtom* ghostAtom = dynamic_cast<DirectionalAtom*>(mol->getAtomAt(ghostIndex));
319        if (ghostAtom == NULL) {
# Line 333 | Line 333 | namespace oopse {
333          painCave.isFatal = 1;
334          simError();
335        }
336 <        
337 <      return new GhostBend(normalAtom, ghostAtom, bendType);      
336 >      
337 >      bend = new GhostBend(normalAtom, ghostAtom, bendType);      
338 >      
339 >    }
340 >    
341 >    return bend;
342 >  }    
343  
344 <    } else {
345 <            
341 <      Atom* atomA = mol->getAtomAt(stamp->getA());
342 <      Atom* atomB = mol->getAtomAt(stamp->getB());
343 <      Atom* atomC = mol->getAtomAt(stamp->getC());
344 >  Torsion* MoleculeCreator::createTorsion(ForceField* ff, Molecule* mol,
345 >                                          TorsionStamp* stamp) {
346  
347 <      assert( atomA && atomB && atomC);
348 <        
349 <      BendType* bendType = ff->getBendType(atomA->getType(), atomB->getType(), atomC->getType());
350 <
349 <      if (bendType == NULL) {
350 <        sprintf(painCave.errMsg, "Can not find Matching Bend Type for[%s, %s, %s]",
351 <                atomA->getType().c_str(),
352 <                atomB->getType().c_str(),
353 <                atomC->getType().c_str());
354 <
355 <        painCave.isFatal = 1;
356 <        simError();
357 <      }
358 <
359 <      return new Bend(atomA, atomB, atomC, bendType);      
347 >    Torsion* torsion = NULL;
348 >    std::vector<int> torsionAtoms = stamp->getMembers();
349 >    if (torsionAtoms.size() < 3) {
350 >        return torsion;
351      }
361  }    
352  
353 <  Torsion* MoleculeCreator::createTorsion(ForceField* ff, Molecule* mol, TorsionStamp* stamp) {
353 >    Atom* atomA = mol->getAtomAt(torsionAtoms[0]);
354 >    Atom* atomB = mol->getAtomAt(torsionAtoms[1]);
355 >    Atom* atomC = mol->getAtomAt(torsionAtoms[2]);
356  
357 <    Atom* atomA = mol->getAtomAt(stamp->getA());
358 <    Atom* atomB = mol->getAtomAt(stamp->getB());
367 <    Atom* atomC = mol->getAtomAt(stamp->getC());
368 <    Torsion* torsion;
357 >    if (torsionAtoms.size() == 4) {
358 >      Atom* atomD = mol->getAtomAt(torsionAtoms[3]);
359  
370    if (stamp->getD() != -1) {
371      Atom* atomD = mol->getAtomAt(stamp->getD());
372
360        assert(atomA && atomB && atomC && atomD);
361          
362 <      TorsionType* torsionType = ff->getTorsionType(atomA->getType(), atomB->getType(),
363 <                                                    atomC->getType(), atomD->getType());
364 <
362 >      TorsionType* torsionType = ff->getTorsionType(atomA->getType(),
363 >                                                    atomB->getType(),
364 >                                                    atomC->getType(),
365 >                                                    atomD->getType());
366        if (torsionType == NULL) {
367          sprintf(painCave.errMsg, "Can not find Matching Torsion Type for[%s, %s, %s, %s]",
368                  atomA->getType().c_str(),
369                  atomB->getType().c_str(),
370                  atomC->getType().c_str(),
371                  atomD->getType().c_str());
372 <
372 >        
373          painCave.isFatal = 1;
374          simError();
375        }
376 <        
376 >      
377        torsion = new Torsion(atomA, atomB, atomC, atomD, torsionType);      
378      }
379      else {
380 <
381 <      DirectionalAtom* dAtom = dynamic_cast<DirectionalAtom*>(atomC);
380 >      
381 >      DirectionalAtom* dAtom = dynamic_cast<DirectionalAtom*>(mol->getAtomAt(stamp->getGhostVectorSource()));
382        if (dAtom == NULL) {
383          sprintf(painCave.errMsg, "Can not cast Atom to DirectionalAtom");
384          painCave.isFatal = 1;
385          simError();
386        }        
387 <
387 >      
388        TorsionType* torsionType = ff->getTorsionType(atomA->getType(), atomB->getType(),
389                                                      atomC->getType(), "GHOST");
390 <
390 >      
391        if (torsionType == NULL) {
392          sprintf(painCave.errMsg, "Can not find Matching Torsion Type for[%s, %s, %s, %s]",
393                  atomA->getType().c_str(),
394                  atomB->getType().c_str(),
395                  atomC->getType().c_str(),
396                  "GHOST");
397 <
397 >        
398          painCave.isFatal = 1;
399          simError();
400        }
401 <        
401 >      
402        torsion = new GhostTorsion(atomA, atomB, dAtom, torsionType);              
403      }
404 <
404 >    
405      return torsion;
406    }    
407  
408 <  CutoffGroup* MoleculeCreator::createCutoffGroup(Molecule* mol, CutoffGroupStamp* stamp) {
408 >  Inversion* MoleculeCreator::createInversion(ForceField* ff, Molecule* mol,
409 >                                              InversionStamp* stamp) {
410 >    
411 >    Inversion* inversion = NULL;
412 >    int center = stamp->getCenter();
413 >    std::vector<int> satellites = stamp->getSatellites();
414 >    if (satellites.size() != 3) {
415 >        return inversion;
416 >    }
417 >
418 >    Atom* atomA = mol->getAtomAt(center);
419 >    Atom* atomB = mol->getAtomAt(satellites[0]);
420 >    Atom* atomC = mol->getAtomAt(satellites[1]);
421 >    Atom* atomD = mol->getAtomAt(satellites[2]);
422 >      
423 >    assert(atomA && atomB && atomC && atomD);
424 >    
425 >    InversionType* inversionType = ff->getInversionType(atomA->getType(),
426 >                                                        atomB->getType(),
427 >                                                        atomC->getType(),
428 >                                                        atomD->getType());
429 >
430 >    if (inversionType == NULL) {
431 >      sprintf(painCave.errMsg, "No Matching Inversion Type for[%s, %s, %s, %s]\n"
432 >              "\t(May not be a problem: not all inversions are parametrized)\n",
433 >              atomA->getType().c_str(),
434 >              atomB->getType().c_str(),
435 >              atomC->getType().c_str(),
436 >              atomD->getType().c_str());
437 >      
438 >      painCave.isFatal = 0;
439 >      painCave.severity = OPENMD_INFO;
440 >      simError();
441 >      return NULL;
442 >    } else {
443 >      
444 >      inversion = new Inversion(atomA, atomB, atomC, atomD, inversionType);
445 >      return inversion;
446 >    }
447 >  }
448 >  
449 >
450 >  CutoffGroup* MoleculeCreator::createCutoffGroup(Molecule* mol,
451 >                                                  CutoffGroupStamp* stamp,
452 >                                                  LocalIndexManager* localIndexMan) {
453      int nAtoms;
454      CutoffGroup* cg;
455      Atom* atom;
# Line 425 | Line 457 | namespace oopse {
457      
458      nAtoms = stamp->getNMembers();
459      for (int i =0; i < nAtoms; ++i) {
460 <      atom = mol->getAtomAt(stamp->getMember(i));
460 >      atom = mol->getAtomAt(stamp->getMemberAt(i));
461        assert(atom);
462        cg->addAtom(atom);
463      }
464 <
464 >    
465 >    //set the local index of this cutoffGroup, global index will be set later
466 >    cg->setLocalIndex(localIndexMan->getNextCutoffGroupIndex());
467 >    
468      return cg;
469    }    
470 <
471 <  CutoffGroup* MoleculeCreator::createCutoffGroup(Molecule * mol, Atom* atom) {
470 >  
471 >  CutoffGroup* MoleculeCreator::createCutoffGroup(Molecule * mol, Atom* atom,
472 >                                                  LocalIndexManager* localIndexMan) {
473      CutoffGroup* cg;
474      cg  = new CutoffGroup();
475      cg->addAtom(atom);
476 +
477 +    //set the local index of this cutoffGroup, global index will be set later
478 +    cg->setLocalIndex(localIndexMan->getNextCutoffGroupIndex());
479 +
480      return cg;
481    }
482  

Comparing:
trunk/src/brains/MoleculeCreator.cpp (property svn:keywords), Revision 647 by tim, Wed Oct 5 19:34:01 2005 UTC vs.
branches/development/src/brains/MoleculeCreator.cpp (property svn:keywords), Revision 1715 by gezelter, Tue May 22 21:55:31 2012 UTC

# Line 0 | Line 1
1 + Author Id Revision Date

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines