Box: lo/hi small/big End Setters

Expose the properties as read and write.
ax3l · Apr 17, 2024 · 313ed96 · 313ed96
1 parent 3c43073
commit 313ed96
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 17 deletions.
diff --git a/docs/source/usage/api.rst b/docs/source/usage/api.rst
@@ -81,8 +81,12 @@ Base
 
 .. autofunction:: amrex.space3d.AlmostEqual
 
-Index Types
-"""""""""""
+Indexing: Box, IntVect and IndexType
+""""""""""""""""""""""""""""""""""""
+
+.. autoclass:: amrex.space3d.IntVect
+ :members:
+ :undoc-members:
 
 .. autoclass:: amrex.space3d.Box
  :members:
@@ -107,10 +111,6 @@ Index Types
 Vectors
 """""""
 
-.. autoclass:: amrex.space3d.IntVect
- :members:
- :undoc-members:
-
 .. autoclass:: amrex.space3d.RealVect
  :members:
  :undoc-members:

diff --git a/src/Base/Box.cpp b/src/Base/Box.cpp
@@ -104,18 +104,23 @@ void init_Box(py::module &m) {
  py::arg("small"), py::arg("big"), py::arg("t")
  )
 
- .def_property_readonly("lo_vect", [](Box const & bx){ return bx.smallEnd(); })
- .def_property_readonly("hi_vect", [](Box const & bx){ return bx.bigEnd(); })
- .def_property_readonly("small_end", [](Box const & bx){ return bx.smallEnd(); })
- .def_property_readonly("big_end", [](Box const & bx){ return bx.bigEnd(); })
- /*
+ .def_property("lo_vect",
+ [](Box const & bx){ return bx.smallEnd(); },
+ [](Box & bx, IntVect const & bg){ bx.setSmall(bg); }
+ )
+ .def_property("hi_vect",
+ [](Box const & bx){ return bx.bigEnd(); },
+ [](Box & bx, IntVect const & bg){ bx.setBig(bg); }
+ )
  .def_property("small_end",
- py::overload_cast<>(&Box::smallEnd, py::const_),
- py::overload_cast< IntVect const & >(&Box::setSmall))
+ [](Box const & bx){ return bx.smallEnd(); },
+ [](Box & bx, IntVect const & bg){ bx.setSmall(bg); }
+ )
  .def_property("big_end",
- &Box::bigEnd,
- &Box::setBig)
- */
+ [](Box const & bx){ return bx.bigEnd(); },
+ [](Box & bx, IntVect const & bg){ bx.setBig(bg); }
+ )
+
  .def_property("type",
  py::overload_cast<>(&Box::type, py::const_),
  &Box::setType)

diff --git a/src/Base/MultiFab.cpp b/src/Base/MultiFab.cpp
@@ -62,7 +62,7 @@ void init_MultiFab(py::module &m)
  .def(py::init< >())
 
  .def("enable_tiling", &MFItInfo::EnableTiling,
- py::arg("ts") /*=FabArrayBase::mfiter_tile_size*/ )
+ py::arg_v("tile_size", FabArrayBase::mfiter_tile_size, "Default tile size in MFIter" ))
  .def("set_dynamic", &MFItInfo::SetDynamic,
  py::arg("f"))
  .def("disable_device_sync", &MFItInfo::DisableDeviceSync)

diff --git a/tests/test_box.py b/tests/test_box.py
@@ -11,6 +11,16 @@ def box():
  return amr.Box((0, 0, 0), (127, 127, 127))
 
 
+def test_box_setget(box):
+ print(box.length())
+
+ box.small_end = amr.IntVect(3)
+ print(box.length())
+
+ box.big_end = amr.IntVect(40)
+ print(box.length())
+
+
 def test_length(box):
  print(box.length())
  assert box.length() == amr.IntVect(128, 128, 128)