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

Comparing trunk/OOPSE/libmdtools/SimInfo.cpp (file contents):
Revision 1113 by tim, Thu Apr 15 16:18:26 2004 UTC vs.
Revision 1125 by gezelter, Mon Apr 19 22:13:01 2004 UTC

# Line 326 | Line 326 | int SimInfo::getNDF(){
326    
327    for(int i = 0; i < integrableObjects.size(); i++){
328      ndf_local += 3;
329 <    if (integrableObjects[i]->isDirectional())
330 <      ndf_local += 3;
329 >    if (integrableObjects[i]->isDirectional()) {
330 >      if (integrableObjects[i]->isLinear())
331 >        ndf_local += 2;
332 >      else
333 >        ndf_local += 3;
334 >    }
335    }
336  
337    // n_constraints is local, so subtract them on each processor:
# Line 345 | Line 349 | int SimInfo::getNDF(){
349  
350    ndf = ndf - 3 - nZconstraints;
351  
352 +  std::cerr << "ndf = " << ndf;
353 +
354    return ndf;
355   }
356  
# Line 356 | Line 362 | int SimInfo::getNDFraw() {
362  
363    for(int i = 0; i < integrableObjects.size(); i++){
364      ndfRaw_local += 3;
365 <    if (integrableObjects[i]->isDirectional())
366 <      ndfRaw_local += 3;
365 >    if (integrableObjects[i]->isDirectional()) {
366 >       if (integrableObjects[i]->isLinear())
367 >        ndfRaw_local += 2;
368 >      else
369 >        ndfRaw_local += 3;
370 >    }
371    }
372      
373   #ifdef IS_MPI
# Line 581 | Line 591 | GenericData* SimInfo::getProperty(const string& propNa
591      return NULL;  
592   }
593  
584 – vector<GenericData*> SimInfo::getProperties(){
585 –
586 –  vector<GenericData*> result;
587 –  map<string, GenericData*>::iterator i;
588 –  
589 –  for(i = properties.begin(); i != properties.end(); i++)
590 –    result.push_back((*i).second);
591 –    
592 –  return result;
593 – }

Diff Legend

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