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

Comparing branches/development/src/brains/SimInfo.cpp (file contents):
Revision 1553 by gezelter, Fri Apr 29 17:25:12 2011 UTC vs.
Revision 1767 by gezelter, Fri Jul 6 22:01:58 2012 UTC

# Line 36 | Line 36
36   * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).            
37   * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
38   * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
39 < * [4]  Vardeman & Gezelter, in progress (2009).                        
39 > * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40 > * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
42  
43   /**
# Line 58 | Line 59
59   #include "utils/simError.h"
60   #include "selection/SelectionManager.hpp"
61   #include "io/ForceFieldOptions.hpp"
62 < #include "UseTheForce/ForceField.hpp"
62 > #include "brains/ForceField.hpp"
63   #include "nonbonded/SwitchingFunction.hpp"
64 + #ifdef IS_MPI
65 + #include <mpi.h>
66 + #endif
67  
68   using namespace std;
69   namespace OpenMD {
# Line 68 | Line 72 | namespace OpenMD {
72      forceField_(ff), simParams_(simParams),
73      ndf_(0), fdf_local(0), ndfRaw_(0), ndfTrans_(0), nZconstraint_(0),
74      nGlobalMols_(0), nGlobalAtoms_(0), nGlobalCutoffGroups_(0),
75 <    nGlobalIntegrableObjects_(0), nGlobalRigidBodies_(0),
75 >    nGlobalIntegrableObjects_(0), nGlobalRigidBodies_(0), nGlobalFluctuatingCharges_(0),
76      nAtoms_(0), nBonds_(0),  nBends_(0), nTorsions_(0), nInversions_(0),
77      nRigidBodies_(0), nIntegrableObjects_(0), nCutoffGroups_(0),
78 <    nConstraints_(0), sman_(NULL), fortranInitialized_(false),
78 >    nConstraints_(0), nFluctuatingCharges_(0), sman_(NULL), topologyDone_(false),
79      calcBoxDipole_(false), useAtomicVirial_(true) {    
80      
81      MoleculeStamp* molStamp;
# Line 125 | Line 129 | namespace OpenMD {
129      //equal to the total number of atoms minus number of atoms belong to
130      //cutoff group defined in meta-data file plus the number of cutoff
131      //groups defined in meta-data file
128 –    std::cerr << "nGA = " << nGlobalAtoms_ << "\n";
129 –    std::cerr << "nCA = " << nCutoffAtoms << "\n";
130 –    std::cerr << "nG = " << nGroups << "\n";
132  
133      nGlobalCutoffGroups_ = nGlobalAtoms_ - nCutoffAtoms + nGroups;
133 –
134 –    std::cerr << "nGCG = " << nGlobalCutoffGroups_ << "\n";
134      
135      //every free atom (atom does not belong to rigid bodies) is an
136      //integrable object therefore the total number of integrable objects
# Line 226 | Line 225 | namespace OpenMD {
225  
226  
227    void SimInfo::calcNdf() {
228 <    int ndf_local;
228 >    int ndf_local, nfq_local;
229      MoleculeIterator i;
230      vector<StuntDouble*>::iterator j;
231 +    vector<Atom*>::iterator k;
232 +
233      Molecule* mol;
234      StuntDouble* integrableObject;
235 +    Atom* atom;
236  
237      ndf_local = 0;
238 +    nfq_local = 0;
239      
240      for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
241        for (integrableObject = mol->beginIntegrableObject(j); integrableObject != NULL;
# Line 247 | Line 250 | namespace OpenMD {
250              ndf_local += 3;
251            }
252          }
250 –            
253        }
254 +      for (atom = mol->beginFluctuatingCharge(k); atom != NULL;
255 +           atom = mol->nextFluctuatingCharge(k)) {
256 +        if (atom->isFluctuatingCharge()) {
257 +          nfq_local++;
258 +        }
259 +      }
260      }
261      
262 +    ndfLocal_ = ndf_local;
263 +
264      // n_constraints is local, so subtract them on each processor
265      ndf_local -= nConstraints_;
266  
267   #ifdef IS_MPI
268      MPI_Allreduce(&ndf_local,&ndf_,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD);
269 +    MPI_Allreduce(&nfq_local,&nGlobalFluctuatingCharges_,1, MPI_INT, MPI_SUM, MPI_COMM_WORLD);
270   #else
271      ndf_ = ndf_local;
272 +    nGlobalFluctuatingCharges_ = nfq_local;
273   #endif
274  
275      // nZconstraints_ is global, as are the 3 COM translations for the
# Line 274 | Line 286 | namespace OpenMD {
286   #endif
287      return fdf_;
288    }
289 +  
290 +  unsigned int SimInfo::getNLocalCutoffGroups(){
291 +    int nLocalCutoffAtoms = 0;
292 +    Molecule* mol;
293 +    MoleculeIterator mi;
294 +    CutoffGroup* cg;
295 +    Molecule::CutoffGroupIterator ci;
296      
297 +    for (mol = beginMolecule(mi); mol != NULL; mol  = nextMolecule(mi)) {
298 +      
299 +      for (cg = mol->beginCutoffGroup(ci); cg != NULL;
300 +           cg = mol->nextCutoffGroup(ci)) {
301 +        nLocalCutoffAtoms += cg->getNumAtom();
302 +        
303 +      }        
304 +    }
305 +    
306 +    return nAtoms_ - nLocalCutoffAtoms + nCutoffGroups_;
307 +  }
308 +    
309    void SimInfo::calcNdfRaw() {
310      int ndfRaw_local;
311  
# Line 680 | Line 711 | namespace OpenMD {
711      Atom* atom;
712      set<AtomType*> atomTypes;
713      
714 <    for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {      
715 <      for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
714 >    for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
715 >      for(atom = mol->beginAtom(ai); atom != NULL;
716 >          atom = mol->nextAtom(ai)) {
717          atomTypes.insert(atom->getAtomType());
718        }      
719      }    
720 <
720 >    
721   #ifdef IS_MPI
722  
723      // loop over the found atom types on this processor, and add their
724      // numerical idents to a vector:
725 <
725 >    
726      vector<int> foundTypes;
727      set<AtomType*>::iterator i;
728      for (i = atomTypes.begin(); i != atomTypes.end(); ++i)
# Line 699 | Line 731 | namespace OpenMD {
731      // count_local holds the number of found types on this processor
732      int count_local = foundTypes.size();
733  
734 <    // count holds the total number of found types on all processors
735 <    // (some will be redundant with the ones found locally):
736 <    int count;
737 <    MPI::COMM_WORLD.Allreduce(&count_local, &count, 1, MPI::INT, MPI::SUM);
734 >    int nproc = MPI::COMM_WORLD.Get_size();
735 >
736 >    // we need arrays to hold the counts and displacement vectors for
737 >    // all processors
738 >    vector<int> counts(nproc, 0);
739 >    vector<int> disps(nproc, 0);
740  
741 <    // create a vector to hold the globally found types, and resize it:
742 <    vector<int> ftGlobal;
743 <    ftGlobal.resize(count);
744 <    vector<int> counts;
741 >    // fill the counts array
742 >    MPI::COMM_WORLD.Allgather(&count_local, 1, MPI::INT, &counts[0],
743 >                              1, MPI::INT);
744 >  
745 >    // use the processor counts to compute the displacement array
746 >    disps[0] = 0;    
747 >    int totalCount = counts[0];
748 >    for (int iproc = 1; iproc < nproc; iproc++) {
749 >      disps[iproc] = disps[iproc-1] + counts[iproc-1];
750 >      totalCount += counts[iproc];
751 >    }
752  
753 <    int nproc = MPI::COMM_WORLD.Get_size();
754 <    counts.resize(nproc);
714 <    vector<int> disps;
715 <    disps.resize(nproc);
716 <
717 <    // now spray out the foundTypes to all the other processors:
753 >    // we need a (possibly redundant) set of all found types:
754 >    vector<int> ftGlobal(totalCount);
755      
756 +    // now spray out the foundTypes to all the other processors:    
757      MPI::COMM_WORLD.Allgatherv(&foundTypes[0], count_local, MPI::INT,
758 <                               &ftGlobal[0], &counts[0], &disps[0], MPI::INT);
758 >                               &ftGlobal[0], &counts[0], &disps[0],
759 >                               MPI::INT);
760  
761 +    vector<int>::iterator j;
762 +
763      // foundIdents is a stl set, so inserting an already found ident
764      // will have no effect.
765      set<int> foundIdents;
766 <    vector<int>::iterator j;
766 >
767      for (j = ftGlobal.begin(); j != ftGlobal.end(); ++j)
768        foundIdents.insert((*j));
769      
770      // now iterate over the foundIdents and get the actual atom types
771      // that correspond to these:
772      set<int>::iterator it;
773 <    for (it = foundIdents.begin(); it != foundIdents.end(); ++it)
773 >    for (it = foundIdents.begin(); it != foundIdents.end(); ++it)
774        atomTypes.insert( forceField_->getAtomType((*it)) );
775  
776   #endif
777 <    
777 >
778      return atomTypes;        
779    }
780  
# Line 745 | Line 786 | namespace OpenMD {
786        if ( simParams_->getAccumulateBoxDipole() ) {
787          calcBoxDipole_ = true;      
788        }
789 <
789 >    
790      set<AtomType*>::iterator i;
791      set<AtomType*> atomTypes;
792      atomTypes = getSimulatedAtomTypes();    
793 <    int usesElectrostatic = 0;
794 <    int usesMetallic = 0;
795 <    int usesDirectional = 0;
793 >    bool usesElectrostatic = false;
794 >    bool usesMetallic = false;
795 >    bool usesDirectional = false;
796 >    bool usesFluctuatingCharges =  false;
797      //loop over all of the atom types
798      for (i = atomTypes.begin(); i != atomTypes.end(); ++i) {
799        usesElectrostatic |= (*i)->isElectrostatic();
800        usesMetallic |= (*i)->isMetal();
801        usesDirectional |= (*i)->isDirectional();
802 +      usesFluctuatingCharges |= (*i)->isFluctuatingCharge();
803      }
804  
805 < #ifdef IS_MPI    
806 <    int temp;
805 > #ifdef IS_MPI
806 >    bool temp;
807      temp = usesDirectional;
808 <    MPI_Allreduce(&temp, &usesDirectionalAtoms_, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
809 <
808 >    MPI::COMM_WORLD.Allreduce(&temp, &usesDirectionalAtoms_, 1, MPI::BOOL,
809 >                              MPI::LOR);
810 >        
811      temp = usesMetallic;
812 <    MPI_Allreduce(&temp, &usesMetallicAtoms_, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
813 <
812 >    MPI::COMM_WORLD.Allreduce(&temp, &usesMetallicAtoms_, 1, MPI::BOOL,
813 >                              MPI::LOR);
814 >    
815      temp = usesElectrostatic;
816 <    MPI_Allreduce(&temp, &usesElectrostaticAtoms_, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
816 >    MPI::COMM_WORLD.Allreduce(&temp, &usesElectrostaticAtoms_, 1, MPI::BOOL,
817 >                              MPI::LOR);
818 >
819 >    temp = usesFluctuatingCharges;
820 >    MPI::COMM_WORLD.Allreduce(&temp, &usesFluctuatingCharges_, 1, MPI::BOOL,
821 >                              MPI::LOR);
822 > #else
823 >
824 >    usesDirectionalAtoms_ = usesDirectional;
825 >    usesMetallicAtoms_ = usesMetallic;
826 >    usesElectrostaticAtoms_ = usesElectrostatic;
827 >    usesFluctuatingCharges_ = usesFluctuatingCharges;
828 >
829   #endif
830 +    
831 +    requiresPrepair_ = usesMetallicAtoms_ ? true : false;
832 +    requiresSkipCorrection_ = usesElectrostaticAtoms_ ? true : false;
833 +    requiresSelfCorrection_ = usesElectrostaticAtoms_ ? true : false;    
834    }
835  
836  
# Line 812 | Line 873 | namespace OpenMD {
873    }
874  
875  
876 <  void SimInfo::setupFortran() {
816 <    int isError;
876 >  void SimInfo::prepareTopology() {
877      int nExclude, nOneTwo, nOneThree, nOneFour;
818 –    vector<int> fortranGlobalGroupMembership;
819 –    
820 –    isError = 0;
878  
822 –    //globalGroupMembership_ is filled by SimCreator    
823 –    for (int i = 0; i < nGlobalAtoms_; i++) {
824 –      fortranGlobalGroupMembership.push_back(globalGroupMembership_[i] + 1);
825 –    }
826 –
879      //calculate mass ratio of cutoff group
828 –    vector<RealType> mfact;
880      SimInfo::MoleculeIterator mi;
881      Molecule* mol;
882      Molecule::CutoffGroupIterator ci;
# Line 834 | Line 885 | namespace OpenMD {
885      Atom* atom;
886      RealType totalMass;
887  
888 <    //to avoid memory reallocation, reserve enough space for mfact
889 <    mfact.reserve(getNCutoffGroups());
888 >    /**
889 >     * The mass factor is the relative mass of an atom to the total
890 >     * mass of the cutoff group it belongs to.  By default, all atoms
891 >     * are their own cutoff groups, and therefore have mass factors of
892 >     * 1.  We need some special handling for massless atoms, which
893 >     * will be treated as carrying the entire mass of the cutoff
894 >     * group.
895 >     */
896 >    massFactors_.clear();
897 >    massFactors_.resize(getNAtoms(), 1.0);
898      
899      for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {        
900 <      for (cg = mol->beginCutoffGroup(ci); cg != NULL; cg = mol->nextCutoffGroup(ci)) {
900 >      for (cg = mol->beginCutoffGroup(ci); cg != NULL;
901 >           cg = mol->nextCutoffGroup(ci)) {
902  
903          totalMass = cg->getMass();
904          for(atom = cg->beginAtom(ai); atom != NULL; atom = cg->nextAtom(ai)) {
905            // Check for massless groups - set mfact to 1 if true
906 <          if (totalMass != 0)
907 <            mfact.push_back(atom->getMass()/totalMass);
906 >          if (totalMass != 0)
907 >            massFactors_[atom->getLocalIndex()] = atom->getMass()/totalMass;
908            else
909 <            mfact.push_back( 1.0 );
909 >            massFactors_[atom->getLocalIndex()] = 1.0;
910          }
911        }      
912      }
# Line 860 | Line 920 | namespace OpenMD {
920          identArray_.push_back(atom->getIdent());
921        }
922      }    
863 –
864 –    //fill molMembershipArray
865 –    //molMembershipArray is filled by SimCreator    
866 –    vector<int> molMembershipArray(nGlobalAtoms_);
867 –    for (int i = 0; i < nGlobalAtoms_; i++) {
868 –      molMembershipArray[i] = globalMolMembership_[i] + 1;
869 –    }
923      
924 <    //setup fortran simulation
924 >    //scan topology
925  
926      nExclude = excludedInteractions_.getSize();
927      nOneTwo = oneTwoInteractions_.getSize();
# Line 880 | Line 933 | namespace OpenMD {
933      int* oneThreeList = oneThreeInteractions_.getPairList();
934      int* oneFourList = oneFourInteractions_.getPairList();
935  
936 <    //setFortranSim( &fInfo_, &nGlobalAtoms_, &nAtoms_, &identArray_[0],
884 <    //               &nExclude, excludeList,
885 <    //               &nOneTwo, oneTwoList,
886 <    //               &nOneThree, oneThreeList,
887 <    //               &nOneFour, oneFourList,
888 <    //               &molMembershipArray[0], &mfact[0], &nCutoffGroups_,
889 <    //               &fortranGlobalGroupMembership[0], &isError);
890 <    
891 <    // if( isError ){
892 <    //  
893 <    //  sprintf( painCave.errMsg,
894 <    //         "There was an error setting the simulation information in fortran.\n" );
895 <    //  painCave.isFatal = 1;
896 <    //  painCave.severity = OPENMD_ERROR;
897 <    //  simError();
898 <    //}
899 <    
900 <    
901 <    // sprintf( checkPointMsg,
902 <    //          "succesfully sent the simulation information to fortran.\n");
903 <    
904 <    // errorCheckPoint();
905 <    
906 <    // Setup number of neighbors in neighbor list if present
907 <    //if (simParams_->haveNeighborListNeighbors()) {
908 <    //  int nlistNeighbors = simParams_->getNeighborListNeighbors();
909 <    //  setNeighbors(&nlistNeighbors);
910 <    //}
911 <  
912 < #ifdef IS_MPI    
913 <    // mpiSimData parallelData;
914 <
915 <    //fill up mpiSimData struct
916 <    // parallelData.nMolGlobal = getNGlobalMolecules();
917 <    // parallelData.nMolLocal = getNMolecules();
918 <    // parallelData.nAtomsGlobal = getNGlobalAtoms();
919 <    // parallelData.nAtomsLocal = getNAtoms();
920 <    // parallelData.nGroupsGlobal = getNGlobalCutoffGroups();
921 <    // parallelData.nGroupsLocal = getNCutoffGroups();
922 <    // parallelData.myNode = worldRank;
923 <    // MPI_Comm_size(MPI_COMM_WORLD, &(parallelData.nProcessors));
924 <
925 <    //pass mpiSimData struct and index arrays to fortran
926 <    //setFsimParallel(&parallelData, &(parallelData.nAtomsLocal),
927 <    //                &localToGlobalAtomIndex[0],  &(parallelData.nGroupsLocal),
928 <    //                &localToGlobalCutoffGroupIndex[0], &isError);
929 <
930 <    // if (isError) {
931 <    //   sprintf(painCave.errMsg,
932 <    //           "mpiRefresh errror: fortran didn't like something we gave it.\n");
933 <    //   painCave.isFatal = 1;
934 <    //   simError();
935 <    // }
936 <
937 <    // sprintf(checkPointMsg, " mpiRefresh successful.\n");
938 <    // errorCheckPoint();
939 < #endif
940 <
941 <    // initFortranFF(&isError);
942 <    // if (isError) {
943 <    //   sprintf(painCave.errMsg,
944 <    //           "initFortranFF errror: fortran didn't like something we gave it.\n");
945 <    //   painCave.isFatal = 1;
946 <    //   simError();
947 <    // }
948 <    // fortranInitialized_ = true;
936 >    topologyDone_ = true;
937    }
938  
939    void SimInfo::addProperty(GenericData* genData) {
# Line 1005 | Line 993 | namespace OpenMD {
993      
994    }
995  
1008 –  Vector3d SimInfo::getComVel(){
1009 –    SimInfo::MoleculeIterator i;
1010 –    Molecule* mol;
996  
1012 –    Vector3d comVel(0.0);
1013 –    RealType totalMass = 0.0;
1014 –    
1015 –
1016 –    for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
1017 –      RealType mass = mol->getMass();
1018 –      totalMass += mass;
1019 –      comVel += mass * mol->getComVel();
1020 –    }  
1021 –
1022 – #ifdef IS_MPI
1023 –    RealType tmpMass = totalMass;
1024 –    Vector3d tmpComVel(comVel);    
1025 –    MPI_Allreduce(&tmpMass,&totalMass,1,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1026 –    MPI_Allreduce(tmpComVel.getArrayPointer(), comVel.getArrayPointer(),3,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1027 – #endif
1028 –
1029 –    comVel /= totalMass;
1030 –
1031 –    return comVel;
1032 –  }
1033 –
1034 –  Vector3d SimInfo::getCom(){
1035 –    SimInfo::MoleculeIterator i;
1036 –    Molecule* mol;
1037 –
1038 –    Vector3d com(0.0);
1039 –    RealType totalMass = 0.0;
1040 –    
1041 –    for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
1042 –      RealType mass = mol->getMass();
1043 –      totalMass += mass;
1044 –      com += mass * mol->getCom();
1045 –    }  
1046 –
1047 – #ifdef IS_MPI
1048 –    RealType tmpMass = totalMass;
1049 –    Vector3d tmpCom(com);    
1050 –    MPI_Allreduce(&tmpMass,&totalMass,1,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1051 –    MPI_Allreduce(tmpCom.getArrayPointer(), com.getArrayPointer(),3,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1052 – #endif
1053 –
1054 –    com /= totalMass;
1055 –
1056 –    return com;
1057 –
1058 –  }        
1059 –
997    ostream& operator <<(ostream& o, SimInfo& info) {
998  
999      return o;
1000    }
1001    
1002 <  
1066 <   /*
1067 <   Returns center of mass and center of mass velocity in one function call.
1068 <   */
1069 <  
1070 <   void SimInfo::getComAll(Vector3d &com, Vector3d &comVel){
1071 <      SimInfo::MoleculeIterator i;
1072 <      Molecule* mol;
1073 <      
1074 <    
1075 <      RealType totalMass = 0.0;
1076 <    
1077 <
1078 <      for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
1079 <         RealType mass = mol->getMass();
1080 <         totalMass += mass;
1081 <         com += mass * mol->getCom();
1082 <         comVel += mass * mol->getComVel();          
1083 <      }  
1084 <      
1085 < #ifdef IS_MPI
1086 <      RealType tmpMass = totalMass;
1087 <      Vector3d tmpCom(com);  
1088 <      Vector3d tmpComVel(comVel);
1089 <      MPI_Allreduce(&tmpMass,&totalMass,1,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1090 <      MPI_Allreduce(tmpCom.getArrayPointer(), com.getArrayPointer(),3,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1091 <      MPI_Allreduce(tmpComVel.getArrayPointer(), comVel.getArrayPointer(),3,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1092 < #endif
1093 <      
1094 <      com /= totalMass;
1095 <      comVel /= totalMass;
1096 <   }        
1097 <  
1098 <   /*
1099 <   Return intertia tensor for entire system and angular momentum Vector.
1100 <
1101 <
1102 <       [  Ixx -Ixy  -Ixz ]
1103 <    J =| -Iyx  Iyy  -Iyz |
1104 <       [ -Izx -Iyz   Izz ]
1105 <    */
1106 <
1107 <   void SimInfo::getInertiaTensor(Mat3x3d &inertiaTensor, Vector3d &angularMomentum){
1108 <      
1109 <
1110 <      RealType xx = 0.0;
1111 <      RealType yy = 0.0;
1112 <      RealType zz = 0.0;
1113 <      RealType xy = 0.0;
1114 <      RealType xz = 0.0;
1115 <      RealType yz = 0.0;
1116 <      Vector3d com(0.0);
1117 <      Vector3d comVel(0.0);
1118 <      
1119 <      getComAll(com, comVel);
1120 <      
1121 <      SimInfo::MoleculeIterator i;
1122 <      Molecule* mol;
1123 <      
1124 <      Vector3d thisq(0.0);
1125 <      Vector3d thisv(0.0);
1126 <
1127 <      RealType thisMass = 0.0;
1128 <    
1129 <      
1130 <      
1131 <  
1132 <      for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
1133 <        
1134 <         thisq = mol->getCom()-com;
1135 <         thisv = mol->getComVel()-comVel;
1136 <         thisMass = mol->getMass();
1137 <         // Compute moment of intertia coefficients.
1138 <         xx += thisq[0]*thisq[0]*thisMass;
1139 <         yy += thisq[1]*thisq[1]*thisMass;
1140 <         zz += thisq[2]*thisq[2]*thisMass;
1141 <        
1142 <         // compute products of intertia
1143 <         xy += thisq[0]*thisq[1]*thisMass;
1144 <         xz += thisq[0]*thisq[2]*thisMass;
1145 <         yz += thisq[1]*thisq[2]*thisMass;
1146 <            
1147 <         angularMomentum += cross( thisq, thisv ) * thisMass;
1148 <            
1149 <      }  
1150 <      
1151 <      
1152 <      inertiaTensor(0,0) = yy + zz;
1153 <      inertiaTensor(0,1) = -xy;
1154 <      inertiaTensor(0,2) = -xz;
1155 <      inertiaTensor(1,0) = -xy;
1156 <      inertiaTensor(1,1) = xx + zz;
1157 <      inertiaTensor(1,2) = -yz;
1158 <      inertiaTensor(2,0) = -xz;
1159 <      inertiaTensor(2,1) = -yz;
1160 <      inertiaTensor(2,2) = xx + yy;
1161 <      
1162 < #ifdef IS_MPI
1163 <      Mat3x3d tmpI(inertiaTensor);
1164 <      Vector3d tmpAngMom;
1165 <      MPI_Allreduce(tmpI.getArrayPointer(), inertiaTensor.getArrayPointer(),9,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1166 <      MPI_Allreduce(tmpAngMom.getArrayPointer(), angularMomentum.getArrayPointer(),3,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1167 < #endif
1168 <              
1169 <      return;
1170 <   }
1171 <
1172 <   //Returns the angular momentum of the system
1173 <   Vector3d SimInfo::getAngularMomentum(){
1174 <      
1175 <      Vector3d com(0.0);
1176 <      Vector3d comVel(0.0);
1177 <      Vector3d angularMomentum(0.0);
1178 <      
1179 <      getComAll(com,comVel);
1180 <      
1181 <      SimInfo::MoleculeIterator i;
1182 <      Molecule* mol;
1183 <      
1184 <      Vector3d thisr(0.0);
1185 <      Vector3d thisp(0.0);
1186 <      
1187 <      RealType thisMass;
1188 <      
1189 <      for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {        
1190 <        thisMass = mol->getMass();
1191 <        thisr = mol->getCom()-com;
1192 <        thisp = (mol->getComVel()-comVel)*thisMass;
1193 <        
1194 <        angularMomentum += cross( thisr, thisp );
1195 <        
1196 <      }  
1197 <      
1198 < #ifdef IS_MPI
1199 <      Vector3d tmpAngMom;
1200 <      MPI_Allreduce(tmpAngMom.getArrayPointer(), angularMomentum.getArrayPointer(),3,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1201 < #endif
1202 <      
1203 <      return angularMomentum;
1204 <   }
1205 <  
1002 >  
1003    StuntDouble* SimInfo::getIOIndexToIntegrableObject(int index) {
1004      return IOIndexToIntegrableObject.at(index);
1005    }
# Line 1210 | Line 1007 | namespace OpenMD {
1007    void SimInfo::setIOIndexToIntegrableObject(const vector<StuntDouble*>& v) {
1008      IOIndexToIntegrableObject= v;
1009    }
1213 –
1214 –  /* Returns the Volume of the simulation based on a ellipsoid with semi-axes
1215 –     based on the radius of gyration V=4/3*Pi*R_1*R_2*R_3
1216 –     where R_i are related to the principle inertia moments R_i = sqrt(C*I_i/N), this reduces to
1217 –     V = 4/3*Pi*(C/N)^3/2*sqrt(det(I)). See S.E. Baltazar et. al. Comp. Mat. Sci. 37 (2006) 526-536.
1218 –  */
1219 –  void SimInfo::getGyrationalVolume(RealType &volume){
1220 –    Mat3x3d intTensor;
1221 –    RealType det;
1222 –    Vector3d dummyAngMom;
1223 –    RealType sysconstants;
1224 –    RealType geomCnst;
1225 –
1226 –    geomCnst = 3.0/2.0;
1227 –    /* Get the inertial tensor and angular momentum for free*/
1228 –    getInertiaTensor(intTensor,dummyAngMom);
1229 –    
1230 –    det = intTensor.determinant();
1231 –    sysconstants = geomCnst/(RealType)nGlobalIntegrableObjects_;
1232 –    volume = 4.0/3.0*NumericConstant::PI*pow(sysconstants,3.0/2.0)*sqrt(det);
1233 –    return;
1234 –  }
1235 –
1236 –  void SimInfo::getGyrationalVolume(RealType &volume, RealType &detI){
1237 –    Mat3x3d intTensor;
1238 –    Vector3d dummyAngMom;
1239 –    RealType sysconstants;
1240 –    RealType geomCnst;
1241 –
1242 –    geomCnst = 3.0/2.0;
1243 –    /* Get the inertial tensor and angular momentum for free*/
1244 –    getInertiaTensor(intTensor,dummyAngMom);
1245 –    
1246 –    detI = intTensor.determinant();
1247 –    sysconstants = geomCnst/(RealType)nGlobalIntegrableObjects_;
1248 –    volume = 4.0/3.0*NumericConstant::PI*pow(sysconstants,3.0/2.0)*sqrt(detI);
1249 –    return;
1250 –  }
1010   /*
1011     void SimInfo::setStuntDoubleFromGlobalIndex(vector<StuntDouble*> v) {
1012        assert( v.size() == nAtoms_ + nRigidBodies_);

Diff Legend

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