add gett_new and getistep functions wrappers; fix typos in `callb…

…acks.py`; avoid error in getting `rho` from `fields.py`
ax3l · Jul 13, 2023 · 9eabe50 · 9eabe50
1 parent dc44a2b
commit 9eabe50
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 13 deletions.
diff --git a/Python/pywarpx/callbacks.py b/Python/pywarpx/callbacks.py
@@ -332,7 +332,7 @@ def installbeforeInitEsolve(f):
 
 # ----------------------------------------------------------------------------
 def callfromafterInitEsolve(f):
-    installafterInitEsolve('afterInitEsolve', f)
+    installcallback('afterInitEsolve', f)
     return f
 def installafterInitEsolve(f):
     installcallback('afterInitEsolve', f)
@@ -440,7 +440,7 @@ def onbreaksignal(f):
     installcallback('onbreaksignal', f)
     return f
 def installonbreaksignal(f):
-    _onbreaksignal.installfuncinlist(f)
+    installcallback('onbreaksignal', f)
 
 # ----------------------------------------------------------------------------
 def callfromparticleinjection(f):

diff --git a/Python/pywarpx/fields.py b/Python/pywarpx/fields.py
@@ -279,7 +279,7 @@ def __getitem__(self, index):
             raise Exception('Too many indices given')
 
         # Expand the indices to length 3
-        ii = self._get_indices(index, None)
+        ii = self._get_indices(index, slice(None))
         ic = index[-1]
 
         ixmin, iymin, izmin = self._get_min_indices()

diff --git a/Source/Python/WarpX.cpp b/Source/Python/WarpX.cpp
@@ -69,6 +69,20 @@ void init_WarpX (py::module& m)
         .def("multi_particle_container", &WarpX::GetPartContainer,
             py::return_value_policy::reference_internal
         )
+
+        // Expose functions to get the current simulation step and time
+        .def("getistep",
+            [](WarpX const & wx, int lev){
+                return wx.getistep(lev);
+            },
+            py::arg("lev")
+        )
+        .def("gett_new",
+            [](WarpX const & wx, int lev){
+                return wx.gett_new(lev);
+            },
+            py::arg("lev")
+        )
     ;
 
     py::class_<warpx::Config>(m, "Config")

diff --git a/Source/Python/WarpXWrappers.H b/Source/Python/WarpXWrappers.H
@@ -140,9 +140,7 @@ extern "C" {
   void warpx_UpdateAuxilaryData ();
   void warpx_PushParticlesandDepose (amrex::Real cur_time);
 
-  int warpx_getistep (int lev);
   void warpx_setistep (int lev, int ii);
-  amrex::Real warpx_gett_new (int lev);
   void warpx_sett_new (int lev, amrex::Real time);
   amrex::Real warpx_getdt (int lev);
 

diff --git a/Source/Python/WarpXWrappers.cpp b/Source/Python/WarpXWrappers.cpp
@@ -447,18 +447,10 @@
         warpx.PushParticlesandDepose(cur_time);
     }
 
-    int warpx_getistep (int lev) {
-        const WarpX& warpx = WarpX::GetInstance();
-        return warpx.getistep(lev);
-    }
     void warpx_setistep (int lev, int ii) {
         WarpX& warpx = WarpX::GetInstance();
         warpx.setistep(lev, ii);
     }
-    amrex::Real warpx_gett_new (int lev) {
-        const WarpX& warpx = WarpX::GetInstance();
-        return warpx.gett_new(lev);
-    }
     void warpx_sett_new (int lev, amrex::Real time) {
         WarpX& warpx = WarpX::GetInstance();
         warpx.sett_new(lev, time);