One more way of trying MPAS AppIDs

Author: dhyan1272

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,
-  void* arg4, void* arg5, void*arg6) {
+  const int arg4) {
   checkMPMeshValid(p_mpmesh);
   auto p_MPs = ((polyMPO::MPMesh*)p_mpmesh)->p_MPs;
-  std::function<int()> polyMPO_getMPASAppID = [getMPASAppID, arg1, arg2, arg3, arg4, arg5, arg6]() 
-    {getMPASAppID(arg1, arg2, arg3, arg4, arg5, arg6); return *(static_cast<int*>(arg5));};
+  std::function<int()> polyMPO_getMPASAppID = [getMPASAppID, arg1, arg2, arg3, arg4]() 
+    { int iParticleNew; getMPASAppID(arg1, arg2, arg3, arg4, iParticleNew); 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,
-  void* arg4, void*arg5, void* arg6);
+  const int arg4);
 
 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*, void*, void*, void*);
+typedef void (*VoidVoidFunc)(void*, void*, void*, const int, int);
 
 using space_t = Kokkos::DefaultExecutionSpace::memory_space;
 

src/pmpo_fortran.f90

@@ -118,17 +118,15 @@ 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, arg5, arg6) &
+    arg1, arg2, arg3, arg4) &
     bind(C, NAME='polympo_setMPASAppIDFunc_f')
     use :: iso_c_binding
     type(c_ptr), value :: mpMesh
     type(c_funptr), value :: getMPASAppID
     type(c_ptr), value :: arg1
     type(c_ptr), value :: arg2
     type(c_ptr), value :: arg3
-    type(c_ptr), value :: arg4
-    type(c_ptr), value :: arg5
-    type(c_ptr), value :: arg6
+    integer(c_int), intent(in), value :: arg4
   end subroutine
 
 

src/pmpo_materialPoints.cpp

@@ -151,7 +151,7 @@ void MaterialPoints::migrate() {
       new_process(mp) = MPs2Proc(mp);
       if(rank!=new_process(mp)){
         mpAppID(mp)=-1;
-	printf("Particle migrated and so its AppID is -1\n");
+        printf("Particle migrated and so its AppID is -1\n");
       }
     }
   };