ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-3.0/src/types/MoleculeStamp.cpp
(Generate patch)

Comparing trunk/OOPSE-3.0/src/types/MoleculeStamp.cpp (file contents):
Revision 1492 by tim, Fri Sep 24 16:27:58 2004 UTC vs.
Revision 1930 by gezelter, Wed Jan 12 22:41:40 2005 UTC

# Line 1 | Line 1
1 + /*
2 + * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
3 + *
4 + * The University of Notre Dame grants you ("Licensee") a
5 + * non-exclusive, royalty free, license to use, modify and
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
19 + *    notice, this list of conditions and the following disclaimer.
20 + *
21 + * 3. Redistributions in binary form must reproduce the above copyright
22 + *    notice, this list of conditions and the following disclaimer in the
23 + *    documentation and/or other materials provided with the
24 + *    distribution.
25 + *
26 + * This software is provided "AS IS," without a warranty of any
27 + * kind. All express or implied conditions, representations and
28 + * warranties, including any implied warranty of merchantability,
29 + * fitness for a particular purpose or non-infringement, are hereby
30 + * excluded.  The University of Notre Dame and its licensors shall not
31 + * be liable for any damages suffered by licensee as a result of
32 + * using, modifying or distributing the software or its
33 + * derivatives. In no event will the University of Notre Dame or its
34 + * licensors be liable for any lost revenue, profit or data, or for
35 + * direct, indirect, special, consequential, incidental or punitive
36 + * damages, however caused and regardless of the theory of liability,
37 + * arising out of the use of or inability to use software, even if the
38 + * University of Notre Dame has been advised of the possibility of
39 + * such damages.
40 + */
41 +
42   #include <stdlib.h>
43   #include <stdio.h>
44   #include <string.h>
# Line 520 | Line 561 | vector<pair<int, int> > MoleculeStamp::getJointAtoms(i
561   //return the position of joint atom apears in  rigidbody's definition
562   //for the time being, we will use the most inefficient algorithm, the complexity is O(N2)
563   //actually we could improve the complexity to O(NlgN) by sorting the atom index in rigid body first
564 < vector<pair<int, int> > MoleculeStamp::getJointAtoms(int rb1, int rb2){
564 > std::vector<std::pair<int, int> > MoleculeStamp::getJointAtoms(int rb1, int rb2){
565    RigidBodyStamp* rbStamp1;
566    RigidBodyStamp* rbStamp2;
567    int natomInRb1;
568    int natomInRb2;
569    int atomIndex1;
570    int atomIndex2;
571 <  vector<pair<int, int> > jointAtomIndexPair;
571 >   std::vector<std::pair<int, int> > jointAtomIndexPair;
572    
573    rbStamp1 = this->getRigidBody(rb1);
574    natomInRb1 =rbStamp1->getNMembers();
# Line 542 | Line 583 | vector<pair<int, int> > MoleculeStamp::getJointAtoms(i
583        atomIndex2 = rbStamp2->getMember(j);
584  
585        if(atomIndex1 == atomIndex2){
586 <        jointAtomIndexPair.push_back(make_pair(i, j));
586 >        jointAtomIndexPair.push_back(std::make_pair(i, j));
587          break;
588        }
589        

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines