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 1744 by gezelter, Tue Jun 5 18:07:08 2012 UTC vs.
Revision 1769 by gezelter, Mon Jul 9 14:15:52 2012 UTC

# Line 231 | Line 231 | namespace OpenMD {
231      vector<Atom*>::iterator k;
232  
233      Molecule* mol;
234 <    StuntDouble* integrableObject;
234 >    StuntDouble* sd;
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;
242 –           integrableObject = mol->nextIntegrableObject(j)) {
241  
242 +      for (sd = mol->beginIntegrableObject(j); sd != NULL;
243 +           sd = mol->nextIntegrableObject(j)) {
244 +
245          ndf_local += 3;
246  
247 <        if (integrableObject->isDirectional()) {
248 <          if (integrableObject->isLinear()) {
247 >        if (sd->isDirectional()) {
248 >          if (sd->isLinear()) {
249              ndf_local += 2;
250            } else {
251              ndf_local += 3;
252            }
253          }
254        }
255 +
256        for (atom = mol->beginFluctuatingCharge(k); atom != NULL;
257             atom = mol->nextFluctuatingCharge(k)) {
258          if (atom->isFluctuatingCharge()) {
# Line 260 | Line 262 | namespace OpenMD {
262      }
263      
264      ndfLocal_ = ndf_local;
263 –    cerr << "ndfLocal_ = " << ndfLocal_ << "\n";
265  
266      // n_constraints is local, so subtract them on each processor
267      ndf_local -= nConstraints_;
# Line 313 | Line 314 | namespace OpenMD {
314      MoleculeIterator i;
315      vector<StuntDouble*>::iterator j;
316      Molecule* mol;
317 <    StuntDouble* integrableObject;
317 >    StuntDouble* sd;
318  
319      // Raw degrees of freedom that we have to set
320      ndfRaw_local = 0;
321      
322      for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
322 –      for (integrableObject = mol->beginIntegrableObject(j); integrableObject != NULL;
323 –           integrableObject = mol->nextIntegrableObject(j)) {
323  
324 +      for (sd = mol->beginIntegrableObject(j); sd != NULL;
325 +           sd = mol->nextIntegrableObject(j)) {
326 +
327          ndfRaw_local += 3;
328  
329 <        if (integrableObject->isDirectional()) {
330 <          if (integrableObject->isLinear()) {
329 >        if (sd->isDirectional()) {
330 >          if (sd->isLinear()) {
331              ndfRaw_local += 2;
332            } else {
333              ndfRaw_local += 3;
# Line 385 | Line 387 | namespace OpenMD {
387      Molecule::RigidBodyIterator rbIter;
388      RigidBody* rb;
389      Molecule::IntegrableObjectIterator ii;
390 <    StuntDouble* integrableObject;
390 >    StuntDouble* sd;
391      
392 <    for (integrableObject = mol->beginIntegrableObject(ii);
393 <         integrableObject != NULL;
392 <         integrableObject = mol->nextIntegrableObject(ii)) {
392 >    for (sd = mol->beginIntegrableObject(ii); sd != NULL;
393 >         sd = mol->nextIntegrableObject(ii)) {
394        
395 <      if (integrableObject->isRigidBody()) {
396 <        rb = static_cast<RigidBody*>(integrableObject);
395 >      if (sd->isRigidBody()) {
396 >        rb = static_cast<RigidBody*>(sd);
397          vector<Atom*> atoms = rb->getAtoms();
398          set<int> rigidAtoms;
399          for (int i = 0; i < static_cast<int>(atoms.size()); ++i) {
# Line 403 | Line 404 | namespace OpenMD {
404          }      
405        } else {
406          set<int> oneAtomSet;
407 <        oneAtomSet.insert(integrableObject->getGlobalIndex());
408 <        atomGroups.insert(map<int, set<int> >::value_type(integrableObject->getGlobalIndex(), oneAtomSet));        
407 >        oneAtomSet.insert(sd->getGlobalIndex());
408 >        atomGroups.insert(map<int, set<int> >::value_type(sd->getGlobalIndex(), oneAtomSet));        
409        }
410      }  
411            
# Line 538 | Line 539 | namespace OpenMD {
539      Molecule::RigidBodyIterator rbIter;
540      RigidBody* rb;
541      Molecule::IntegrableObjectIterator ii;
542 <    StuntDouble* integrableObject;
542 >    StuntDouble* sd;
543      
544 <    for (integrableObject = mol->beginIntegrableObject(ii);
545 <         integrableObject != NULL;
545 <         integrableObject = mol->nextIntegrableObject(ii)) {
544 >    for (sd = mol->beginIntegrableObject(ii); sd != NULL;
545 >         sd = mol->nextIntegrableObject(ii)) {
546        
547 <      if (integrableObject->isRigidBody()) {
548 <        rb = static_cast<RigidBody*>(integrableObject);
547 >      if (sd->isRigidBody()) {
548 >        rb = static_cast<RigidBody*>(sd);
549          vector<Atom*> atoms = rb->getAtoms();
550          set<int> rigidAtoms;
551          for (int i = 0; i < static_cast<int>(atoms.size()); ++i) {
# Line 556 | Line 556 | namespace OpenMD {
556          }      
557        } else {
558          set<int> oneAtomSet;
559 <        oneAtomSet.insert(integrableObject->getGlobalIndex());
560 <        atomGroups.insert(map<int, set<int> >::value_type(integrableObject->getGlobalIndex(), oneAtomSet));        
559 >        oneAtomSet.insert(sd->getGlobalIndex());
560 >        atomGroups.insert(map<int, set<int> >::value_type(sd->getGlobalIndex(), oneAtomSet));        
561        }
562      }  
563  
# Line 791 | Line 791 | namespace OpenMD {
791      set<AtomType*>::iterator i;
792      set<AtomType*> atomTypes;
793      atomTypes = getSimulatedAtomTypes();    
794 <    int usesElectrostatic = 0;
795 <    int usesMetallic = 0;
796 <    int usesDirectional = 0;
797 <    int usesFluctuatingCharges =  0;
794 >    bool usesElectrostatic = false;
795 >    bool usesMetallic = false;
796 >    bool usesDirectional = false;
797 >    bool usesFluctuatingCharges =  false;
798      //loop over all of the atom types
799      for (i = atomTypes.begin(); i != atomTypes.end(); ++i) {
800        usesElectrostatic |= (*i)->isElectrostatic();
# Line 802 | Line 802 | namespace OpenMD {
802        usesDirectional |= (*i)->isDirectional();
803        usesFluctuatingCharges |= (*i)->isFluctuatingCharge();
804      }
805 <    
806 < #ifdef IS_MPI    
807 <    int temp;
805 >
806 > #ifdef IS_MPI
807 >    bool temp;
808      temp = usesDirectional;
809 <    MPI_Allreduce(&temp, &usesDirectionalAtoms_, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
810 <    
809 >    MPI::COMM_WORLD.Allreduce(&temp, &usesDirectionalAtoms_, 1, MPI::BOOL,
810 >                              MPI::LOR);
811 >        
812      temp = usesMetallic;
813 <    MPI_Allreduce(&temp, &usesMetallicAtoms_, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);    
813 >    MPI::COMM_WORLD.Allreduce(&temp, &usesMetallicAtoms_, 1, MPI::BOOL,
814 >                              MPI::LOR);
815      
816      temp = usesElectrostatic;
817 <    MPI_Allreduce(&temp, &usesElectrostaticAtoms_, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
817 >    MPI::COMM_WORLD.Allreduce(&temp, &usesElectrostaticAtoms_, 1, MPI::BOOL,
818 >                              MPI::LOR);
819  
820      temp = usesFluctuatingCharges;
821 <    MPI_Allreduce(&temp, &usesFluctuatingCharges_, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
821 >    MPI::COMM_WORLD.Allreduce(&temp, &usesFluctuatingCharges_, 1, MPI::BOOL,
822 >                              MPI::LOR);
823   #else
824  
825      usesDirectionalAtoms_ = usesDirectional;
# Line 990 | Line 994 | namespace OpenMD {
994      
995    }
996  
993 –  Vector3d SimInfo::getComVel(){
994 –    SimInfo::MoleculeIterator i;
995 –    Molecule* mol;
997  
997 –    Vector3d comVel(0.0);
998 –    RealType totalMass = 0.0;
999 –    
1000 –
1001 –    for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
1002 –      RealType mass = mol->getMass();
1003 –      totalMass += mass;
1004 –      comVel += mass * mol->getComVel();
1005 –    }  
1006 –
1007 – #ifdef IS_MPI
1008 –    RealType tmpMass = totalMass;
1009 –    Vector3d tmpComVel(comVel);    
1010 –    MPI_Allreduce(&tmpMass,&totalMass,1,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1011 –    MPI_Allreduce(tmpComVel.getArrayPointer(), comVel.getArrayPointer(),3,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1012 – #endif
1013 –
1014 –    comVel /= totalMass;
1015 –
1016 –    return comVel;
1017 –  }
1018 –
1019 –  Vector3d SimInfo::getCom(){
1020 –    SimInfo::MoleculeIterator i;
1021 –    Molecule* mol;
1022 –
1023 –    Vector3d com(0.0);
1024 –    RealType totalMass = 0.0;
1025 –    
1026 –    for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
1027 –      RealType mass = mol->getMass();
1028 –      totalMass += mass;
1029 –      com += mass * mol->getCom();
1030 –    }  
1031 –
1032 – #ifdef IS_MPI
1033 –    RealType tmpMass = totalMass;
1034 –    Vector3d tmpCom(com);    
1035 –    MPI_Allreduce(&tmpMass,&totalMass,1,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1036 –    MPI_Allreduce(tmpCom.getArrayPointer(), com.getArrayPointer(),3,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1037 – #endif
1038 –
1039 –    com /= totalMass;
1040 –
1041 –    return com;
1042 –
1043 –  }        
1044 –
998    ostream& operator <<(ostream& o, SimInfo& info) {
999  
1000      return o;
1001    }
1002    
1003 <  
1051 <   /*
1052 <   Returns center of mass and center of mass velocity in one function call.
1053 <   */
1054 <  
1055 <   void SimInfo::getComAll(Vector3d &com, Vector3d &comVel){
1056 <      SimInfo::MoleculeIterator i;
1057 <      Molecule* mol;
1058 <      
1059 <    
1060 <      RealType totalMass = 0.0;
1061 <    
1062 <
1063 <      for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
1064 <         RealType mass = mol->getMass();
1065 <         totalMass += mass;
1066 <         com += mass * mol->getCom();
1067 <         comVel += mass * mol->getComVel();          
1068 <      }  
1069 <      
1070 < #ifdef IS_MPI
1071 <      RealType tmpMass = totalMass;
1072 <      Vector3d tmpCom(com);  
1073 <      Vector3d tmpComVel(comVel);
1074 <      MPI_Allreduce(&tmpMass,&totalMass,1,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1075 <      MPI_Allreduce(tmpCom.getArrayPointer(), com.getArrayPointer(),3,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1076 <      MPI_Allreduce(tmpComVel.getArrayPointer(), comVel.getArrayPointer(),3,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1077 < #endif
1078 <      
1079 <      com /= totalMass;
1080 <      comVel /= totalMass;
1081 <   }        
1082 <  
1083 <   /*
1084 <   Return intertia tensor for entire system and angular momentum Vector.
1085 <
1086 <
1087 <       [  Ixx -Ixy  -Ixz ]
1088 <    J =| -Iyx  Iyy  -Iyz |
1089 <       [ -Izx -Iyz   Izz ]
1090 <    */
1091 <
1092 <   void SimInfo::getInertiaTensor(Mat3x3d &inertiaTensor, Vector3d &angularMomentum){
1093 <      
1094 <
1095 <      RealType xx = 0.0;
1096 <      RealType yy = 0.0;
1097 <      RealType zz = 0.0;
1098 <      RealType xy = 0.0;
1099 <      RealType xz = 0.0;
1100 <      RealType yz = 0.0;
1101 <      Vector3d com(0.0);
1102 <      Vector3d comVel(0.0);
1103 <      
1104 <      getComAll(com, comVel);
1105 <      
1106 <      SimInfo::MoleculeIterator i;
1107 <      Molecule* mol;
1108 <      
1109 <      Vector3d thisq(0.0);
1110 <      Vector3d thisv(0.0);
1111 <
1112 <      RealType thisMass = 0.0;
1113 <    
1114 <      
1115 <      
1116 <  
1117 <      for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {
1118 <        
1119 <         thisq = mol->getCom()-com;
1120 <         thisv = mol->getComVel()-comVel;
1121 <         thisMass = mol->getMass();
1122 <         // Compute moment of intertia coefficients.
1123 <         xx += thisq[0]*thisq[0]*thisMass;
1124 <         yy += thisq[1]*thisq[1]*thisMass;
1125 <         zz += thisq[2]*thisq[2]*thisMass;
1126 <        
1127 <         // compute products of intertia
1128 <         xy += thisq[0]*thisq[1]*thisMass;
1129 <         xz += thisq[0]*thisq[2]*thisMass;
1130 <         yz += thisq[1]*thisq[2]*thisMass;
1131 <            
1132 <         angularMomentum += cross( thisq, thisv ) * thisMass;
1133 <            
1134 <      }  
1135 <      
1136 <      
1137 <      inertiaTensor(0,0) = yy + zz;
1138 <      inertiaTensor(0,1) = -xy;
1139 <      inertiaTensor(0,2) = -xz;
1140 <      inertiaTensor(1,0) = -xy;
1141 <      inertiaTensor(1,1) = xx + zz;
1142 <      inertiaTensor(1,2) = -yz;
1143 <      inertiaTensor(2,0) = -xz;
1144 <      inertiaTensor(2,1) = -yz;
1145 <      inertiaTensor(2,2) = xx + yy;
1146 <      
1147 < #ifdef IS_MPI
1148 <      Mat3x3d tmpI(inertiaTensor);
1149 <      Vector3d tmpAngMom;
1150 <      MPI_Allreduce(tmpI.getArrayPointer(), inertiaTensor.getArrayPointer(),9,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1151 <      MPI_Allreduce(tmpAngMom.getArrayPointer(), angularMomentum.getArrayPointer(),3,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1152 < #endif
1153 <              
1154 <      return;
1155 <   }
1156 <
1157 <   //Returns the angular momentum of the system
1158 <   Vector3d SimInfo::getAngularMomentum(){
1159 <      
1160 <      Vector3d com(0.0);
1161 <      Vector3d comVel(0.0);
1162 <      Vector3d angularMomentum(0.0);
1163 <      
1164 <      getComAll(com,comVel);
1165 <      
1166 <      SimInfo::MoleculeIterator i;
1167 <      Molecule* mol;
1168 <      
1169 <      Vector3d thisr(0.0);
1170 <      Vector3d thisp(0.0);
1171 <      
1172 <      RealType thisMass;
1173 <      
1174 <      for (mol = beginMolecule(i); mol != NULL; mol = nextMolecule(i)) {        
1175 <        thisMass = mol->getMass();
1176 <        thisr = mol->getCom()-com;
1177 <        thisp = (mol->getComVel()-comVel)*thisMass;
1178 <        
1179 <        angularMomentum += cross( thisr, thisp );
1180 <        
1181 <      }  
1182 <      
1183 < #ifdef IS_MPI
1184 <      Vector3d tmpAngMom;
1185 <      MPI_Allreduce(tmpAngMom.getArrayPointer(), angularMomentum.getArrayPointer(),3,MPI_REALTYPE,MPI_SUM, MPI_COMM_WORLD);
1186 < #endif
1187 <      
1188 <      return angularMomentum;
1189 <   }
1190 <  
1003 >  
1004    StuntDouble* SimInfo::getIOIndexToIntegrableObject(int index) {
1005      return IOIndexToIntegrableObject.at(index);
1006    }
# Line 1195 | Line 1008 | namespace OpenMD {
1008    void SimInfo::setIOIndexToIntegrableObject(const vector<StuntDouble*>& v) {
1009      IOIndexToIntegrableObject= v;
1010    }
1198 –
1199 –  /* Returns the Volume of the simulation based on a ellipsoid with semi-axes
1200 –     based on the radius of gyration V=4/3*Pi*R_1*R_2*R_3
1201 –     where R_i are related to the principle inertia moments R_i = sqrt(C*I_i/N), this reduces to
1202 –     V = 4/3*Pi*(C/N)^3/2*sqrt(det(I)). See S.E. Baltazar et. al. Comp. Mat. Sci. 37 (2006) 526-536.
1203 –  */
1204 –  void SimInfo::getGyrationalVolume(RealType &volume){
1205 –    Mat3x3d intTensor;
1206 –    RealType det;
1207 –    Vector3d dummyAngMom;
1208 –    RealType sysconstants;
1209 –    RealType geomCnst;
1210 –
1211 –    geomCnst = 3.0/2.0;
1212 –    /* Get the inertial tensor and angular momentum for free*/
1213 –    getInertiaTensor(intTensor,dummyAngMom);
1214 –    
1215 –    det = intTensor.determinant();
1216 –    sysconstants = geomCnst/(RealType)nGlobalIntegrableObjects_;
1217 –    volume = 4.0/3.0*NumericConstant::PI*pow(sysconstants,geomCnst)*sqrt(det);
1218 –    return;
1219 –  }
1220 –
1221 –  void SimInfo::getGyrationalVolume(RealType &volume, RealType &detI){
1222 –    Mat3x3d intTensor;
1223 –    Vector3d dummyAngMom;
1224 –    RealType sysconstants;
1225 –    RealType geomCnst;
1226 –
1227 –    geomCnst = 3.0/2.0;
1228 –    /* Get the inertial tensor and angular momentum for free*/
1229 –    getInertiaTensor(intTensor,dummyAngMom);
1230 –    
1231 –    detI = intTensor.determinant();
1232 –    sysconstants = geomCnst/(RealType)nGlobalIntegrableObjects_;
1233 –    volume = 4.0/3.0*NumericConstant::PI*pow(sysconstants,geomCnst)*sqrt(detI);
1234 –    return;
1235 –  }
1011   /*
1012     void SimInfo::setStuntDoubleFromGlobalIndex(vector<StuntDouble*> v) {
1013        assert( v.size() == nAtoms_ + nRigidBodies_);

Diff Legend

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