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

Comparing trunk/src/brains/SimInfo.cpp (file contents):
Revision 1095 by chuckv, Tue Dec 5 00:17:24 2006 UTC vs.
Revision 1126 by gezelter, Fri Apr 6 21:53:43 2007 UTC

# Line 92 | Line 92 | namespace oopse {
92      nGlobalIntegrableObjects_(0), nGlobalRigidBodies_(0),
93      nAtoms_(0), nBonds_(0),  nBends_(0), nTorsions_(0), nRigidBodies_(0),
94      nIntegrableObjects_(0),  nCutoffGroups_(0), nConstraints_(0),
95 <    sman_(NULL), fortranInitialized_(false), calcBoxDipole_(false) {
95 >    sman_(NULL), fortranInitialized_(false), calcBoxDipole_(false),
96 >    useAtomicVirial_(true) {
97  
98        MoleculeStamp* molStamp;
99        int nMolWithSameStamp;
# Line 666 | Line 667 | namespace oopse {
667      int useSF;
668      int useSP;
669      int useBoxDipole;
670 +
671      std::string myMethod;
672  
673      // set the useRF logical
# Line 690 | Line 692 | namespace oopse {
692        if (simParams_->getAccumulateBoxDipole())
693          useBoxDipole = 1;
694  
695 +    useAtomicVirial_ = simParams_->getUseAtomicVirial();
696 +
697      //loop over all of the atom types
698      for (i = atomTypes.begin(); i != atomTypes.end(); ++i) {
699        useLennardJones |= (*i)->isLennardJones();
# Line 767 | Line 771 | namespace oopse {
771      temp = useBoxDipole;
772      MPI_Allreduce(&temp, &useBoxDipole, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
773  
774 +    temp = useAtomicVirial_;
775 +    MPI_Allreduce(&temp, &useAtomicVirial_, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
776 +
777   #endif
778  
779      fInfo_.SIM_uses_PBC = usePBC;    
# Line 786 | Line 793 | namespace oopse {
793      fInfo_.SIM_uses_SF = useSF;
794      fInfo_.SIM_uses_SP = useSP;
795      fInfo_.SIM_uses_BoxDipole = useBoxDipole;
796 +    fInfo_.SIM_uses_AtomicVirial = useAtomicVirial_;
797    }
798  
799    void SimInfo::setupFortranSim() {
# Line 873 | Line 881 | namespace oopse {
881  
882      // Setup number of neighbors in neighbor list if present
883      if (simParams_->haveNeighborListNeighbors()) {
884 <      setNeighbors(simParams_->getNeighborListNeighbors());
884 >      int nlistNeighbors = simParams_->getNeighborListNeighbors();
885 >      setNeighbors(&nlistNeighbors);
886      }
887    
888  
# Line 1453 | Line 1462 | namespace oopse {
1462    
1463    void SimInfo::setIOIndexToIntegrableObject(const std::vector<StuntDouble*>& v) {
1464      IOIndexToIntegrableObject= v;
1465 +  }
1466 +
1467 +  /* Returns the Volume of the simulation based on a ellipsoid with semi-axes
1468 +     based on the radius of gyration V=4/3*Pi*R_1*R_2*R_3
1469 +     where R_i are related to the principle inertia moments R_i = sqrt(C*I_i/N), this reduces to
1470 +     V = 4/3*Pi*(C/N)^3/2*sqrt(det(I)). See S.E. Baltazar et. al. Comp. Mat. Sci. 37 (2006) 526-536.
1471 +  */
1472 +  void SimInfo::getGyrationalVolume(RealType &volume){
1473 +    Mat3x3d intTensor;
1474 +    RealType det;
1475 +    Vector3d dummyAngMom;
1476 +    RealType sysconstants;
1477 +    RealType geomCnst;
1478 +
1479 +    geomCnst = 3.0/2.0;
1480 +    /* Get the inertial tensor and angular momentum for free*/
1481 +    getInertiaTensor(intTensor,dummyAngMom);
1482 +    
1483 +    det = intTensor.determinant();
1484 +    sysconstants = geomCnst/(RealType)nGlobalIntegrableObjects_;
1485 +    volume = 4.0/3.0*NumericConstant::PI*pow(sysconstants,3.0/2.0)*sqrt(det);
1486 +    return;
1487    }
1488  
1489 +  void SimInfo::getGyrationalVolume(RealType &volume, RealType &detI){
1490 +    Mat3x3d intTensor;
1491 +    Vector3d dummyAngMom;
1492 +    RealType sysconstants;
1493 +    RealType geomCnst;
1494 +
1495 +    geomCnst = 3.0/2.0;
1496 +    /* Get the inertial tensor and angular momentum for free*/
1497 +    getInertiaTensor(intTensor,dummyAngMom);
1498 +    
1499 +    detI = intTensor.determinant();
1500 +    sysconstants = geomCnst/(RealType)nGlobalIntegrableObjects_;
1501 +    volume = 4.0/3.0*NumericConstant::PI*pow(sysconstants,3.0/2.0)*sqrt(detI);
1502 +    return;
1503 +  }
1504   /*
1505     void SimInfo::setStuntDoubleFromGlobalIndex(std::vector<StuntDouble*> v) {
1506        assert( v.size() == nAtoms_ + nRigidBodies_);

Diff Legend

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