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

Comparing trunk/OOPSE-3.0/src/applications/staticProps/GofXyz.cpp (file contents):
Revision 2049 by tim, Thu Feb 17 20:15:29 2005 UTC vs.
Revision 2053 by tim, Fri Feb 18 23:07:32 2005 UTC

# Line 46 | Line 46 | GofXyz::GofXyz(SimInfo* info, const std::string& filen
46   #include "primitives/Molecule.hpp"
47   namespace oopse {
48  
49 < GofXyz::GofXyz(SimInfo* info, const std::string& filename, const std::string& sele1, const std::string& sele2, double len, int nrbins)
50 <    : RadialDistrFunc(info, filename, sele1, sele2), len_(len), halfLen_(len/2), nRBins_(nrbins) {
49 > GofXyz::GofXyz(SimInfo* info, const std::string& filename, const std::string& sele1, const std::string& sele2, const std::string& sele3, double len, int nrbins)
50 >    : RadialDistrFunc(info, filename, sele1, sele2), evaluator3_(info), seleMan3_(info), len_(len), halfLen_(len/2), nRBins_(nrbins) {
51      setOutputName(getPrefix(filename) + ".gxyz");
52  
53 +    evaluator3_.loadScriptString(sele3);
54 +    if (!evaluator3_.isDynamic()) {
55 +        seleMan3_.setSelectionSet(evaluator3_.evaluate());
56 +    }    
57 +
58      deltaR_ =  len_ / nRBins_;
59      
60      histogram_.resize(nRBins_);
# Line 59 | Line 64 | GofXyz::GofXyz(SimInfo* info, const std::string& filen
64              histogram_[i][j].resize(nRBins_);
65          }
66      }  
67 <
63 <    //create atom2Mol mapping (should be other class' responsibility)
64 <    atom2Mol_.insert(atom2Mol_.begin(), info_->getNGlobalAtoms() + info_->getNGlobalRigidBodies(), static_cast<Molecule*>(NULL));
65 <    
66 <    SimInfo::MoleculeIterator mi;
67 <    Molecule* mol;
68 <    Molecule::AtomIterator ai;
69 <    Atom* atom;
70 <    Molecule::RigidBodyIterator rbIter;
71 <    RigidBody* rb;
72 <    
73 <    for (mol = info_->beginMolecule(mi); mol != NULL; mol = info_->nextMolecule(mi)) {
74 <        
75 <        for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
76 <            atom2Mol_[atom->getGlobalIndex()] = mol;
77 <        }
78 <
79 <        for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) {
80 <            atom2Mol_[rb->getGlobalIndex()] = mol;
81 <        }
82 <        
83 <    }      
67 >  
68   }
69  
70  
# Line 97 | Line 81 | void GofXyz::initalizeHistogram() {
81   void GofXyz::initalizeHistogram() {
82      //calculate the center of mass of the molecule of selected stuntdouble in selection1
83  
84 <    //determine the new coordinate set of selection1
85 <    //v1 = Rs1 -Rcom,
86 <    //z = Rs1.dipole
84 >    if (!evaluator3_.isDynamic()) {
85 >        seleMan3_.setSelectionSet(evaluator3_.evaluate());
86 >    }    
87 >
88 >    assert(seleMan1_.getSelectionCount() == seleMan3_.getSelectionCount());
89 >    
90 >    //dipole direction of selection3 and position of selection3 will be used to determine the y-z plane
91 >    //v1 = s3 -s1,
92 >    //z = origin.dipole
93      //x = v1 X z
94      //y = z X x
95 <    coorSets_.clear();
95 >    rotMats_.clear();
96  
97      int i;
98 <    StuntDouble* sd;
99 <    for (sd = seleMan1_.beginSelected(i); sd != NULL; sd = seleMan1_.nextSelected(i)) {
100 <        Vector3d rcom = getMolCom(sd);
101 <        Vector3d rs1 = sd->getPos();
102 <        Vector3d v1 =  rcom - rs1;
103 <        CoorSet currCoorSet;
104 <        currCoorSet.zaxis = sd->getElectroFrame().getColumn(2);
105 <        v1.normalize();
106 <        currCoorSet.zaxis.normalize();
107 <        currCoorSet.xaxis = cross(v1, currCoorSet.zaxis);
108 <        currCoorSet.yaxis = cross(currCoorSet.zaxis, currCoorSet.xaxis);
109 <        coorSets_.insert(std::map<int, CoorSet>::value_type(sd->getGlobalIndex(), currCoorSet));
98 >    int j;
99 >    StuntDouble* sd1;
100 >    StuntDouble* sd3;
101 >    
102 >    for (sd1 = seleMan1_.beginSelected(i), sd3 = seleMan3_.beginSelected(j);
103 >        sd1 != NULL, sd3 != NULL;
104 >        sd1 = seleMan1_.nextSelected(i), sd3 = seleMan3_.nextSelected(j)) {
105 >
106 >        Vector3d r3 =sd3->getPos();
107 >        Vector3d r1 = sd1->getPos();
108 >        Vector3d v1 =  r3 - r1;
109 >        info_->getSnapshotManager()->getCurrentSnapshot()->wrapVector(v1);
110 >        Vector3d zaxis = sd1->getElectroFrame().getColumn(2);
111 >        Vector3d xaxis = cross(v1, zaxis);
112 >        Vector3d yaxis = cross(zaxis, xaxis);
113 >
114 >        xaxis.normalize();
115 >        yaxis.normalize();
116 >        zaxis.normalize();
117 >
118 >        RotMat3x3d rotMat;
119 >        rotMat.setRow(0, xaxis);
120 >        rotMat.setRow(1, yaxis);
121 >        rotMat.setRow(2, zaxis);
122 >        
123 >        rotMats_.insert(std::map<int, RotMat3x3d>::value_type(sd1->getGlobalIndex(), rotMat));
124      }
125  
126   }
# Line 128 | Line 132 | void GofXyz::collectHistogram(StuntDouble* sd1, StuntD
132      Vector3d r12 = pos2 - pos1;
133      currentSnapshot_->wrapVector(r12);
134  
135 <    std::map<int, CoorSet>::iterator i = coorSets_.find(sd1->getGlobalIndex());
136 <    assert(i != coorSets_.end());
135 >    std::map<int, RotMat3x3d>::iterator i = rotMats_.find(sd1->getGlobalIndex());
136 >    assert(i != rotMats_.end());
137      
138 <    double x = dot(r12, i->second.xaxis);
135 <    double y = dot(r12, i->second.yaxis);
136 <    double z = dot(r12, i->second.zaxis);
137 <
138 >    Vector3d newR12 = i->second * r12;
139      // x, y and z's possible values range -halfLen_ to halfLen_
140 <    int xbin = (x+ halfLen_) / deltaR_;
141 <    int ybin = (y + halfLen_) / deltaR_;
142 <    int zbin = (z + halfLen_) / deltaR_;
140 >    int xbin = (newR12.x()+ halfLen_) / deltaR_;
141 >    int ybin = (newR12.y() + halfLen_) / deltaR_;
142 >    int zbin = (newR12.z() + halfLen_) / deltaR_;
143  
144      if (xbin < nRBins_ && xbin >=0 &&
145          ybin < nRBins_ && ybin >= 0 &&
# Line 175 | Line 176 | Vector3d GofXyz::getMolCom(StuntDouble* sd){
176      rdfStream.close();
177   }
178  
178 Vector3d GofXyz::getMolCom(StuntDouble* sd){
179    Molecule* mol = atom2Mol_[sd->getGlobalIndex()];
180    assert(mol);
181    return mol->getCom();
179   }
183
184 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines