ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/devel_omp/src/nonbonded/LJ.cpp
(Generate patch)

Comparing:
branches/development/src/nonbonded/LJ.cpp (file contents), Revision 1583 by gezelter, Thu Jun 16 22:00:08 2011 UTC vs.
branches/devel_omp/src/nonbonded/LJ.cpp (file contents), Revision 1608 by mciznick, Tue Aug 9 01:58:56 2011 UTC

# Line 240 | Line 240 | namespace OpenMD {
240    }
241  
242    void LJ::calcForce(InteractionData &idat) {
243 <    
244 <    if (!initialized_) initialize();
245 <    
243 >                #pragma omp critical
244 >        {
245 >                if (!initialized_) initialize();
246 >        }
247 >
248      map<pair<AtomType*, AtomType*>, LJInteractionData>::iterator it;
249      it = MixingMap.find( idat.atypes );
250      

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines