working version with possibility to initialize the flow from python

Author: glesur

src/pydefix.cpp

@@ -46,6 +46,20 @@ PYBIND11_EMBEDDED_MODULE(pydefix, m) {
       .def_readwrite("Ex3", &DataBlockHost::Ex3)
     #endif
     .def_readwrite("InvDt", &DataBlockHost::InvDt);
+
+    m.attr("RHO") = RHO;
+    m.attr("VX1") = VX1;
+    m.attr("VX2") = VX2;
+    m.attr("VX3") = VX3;
+    m.attr("PRS") = PRS;
+    #if MHD == YES
+      m.attr("BX1") = BX1;
+      m.attr("BX2") = BX2;
+      m.attr("BX3") = BX3;
+    #endif
+    m.attr("IDIR") = IDIR;
+    m.attr("JDIR") = JDIR;
+    m.attr("KDIR") = KDIR;
 }
 
 
@@ -87,7 +101,7 @@ void Pydefix::Output(DataBlock &data) {
   }
   DataBlockHost dataHost(data);
   dataHost.SyncFromDevice();
-  this->CallScript(&dataHost,this->scriptFilename,this->outputFunctionName);
+  this->CallScript(dataHost,this->scriptFilename,this->outputFunctionName);
   idfx::popRegion();
 }
 
@@ -102,7 +116,7 @@ void Pydefix::InitFlow(DataBlock &data) {
   }
   DataBlockHost dataHost(data);
   dataHost.SyncFromDevice();
-  this->CallScript(&dataHost,this->scriptFilename,this->initflowFunctionName);
+  this->CallScript(dataHost,this->scriptFilename,this->initflowFunctionName);
   dataHost.SyncToDevice();
   idfx::popRegion();
 }
@@ -136,14 +150,15 @@ Pydefix::~Pydefix() {
   }
 }
 
-void Pydefix::CallScript(DataBlockHost *data, std::string scriptName, std::string funcName) {
+void Pydefix::CallScript(DataBlockHost &data, std::string scriptName, std::string funcName) {
   idfx::pushRegion("Pydefix::CallScript");
   try {
     //auto Vc = pydefix.toNumpyArray(d.Vc);
     py::module_ script = py::module_::import(scriptName.c_str());
 
     //py::module_ embeded = py::module_::import("embeded");
     //py::object myV = py::cast(Vc);
+    //py::object result = script.attr(funcName.c_str())(data);
     py::object result = script.attr(funcName.c_str())(data);
   } catch(std::exception &e) {
     std::stringstream message;

src/pydefix.hpp

@@ -34,7 +34,7 @@ class Pydefix {
   bool haveOutput{false};
   bool haveInitflow{false};
  private:
-  void CallScript(DataBlockHost *, std::string, std::string);
+  void CallScript(DataBlockHost &, std::string, std::string);
   static int ninstance;
   std::string scriptFilename;
   std::string outputFunctionName;
@@ -78,12 +78,13 @@ template <typename T> struct type_caster<IdefixHostArray4D<T>> {
   static py::handle cast(const IdefixHostArray4D<T>& src,
                          py::return_value_policy policy,
                          py::handle parent) {
+    py::none dummyDataOwner;
     py::array_t<real, py::array::c_style> a({src.extent(0),
                                              src.extent(1),
                                              src.extent(2),
                                              src.extent(3)},
-                                             src.data());
-    idfx::cout << "Coucou @ cast" << std::endl;
+                                             src.data(), dummyDataOwner);
+
     return a.release();
   }
 };
@@ -122,10 +123,11 @@ template <typename T> struct type_caster<IdefixHostArray3D<T>> {
   static py::handle cast(const IdefixHostArray3D<T>& src,
                          py::return_value_policy policy,
                          py::handle parent) {
+    py::none dummyDataOwner;
     py::array_t<real, py::array::c_style> a({src.extent(0),
                                              src.extent(1),
                                              src.extent(2)},
-                                             src.data());
+                                             src.data(),dummyDataOwner);
     return a.release();
   }
 };
@@ -164,7 +166,8 @@ template <typename T> struct type_caster<IdefixHostArray2D<T>> {
   static py::handle cast(const IdefixHostArray2D<T>& src,
                          py::return_value_policy policy,
                          py::handle parent) {
-    py::array_t<real, py::array::c_style> a({src.extent(0),src.extent(1)},src.data());
+    py::none dummyOwner;
+    py::array_t<real, py::array::c_style> a({src.extent(0),src.extent(1)},src.data(),dummyOwner);
     return a.release();
   }
 };
@@ -203,7 +206,8 @@ template <typename T> struct type_caster<IdefixHostArray1D<T>> {
   static py::handle cast(const IdefixHostArray1D<T>& src,
                          py::return_value_policy policy,
                          py::handle parent) {
-    py::array_t<real, py::array::c_style> a(src.extent(0),src.data());
+    py::none dummyDataOwner;
+    py::array_t<real, py::array::c_style> a(src.extent(0),src.data(),dummyDataOwner);
     return a.release();
   }
 };

test/HD/sod/idefix_py.ini

@@ -29,4 +29,4 @@ initflow_function    initflow
 [Output]
 vtk       0.1
 dmp       0.2
-python    0.1  output  myfunc
+python    0.01

test/HD/sod/pydefix_example.py

@@ -1,14 +1,19 @@
+import pydefix as pdfx
+import numpy as np
+import matplotlib.pyplot as plt
 
 def output(data):
-  print("data=")
-  print(data.Vc[0,0,0,:])
-  data.Vc[0,0,0,10] = 2.0
+
+  plt.figure()
+  plt.plot(data.x[pdfx.IDIR],data.Vc[pdfx.VX1,0,0,:],label='VX1')
+  plt.plot(data.x[pdfx.IDIR],data.Vc[pdfx.RHO,0,0,:],label='RHO')
+  plt.legend()
+  plt.show()
+  #data.Vc[0,0,0,10] = 2.0
 
 def initflow(data):
+
   # Initialize the flow
-  print(data.Vc.shape)
-  data.Vc[0,0,0,:] = 1+0*data.x[0][:]
-  data.Vc[0,0,0,1] = 1.0
-  data.Vc[1,0,0,:] = data.x[0][:]
-  print(data.Vc[0,0,0,:])
-  print(data.Vc[1,0,0,:])
+  data.Vc[pdfx.RHO,0,0,:] = 1.0
+  data.Vc[pdfx.PRS,0,0,:] = 2.0
+  data.Vc[pdfx.VX1,0,0,:] = np.sin(2.0*np.pi*data.x[0][:])