Merge branch 'devel' into AddUnits

Author: michael-petersen

expui/BiorthBasis.H

@@ -195,9 +195,9 @@ namespace BasisClasses
 
     //! Evaluate acceleration in Cartesian coordinates in centered
     //! coordinate system for a collections of points
-    virtual RowMatrixXd& getAccel(Eigen::VectorXd& x,
-				  Eigen::VectorXd& y,
-				  Eigen::VectorXd& z)
+    virtual RowMatrixXd& getAccel(Eigen::Ref<const Eigen::VectorXd> x,
+				  Eigen::Ref<const Eigen::VectorXd> y,
+				  Eigen::Ref<const Eigen::VectorXd> z)
     {
       // Sanity check
       if (x.size() != y.size() || x.size() != z.size())
@@ -216,7 +216,7 @@ namespace BasisClasses
 
     //! Evaluate acceleration in Cartesian coordinates in centered
     //! coordinate system for a collections of points
-    virtual RowMatrixXd& getAccel(RowMatrixXd& pos)
+    virtual RowMatrixXd& getAccel(Eigen::Ref<const RowMatrixXd> pos)
     {
       // Sanity check
       if (pos.cols() != 3)

pyEXP/BasisWrappers.cc

@@ -1370,7 +1370,7 @@ void BasisFactoryClasses(py::module &m)
          __call__       : same as getFields() but provides field labels in a tuple
          )",
 	 py::arg("x"), py::arg("y"), py::arg("z"))
-    .def("getAccel", py::overload_cast<Eigen::VectorXd&, Eigen::VectorXd&, Eigen::VectorXd&>(&BasisClasses::BiorthBasis::getAccel),
+    .def("getAccel", py::overload_cast<Eigen::Ref<const Eigen::VectorXd>, Eigen::Ref<const Eigen::VectorXd>, Eigen::Ref<const Eigen::VectorXd>>(&BasisClasses::BiorthBasis::getAccel),
 	 R"(
          Return the acceleration for a given cartesian position
 
@@ -1394,7 +1394,7 @@ void BasisFactoryClasses(py::module &m)
          __call__       : same as getFields() but provides field labels in a tuple
          )",
 	 py::arg("x"), py::arg("y"), py::arg("z"))
-    .def("getAccel", py::overload_cast<RowMatrixXd&>(&BasisClasses::BiorthBasis::getAccel),
+    .def("getAccel", py::overload_cast<Eigen::Ref<const RowMatrixXd>>(&BasisClasses::BiorthBasis::getAccel),
 	 R"(
          Return the acceleration for an array of cartesian positions
 
@@ -1414,7 +1414,7 @@ void BasisFactoryClasses(py::module &m)
          __call__       : same as getFields() but provides field labels in a tuple
          )",
 	 py::arg("pos"))
-    .def("getAccelArray", py::overload_cast<Eigen::VectorXd&, Eigen::VectorXd&, Eigen::VectorXd&>(&BasisClasses::BiorthBasis::getAccel),
+    .def("getAccelArray", py::overload_cast<Eigen::Ref<const Eigen::VectorXd>, Eigen::Ref<const Eigen::VectorXd>, Eigen::Ref<const Eigen::VectorXd>>(&BasisClasses::BiorthBasis::getAccel),
 	 R"(
          Return the acceleration for a given cartesian position
 
@@ -1561,7 +1561,29 @@ void BasisFactoryClasses(py::module &m)
          Returns
          -------
          None
-         )", py::arg("coefs"));
+         )", py::arg("coefs"))
+    .def("get_shared_ptr_capsule", [](const std::shared_ptr<BasisClasses::BiorthBasis> &self) -> py::capsule {
+      return py::capsule(
+        new std::shared_ptr(self),
+        "BiorthBasis_shared_ptr",
+        [](void *v) { delete static_cast<std::shared_ptr<BasisClasses::BiorthBasis> *>(v); }
+      );
+    },
+    R"(
+        Get a capsule containing a shared pointer to the BiorthBasis instance.
+
+        Returns
+        -------
+        capsule: PyCapsule
+            A PyCapsule containing a shared pointer to the BiorthBasis instance with
+            the name "BiorthBasis_shared_ptr".
+
+        Notes
+        -----
+        This can be used to pass the BiorthBasis instance to non-Pybind11 C extensions
+        in a lifetime-safe manner.
+        )"
+    );
 
   py::class_<BasisClasses::Cylindrical, std::shared_ptr<BasisClasses::Cylindrical>, PyCylindrical, BasisClasses::BiorthBasis>(m, "Cylindrical")
     .def(py::init<const std::string&>(),

pyEXP/CoefWrappers.cc

@@ -1488,8 +1488,29 @@ void CoefficientClasses(py::module &m) {
                 --------
                 addcoef : add coefficient structures to an existing coefficieint container
                 )",
-                py::arg("coef"), py::arg("name")="");
+		py::arg("coef"), py::arg("name")="")
+    .def("get_shared_ptr_capsule", [](const std::shared_ptr<CoefClasses::Coefs> &self) -> py::capsule {
+      return py::capsule(
+        new std::shared_ptr(self),
+        "Coefs_shared_ptr",
+        [](void *v) { delete static_cast<std::shared_ptr<CoefClasses::Coefs> *>(v); }
+      );
+    },
+    R"(
+        Get a capsule containing a shared pointer to the Coefs instance.
+
+        Returns
+        -------
+        capsule: PyCapsule
+            A PyCapsule containing a shared pointer to the Coefs instance with
+            the name "Coefs_shared_ptr".
 
+        Notes
+        -----
+        This can be used to pass the Coefs instance to non-Pybind11 C extensions
+        in a lifetime-safe manner.
+        )"
+    );
 
   py::class_<CoefClasses::SphCoefs, std::shared_ptr<CoefClasses::SphCoefs>, PySphCoefs, CoefClasses::Coefs>
     (m, "SphCoefs", "Container for spherical coefficients")