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

Comparing trunk/src/brains/SimCreator.cpp (file contents):
Revision 1810 by gezelter, Thu Nov 8 14:23:43 2012 UTC vs.
Revision 1880 by gezelter, Mon Jun 17 18:28:30 2013 UTC

# Line 1 | Line 1
1   /*
2 < * copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
2 > * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
3   *
4   * The University of Notre Dame grants you ("Licensee") a
5   * non-exclusive, royalty free, license to use, modify and
# Line 35 | Line 35
35   *                                                                      
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).          
38 > * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (2008).          
39   * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40   * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
# Line 44 | Line 44
44   * @file SimCreator.cpp
45   * @author tlin
46   * @date 11/03/2004
47 * @time 13:51am
47   * @version 1.0
48   */
49   #include <exception>
# Line 105 | Line 104 | namespace OpenMD {
104          MPI::COMM_WORLD.Bcast(&mdFileVersion, 1, MPI::INT, masterNode);
105   #endif                
106          SimplePreprocessor preprocessor;
107 <        preprocessor.preprocess(rawMetaDataStream, filename, startOfMetaDataBlock,
109 <                                ppStream);
107 >        preprocessor.preprocess(rawMetaDataStream, filename, startOfMetaDataBlock, ppStream);
108                  
109   #ifdef IS_MPI            
110          //brocasting the stream size
111          streamSize = ppStream.str().size() +1;
112          MPI::COMM_WORLD.Bcast(&streamSize, 1, MPI::LONG, masterNode);
113 <        MPI::COMM_WORLD.Bcast(static_cast<void*>(const_cast<char*>(ppStream.str().c_str())),
114 <                              streamSize, MPI::CHAR, masterNode);
117 <                
113 >        MPI::COMM_WORLD.Bcast(static_cast<void*>(const_cast<char*>(ppStream.str().c_str())), streamSize, MPI::CHAR, masterNode);
114 >                          
115        } else {
119
116          MPI::COMM_WORLD.Bcast(&mdFileVersion, 1, MPI::INT, masterNode);
117  
118          //get stream size
# Line 130 | Line 126 | namespace OpenMD {
126                  
127          ppStream.str(buf);
128          delete [] buf;
133
129        }
130   #endif            
131        // Create a scanner that reads from the input stream
# Line 256 | Line 251 | namespace OpenMD {
251      int metaDataBlockStart = -1;
252      int metaDataBlockEnd = -1;
253      int i, j;
254 <    streamoff mdOffset(0);
254 >    streamoff mdOffset;
255      int mdFileVersion;
256  
257      // Create a string for embedding the version information in the MetaData
# Line 515 | Line 510 | namespace OpenMD {
510    
511   #ifdef IS_MPI
512    void SimCreator::divideMolecules(SimInfo *info) {
518    RealType numerator;
519    RealType denominator;
520    RealType precast;
521    RealType x;
522    RealType y;
513      RealType a;
524    int old_atoms;
525    int add_atoms;
526    int new_atoms;
527    int nTarget;
528    int done;
529    int i;
530    int loops;
531    int which_proc;
514      int nProcessors;
515      std::vector<int> atomsPerProc;
516      int nGlobalMols = info->getNGlobalMolecules();
517 <    std::vector<int> molToProcMap(nGlobalMols, -1); // default to an error condition:
517 >    std::vector<int> molToProcMap(nGlobalMols, -1); // default to an
518 >                                                    // error
519 >                                                    // condition:
520      
521      nProcessors = MPI::COMM_WORLD.Get_size();
522      
# Line 543 | Line 527 | namespace OpenMD {
527                "\tthe number of molecules.  This will not result in a \n"
528                "\tusable division of atoms for force decomposition.\n"
529                "\tEither try a smaller number of processors, or run the\n"
530 <              "\tsingle-processor version of OpenMD.\n", nProcessors, nGlobalMols);
530 >              "\tsingle-processor version of OpenMD.\n", nProcessors,
531 >              nGlobalMols);
532        
533        painCave.isFatal = 1;
534        simError();
535      }
536      
552    int seedValue;
537      Globals * simParams = info->getSimParams();
538 <    SeqRandNumGen* myRandom; //divide labor does not need Parallel random number generator
538 >    SeqRandNumGen* myRandom; //divide labor does not need Parallel
539 >                             //random number generator
540      if (simParams->haveSeed()) {
541 <      seedValue = simParams->getSeed();
541 >      int seedValue = simParams->getSeed();
542        myRandom = new SeqRandNumGen(seedValue);
543      }else {
544        myRandom = new SeqRandNumGen();
# Line 566 | Line 551 | namespace OpenMD {
551      atomsPerProc.insert(atomsPerProc.end(), nProcessors, 0);
552      
553      if (worldRank == 0) {
554 <      numerator = info->getNGlobalAtoms();
555 <      denominator = nProcessors;
556 <      precast = numerator / denominator;
557 <      nTarget = (int)(precast + 0.5);
558 <      
559 <      for(i = 0; i < nGlobalMols; i++) {
554 >      RealType numerator = info->getNGlobalAtoms();
555 >      RealType denominator = nProcessors;
556 >      RealType precast = numerator / denominator;
557 >      int nTarget = (int)(precast + 0.5);
558 >      
559 >      for(int i = 0; i < nGlobalMols; i++) {
560  
561 <        done = 0;
562 <        loops = 0;
561 >        int done = 0;
562 >        int loops = 0;
563          
564          while (!done) {
565            loops++;
566            
567            // Pick a processor at random
568            
569 <          which_proc = (int) (myRandom->rand() * nProcessors);
569 >          int which_proc = (int) (myRandom->rand() * nProcessors);
570            
571            //get the molecule stamp first
572            int stampId = info->getMoleculeStampId(i);
573            MoleculeStamp * moleculeStamp = info->getMoleculeStamp(stampId);
574            
575            // How many atoms does this processor have so far?
576 <          old_atoms = atomsPerProc[which_proc];
577 <          add_atoms = moleculeStamp->getNAtoms();
578 <          new_atoms = old_atoms + add_atoms;
576 >          int old_atoms = atomsPerProc[which_proc];
577 >          int add_atoms = moleculeStamp->getNAtoms();
578 >          int new_atoms = old_atoms + add_atoms;
579            
580            // If we've been through this loop too many times, we need
581            // to just give up and assign the molecule to this processor
# Line 634 | Line 619 | namespace OpenMD {
619            //           Pacc(x) = exp(- a * x)
620            // where a = penalty / (average atoms per molecule)
621            
622 <          x = (RealType)(new_atoms - nTarget);
623 <          y = myRandom->rand();
622 >          RealType x = (RealType)(new_atoms - nTarget);
623 >          RealType y = myRandom->rand();
624            
625            if (y < exp(- a * x)) {
626              molToProcMap[i] = which_proc;
# Line 704 | Line 689 | namespace OpenMD {
689      set<AtomType*>::iterator i;
690      bool hasDirectionalAtoms = false;
691      bool hasFixedCharge = false;
692 <    bool hasMultipoles = false;    
692 >    bool hasDipoles = false;    
693 >    bool hasQuadrupoles = false;    
694      bool hasPolarizable = false;    
695      bool hasFluctuatingCharge = false;    
696      bool hasMetallic = false;
# Line 726 | Line 712 | namespace OpenMD {
712        if (da.isDirectional()){
713          hasDirectionalAtoms = true;
714        }
715 <      if (ma.isMultipole()){
716 <        hasMultipoles = true;
715 >      if (ma.isDipole()){
716 >        hasDipoles = true;
717        }
718 +      if (ma.isQuadrupole()){
719 +        hasQuadrupoles = true;
720 +      }
721        if (ea.isEAM() || sca.isSuttonChen()){
722          hasMetallic = true;
723        }
# Line 752 | Line 741 | namespace OpenMD {
741          storageLayout |= DataStorage::dslTorque;
742        }
743      }
744 <    if (hasMultipoles) {
745 <      storageLayout |= DataStorage::dslElectroFrame;
744 >    if (hasDipoles) {
745 >      storageLayout |= DataStorage::dslDipole;
746      }
747 +    if (hasQuadrupoles) {
748 +      storageLayout |= DataStorage::dslQuadrupole;
749 +    }
750      if (hasFixedCharge || hasFluctuatingCharge) {
751        storageLayout |= DataStorage::dslSkippedCharge;
752      }
# Line 789 | Line 781 | namespace OpenMD {
781        }
782      }
783  
784 <    if (simParams->getOutputElectricField()) {
784 >    if (simParams->getOutputElectricField() | simParams->haveElectricField()) {
785        storageLayout |= DataStorage::dslElectricField;
786      }
787 +
788      if (simParams->getOutputFluctuatingCharges()) {
789        storageLayout |= DataStorage::dslFlucQPosition;
790        storageLayout |= DataStorage::dslFlucQVelocity;
791        storageLayout |= DataStorage::dslFlucQForce;
792      }
793  
794 +    info->setStorageLayout(storageLayout);
795 +
796      return storageLayout;
797    }
798  
# Line 960 | Line 955 | namespace OpenMD {
955    }
956    
957    void SimCreator::loadCoordinates(SimInfo* info, const std::string& mdFileName) {
958 <
958 >    
959      DumpReader reader(info, mdFileName);
960      int nframes = reader.getNFrames();
961 <
961 >    
962      if (nframes > 0) {
963        reader.readFrame(nframes - 1);
964      } else {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines