--- trunk/OOPSE/libmdtools/Integrator.cpp	2003/10/29 20:41:39	843
+++ trunk/OOPSE/libmdtools/Integrator.cpp	2003/12/22 21:27:04	892
@@ -7,6 +7,10 @@
 #include <unistd.h>
 #endif //is_mpi
 
+#ifdef PROFILE
+#include "mdProfile.hpp"
+#endif // profile
+
 #include "Integrator.hpp"
 #include "simError.h"
 
@@ -209,7 +213,17 @@ template<typename T> void Integrator<T>::integrate(voi
       calcStress = 1;
     }
 
+#ifdef PROFILE
+    startProfile( pro1 );
+#endif
+    
     integrateStep(calcPot, calcStress);
+
+#ifdef PROFILE
+    endProfile( pro1 );
+
+    startProfile( pro2 );
+#endif // profile
 
     info->incrTime(dt);
 
@@ -238,6 +252,10 @@ template<typename T> void Integrator<T>::integrate(voi
         currReset += resetTime;
       }
     }
+    
+#ifdef PROFILE
+    endProfile( pro2 );
+#endif //profile
 
 #ifdef IS_MPI
     strcpy(checkPointMsg, "successfully took a time step.");
@@ -256,13 +274,28 @@ template<typename T> void Integrator<T>::integrateStep
 template<typename T> void Integrator<T>::integrateStep(int calcPot,
                                                        int calcStress){
   // Position full step, and velocity half step
+
+#ifdef PROFILE
+  startProfile(pro3);
+#endif //profile
+
   preMove();
 
-  moveA();
+#ifdef PROFILE
+  endProfile(pro3);
 
+  startProfile(pro4);
+#endif // profile
 
+  moveA();
 
+#ifdef PROFILE
+  endProfile(pro4);
+  
+  startProfile(pro5);
+#endif//profile
 
+
 #ifdef IS_MPI
   strcpy(checkPointMsg, "Succesful moveA\n");
   MPIcheckPoint();
@@ -278,12 +311,19 @@ template<typename T> void Integrator<T>::integrateStep
   MPIcheckPoint();
 #endif // is_mpi
 
+#ifdef PROFILE
+  endProfile( pro5 );
+
+  startProfile( pro6 );
+#endif //profile
 
   // finish the velocity  half step
 
   moveB();
 
-
+#ifdef PROFILE
+  endProfile(pro6);
+#endif // profile
 
 #ifdef IS_MPI
   strcpy(checkPointMsg, "Succesful moveB\n");