Fix merge errors post 8.3.0

[tools/medcoupling.git] / src / MEDCoupling_Swig / MEDCouplingFinalize.i

diff --git a/src/MEDCoupling_Swig/MEDCouplingFinalize.i b/src/MEDCoupling_Swig/MEDCouplingFinalize.i
index 5a3d5fdf7768f1c42ea1c4f6a087a34c431aa944..749f5a3abc62c178d5a887b4c30e5ef08b4fad43 100644 (file)
--- a/src/MEDCoupling_Swig/MEDCouplingFinalize.i
+++ b/src/MEDCoupling_Swig/MEDCouplingFinalize.i
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2015  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2016  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -25,6 +25,12 @@ DataArrayDouble.__isub__=MEDCouplingDataArrayDoubleIsub
 DataArrayDouble.__imul__=MEDCouplingDataArrayDoubleImul
 DataArrayDouble.__idiv__=MEDCouplingDataArrayDoubleIdiv
 DataArrayDouble.__ipow__=MEDCouplingDataArrayDoubleIpow
+DataArrayDouble.__truediv__=DataArrayDouble.__div__
+DataArrayDouble.__itruediv__=MEDCouplingDataArrayDoubleIdiv
+DataArrayDouble.__rtruediv__=DataArrayDouble.__rdiv__
+DataArrayDouble.__floordiv__=DataArrayDouble.__div__
+DataArrayDouble.__ifloordiv__=MEDCouplingDataArrayDoubleIdiv
+DataArrayDouble.__rfloordiv__=DataArrayDouble.__rdiv__
 
 DataArrayInt.__new__=classmethod(MEDCouplingDataArrayIntnew)
 DataArrayInt.__iadd__=MEDCouplingDataArrayIntIadd
@@ -33,35 +39,71 @@ DataArrayInt.__imul__=MEDCouplingDataArrayIntImul
 DataArrayInt.__idiv__=MEDCouplingDataArrayIntIdiv
 DataArrayInt.__imod__=MEDCouplingDataArrayIntImod
 DataArrayInt.__ipow__=MEDCouplingDataArrayIntIpow
+DataArrayInt.__truediv__=DataArrayInt.__div__
+DataArrayInt.__itruediv__=MEDCouplingDataArrayIntIdiv
+DataArrayInt.__rtruediv__=DataArrayInt.__rdiv__
+DataArrayInt.__floordiv__=DataArrayInt.__div__
+DataArrayInt.__ifloordiv__=MEDCouplingDataArrayIntIdiv
+DataArrayInt.__rfloordiv__=DataArrayInt.__rdiv__
 
-MEDCouplingFieldDouble.__iadd__=ParaMEDMEMMEDCouplingFieldDoubleIadd
-MEDCouplingFieldDouble.__isub__=ParaMEDMEMMEDCouplingFieldDoubleIsub
-MEDCouplingFieldDouble.__imul__=ParaMEDMEMMEDCouplingFieldDoubleImul
-MEDCouplingFieldDouble.__idiv__=ParaMEDMEMMEDCouplingFieldDoubleIdiv
-MEDCouplingFieldDouble.__ipow__=ParaMEDMEMMEDCouplingFieldDoubleIpow
+DataArrayByte.__new__=classmethod(MEDCouplingDataArrayBytenew)
+
+DataArrayFloat.__new__=classmethod(MEDCouplingDataArrayFloatnew)
+DataArrayFloat.__iadd__=MEDCouplingDataArrayFloatIadd
+DataArrayFloat.__isub__=MEDCouplingDataArrayFloatIsub
+DataArrayFloat.__imul__=MEDCouplingDataArrayFloatImul
+DataArrayFloat.__idiv__=MEDCouplingDataArrayFloatIdiv
+DataArrayFloat.__itruediv__=MEDCouplingDataArrayFloatIdiv
+DataArrayFloat.__ifloordiv__=MEDCouplingDataArrayFloatIdiv
+
+MEDCouplingFieldDouble.__new__=classmethod(MEDCouplingFieldDoublenew)
+MEDCouplingFieldDouble.__iadd__=MEDCouplingFieldDoubleIadd
+MEDCouplingFieldDouble.__isub__=MEDCouplingFieldDoubleIsub
+MEDCouplingFieldDouble.__imul__=MEDCouplingFieldDoubleImul
+MEDCouplingFieldDouble.__idiv__=MEDCouplingFieldDoubleIdiv
+MEDCouplingFieldDouble.__ipow__=MEDCouplingFieldDoubleIpow
+MEDCouplingFieldDouble.__truediv__=MEDCouplingFieldDouble.__div__
+MEDCouplingFieldDouble.__rtruediv__=MEDCouplingFieldDouble.__rdiv__
+MEDCouplingFieldDouble.__itruediv__=MEDCouplingFieldDoubleIdiv
+MEDCouplingFieldDouble.__floordiv__=MEDCouplingFieldDouble.__div__
+MEDCouplingFieldDouble.__rfloordiv__=MEDCouplingFieldDouble.__rdiv__
+MEDCouplingFieldDouble.__ifloordiv__=MEDCouplingFieldDoubleIdiv
+
+MEDCouplingFieldInt.__new__=classmethod(MEDCouplingFieldIntnew)
+  
+MEDCouplingFieldFloat.__new__=classmethod(MEDCouplingFieldFloatnew)
 
 DataArrayDoubleTuple.__iadd__=MEDCouplingDataArrayDoubleTupleIadd
 DataArrayDoubleTuple.__isub__=MEDCouplingDataArrayDoubleTupleIsub
 DataArrayDoubleTuple.__imul__=MEDCouplingDataArrayDoubleTupleImul
 DataArrayDoubleTuple.__idiv__=MEDCouplingDataArrayDoubleTupleIdiv
+DataArrayDoubleTuple.__itruediv__=MEDCouplingDataArrayDoubleTupleIdiv
+DataArrayDoubleTuple.__ifloordiv__=MEDCouplingDataArrayDoubleTupleIdiv
 
 DataArrayIntTuple.__iadd__=MEDCouplingDataArrayIntTupleIadd
 DataArrayIntTuple.__isub__=MEDCouplingDataArrayIntTupleIsub
 DataArrayIntTuple.__imul__=MEDCouplingDataArrayIntTupleImul
 DataArrayIntTuple.__idiv__=MEDCouplingDataArrayIntTupleIdiv
+DataArrayIntTuple.__itruediv__=MEDCouplingDataArrayIntTupleIdiv
+DataArrayIntTuple.__ifloordiv__=MEDCouplingDataArrayIntTupleIdiv
 DataArrayIntTuple.__imod__=MEDCouplingDataArrayIntTupleImod
 
 DenseMatrix.__iadd__=ParaMEDMEMDenseMatrixIadd
 DenseMatrix.__isub__=ParaMEDMEMDenseMatrixIsub
 
-MEDCouplingUMesh.__new__=classmethod(ParaMEDMEMMEDCouplingUMeshnew)
-MEDCoupling1DGTUMesh.__new__=classmethod(ParaMEDMEMMEDCoupling1DGTUMeshnew)
-MEDCoupling1SGTUMesh.__new__=classmethod(ParaMEDMEMMEDCoupling1SGTUMeshnew)
-MEDCouplingCurveLinearMesh.__new__=classmethod(ParaMEDMEMMEDCouplingCurveLinearMeshnew)
-MEDCouplingCMesh.__new__=classmethod(ParaMEDMEMMEDCouplingCMeshnew)
-MEDCouplingIMesh.__new__=classmethod(ParaMEDMEMMEDCouplingIMeshnew)
-MEDCouplingExtrudedMesh.__new__=classmethod(ParaMEDMEMMEDCouplingExtrudedMeshnew)
-MEDCouplingFieldDouble.__new__=classmethod(ParaMEDMEMMEDCouplingFieldDoublenew)
+MEDCouplingUMesh.__new__=classmethod(MEDCouplingUMeshnew)
+MEDCoupling1DGTUMesh.__new__=classmethod(MEDCoupling1DGTUMeshnew)
+MEDCoupling1SGTUMesh.__new__=classmethod(MEDCoupling1SGTUMeshnew)
+MEDCouplingCurveLinearMesh.__new__=classmethod(MEDCouplingCurveLinearMeshnew)
+MEDCouplingCMesh.__new__=classmethod(MEDCouplingCMeshnew)
+MEDCouplingIMesh.__new__=classmethod(MEDCouplingIMeshnew)
+MEDCouplingMappedExtrudedMesh.__new__=classmethod(MEDCouplingExtrudedMeshnew)
+
+DataArrayAsciiCharIterator.__next__ = DataArrayAsciiCharIterator.next
+DataArrayIntIterator.__next__ = DataArrayIntIterator.next
+DataArrayDoubleIterator.__next__ = DataArrayDoubleIterator.next
+MEDCouplingUMeshCellIterator.__next__ = MEDCouplingUMeshCellIterator.next
+MEDCouplingUMeshCellByTypeIterator.__next__ = MEDCouplingUMeshCellByTypeIterator.next
 
 del INTERPKERNELExceptionReduce
 del MEDCouplingDataArrayDoublenew
@@ -69,17 +111,23 @@ del MEDCouplingDataArrayDoubleIadd
 del MEDCouplingDataArrayDoubleIsub
 del MEDCouplingDataArrayDoubleImul
 del MEDCouplingDataArrayDoubleIdiv
-del ParaMEDMEMMEDCouplingFieldDoubleIadd
-del ParaMEDMEMMEDCouplingFieldDoubleIsub
-del ParaMEDMEMMEDCouplingFieldDoubleImul
-del ParaMEDMEMMEDCouplingFieldDoubleIdiv
-del ParaMEDMEMMEDCouplingFieldDoubleIpow
+del MEDCouplingFieldDoubleIadd
+del MEDCouplingFieldDoubleIsub
+del MEDCouplingFieldDoubleImul
+del MEDCouplingFieldDoubleIdiv
+del MEDCouplingFieldDoubleIpow
 del MEDCouplingDataArrayIntnew
 del MEDCouplingDataArrayIntIadd
 del MEDCouplingDataArrayIntIsub
 del MEDCouplingDataArrayIntImul
 del MEDCouplingDataArrayIntIdiv
 del MEDCouplingDataArrayIntImod
+del MEDCouplingDataArrayBytenew
+del MEDCouplingDataArrayFloatnew
+del MEDCouplingDataArrayFloatIadd
+del MEDCouplingDataArrayFloatIsub
+del MEDCouplingDataArrayFloatImul
+del MEDCouplingDataArrayFloatIdiv
 del MEDCouplingDataArrayDoubleTupleIadd
 del MEDCouplingDataArrayDoubleTupleIsub
 del MEDCouplingDataArrayDoubleTupleImul
@@ -91,12 +139,12 @@ del MEDCouplingDataArrayIntTupleIdiv
 del MEDCouplingDataArrayIntTupleImod
 del ParaMEDMEMDenseMatrixIadd
 del ParaMEDMEMDenseMatrixIsub
-del ParaMEDMEMMEDCouplingUMeshnew
-del ParaMEDMEMMEDCoupling1DGTUMeshnew
-del ParaMEDMEMMEDCoupling1SGTUMeshnew
-del ParaMEDMEMMEDCouplingCurveLinearMeshnew
-del ParaMEDMEMMEDCouplingCMeshnew
-del ParaMEDMEMMEDCouplingIMeshnew
-del ParaMEDMEMMEDCouplingExtrudedMeshnew
-del ParaMEDMEMMEDCouplingFieldDoublenew
+del MEDCouplingUMeshnew
+del MEDCoupling1DGTUMeshnew
+del MEDCoupling1SGTUMeshnew
+del MEDCouplingCurveLinearMeshnew
+del MEDCouplingCMeshnew
+del MEDCouplingIMeshnew
+del MEDCouplingExtrudedMeshnew
+del MEDCouplingFieldDoublenew
 %}