ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/branches/new_design/OOPSE-2.0/src/brains/SimInfo.cpp
(Generate patch)

Comparing branches/new_design/OOPSE-2.0/src/brains/SimInfo.cpp (file contents):
Revision 1856 by tim, Mon Dec 6 04:49:53 2004 UTC vs.
Revision 1883 by tim, Mon Dec 13 22:30:27 2004 UTC

# Line 39 | Line 39 | namespace oopse {
39   #include "utils/MemoryUtils.hpp"
40   #include "utils/simError.h"
41  
42 + #ifdef IS_MPI
43 + #include "UseTheForce/mpiComponentPlan.h"
44 + #include "UseTheForce/DarkSide/simParallel_interface.h"
45 + #endif
46 +
47   namespace oopse {
48  
49   SimInfo::SimInfo(std::vector<std::pair<MoleculeStamp*, int> >& molStampPairs,
# Line 673 | Line 678 | void SimInfo::setupFortranParallel() {
678      parallelData.nGroupsGlobal = getNGlobalCutoffGroups();
679      parallelData.nGroupsLocal = getNCutoffGroups();
680      parallelData.myNode = worldRank;
681 <    MPI_Comm_size(MPI_COMM_WORLD, &(parallelData->nProcessors));
681 >    MPI_Comm_size(MPI_COMM_WORLD, &(parallelData.nProcessors));
682  
683      //pass mpiSimData struct and index arrays to fortran
684 <    setFsimParallel(parallelData, &(parallelData->nAtomsLocal),
685 <                    &localToGlobalAtomIndex[0],  &(parallelData->nGroupsLocal),
684 >    setFsimParallel(&parallelData, &(parallelData.nAtomsLocal),
685 >                    &localToGlobalAtomIndex[0],  &(parallelData.nGroupsLocal),
686                      &localToGlobalCutoffGroupIndex[0], &isError);
687  
688      if (isError) {

Diff Legend

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