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 1550 by gezelter, Wed Apr 27 21:49:59 2011 UTC vs.
Revision 1569 by gezelter, Thu May 26 13:55:04 2011 UTC

# Line 71 | Line 71 | namespace OpenMD {
71      nGlobalIntegrableObjects_(0), nGlobalRigidBodies_(0),
72      nAtoms_(0), nBonds_(0),  nBends_(0), nTorsions_(0), nInversions_(0),
73      nRigidBodies_(0), nIntegrableObjects_(0), nCutoffGroups_(0),
74 <    nConstraints_(0), sman_(NULL), fortranInitialized_(false),
74 >    nConstraints_(0), sman_(NULL), topologyDone_(false),
75      calcBoxDipole_(false), useAtomicVirial_(true) {    
76      
77      MoleculeStamp* molStamp;
# Line 770 | Line 770 | namespace OpenMD {
770      temp = usesElectrostatic;
771      MPI_Allreduce(&temp, &usesElectrostaticAtoms_, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
772   #endif
773    fInfo_.SIM_uses_PBC = usesPeriodicBoundaries_;    
774    fInfo_.SIM_uses_DirectionalAtoms = usesDirectionalAtoms_;
775    fInfo_.SIM_uses_MetallicAtoms = usesMetallicAtoms_;
776    fInfo_.SIM_requires_SkipCorrection = usesElectrostaticAtoms_;
777    fInfo_.SIM_requires_SelfCorrection = usesElectrostaticAtoms_;
778    fInfo_.SIM_uses_AtomicVirial = usesAtomicVirial_;
773    }
774  
775  
# Line 818 | Line 812 | namespace OpenMD {
812    }
813  
814  
815 <  void SimInfo::setupFortran() {
822 <    int isError;
815 >  void SimInfo::prepareTopology() {
816      int nExclude, nOneTwo, nOneThree, nOneFour;
824    vector<int> fortranGlobalGroupMembership;
825    
826    isError = 0;
817  
828    //globalGroupMembership_ is filled by SimCreator    
829    for (int i = 0; i < nGlobalAtoms_; i++) {
830      fortranGlobalGroupMembership.push_back(globalGroupMembership_[i] + 1);
831    }
832
818      //calculate mass ratio of cutoff group
834    vector<RealType> mfact;
819      SimInfo::MoleculeIterator mi;
820      Molecule* mol;
821      Molecule::CutoffGroupIterator ci;
# Line 840 | Line 824 | namespace OpenMD {
824      Atom* atom;
825      RealType totalMass;
826  
827 <    //to avoid memory reallocation, reserve enough space for mfact
828 <    mfact.reserve(getNCutoffGroups());
827 >    //to avoid memory reallocation, reserve enough space for massFactors_
828 >    massFactors_.clear();
829 >    massFactors_.reserve(getNCutoffGroups());
830      
831      for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {        
832 <      for (cg = mol->beginCutoffGroup(ci); cg != NULL; cg = mol->nextCutoffGroup(ci)) {
832 >      for (cg = mol->beginCutoffGroup(ci); cg != NULL;
833 >           cg = mol->nextCutoffGroup(ci)) {
834  
835          totalMass = cg->getMass();
836          for(atom = cg->beginAtom(ai); atom != NULL; atom = cg->nextAtom(ai)) {
837            // Check for massless groups - set mfact to 1 if true
838            if (totalMass != 0)
839 <            mfact.push_back(atom->getMass()/totalMass);
839 >            massFactors_.push_back(atom->getMass()/totalMass);
840            else
841 <            mfact.push_back( 1.0 );
841 >            massFactors_.push_back( 1.0 );
842          }
843        }      
844      }
# Line 866 | Line 852 | namespace OpenMD {
852          identArray_.push_back(atom->getIdent());
853        }
854      }    
869
870    //fill molMembershipArray
871    //molMembershipArray is filled by SimCreator    
872    vector<int> molMembershipArray(nGlobalAtoms_);
873    for (int i = 0; i < nGlobalAtoms_; i++) {
874      molMembershipArray[i] = globalMolMembership_[i] + 1;
875    }
855      
856 <    //setup fortran simulation
856 >    //scan topology
857  
858      nExclude = excludedInteractions_.getSize();
859      nOneTwo = oneTwoInteractions_.getSize();
# Line 893 | Line 872 | namespace OpenMD {
872      //               &nOneFour, oneFourList,
873      //               &molMembershipArray[0], &mfact[0], &nCutoffGroups_,
874      //               &fortranGlobalGroupMembership[0], &isError);
896    
897    // if( isError ){
898    //  
899    //  sprintf( painCave.errMsg,
900    //         "There was an error setting the simulation information in fortran.\n" );
901    //  painCave.isFatal = 1;
902    //  painCave.severity = OPENMD_ERROR;
903    //  simError();
904    //}
875      
876 <    
907 <    // sprintf( checkPointMsg,
908 <    //          "succesfully sent the simulation information to fortran.\n");
909 <    
910 <    // errorCheckPoint();
911 <    
912 <    // Setup number of neighbors in neighbor list if present
913 <    //if (simParams_->haveNeighborListNeighbors()) {
914 <    //  int nlistNeighbors = simParams_->getNeighborListNeighbors();
915 <    //  setNeighbors(&nlistNeighbors);
916 <    //}
917 <  
918 < #ifdef IS_MPI    
919 <    // mpiSimData parallelData;
920 <
921 <    //fill up mpiSimData struct
922 <    // parallelData.nMolGlobal = getNGlobalMolecules();
923 <    // parallelData.nMolLocal = getNMolecules();
924 <    // parallelData.nAtomsGlobal = getNGlobalAtoms();
925 <    // parallelData.nAtomsLocal = getNAtoms();
926 <    // parallelData.nGroupsGlobal = getNGlobalCutoffGroups();
927 <    // parallelData.nGroupsLocal = getNCutoffGroups();
928 <    // parallelData.myNode = worldRank;
929 <    // MPI_Comm_size(MPI_COMM_WORLD, &(parallelData.nProcessors));
930 <
931 <    //pass mpiSimData struct and index arrays to fortran
932 <    //setFsimParallel(&parallelData, &(parallelData.nAtomsLocal),
933 <    //                &localToGlobalAtomIndex[0],  &(parallelData.nGroupsLocal),
934 <    //                &localToGlobalCutoffGroupIndex[0], &isError);
935 <
936 <    // if (isError) {
937 <    //   sprintf(painCave.errMsg,
938 <    //           "mpiRefresh errror: fortran didn't like something we gave it.\n");
939 <    //   painCave.isFatal = 1;
940 <    //   simError();
941 <    // }
942 <
943 <    // sprintf(checkPointMsg, " mpiRefresh successful.\n");
944 <    // errorCheckPoint();
945 < #endif
946 <
947 <    // initFortranFF(&isError);
948 <    // if (isError) {
949 <    //   sprintf(painCave.errMsg,
950 <    //           "initFortranFF errror: fortran didn't like something we gave it.\n");
951 <    //   painCave.isFatal = 1;
952 <    //   simError();
953 <    // }
954 <    // fortranInitialized_ = true;
876 >    topologyDone_ = true;
877    }
878  
879    void SimInfo::addProperty(GenericData* genData) {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines