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

Comparing branches/development/src/brains/SimCreator.cpp (file contents):
Revision 1600 by gezelter, Wed Aug 3 20:20:37 2011 UTC vs.
Revision 1723 by gezelter, Thu May 24 20:59:54 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 75 | Line 76
76   #include "antlr/NoViableAltForCharException.hpp"
77   #include "antlr/NoViableAltException.hpp"
78  
79 + #include "types/DirectionalAdapter.hpp"
80 + #include "types/MultipoleAdapter.hpp"
81 + #include "types/EAMAdapter.hpp"
82 + #include "types/SuttonChenAdapter.hpp"
83 + #include "types/PolarizableAdapter.hpp"
84 + #include "types/FixedChargeAdapter.hpp"
85 + #include "types/FluctuatingChargeAdapter.hpp"
86 +
87   #ifdef IS_MPI
88 + #include "mpi.h"
89   #include "math/ParallelRandNumGen.hpp"
90   #endif
91  
92   namespace OpenMD {
93    
94 <  Globals* SimCreator::parseFile(std::istream& rawMetaDataStream, const std::string& filename, int startOfMetaDataBlock ){
94 >  Globals* SimCreator::parseFile(std::istream& rawMetaDataStream, const std::string& filename, int mdFileVersion, int startOfMetaDataBlock ){
95      Globals* simParams = NULL;
96      try {
97  
# Line 92 | Line 102 | namespace OpenMD {
102        const int masterNode = 0;
103        int commStatus;
104        if (worldRank == masterNode) {
105 < #endif
106 <                
105 >        commStatus = MPI_Bcast(&mdFileVersion, 1, MPI_INT, masterNode, MPI_COMM_WORLD);
106 > #endif                
107          SimplePreprocessor preprocessor;
108          preprocessor.preprocess(rawMetaDataStream, filename, startOfMetaDataBlock, ppStream);
109                  
# Line 106 | Line 116 | namespace OpenMD {
116              
117                  
118        } else {
119 +
120 +        commStatus = MPI_Bcast(&mdFileVersion, 1, MPI_INT, masterNode, MPI_COMM_WORLD);
121 +
122          //get stream size
123          commStatus = MPI_Bcast(&streamSize, 1, MPI_LONG, masterNode, MPI_COMM_WORLD);  
124  
# Line 229 | Line 242 | namespace OpenMD {
242        simError();
243      }
244  
245 +    simParams->setMDfileVersion(mdFileVersion);
246      return simParams;
247    }
248    
# Line 243 | Line 257 | namespace OpenMD {
257      int metaDataBlockEnd = -1;
258      int i;
259      int mdOffset;
260 +    int mdFileVersion;
261  
262   #ifdef IS_MPI            
263      const int masterNode = 0;
# Line 276 | Line 291 | namespace OpenMD {
291          painCave.isFatal = 1;
292          simError();
293        }
294 +      
295 +      // found the correct opening string, now try to get the file
296 +      // format version number.
297  
298 +      StringTokenizer tokenizer(line, "=<> \t\n\r");
299 +      std::string fileType = tokenizer.nextToken();
300 +      toUpper(fileType);
301 +
302 +      mdFileVersion = 0;
303 +
304 +      if (fileType == "OPENMD") {
305 +        while (tokenizer.hasMoreTokens()) {
306 +          std::string token(tokenizer.nextToken());
307 +          toUpper(token);
308 +          if (token == "VERSION") {
309 +            mdFileVersion = tokenizer.nextTokenAsInt();
310 +            break;
311 +          }
312 +        }
313 +      }
314 +            
315        //scan through the input stream and find MetaData tag        
316        while(mdFile_.getline(buffer, bufferSize)) {
317          ++lineNo;
# Line 332 | Line 367 | namespace OpenMD {
367      std::stringstream rawMetaDataStream(mdRawData);
368  
369      //parse meta-data file
370 <    Globals* simParams = parseFile(rawMetaDataStream, mdFileName, metaDataBlockStart+1);
370 >    Globals* simParams = parseFile(rawMetaDataStream, mdFileName, mdFileVersion,
371 >                                   metaDataBlockStart + 1);
372      
373      //create the force field
374      ForceField * ff = ForceFieldFactory::getInstance()->createForceField(simParams->getForceField());
# Line 386 | Line 422 | namespace OpenMD {
422      //create the molecules
423      createMolecules(info);
424      
425 +    //find the storage layout
426 +
427 +    int storageLayout = computeStorageLayout(info);
428 +
429      //allocate memory for DataStorage(circular reference, need to
430      //break it)
431 <    info->setSnapshotManager(new SimSnapshotManager(info));
431 >    info->setSnapshotManager(new SimSnapshotManager(info, storageLayout));
432      
433      //set the global index of atoms, rigidbodies and cutoffgroups
434      //(only need to be set once, the global index will never change
# Line 589 | Line 629 | namespace OpenMD {
629        MPI_Bcast(&molToProcMap[0], nGlobalMols, MPI_INT, 0, MPI_COMM_WORLD);
630      }
631      
592 –    cerr << "molToProcMap:\n";
593 –    for (int i = 0; i < molToProcMap.size(); i++) {
594 –      cerr << "m = " << i << " mtpr[m] = " << molToProcMap[i] <<"\n";
595 –    }
596 –
632      info->setMolToProcMap(molToProcMap);
633      sprintf(checkPointMsg,
634              "Successfully divided the molecules among the processors.\n");
# Line 630 | Line 665 | namespace OpenMD {
665      } //end for(int i=0)  
666    }
667      
668 +  int SimCreator::computeStorageLayout(SimInfo* info) {
669 +
670 +    Globals* simParams = info->getSimParams();
671 +    int nRigidBodies = info->getNGlobalRigidBodies();
672 +    set<AtomType*> atomTypes = info->getSimulatedAtomTypes();
673 +    set<AtomType*>::iterator i;
674 +    bool hasDirectionalAtoms = false;
675 +    bool hasFixedCharge = false;
676 +    bool hasMultipoles = false;    
677 +    bool hasPolarizable = false;    
678 +    bool hasFluctuatingCharge = false;    
679 +    bool hasMetallic = false;
680 +    int storageLayout = 0;
681 +    storageLayout |= DataStorage::dslPosition;
682 +    storageLayout |= DataStorage::dslVelocity;
683 +    storageLayout |= DataStorage::dslForce;
684 +
685 +    for (i = atomTypes.begin(); i != atomTypes.end(); ++i) {
686 +
687 +      DirectionalAdapter da = DirectionalAdapter( (*i) );
688 +      MultipoleAdapter ma = MultipoleAdapter( (*i) );
689 +      EAMAdapter ea = EAMAdapter( (*i) );
690 +      SuttonChenAdapter sca = SuttonChenAdapter( (*i) );
691 +      PolarizableAdapter pa = PolarizableAdapter( (*i) );
692 +      FixedChargeAdapter fca = FixedChargeAdapter( (*i) );
693 +      FluctuatingChargeAdapter fqa = FluctuatingChargeAdapter( (*i) );
694 +
695 +      if (da.isDirectional()){
696 +        hasDirectionalAtoms = true;
697 +      }
698 +      if (ma.isMultipole()){
699 +        hasMultipoles = true;
700 +      }
701 +      if (ea.isEAM() || sca.isSuttonChen()){
702 +        hasMetallic = true;
703 +      }
704 +      if ( fca.isFixedCharge() ){
705 +        hasFixedCharge = true;
706 +      }
707 +      if ( fqa.isFluctuatingCharge() ){
708 +        hasFluctuatingCharge = true;
709 +      }
710 +      if ( pa.isPolarizable() ){
711 +        hasPolarizable = true;
712 +      }
713 +    }
714 +    
715 +    if (nRigidBodies > 0 || hasDirectionalAtoms) {
716 +      storageLayout |= DataStorage::dslAmat;
717 +      if(storageLayout & DataStorage::dslVelocity) {
718 +        storageLayout |= DataStorage::dslAngularMomentum;
719 +      }
720 +      if (storageLayout & DataStorage::dslForce) {
721 +        storageLayout |= DataStorage::dslTorque;
722 +      }
723 +    }
724 +    if (hasMultipoles) {
725 +      storageLayout |= DataStorage::dslElectroFrame;
726 +    }
727 +    if (hasFixedCharge || hasFluctuatingCharge) {
728 +      storageLayout |= DataStorage::dslSkippedCharge;
729 +    }
730 +    if (hasMetallic) {
731 +      storageLayout |= DataStorage::dslDensity;
732 +      storageLayout |= DataStorage::dslFunctional;
733 +      storageLayout |= DataStorage::dslFunctionalDerivative;
734 +    }
735 +    if (hasPolarizable) {
736 +      storageLayout |= DataStorage::dslElectricField;
737 +    }
738 +    if (hasFluctuatingCharge){
739 +      storageLayout |= DataStorage::dslFlucQPosition;
740 +      if(storageLayout & DataStorage::dslVelocity) {
741 +        storageLayout |= DataStorage::dslFlucQVelocity;
742 +      }
743 +      if (storageLayout & DataStorage::dslForce) {
744 +        storageLayout |= DataStorage::dslFlucQForce;
745 +      }
746 +    }
747 +    
748 +    // if the user has asked for them, make sure we've got the memory for the
749 +    // objects defined.
750 +
751 +    if (simParams->getOutputParticlePotential()) {
752 +      storageLayout |= DataStorage::dslParticlePot;
753 +    }
754 +
755 +    if (simParams->havePrintHeatFlux()) {
756 +      if (simParams->getPrintHeatFlux()) {
757 +        storageLayout |= DataStorage::dslParticlePot;
758 +      }
759 +    }
760 +
761 +    if (simParams->getOutputElectricField()) {
762 +      storageLayout |= DataStorage::dslElectricField;
763 +    }
764 +    if (simParams->getOutputFluctuatingCharges()) {
765 +      storageLayout |= DataStorage::dslFlucQPosition;
766 +      storageLayout |= DataStorage::dslFlucQVelocity;
767 +      storageLayout |= DataStorage::dslFlucQForce;
768 +    }
769 +
770 +    return storageLayout;
771 +  }
772 +
773    void SimCreator::setGlobalIndex(SimInfo *info) {
774      SimInfo::MoleculeIterator mi;
775      Molecule::AtomIterator ai;
# Line 712 | Line 852 | namespace OpenMD {
852      MPI_Allreduce(&globalGroupMembership[0], &tmpGroupMembership[0], nGlobalAtoms,
853                    MPI_INT, MPI_SUM, MPI_COMM_WORLD);
854      info->setGlobalGroupMembership(tmpGroupMembership);
715 –
716 –    cerr << "ggm:\n";
717 –    for (int i = 0; i < tmpGroupMembership.size(); i++)
718 –      cerr << "i = " << i << "\t ggm(i) = " << tmpGroupMembership[i] << "\n";
719 –
855   #else
856      info->setGlobalGroupMembership(globalGroupMembership);
857   #endif
# Line 776 | Line 911 | namespace OpenMD {
911          globalIO++;
912        }
913      }
779 –    cerr << "ioi2io:\n";
780 –    for (int i = 0; i < IOIndexToIntegrableObject.size(); i++) {
781 –      if (IOIndexToIntegrableObject[i] != NULL) {
782 –        cerr << "i = " << i << "globalIOindex = " << IOIndexToIntegrableObject[i]->getGlobalIntegrableObjectIndex() << "\n";
783 –      }
784 –    }
914        
915      info->setIOIndexToIntegrableObject(IOIndexToIntegrableObject);
916      

Diff Legend

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