--- trunk/OOPSE/libmdtools/ForceFields.cpp 2003/10/28 16:03:37 829 +++ trunk/OOPSE/libmdtools/ForceFields.cpp 2003/12/22 21:27:04 892 @@ -10,6 +10,10 @@ using namespace std; #endif // is_mpi +#ifdef PROFILE +#include "mdProfile.hpp" +#endif + #include "simError.h" #include "ForceFields.hpp" #include "Atom.hpp" @@ -26,7 +30,7 @@ void ForceFields::calcRcut( void ){ //calc rCut and rList - entry_plug->setRcut( 2.5 * bigSigma ); + entry_plug->setDefaultRcut( 2.5 * bigSigma ); } @@ -50,10 +54,18 @@ void ForceFields::doForces( int calcPot, int calcStres entry_plug->atoms[i]->zeroForces(); } +#ifdef PROFILE + startProfile(pro7); +#endif + for(i=0; in_mol; i++ ){ entry_plug->molecules[i].calcForces(); } +#ifdef PROFILE + endProfile( pro7 ); +#endif + config = entry_plug->getConfiguration(); frc = config->getFrcArray(); @@ -69,6 +81,11 @@ void ForceFields::doForces( int calcPot, int calcStres entry_plug->tau[i] = 0.0; } + +#ifdef PROFILE + startProfile(pro8); +#endif + fortranForceLoop( pos, A, u_l, @@ -80,6 +97,11 @@ void ForceFields::doForces( int calcPot, int calcStres &passedCalcStress, &isError ); +#ifdef PROFILE + endProfile(pro8); +#endif + + if( isError ){ sprintf( painCave.errMsg, "Error returned from the fortran force calculation.\n" );