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

Comparing trunk/OOPSE/libmdtools/SimSetup.cpp (file contents):
Revision 733 by tim, Wed Aug 27 19:23:29 2003 UTC vs.
Revision 738 by tim, Tue Sep 2 14:30:12 2003 UTC

# Line 1615 | Line 1615 | void SimSetup::setupZConstraint(SimInfo& theInfo){
1615    }
1616    theInfo.addProperty(zconsTol);
1617  
1618 <  //set Force Substraction Policy
1618 >  //set Force Subtraction Policy
1619    StringData* zconsForcePolicy = new StringData();
1620    zconsForcePolicy->setID(ZCONSFORCEPOLICY_ID);
1621  
# Line 1624 | Line 1624 | void SimSetup::setupZConstraint(SimInfo& theInfo){
1624    }
1625    else{
1626      sprintf(painCave.errMsg,
1627 <            "ZConstraint Warning: User does not set force substraction policy, "
1628 <            "average force substraction policy is used\n");
1627 >            "ZConstraint Warning: User does not set force Subtraction policy, "
1628 >            "PolicyByMass is used\n");
1629      painCave.isFatal = 0;
1630      simError();
1631 <    zconsForcePolicy->setData("BYNUMBER");
1631 >    zconsForcePolicy->setData("BYMASS");
1632    }
1633  
1634    theInfo.addProperty(zconsForcePolicy);
# Line 1664 | Line 1664 | void SimSetup::setupZConstraint(SimInfo& theInfo){
1664      tempParaItem.kRatio = zconStamp[i]->getKratio();
1665  
1666      zconsParaData->addItem(tempParaItem);
1667 +  }
1668 +
1669 +  //check the uniqueness of index  
1670 +  if(!zconsParaData->isIndexUnique()){
1671 +    sprintf(painCave.errMsg,
1672 +            "ZConstraint Error: molIndex is not unique\n");
1673 +    painCave.isFatal = 1;
1674 +    simError();
1675    }
1676  
1677    //sort the parameters by index of molecules
1678    zconsParaData->sortByIndex();
1679 <
1679 >  
1680    //push data into siminfo, therefore, we can retrieve later
1681    theInfo.addProperty(zconsParaData);
1682   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines