Timings fixed/added

Author: dhyan1272

src/pmpo_MPMesh.cpp

@@ -323,6 +323,7 @@ bool getAnyIsMigrating(MaterialPoints* p_MPs, bool isMigrating) {
 }
 
 void MPMesh::push_ahead(){
+  Kokkos::Timer timer;
   //Latitude Longitude increment at mesh vertices and interpolate to particle position
   p_mesh->computeRotLatLonIncr(); 
   sphericalInterpolation<MeshF_RotLatLonIncr>(*this);
@@ -333,14 +334,17 @@ void MPMesh::push_ahead(){
   sphericalInterpolation<MeshF_OnSurfVeloIncr>(*this);
   //Push the MPs
   p_MPs->updateRotLatLonAndXYZ2Tgt(p_mesh->getSphereRadius());
+  pumipic::RecordTime("PolyMPO_interpolateAndPush", timer.seconds());
 }
 
 bool MPMesh::push1P(){
+  Kokkos::Timer timer;
   //Given target location find the new element or the last element in a partioned mesh
   //and the process it belongs to so that migration can be checked
   CVTTrackingElmCenterBased(); 
   //From the above two inputs find if any particle needs to be migrated
   bool anyIsMigrating = getAnyIsMigrating(p_MPs, p_MPs->check_migrate());
+  pumipic::RecordTime("PolyMPO_trackAndCheckMigrate", timer.seconds());
   return anyIsMigrating;
 }
 

src/pmpo_c.cpp

@@ -254,6 +254,7 @@ void polympo_setAppIDFunc_f(MPMesh_ptr p_mpmesh, IntVoidFunc getNext, void* appI
 void polympo_getMPTgtElmID_f(MPMesh_ptr p_mpmesh,
                             const int numMPs,
                             int* elmIDs){
+  Kokkos::Timer timer;
   checkMPMeshValid(p_mpmesh);
   auto p_MPs = ((polyMPO::MPMesh*)p_mpmesh)->p_MPs;
   PMT_ALWAYS_ASSERT(numMPs >= p_MPs->getCount());
@@ -272,7 +273,7 @@ void polympo_getMPTgtElmID_f(MPMesh_ptr p_mpmesh,
   };
   p_MPs->parallel_for(setTgtElmId, "set mpTgtElmID");
   Kokkos::deep_copy( arrayHost, mpTgtElmIDCopy);
-  
+  pumipic::RecordTime("PolyMPO_getMPTgtElmID", timer.seconds());
 }
 
 void polympo_getMPCurElmID_f(MPMesh_ptr p_mpmesh,
@@ -396,13 +397,14 @@ void polympo_setMPTgtPositions_f(MPMesh_ptr p_mpmesh,
     }
   };
   p_MPs->parallel_for(setPos, "setMPPositions");
-  pumipic::RecordTime("PolyMPO_setMPPositions", timer.seconds());
+  pumipic::RecordTime("PolyMPO_setMPTgtPositions", timer.seconds());
 }
 
 void polympo_getMPTgtPositions_f(MPMesh_ptr p_mpmesh,
                             const int nComps,
                             const int numMPs,
                             double* mpPositionsHost){
+  Kokkos::Timer timer;
   checkMPMeshValid(p_mpmesh);
   auto p_MPs = ((polyMPO::MPMesh*)p_mpmesh)->p_MPs;
   PMT_ALWAYS_ASSERT(nComps == vec3d_nEntries);
@@ -422,13 +424,15 @@ void polympo_getMPTgtPositions_f(MPMesh_ptr p_mpmesh,
   p_MPs->parallel_for(getPos, "getMPPositions");
   kkDbl2dViewHostU arrayHost(mpPositionsHost,nComps,numMPs);
   Kokkos::deep_copy(arrayHost, mpPositionsCopy);
+  pumipic::RecordTime("PolyMPO_getMPTgtPositions", timer.seconds());
 }
 
 
 void polympo_setMPRotLatLon_f(MPMesh_ptr p_mpmesh,
                          const int nComps,
                          const int numMPs,
                          const double* mpRotLatLonIn){
+  Kokkos::Timer timer;
   static int callCount = 0;
   PMT_ALWAYS_ASSERT(callCount == 0);
   checkMPMeshValid(p_mpmesh);
@@ -450,6 +454,7 @@ void polympo_setMPRotLatLon_f(MPMesh_ptr p_mpmesh,
   };
   p_MPs->parallel_for(setPos, "setMPRotLatLon");
   callCount++;
+  pumipic::RecordTime("PolyMPO_setMPRotLatLon", timer.seconds());
 }
 
 void polympo_getMPRotLatLon_f(MPMesh_ptr p_mpmesh,
@@ -481,6 +486,7 @@ void polympo_setMPTgtRotLatLon_f(MPMesh_ptr p_mpmesh,
                          const int nComps,
                          const int numMPs,
                          const double* mpRotLatLonIn){
+  Kokkos::Timer timer;
   checkMPMeshValid(p_mpmesh);
   auto p_MPs = ((polyMPO::MPMesh*)p_mpmesh)->p_MPs;
   PMT_ALWAYS_ASSERT(nComps == vec2d_nEntries);
@@ -498,13 +504,15 @@ void polympo_setMPTgtRotLatLon_f(MPMesh_ptr p_mpmesh,
       mpRotLatLon(mp,1) = mpRotLatLonIn_d(1, mpAppID(mp));
     }
   };
-  p_MPs->parallel_for(setPos, "setMPRotLatLon");
+  p_MPs->parallel_for(setPos, "setMPTgtRotLatLon");
+  pumipic::RecordTime("PolyMPO_setMPTgtRotLatLon", timer.seconds());
 }
 
 void polympo_getMPTgtRotLatLon_f(MPMesh_ptr p_mpmesh,
                          const int nComps,
                          const int numMPs,
                          double* mpRotLatLonHost){
+  Kokkos::Timer timer;
   checkMPMeshValid(p_mpmesh);
   auto p_MPs = ((polyMPO::MPMesh*)p_mpmesh)->p_MPs;
   PMT_ALWAYS_ASSERT(nComps == vec2d_nEntries);
@@ -523,6 +531,7 @@ void polympo_getMPTgtRotLatLon_f(MPMesh_ptr p_mpmesh,
   p_MPs->parallel_for(getPos, "getMPRotLatLon");
   kkDbl2dViewHostU arrayHost(mpRotLatLonHost,nComps,numMPs);
   Kokkos::deep_copy(arrayHost, mpRotLatLonCopy);
+  pumipic::RecordTime("PolyMPO_getMPTgtRotLatLon", timer.seconds());
 }