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

Comparing trunk/src/integrators/RNEMD.cpp (file contents):
Revision 1331 by gezelter, Thu Apr 2 16:04:52 2009 UTC vs.
Revision 1333 by gezelter, Thu Apr 2 18:11:59 2009 UTC

# Line 40 | Line 40
40   */
41  
42   #include "integrators/RNEMD.hpp"
43 + #include "math/Vector3.hpp"
44   #include "math/SquareMatrix3.hpp"
45   #include "primitives/Molecule.hpp"
46   #include "primitives/StuntDouble.hpp"
47 + #include "utils/OOPSEConstant.hpp"
48 + #include "utils/Tuple.hpp"
49  
50   #ifndef IS_MPI
51   #include "math/SeqRandNumGen.hpp"
# Line 110 | Line 113 | namespace oopse {
113    void RNEMD::doSwap() {
114      std::cerr << "in RNEMD!\n";  
115      std::cerr << "nBins = " << nBins_ << "\n";
116 +    int midBin = nBins_ / 2;
117 +    std::cerr << "midBin = " << midBin << "\n";
118      std::cerr << "swapTime = " << swapTime_ << "\n";
119      std::cerr << "exchangeSum = " << exchangeSum_ << "\n";
120      std::cerr << "swapType = " << rnemdType_ << "\n";
121      std::cerr << "selection = " << rnemdObjectSelection_ << "\n";
122  
123 +    Snapshot* currentSnap_ = info_->getSnapshotManager()->getCurrentSnapshot();
124 +    Mat3x3d hmat = currentSnap_->getHmat();
125 +
126 +    std::cerr << "hmat = " << hmat << "\n";
127 +
128      seleMan_.setSelectionSet(evaluator_.evaluate());
129  
130      std::cerr << "selectionCount = " << seleMan_.getSelectionCount() << "\n\n";
131  
132 <    int i;
132 >    int selei;
133      StuntDouble* sd;
134 +    int idx;
135  
136 <    for (sd = seleMan_.beginSelected(i); sd != NULL; sd = seleMan_.nextSelected(i)) {
136 >    std::vector<tuple3<RealType, int, StuntDouble* > > endSlice;
137 >    std::vector<tuple3<RealType, int, StuntDouble* > > midSlice;
138 >    
139 >    for (sd = seleMan_.beginSelected(selei); sd != NULL;
140 >         sd = seleMan_.nextSelected(selei)) {
141 >
142 >      idx = sd->getLocalIndex();
143 >
144        Vector3d pos = sd->getPos();
145 <      //wrap the stuntdoubles into a cell      
145 >
146 >      std::cerr << "idx = " << idx << "pos = " << pos << "\n";
147 >      // wrap the stuntdouble's position back into the box:
148 >
149        if (usePeriodicBoundaryConditions_)
150 <        info_->getSnapshotManager()->getCurrentSnapshot()->wrapVector(pos);
150 >        currentSnap_->wrapVector(pos);
151 >      std::cerr << "new pos.z = " << pos.z() << "\n";
152 >
153 >      // which bin is this stuntdouble in?
154 >
155        int binNo = int(nBins_ * (pos.z()) / hmat(2,2));
131      sliceSDLists_[binNo].push_back(sd);
132    }
156  
157 +      std::cerr << "bin = " << binNo << "\n";
158 +
159 +      // if we're in bin 0 or the middleBin
160 +      if (binNo == 0 || binNo == midBin) {
161 +        
162 +        RealType mass = sd->getMass();
163 +        Vector3d vel = sd->getVel();
164 +        RealType value;
165 +
166 +        switch(rnemdType_) {
167 +        case rnemdKinetic :
168 +          
169 +          value = mass * (vel[0]*vel[0] + vel[1]*vel[1] +
170 +                          vel[2]*vel[2]);
171 +          
172 +          if (sd->isDirectional()) {
173 +            Vector3d angMom = sd->getJ();
174 +            Mat3x3d I = sd->getI();
175 +            
176 +            if (sd->isLinear()) {
177 +              int i = sd->linearAxis();
178 +              int j = (i + 1) % 3;
179 +              int k = (i + 2) % 3;
180 +              value += angMom[j] * angMom[j] / I(j, j) +
181 +                angMom[k] * angMom[k] / I(k, k);
182 +            } else {                        
183 +              value += angMom[0]*angMom[0]/I(0, 0)
184 +                + angMom[1]*angMom[1]/I(1, 1)
185 +                + angMom[2]*angMom[2]/I(2, 2);
186 +            }
187 +          }
188 +          value = value * 0.5 / OOPSEConstant::energyConvert;
189 +          break;
190 +        case rnemdPx :
191 +          value = mass * vel[0];
192 +          break;
193 +        case rnemdPy :
194 +          value = mass * vel[1];
195 +          break;
196 +        case rnemdPz :
197 +          value = mass * vel[2];
198 +          break;
199 +        case rnemdUnknown :
200 +        default :
201 +          break;
202 +        }
203 +        
204 +        if (binNo == 0)
205 +          endSlice.push_back( make_tuple3(value, idx, sd));
206 +        
207 +        if (binNo == midBin)
208 +          midSlice.push_back( make_tuple3(value, idx, sd));              
209 +      }
210 +
211 +      // find smallest value in endSlice:
212 +      std::sort(endSlice.begin(), endSlice.end());    
213 +      RealType min_val = endSlice[0].first;
214 +      int min_idx = endSlice[0].second;
215 +      StuntDouble* min_sd = endSlice[0].third;
216 +
217 +      std::cerr << "smallest value = " << min_val << " idx = " << min_idx << "\n";
218 +
219 +      // find largest value in midSlice:
220 +      std::sort(midSlice.rbegin(), midSlice.rend());
221 +      RealType max_val = midSlice[0].first;
222 +      int max_idx = midSlice[0].second;
223 +      StuntDouble* max_sd = midSlice[0].third;
224 +
225 +      std::cerr << "largest value = " << max_val << " idx = " << max_idx << "\n";
226 +
227 +    }
228    }  
229   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines