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 1969 by gezelter, Wed Feb 26 14:14:50 2014 UTC vs.
Revision 2047 by gezelter, Thu Dec 11 16:16:43 2014 UTC

# Line 64 | Line 64
64   #include "brains/ForceField.hpp"
65   #include "utils/simError.h"
66   #include "utils/StringUtils.hpp"
67 + #include "utils/Revision.hpp"
68   #include "math/SeqRandNumGen.hpp"
69   #include "mdParser/MDLexer.hpp"
70   #include "mdParser/MDParser.hpp"
# Line 104 | Line 105 | namespace OpenMD {
105  
106        if (worldRank == masterNode) {
107          MPI_Bcast(&mdFileVersion, 1, MPI_INT, masterNode, MPI_COMM_WORLD);
107 –        // MPI::COMM_WORLD.Bcast(&mdFileVersion, 1, MPI::INT, masterNode);
108   #endif                
109          SimplePreprocessor preprocessor;
110          preprocessor.preprocess(rawMetaDataStream, filename,
# Line 113 | Line 113 | namespace OpenMD {
113   #ifdef IS_MPI            
114          //broadcasting the stream size
115          streamSize = ppStream.str().size() +1;
116 <        MPI_Bcast(&streamSize, 1, MPI_LONG, masterNode, MPI_COMM_WORLD);
117 <        MPI_Bcast(static_cast<void*>(const_cast<char*>(ppStream.str().c_str())),
116 >        MPI_Bcast(&streamSize, 1, MPI_INT, masterNode, MPI_COMM_WORLD);
117 >        MPI_Bcast(static_cast<void*>(const_cast<char*>(ppStream.str().c_str())),
118                    streamSize, MPI_CHAR, masterNode, MPI_COMM_WORLD);
119 –
120 –        // MPI::COMM_WORLD.Bcast(&streamSize, 1, MPI::LONG, masterNode);
121 –        // MPI::COMM_WORLD.Bcast(static_cast<void*>(const_cast<char*>(ppStream.str().c_str())),
122 –        //                       streamSize, MPI::CHAR, masterNode);
123 –                          
119        } else {
120  
121          MPI_Bcast(&mdFileVersion, 1, MPI_INT, masterNode, MPI_COMM_WORLD);
127 –        // MPI::COMM_WORLD.Bcast(&mdFileVersion, 1, MPI::INT, masterNode);
122  
123          //get stream size
124 <        MPI_Bcast(&streamSize, 1, MPI_LONG, masterNode, MPI_COMM_WORLD);
131 <        // MPI::COMM_WORLD.Bcast(&streamSize, 1, MPI::LONG, masterNode);
124 >        MPI_Bcast(&streamSize, 1, MPI_INT, masterNode, MPI_COMM_WORLD);
125          char* buf = new char[streamSize];
126          assert(buf);
127                  
128          //receive file content
129          MPI_Bcast(buf, streamSize, MPI_CHAR, masterNode, MPI_COMM_WORLD);
137 –        // MPI::COMM_WORLD.Bcast(buf, streamSize, MPI::CHAR, masterNode);
130  
131          ppStream.str(buf);
132          delete [] buf;
# Line 236 | Line 228 | namespace OpenMD {
228      catch (OpenMDException& e) {
229        sprintf(painCave.errMsg,
230                "%s\n",
231 <              e.getMessage().c_str());
231 >              e.what());
232        painCave.isFatal = 1;
233        simError();
234      }
# Line 272 | Line 264 | namespace OpenMD {
264      version.append(".");
265      version.append(OPENMD_VERSION_MINOR);
266  
267 <    std::string svnrev;
267 >    std::string svnrev(g_REVISION, strnlen(g_REVISION, 20));
268      //convert a macro from compiler to a string in c++
269 <    STR_DEFINE(svnrev, SVN_REV );
269 >    // STR_DEFINE(svnrev, SVN_REV );
270      version.append(" Revision: ");
271      // If there's no SVN revision, just call this the RELEASE revision.
272      if (!svnrev.empty()) {
# Line 530 | Line 522 | namespace OpenMD {
522                                                      // condition:
523      
524      MPI_Comm_size( MPI_COMM_WORLD, &nProcessors);    
533 –    //nProcessors = MPI::COMM_WORLD.Get_size();
525      
526      if (nProcessors > nGlobalMols) {
527        sprintf(painCave.errMsg,
# Line 650 | Line 641 | namespace OpenMD {
641  
642        // Spray out this nonsense to all other processors:
643        MPI_Bcast(&molToProcMap[0], nGlobalMols, MPI_INT, 0, MPI_COMM_WORLD);
644 <      // MPI::COMM_WORLD.Bcast(&molToProcMap[0], nGlobalMols, MPI::INT, 0);
644 >
645      } else {
646        
647        // Listen to your marching orders from processor 0:
648        MPI_Bcast(&molToProcMap[0], nGlobalMols, MPI_INT, 0, MPI_COMM_WORLD);
658 –      // MPI::COMM_WORLD.Bcast(&molToProcMap[0], nGlobalMols, MPI::INT, 0);
649  
650      }
651      
# Line 795 | Line 785 | namespace OpenMD {
785        }
786      }
787  
788 <    if (simParams->getOutputElectricField() | simParams->haveElectricField()) {
788 >    if (simParams->getOutputElectricField() |
789 >        simParams->haveElectricField() | simParams->haveUniformField() |
790 >        simParams->haveUniformGradientStrength() |
791 >        simParams->haveUniformGradientDirection1() |
792 >        simParams->haveUniformGradientDirection2() ) {
793        storageLayout |= DataStorage::dslElectricField;
794      }
795  
796 +    if (simParams->getOutputSitePotential() ) {
797 +      storageLayout |= DataStorage::dslSitePotential;
798 +    }
799 +
800      if (simParams->getOutputFluctuatingCharges()) {
801        storageLayout |= DataStorage::dslFlucQPosition;
802        storageLayout |= DataStorage::dslFlucQVelocity;
# Line 932 | Line 930 | namespace OpenMD {
930      MPI_Allreduce(&globalGroupMembership[0],
931                    &tmpGroupMembership[0], nGlobalAtoms,
932                    MPI_INT, MPI_SUM, MPI_COMM_WORLD);
933 <    // MPI::COMM_WORLD.Allreduce(&globalGroupMembership[0],
936 <    //                           &tmpGroupMembership[0], nGlobalAtoms,
937 <    //                           MPI::INT, MPI::SUM);
933 >
934      info->setGlobalGroupMembership(tmpGroupMembership);
935   #else
936      info->setGlobalGroupMembership(globalGroupMembership);
# Line 961 | Line 957 | namespace OpenMD {
957      MPI_Allreduce(&globalMolMembership[0], &tmpMolMembership[0],
958                    nGlobalAtoms + nGlobalRigidBodies,
959                    MPI_INT, MPI_SUM, MPI_COMM_WORLD);
964 –    // MPI::COMM_WORLD.Allreduce(&globalMolMembership[0], &tmpMolMembership[0],
965 –    //                           nGlobalAtoms + nGlobalRigidBodies,
966 –    //                           MPI::INT, MPI::SUM);
960      
961      info->setGlobalMolMembership(tmpMolMembership);
962   #else
# Line 983 | Line 976 | namespace OpenMD {
976      std::vector<int> numIntegrableObjectsPerMol(info->getNGlobalMolecules(), 0);
977      MPI_Allreduce(&nIOPerMol[0], &numIntegrableObjectsPerMol[0],
978        info->getNGlobalMolecules(), MPI_INT, MPI_SUM, MPI_COMM_WORLD);
986 –    // MPI::COMM_WORLD.Allreduce(&nIOPerMol[0], &numIntegrableObjectsPerMol[0],
987 –    //                           info->getNGlobalMolecules(), MPI::INT, MPI::SUM);
979   #else
980      std::vector<int> numIntegrableObjectsPerMol = nIOPerMol;
981   #endif    

Diff Legend

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