Wrap functions getNprocs / getMyProc

ax3l · Jul 12, 2023 · bebd3ff · bebd3ff
1 parent c198175
commit bebd3ff
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 14 deletions.
diff --git a/Examples/Tests/particle_data_python/PICMI_inputs_2d.py b/Examples/Tests/particle_data_python/PICMI_inputs_2d.py
@@ -130,7 +130,7 @@ def add_particles():
         w=w, newPid=newPid, unique_particles=args.unique
     )
 
-callbacks.installbeforestep(add_particles)
+sim.extension.libwarpx_so.add_python_callback( "installbeforestep", add_particles )
 
 ##########################
 # simulation run

diff --git a/Python/pywarpx/_libwarpx.py b/Python/pywarpx/_libwarpx.py
@@ -147,15 +147,15 @@ def getNProcs(self):
         Get the number of processors
 
         '''
-        return self.libwarpx_so.warpx_getNProcs()
+        return self.libwarpx_so.getNProcs()
 
     def getMyProc(self):
         '''
 
         Get the number of the processor
 
         '''
-        return self.libwarpx_so.warpx_getMyProc()
+        return self.libwarpx_so.getMyProc()
 
     def get_nattr(self):
         '''

diff --git a/Source/Python/WarpXWrappers.H b/Source/Python/WarpXWrappers.H
@@ -151,9 +151,6 @@ extern "C" {
 
   int warpx_finestLevel ();
 
-  int warpx_getMyProc ();
-  int warpx_getNProcs ();
-
   void warpx_setPotentialEB (const char * char_potential);
 
   void mypc_Redistribute ();

diff --git a/Source/Python/WarpXWrappers.cpp b/Source/Python/WarpXWrappers.cpp
@@ -482,14 +482,6 @@
         return warpx.finestLevel();
     }
 
-    int warpx_getMyProc () {
-        return amrex::ParallelDescriptor::MyProc();
-    }
-
-    int warpx_getNProcs () {
-        return amrex::ParallelDescriptor::NProcs();
-    }
-
     void warpx_setPotentialEB (const char * char_potential) {
         WarpX& warpx = WarpX::GetInstance();
         const std::string potential(char_potential);

diff --git a/Source/Python/pyWarpX.cpp b/Source/Python/pyWarpX.cpp
@@ -122,6 +122,10 @@ PYBIND11_MODULE(PYWARPX_MODULE_NAME, m) {
         py::return_value_policy::reference,
         "Return a reference to the WarpX object.");
 
+    // Expose functions to get the processor number
+    m.def("getNProcs", [](){amrex::ParallelDescriptor::NProcs();} );
+    m.def("getMyProc", [](){amrex::ParallelDescriptor::MyProc();} );
+
     // Expose the python callback function installation and removal functions
     m.def("add_python_callback", &InstallPythonCallback);
     m.def("remove_python_callback", &ClearPythonCallback);