iParticleNew Issue

Author: dhyan1272

src/pmpo_MPMesh.cpp

@@ -345,7 +345,7 @@ void MPMesh::push(){
 
   static int count=0;
   std::cout<<"Push"<<"  "<<count<<std::endl;
-  
+  if(count>473) exit(-1); 
   Kokkos::Timer timer;
 
   p_mesh->computeRotLatLonIncr();

src/pmpo_c.cpp

@@ -213,11 +213,11 @@ void polympo_setAppIDFunc_f(MPMesh_ptr p_mpmesh, IntVoidFunc getNext, void* appI
 }
 
 void polympo_setMPASAppIDFunc_f(MPMesh_ptr p_mpmesh, VoidVoidFunc getMPASAppID, void* arg1, void*arg2, void*arg3,
-  const int arg4) {
+  const int arg4, const int arg5) {
   checkMPMeshValid(p_mpmesh);
   auto p_MPs = ((polyMPO::MPMesh*)p_mpmesh)->p_MPs;
-  std::function<int(int)> polyMPO_getMPASAppID = [getMPASAppID, arg1, arg2, arg3, arg4](int iCell) 
-    { int iParticleNew; getMPASAppID(arg1, arg2, arg3, arg4, iCell, iParticleNew); return iParticleNew;};
+  std::function<int(int)> polyMPO_getMPASAppID = [getMPASAppID, arg1, arg2, arg3, arg4, arg5](int iCell) 
+    { int iParticleNew; getMPASAppID(arg1, arg2, arg3, arg4, iCell, iParticleNew, arg5); return iParticleNew;};
   p_MPs->setAppIDFunc(polyMPO_getMPASAppID);
 }
 

src/pmpo_c.h

@@ -25,7 +25,7 @@ void polympo_finishRebuildMPs_f(MPMesh_ptr p_mpmesh);
 
 void polympo_setAppIDFunc_f(MPMesh_ptr p_mpmesh, IntVoidFunc getNext, void* appIDs);
 void polympo_setMPASAppIDFunc_f(MPMesh_ptr p_mpmesh, VoidVoidFunc getMPASAppID, void* arg1, void* arg2, void*arg3,
-  const int arg4);
+  const int arg4, const int arg5);
 
 void polympo_getMPCurElmID_f(MPMesh_ptr p_mpmesh, const int numMPs, int* elmIDs);
 void polympo_setMPLatLonRotatedFlag_f(MPMesh_ptr p_mpmesh, const int isRotateFlag);

src/pmpo_defines.h

@@ -8,7 +8,7 @@
 typedef void* MPMesh_ptr;
 //Function that receives void* and returns an int
 typedef int (*IntVoidFunc)(void*);
-typedef void (*VoidVoidFunc)(void*, void*, void*, const int, int, int);
+typedef void (*VoidVoidFunc)(void*, void*, void*, const int, int, int, const int);
 
 using space_t = Kokkos::DefaultExecutionSpace::memory_space;
 

src/pmpo_fortran.f90

@@ -118,7 +118,7 @@ subroutine polympo_setAppIDFunc(mpMesh, getNext, appIDs) &
   !> @param appIDs(in) Pointer to opaque data application data structure (that may contain all available app IDs)
   !---------------------------------------------------------------------------
   subroutine polympo_setMPASAppIDFunc(mpMesh, getMPASAppID, &
-    arg1, arg2, arg3, arg4) &
+    arg1, arg2, arg3, arg4, arg5) &
     bind(C, NAME='polympo_setMPASAppIDFunc_f')
     use :: iso_c_binding
     type(c_ptr), value :: mpMesh
@@ -127,6 +127,7 @@ subroutine polympo_setMPASAppIDFunc(mpMesh, getMPASAppID, &
     type(c_ptr), value :: arg2
     type(c_ptr), value :: arg3
     integer(c_int), intent(in), value :: arg4
+    integer(c_int), intent(in), value :: arg5
   end subroutine
 
 

src/pmpo_materialPoints.cpp

@@ -195,7 +195,7 @@ void MaterialPoints::migrate() {
 
   for(int i=0; i<numReceivedMPs_host(0); i++){
     printf("Trying to find an ID for a material point\n");
-    auto xx = getNextAppID(receivedMPs2Elm_host(i));
+    auto xx = getNextAppID(receivedMPs2Elm_host(i)+1);
   }
 
   if (getOpMode() == polyMPO::MP_DEBUG)