ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE/libmdtools/Integrator.cpp
(Generate patch)

Comparing trunk/OOPSE/libmdtools/Integrator.cpp (file contents):
Revision 1144 by tim, Sat May 1 18:52:38 2004 UTC vs.
Revision 1221 by chrisfen, Wed Jun 2 14:56:18 2004 UTC

# Line 32 | Line 32 | template<typename T> Integrator<T>::Integrator(SimInfo
32  
33    nAtoms = info->n_atoms;
34    integrableObjects = info->integrableObjects;
35 <
35 >
36    // check for constraints
37  
38    constrainedA = NULL;
# Line 45 | Line 45 | template<typename T> Integrator<T>::Integrator(SimInfo
45    nConstrained = 0;
46  
47    checkConstraints();
48 +
49   }
50  
51   template<typename T> Integrator<T>::~Integrator(){
# Line 160 | Line 161 | template<typename T> void Integrator<T>::integrate(voi
161    double thermalTime = info->thermalTime;
162    double resetTime = info->resetTime;
163  
164 <
164 >  double difference;
165    double currSample;
166    double currThermal;
167    double currStatus;
# Line 183 | Line 184 | template<typename T> void Integrator<T>::integrate(voi
184    // that was drifting
185    tStats->removeCOMdrift();
186  
187 +  // initialize the retraints if necessary
188 +  if (info->useSolidThermInt && !info->useLiquidThermInt) {
189 +    myFF->initRestraints();
190 +  }
191 +
192    // initialize the forces before the first step
193  
194    calcForce(1, 1);
# Line 215 | Line 221 | template<typename T> void Integrator<T>::integrate(voi
221   #endif // is_mpi
222  
223    while (info->getTime() < runTime && !stopIntegrator()){
224 <    if ((info->getTime() + dt) >= currStatus){
224 >    difference = info->getTime() + dt - currStatus;
225 >    if (difference > 0 || fabs(difference) < 1e-4 ){
226        calcPot = 1;
227        calcStress = 1;
228      }
# Line 270 | Line 277 | template<typename T> void Integrator<T>::integrate(voi
277   #endif // is_mpi
278    }
279  
280 +  // dump out a file containing the omega values for the final configuration
281 +  if (info->useSolidThermInt && !info->useLiquidThermInt)
282 +    myFF->dumpzAngle();
283 +  
284 +
285    delete dumpOut;
286    delete statOut;
287   }
# Line 304 | Line 316 | template<typename T> void Integrator<T>::integrateStep
316    MPIcheckPoint();
317   #endif // is_mpi
318  
307 –
319    // calc forces
309 –
320    calcForce(calcPot, calcStress);
321  
322   #ifdef IS_MPI
# Line 341 | Line 351 | template<typename T> void Integrator<T>::moveA(void){
351    double Tb[3], ji[3];
352    double vel[3], pos[3], frc[3];
353    double mass;
354 +  double omega;
355  
356    for (i = 0; i < integrableObjects.size() ; i++){
357      integrableObjects[i]->getVel(vel);
358      integrableObjects[i]->getPos(pos);
359      integrableObjects[i]->getFrc(frc);
349 –
350 –    std::cerr << "i =\t" << i << "\t" << frc[0] << "\t" << frc[1]<< "\t" << frc[2] << "\n";
360      
361      mass = integrableObjects[i]->getMass();
362  
# Line 726 | Line 735 | template<typename T> void Integrator<T>::rotationPropa
735      
736      // rotate about the z-axis
737      angle = dt * ji[2] / I[2][2];
738 +    sd->addZangle(angle);
739      this->rotate( 0, 1, angle, ji, A);
740      
741      // rotate about the y-axis

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines