From 96d93eee4d12f6a31e6d48da5dd31f70fdac222c Mon Sep 17 00:00:00 2001 From: Anthony Geay Date: Tue, 17 Oct 2017 07:48:49 +0200 Subject: [PATCH] Final cleanup --- src/MEDCoupling_Swig/MEDCouplingRemapper.i | 42 ---------------------- src/MEDLoader/Swig/MEDLoader.i | 35 +----------------- src/ParaMEDMEM_Swig/ParaMEDMEM.i | 42 ---------------------- src/RENUMBER_Swig/MEDRenumber.i | 20 +++-------- 4 files changed, 5 insertions(+), 134 deletions(-) diff --git a/src/MEDCoupling_Swig/MEDCouplingRemapper.i b/src/MEDCoupling_Swig/MEDCouplingRemapper.i index aad7b1997..9e277868c 100644 --- a/src/MEDCoupling_Swig/MEDCouplingRemapper.i +++ b/src/MEDCoupling_Swig/MEDCouplingRemapper.i @@ -103,9 +103,6 @@ namespace MEDCoupling } %pythoncode %{ -def MEDCouplingDataArrayDoublenew(cls,*args): - import _MEDCouplingRemapper - return _MEDCouplingRemapper.DataArrayDouble____new___(cls,args) def MEDCouplingDataArrayDoubleIadd(self,*args): import _MEDCouplingRemapper return _MEDCouplingRemapper.DataArrayDouble____iadd___(self, self, *args) @@ -121,9 +118,6 @@ def MEDCouplingDataArrayDoubleIdiv(self,*args): def MEDCouplingDataArrayDoubleIpow(self,*args): import _MEDCouplingRemapper return _MEDCouplingRemapper.DataArrayDouble____ipow___(self, self, *args) -def MEDCouplingFieldDoublenew(cls,*args): - import _MEDCouplingRemapper - return _MEDCouplingRemapper.MEDCouplingFieldDouble____new___(cls,args) def MEDCouplingFieldDoubleIadd(self,*args): import _MEDCouplingRemapper return _MEDCouplingRemapper.MEDCouplingFieldDouble____iadd___(self, self, *args) @@ -139,18 +133,6 @@ def MEDCouplingFieldDoubleIdiv(self,*args): def MEDCouplingFieldDoubleIpow(self,*args): import _MEDCouplingRemapper return _MEDCouplingRemapper.MEDCouplingFieldDouble____ipow___(self, self, *args) -def MEDCouplingFieldIntnew(cls,*args): - import _MEDCouplingRemapper - return _MEDCouplingRemapper.MEDCouplingFieldInt____new___(cls,args) -def MEDCouplingFieldFloatnew(cls,*args): - import _MEDCouplingRemapper - return _MEDCouplingRemapper.MEDCouplingFieldFloat____new___(cls,args) -def MEDCouplingDataArrayBytenew(cls,*args): - import _MEDCouplingRemapper - return _MEDCouplingRemapper.DataArrayByte____new___(cls,args) -def MEDCouplingDataArrayFloatnew(cls,*args): - import _MEDCouplingRemapper - return _MEDCouplingRemapper.DataArrayFloat____new___(cls,args) def MEDCouplingDataArrayFloatIadd(self,*args): import _MEDCouplingRemapper return _MEDCouplingRemapper.DataArrayFloat____iadd___(self, self, *args) @@ -163,9 +145,6 @@ def MEDCouplingDataArrayFloatImul(self,*args): def MEDCouplingDataArrayFloatIdiv(self,*args): import _MEDCouplingRemapper return _MEDCouplingRemapper.DataArrayFloat____idiv___(self, self, *args) -def MEDCouplingDataArrayIntnew(cls,*args): - import _MEDCouplingRemapper - return _MEDCouplingRemapper.DataArrayInt____new___(cls,args) def MEDCouplingDataArrayIntIadd(self,*args): import _MEDCouplingRemapper return _MEDCouplingRemapper.DataArrayInt____iadd___(self, self, *args) @@ -217,27 +196,6 @@ def ParaMEDMEMDenseMatrixIadd(self,*args): def ParaMEDMEMDenseMatrixIsub(self,*args): import _MEDCouplingRemapper return _MEDCouplingRemapper.DenseMatrix____isub___(self, self, *args) -def MEDCouplingUMeshnew(cls,*args): - import _MEDCouplingRemapper - return _MEDCouplingRemapper.MEDCouplingUMesh____new___(cls,args) -def MEDCoupling1DGTUMeshnew(cls,*args): - import _MEDCouplingRemapper - return _MEDCouplingRemapper.MEDCoupling1DGTUMesh____new___(cls,args) -def MEDCoupling1SGTUMeshnew(cls,*args): - import _MEDCouplingRemapper - return _MEDCouplingRemapper.MEDCoupling1SGTUMesh____new___(cls,args) -def MEDCouplingCurveLinearMeshnew(cls,*args): - import _MEDCouplingRemapper - return _MEDCouplingRemapper.MEDCouplingCurveLinearMesh____new___(cls,args) -def MEDCouplingCMeshnew(cls,*args): - import _MEDCouplingRemapper - return _MEDCouplingRemapper.MEDCouplingCMesh____new___(cls,args) -def MEDCouplingIMeshnew(cls,*args): - import _MEDCouplingRemapper - return _MEDCouplingRemapper.MEDCouplingIMesh____new___(cls,args) -def MEDCouplingExtrudedMeshnew(cls,*args): - import _MEDCouplingRemapper - return _MEDCouplingRemapper.MEDCouplingMappedExtrudedMesh____new___(cls,args) %} %include "MEDCouplingFinalize.i" diff --git a/src/MEDLoader/Swig/MEDLoader.i b/src/MEDLoader/Swig/MEDLoader.i index 5eb51ebf0..8a81961e2 100644 --- a/src/MEDLoader/Swig/MEDLoader.i +++ b/src/MEDLoader/Swig/MEDLoader.i @@ -21,9 +21,6 @@ %include "MEDLoaderCommon.i" %pythoncode %{ -def MEDCouplingDataArrayDoublenew(cls,*args): - import _MEDLoader - return _MEDLoader.DataArrayDouble____new___(cls,args) def MEDCouplingDataArrayDoubleIadd(self,*args): import _MEDLoader return _MEDLoader.DataArrayDouble____iadd___(self, self, *args) @@ -119,36 +116,6 @@ def ParaMEDMEMDenseMatrixIsub(self,*args): return _MEDLoader.DenseMatrix____isub___(self, self, *args) %} -%pythoncode %{ -def MEDCouplingMEDFileMeshesnew(cls,*args): - import _MEDLoader - return _MEDLoader.MEDFileMeshes____new___(cls,args) -def MEDCouplingMEDFileFieldsnew(cls,*args): - import _MEDLoader - return _MEDLoader.MEDFileFields____new___(cls,args) -def MEDCouplingMEDFileField1TSnew(cls,*args): - import _MEDLoader - return _MEDLoader.MEDFileField1TS____new___(cls,args) -def MEDCouplingMEDFileFieldMultiTSnew(cls,*args): - import _MEDLoader - return _MEDLoader.MEDFileFieldMultiTS____new___(cls,args) -def MEDCouplingMEDFileIntField1TSnew(cls,*args): - import _MEDLoader - return _MEDLoader.MEDFileIntField1TS____new___(cls,args) -def MEDCouplingMEDFileIntFieldMultiTSnew(cls,*args): - import _MEDLoader - return _MEDLoader.MEDFileIntFieldMultiTS____new___(cls,args) -def MEDCouplingMEDFileFloatField1TSnew(cls,*args): - import _MEDLoader - return _MEDLoader.MEDFileFloatField1TS____new___(cls,args) -def MEDCouplingMEDFileFloatFieldMultiTSnew(cls,*args): - import _MEDLoader - return _MEDLoader.MEDFileFloatFieldMultiTS____new___(cls,args) -def MEDCouplingMEDFileParametersnew(cls,*args): - import _MEDLoader - return _MEDLoader.MEDFileParameters____new___(cls,args) -%} - %include "MEDCouplingFinalize.i" %pythoncode %{ @@ -170,7 +137,7 @@ def MEDCouplingMEDFileCurveLinearMeshReduce(self): return MEDCouplingStdReduceFunct,(MEDFileCurveLinearMesh,((self.serialize(),),(self.__getstate__()),)) MEDFileCurveLinearMesh.__reduce__=MEDCouplingMEDFileCurveLinearMeshReduce del MEDCouplingMEDFileCurveLinearMeshReduce -def MEDCouplingMEDFileDataReduce(self):#"PyWrap of MEDFileData.__getnewargs__ : not implemented because numpy is not active in your configuration ! No serialization/unserialization available without numpy !" +def MEDCouplingMEDFileDataReduce(self): return MEDCouplingStdReduceFunct,(MEDFileData,((self.serialize(),),(self.__getstate__()),)) MEDFileData.__reduce__=MEDCouplingMEDFileDataReduce del MEDCouplingMEDFileDataReduce diff --git a/src/ParaMEDMEM_Swig/ParaMEDMEM.i b/src/ParaMEDMEM_Swig/ParaMEDMEM.i index abead8842..62478273b 100644 --- a/src/ParaMEDMEM_Swig/ParaMEDMEM.i +++ b/src/ParaMEDMEM_Swig/ParaMEDMEM.i @@ -259,9 +259,6 @@ int MPI_Finalize(); %} %pythoncode %{ -def MEDCouplingDataArrayDoublenew(cls,*args): - import _ParaMEDMEM - return _ParaMEDMEM.DataArrayDouble____new___(cls,args) def MEDCouplingDataArrayDoubleIadd(self,*args): import _ParaMEDMEM return _ParaMEDMEM.DataArrayDouble____iadd___(self, self, *args) @@ -277,9 +274,6 @@ def MEDCouplingDataArrayDoubleIdiv(self,*args): def MEDCouplingDataArrayDoubleIpow(self,*args): import _ParaMEDMEM return _ParaMEDMEM.DataArrayDouble____ipow___(self, self, *args) -def MEDCouplingFieldDoublenew(cls,*args): - import _ParaMEDMEM - return _ParaMEDMEM.MEDCouplingFieldDouble____new___(cls,args) def MEDCouplingFieldDoubleIadd(self,*args): import _ParaMEDMEM return _ParaMEDMEM.MEDCouplingFieldDouble____iadd___(self, self, *args) @@ -295,15 +289,6 @@ def MEDCouplingFieldDoubleIdiv(self,*args): def MEDCouplingFieldDoubleIpow(self,*args): import _ParaMEDMEM return _ParaMEDMEM.MEDCouplingFieldDouble____ipow___(self, self, *args) -def MEDCouplingFieldIntnew(cls,*args): - import _ParaMEDMEM - return _ParaMEDMEM.MEDCouplingFieldInt____new___(cls,args) -def MEDCouplingFieldFloatnew(cls,*args): - import _ParaMEDMEM - return _ParaMEDMEM.MEDCouplingFieldFloat____new___(cls,args) -def MEDCouplingDataArrayIntnew(cls,*args): - import _ParaMEDMEM - return _ParaMEDMEM.DataArrayInt____new___(cls,args) def MEDCouplingDataArrayIntIadd(self,*args): import _ParaMEDMEM return _ParaMEDMEM.DataArrayInt____iadd___(self, self, *args) @@ -322,12 +307,6 @@ def MEDCouplingDataArrayIntImod(self,*args): def MEDCouplingDataArrayIntIpow(self,*args): import _ParaMEDMEM return _ParaMEDMEM.DataArrayInt____ipow___(self, self, *args) -def MEDCouplingDataArrayBytenew(cls,*args): - import _ParaMEDMEM - return _ParaMEDMEM.DataArrayByte____new___(cls,args) -def MEDCouplingDataArrayFloatnew(cls,*args): - import _ParaMEDMEM - return _ParaMEDMEM.DataArrayFloat____new___(cls,args) def MEDCouplingDataArrayFloatIadd(self,*args): import _ParaMEDMEM return _ParaMEDMEM.DataArrayFloat____iadd___(self, self, *args) @@ -373,27 +352,6 @@ def ParaMEDMEMDenseMatrixIadd(self,*args): def ParaMEDMEMDenseMatrixIsub(self,*args): import _ParaMEDMEM return _ParaMEDMEM.DenseMatrix____isub___(self, self, *args) -def MEDCouplingUMeshnew(cls,*args): - import _ParaMEDMEM - return _ParaMEDMEM.MEDCouplingUMesh____new___(cls,args) -def MEDCoupling1DGTUMeshnew(cls,*args): - import _ParaMEDMEM - return _ParaMEDMEM.MEDCoupling1DGTUMesh____new___(cls,args) -def MEDCoupling1SGTUMeshnew(cls,*args): - import _ParaMEDMEM - return _ParaMEDMEM.MEDCoupling1SGTUMesh____new___(cls,args) -def MEDCouplingCurveLinearMeshnew(cls,*args): - import _ParaMEDMEM - return _ParaMEDMEM.MEDCouplingCurveLinearMesh____new___(cls,args) -def MEDCouplingCMeshnew(cls,*args): - import _ParaMEDMEM - return _ParaMEDMEM.MEDCouplingCMesh____new___(cls,args) -def MEDCouplingIMeshnew(cls,*args): - import _ParaMEDMEM - return _ParaMEDMEM.MEDCouplingIMesh____new___(cls,args) -def MEDCouplingExtrudedMeshnew(cls,*args): - import _ParaMEDMEM - return _ParaMEDMEM.MEDCouplingMappedExtrudedMesh____new___(cls,args) %} %include "MEDCouplingFinalize.i" diff --git a/src/RENUMBER_Swig/MEDRenumber.i b/src/RENUMBER_Swig/MEDRenumber.i index 82667ea27..b610d7192 100644 --- a/src/RENUMBER_Swig/MEDRenumber.i +++ b/src/RENUMBER_Swig/MEDRenumber.i @@ -20,9 +20,6 @@ %include "MEDRenumberCommon.i" %pythoncode %{ -def MEDCouplingDataArrayDoublenew(cls,*args): - import _MEDRenumber - return _MEDRenumber.DataArrayDouble____new___(cls,args) def MEDCouplingDataArrayDoubleIadd(self,*args): import _MEDRenumber return _MEDRenumber.DataArrayDouble____iadd___(self, self, *args) @@ -38,9 +35,6 @@ def MEDCouplingDataArrayDoubleIdiv(self,*args): def MEDCouplingDataArrayDoubleIpow(self,*args): import _MEDRenumber return _MEDRenumber.DataArrayDouble____ipow___(self, self, *args) -def MEDCouplingDataArrayIntnew(cls,*args): - import _MEDRenumber - return _MEDRenumber.DataArrayInt____new___(cls,args) def MEDCouplingDataArrayIntIadd(self,*args): import _MEDRenumber return _MEDRenumber.DataArrayInt____iadd___(self, self, *args) @@ -59,12 +53,6 @@ def MEDCouplingDataArrayIntImod(self,*args): def MEDCouplingDataArrayIntIpow(self,*args): import _MEDRenumber return _MEDRenumber.DataArrayInt____ipow___(self, self, *args) -def MEDCouplingDataArrayBytenew(cls,*args): - import _MEDRenumber - return _MEDRenumber.DataArrayByte____new___(cls,args) -def MEDCouplingDataArrayFloatnew(cls,*args): - import _MEDRenumber - return _MEDRenumber.DataArrayFloat____new___(cls,args) def MEDCouplingDataArrayFloatIadd(self,*args): import _MEDRenumber return _MEDRenumber.DataArrayFloat____iadd___(self, self, *args) @@ -109,14 +97,14 @@ def MEDCouplingDataArrayIntTupleImod(self,*args): %pythoncode %{ InterpKernelException.__reduce__=INTERPKERNELExceptionReduce -DataArrayDouble.__new__=classmethod(MEDCouplingDataArrayDoublenew) +DataArrayDouble.__reduce__=MEDCouplingDataArrayDoubleReduce DataArrayDouble.__iadd__=MEDCouplingDataArrayDoubleIadd DataArrayDouble.__isub__=MEDCouplingDataArrayDoubleIsub DataArrayDouble.__imul__=MEDCouplingDataArrayDoubleImul DataArrayDouble.__idiv__=MEDCouplingDataArrayDoubleIdiv DataArrayDouble.__ipow__=MEDCouplingDataArrayDoubleIpow -DataArrayInt.__new__=classmethod(MEDCouplingDataArrayIntnew) +DataArrayInt.__reduce__=MEDCouplingDataArrayIntReduce DataArrayInt.__iadd__=MEDCouplingDataArrayIntIadd DataArrayInt.__isub__=MEDCouplingDataArrayIntIsub DataArrayInt.__imul__=MEDCouplingDataArrayIntImul @@ -136,12 +124,12 @@ DataArrayIntTuple.__idiv__=MEDCouplingDataArrayIntTupleIdiv DataArrayIntTuple.__imod__=MEDCouplingDataArrayIntTupleImod del INTERPKERNELExceptionReduce -del MEDCouplingDataArrayDoublenew +del MEDCouplingDataArrayDoubleReduce +del MEDCouplingDataArrayIntReduce del MEDCouplingDataArrayDoubleIadd del MEDCouplingDataArrayDoubleIsub del MEDCouplingDataArrayDoubleImul del MEDCouplingDataArrayDoubleIdiv -del MEDCouplingDataArrayIntnew del MEDCouplingDataArrayIntIadd del MEDCouplingDataArrayIntIsub del MEDCouplingDataArrayIntImul -- 2.39.2