From 892de9b6f48db4d415f062dd9c3acfaef925b652 Mon Sep 17 00:00:00 2001 From: Anthony Geay Date: Fri, 15 Dec 2017 16:26:31 +0100 Subject: [PATCH] continue --- src/MEDCoupling_Swig/MEDCoupling.i | 2 +- src/MEDPartitioner_Swig/MEDPartitioner.i | 18 ++++++++++++++++++ src/MEDPartitioner_Swig/MEDPartitionerCommon.i | 16 ---------------- src/PyWrapping/CMakeLists.txt | 4 ++++ 4 files changed, 23 insertions(+), 17 deletions(-) diff --git a/src/MEDCoupling_Swig/MEDCoupling.i b/src/MEDCoupling_Swig/MEDCoupling.i index ed247753c..17dc3516f 100644 --- a/src/MEDCoupling_Swig/MEDCoupling.i +++ b/src/MEDCoupling_Swig/MEDCoupling.i @@ -19,7 +19,7 @@ %module MEDCoupling -%include "MEDCouplingImpl.i" +%include "MEDCouplingCommon.i" %pythoncode %{ def MEDCouplingDataArrayDoubleIadd(self,*args): diff --git a/src/MEDPartitioner_Swig/MEDPartitioner.i b/src/MEDPartitioner_Swig/MEDPartitioner.i index 4bd1dbc4f..9460fe8c6 100644 --- a/src/MEDPartitioner_Swig/MEDPartitioner.i +++ b/src/MEDPartitioner_Swig/MEDPartitioner.i @@ -17,5 +17,23 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // +%module MEDPartitioner + +%{ +#include "MEDFileData.hxx" + +using namespace MEDCoupling; +using namespace INTERP_KERNEL; +%} + +%feature("autodoc", "1"); +%feature("docstring"); + +%feature("unref") MEDCoupling::MEDFileData "$this->decrRef();" + +%nodefaultctor; + +%rename (InterpKernelException) INTERP_KERNEL::Exception; + %include "MEDPartitionerCommon.i" diff --git a/src/MEDPartitioner_Swig/MEDPartitionerCommon.i b/src/MEDPartitioner_Swig/MEDPartitionerCommon.i index a9060838c..e67c75f89 100644 --- a/src/MEDPartitioner_Swig/MEDPartitionerCommon.i +++ b/src/MEDPartitioner_Swig/MEDPartitionerCommon.i @@ -17,35 +17,19 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -%module MEDPartitioner - -%include std_string.i - %{ -#include "MEDFileData.hxx" - #include "MEDPARTITIONER_MEDPartitioner.hxx" #include "MEDPARTITIONER.hxx" #include "MEDPARTITIONER_Graph.hxx" -using namespace MEDCoupling; -using namespace INTERP_KERNEL; using namespace MEDPARTITIONER; %} -%feature("autodoc", "1"); -%feature("docstring"); - %newobject MEDPARTITIONER::MEDPartitioner::New; %newobject MEDPARTITIONER::MEDPartitioner::Graph; %newobject MEDPARTITIONER::MEDPartitioner::Graph::getGraph; %newobject MEDPARTITIONER::MEDPartitioner::Graph::getPartition; %newobject MEDPARTITIONER::MEDPartitioner::getMEDFileData; -%feature("unref") MEDCoupling::MEDFileData "$this->decrRef();" - -%nodefaultctor; - -%rename (InterpKernelException) INTERP_KERNEL::Exception; namespace MEDPARTITIONER { diff --git a/src/PyWrapping/CMakeLists.txt b/src/PyWrapping/CMakeLists.txt index f48ff3eb8..6e6ceb6f5 100644 --- a/src/PyWrapping/CMakeLists.txt +++ b/src/PyWrapping/CMakeLists.txt @@ -74,6 +74,10 @@ IF(MEDCOUPLING_ENABLE_RENUMBER) ENDIF(MEDCOUPLING_ENABLE_RENUMBER) +IF(MEDCOUPLING_ENABLE_PARTITIONER) + +ENDIF(MEDCOUPLING_ENABLE_PARTITIONER) + SWIG_ADD_MODULE(medcoupling python medcoupling.i) SWIG_LINK_LIBRARIES(medcoupling ${medcoupling_LIB_dependancies}) SWIG_CHECK_GENERATION(medcoupling) -- 2.39.2