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 690 by mmeineke, Tue Aug 12 21:44:06 2003 UTC vs.
Revision 699 by tim, Fri Aug 15 19:24:13 2003 UTC

# Line 903 | Line 903 | void SimSetup::initSystemCoords( void ){
903      if( worldRank == 0 ){
904   #endif //is_mpi
905        inName = globals->getInitialConfig();
906 +      double* tempDouble = new double[1000000];
907        fileInit = new InitializeFromFile( inName );
908   #ifdef IS_MPI
909      }else fileInit = new InitializeFromFile( NULL );
# Line 1611 | Line 1612 | void SimSetup::setupZConstraint(SimInfo& theInfo)
1612                 " , you must set sample time.\n");
1613        painCave.isFatal = 1;
1614        simError();      
1614    }
1615
1616    //
1617    nZConstraints = globals->getNzConstraints();
1618    zconStamp = globals->getZconStamp();
1619    ZConsParaItem tempParaItem;
1620
1621    ZConsParaData* zconsParaData = new ZConsParaData();
1622    zconsParaData->setID(ZCONSPARADATA_ID);
1623  
1624    for(int i = 0; i < nZConstraints; i++){
1625    tempParaItem.havingZPos = zconStamp[i]->haveZpos();
1626    tempParaItem.zPos = zconStamp[i]->getZpos();
1627    tempParaItem.zconsIndex = zconStamp[i]->getMolIndex();
1628    tempParaItem.kRatio = zconStamp[i]->getKratio();
1629
1630    zconsParaData->addItem(tempParaItem);
1615      }
1616  
1633    //sort the parameters by index of molecules
1634    zconsParaData->sortByIndex();
1635        
1636    //push data into siminfo, therefore, we can retrieve later
1637    theInfo.addProperty(zconsParaData);
1638
1617      //push zconsTol into siminfo, if user does not specify
1618      //value for zconsTol, a default value will be used
1619      DoubleData* zconsTol = new DoubleData();
# Line 1644 | Line 1622 | void SimSetup::setupZConstraint(SimInfo& theInfo)
1622        zconsTol->setData(globals->getZconsTol());
1623      }
1624           else{
1625 <                double defaultZConsTol = 1E-6;
1625 >                double defaultZConsTol = 0.01;
1626        sprintf( painCave.errMsg,
1627                 "ZConstraint Waring: Tolerance for z-constraint methodl is not specified\n"
1628                 " , default value %f is used.\n", defaultZConsTol);
# Line 1654 | Line 1632 | void SimSetup::setupZConstraint(SimInfo& theInfo)
1632        zconsTol->setData(defaultZConsTol);
1633           }
1634      theInfo.addProperty(zconsTol);
1635 +
1636 +    //set Force Substraction Policy
1637 +    StringData* zconsForcePolicy =  new StringData();
1638 +    zconsForcePolicy->setID(ZCONSFORCEPOLICY_ID);
1639 +                
1640 +         if(globals->haveZconsForcePolicy()){
1641 +      zconsForcePolicy->setData(globals->getZconsForcePolicy());
1642 +         }      
1643 +         else{
1644 +       sprintf( painCave.errMsg,
1645 +               "ZConstraint Warning: User does not set force substraction policy, "
1646 +               "average force substraction policy is used\n");
1647 +       painCave.isFatal = 0;
1648 +       simError();
1649 +                 zconsForcePolicy->setData("BYNUMBER");
1650 +         }
1651          
1652 +         theInfo.addProperty(zconsForcePolicy);
1653 +        
1654      //Determine the name of ouput file and add it into SimInfo's property list
1655      //Be careful, do not use inFileName, since it is a pointer which
1656      //point to a string at master node, and slave nodes do not contain that string
# Line 1667 | Line 1663 | void SimSetup::setupZConstraint(SimInfo& theInfo)
1663      zconsFilename->setID(ZCONSFILENAME_ID);
1664      zconsFilename->setData(zconsOutput);
1665      
1666 <    theInfo.addProperty(zconsFilename);      
1666 >    theInfo.addProperty(zconsFilename);
1667 >                
1668 >    //setup index, pos and other parameters of z-constraint molecules
1669 >    nZConstraints = globals->getNzConstraints();
1670 >    theInfo.nZconstraints = nZConstraints;
1671 >        
1672 >    zconStamp = globals->getZconStamp();
1673 >    ZConsParaItem tempParaItem;
1674 >
1675 >    ZConsParaData* zconsParaData = new ZConsParaData();
1676 >    zconsParaData->setID(ZCONSPARADATA_ID);
1677 >  
1678 >    for(int i = 0; i < nZConstraints; i++){
1679 >    tempParaItem.havingZPos = zconStamp[i]->haveZpos();
1680 >    tempParaItem.zPos = zconStamp[i]->getZpos();
1681 >    tempParaItem.zconsIndex = zconStamp[i]->getMolIndex();
1682 >    tempParaItem.kRatio = zconStamp[i]->getKratio();
1683 >
1684 >    zconsParaData->addItem(tempParaItem);
1685 >    }
1686 >
1687 >    //sort the parameters by index of molecules
1688 >    zconsParaData->sortByIndex();
1689 >        
1690 >    //push data into siminfo, therefore, we can retrieve later
1691 >    theInfo.addProperty(zconsParaData);
1692 >      
1693   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines