X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDCoupling_Swig%2FMEDCouplingRemapper.i;h=4aea9b44a2a026954ca7017de0289ff072403fe9;hb=3b1d77efdd048ef4aad858e96138bf79318119df;hp=5578506acb061ae04d04e807e48780458dbc43b4;hpb=8789b74c2b857a64813f3db83ee86b1614ce3ac5;p=tools%2Fmedcoupling.git diff --git a/src/MEDCoupling_Swig/MEDCouplingRemapper.i b/src/MEDCoupling_Swig/MEDCouplingRemapper.i index 5578506ac..4aea9b44a 100644 --- a/src/MEDCoupling_Swig/MEDCouplingRemapper.i +++ b/src/MEDCoupling_Swig/MEDCouplingRemapper.i @@ -1,9 +1,9 @@ -// Copyright (C) 2007-2013 CEA/DEN, EDF R&D +// Copyright (C) 2007-2015 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 // License as published by the Free Software Foundation; either -// version 2.1 of the License. +// version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -30,17 +30,17 @@ #include "MEDCouplingFieldDouble.hxx" #include "MEDCouplingRemapper.hxx" -using namespace ParaMEDMEM; +using namespace MEDCoupling; using namespace INTERP_KERNEL; %} -%newobject ParaMEDMEM::MEDCouplingRemapper::transferField; -%newobject ParaMEDMEM::MEDCouplingRemapper::reverseTransferField; +%newobject MEDCoupling::MEDCouplingRemapper::transferField; +%newobject MEDCoupling::MEDCouplingRemapper::reverseTransferField; %include "MEDCouplingCommon.i" %include "InterpolationOptions.hxx" -namespace ParaMEDMEM +namespace MEDCoupling { typedef enum { @@ -57,7 +57,7 @@ namespace ParaMEDMEM public: MEDCouplingRemapper(); ~MEDCouplingRemapper(); - int prepare(const MEDCouplingMesh *srcMesh, const MEDCouplingMesh *targetMesh, const char *method) throw(INTERP_KERNEL::Exception); + int prepare(const MEDCouplingMesh *srcMesh, const MEDCouplingMesh *targetMesh, const std::string& method) throw(INTERP_KERNEL::Exception); int prepareEx(const MEDCouplingFieldTemplate *src, const MEDCouplingFieldTemplate *target) throw(INTERP_KERNEL::Exception); void transfer(const MEDCouplingFieldDouble *srcField, MEDCouplingFieldDouble *targetField, double dftValue) throw(INTERP_KERNEL::Exception); void partialTransfer(const MEDCouplingFieldDouble *srcField, MEDCouplingFieldDouble *targetField) throw(INTERP_KERNEL::Exception); @@ -74,6 +74,7 @@ namespace ParaMEDMEM int nullifiedTinyCoeffInCrudeMatrix(double scaleFactor) throw(INTERP_KERNEL::Exception); double getMaxValueInCrudeMatrix() const throw(INTERP_KERNEL::Exception); int getNumberOfColsOfMatrix() const throw(INTERP_KERNEL::Exception); + static std::string BuildMethodFrom(const std::string& meth1, const std::string& meth2) throw(INTERP_KERNEL::Exception); %extend { PyObject *getCrudeMatrix() const throw(INTERP_KERNEL::Exception) @@ -91,7 +92,7 @@ namespace ParaMEDMEM } return ret; } -#ifdef WITH_NUMPY +#if defined(WITH_NUMPY) && defined(WITH_SCIPY) PyObject *getCrudeCSRMatrix() const throw(INTERP_KERNEL::Exception) { return ToCSRMatrix(self->getCrudeMatrix(),self->getNumberOfColsOfMatrix()); @@ -102,81 +103,120 @@ namespace ParaMEDMEM } %pythoncode %{ -def ParaMEDMEMDataArrayDoubleIadd(self,*args): +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) -def ParaMEDMEMDataArrayDoubleIsub(self,*args): +def MEDCouplingDataArrayDoubleIsub(self,*args): import _MEDCouplingRemapper return _MEDCouplingRemapper.DataArrayDouble____isub___(self, self, *args) -def ParaMEDMEMDataArrayDoubleImul(self,*args): +def MEDCouplingDataArrayDoubleImul(self,*args): import _MEDCouplingRemapper return _MEDCouplingRemapper.DataArrayDouble____imul___(self, self, *args) -def ParaMEDMEMDataArrayDoubleIdiv(self,*args): +def MEDCouplingDataArrayDoubleIdiv(self,*args): import _MEDCouplingRemapper return _MEDCouplingRemapper.DataArrayDouble____idiv___(self, self, *args) -def ParaMEDMEMDataArrayDoubleIpow(self,*args): +def MEDCouplingDataArrayDoubleIpow(self,*args): import _MEDCouplingRemapper return _MEDCouplingRemapper.DataArrayDouble____ipow___(self, self, *args) -def ParaMEDMEMMEDCouplingFieldDoubleIadd(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) -def ParaMEDMEMMEDCouplingFieldDoubleIsub(self,*args): +def MEDCouplingFieldDoubleIsub(self,*args): import _MEDCouplingRemapper return _MEDCouplingRemapper.MEDCouplingFieldDouble____isub___(self, self, *args) -def ParaMEDMEMMEDCouplingFieldDoubleImul(self,*args): +def MEDCouplingFieldDoubleImul(self,*args): import _MEDCouplingRemapper return _MEDCouplingRemapper.MEDCouplingFieldDouble____imul___(self, self, *args) -def ParaMEDMEMMEDCouplingFieldDoubleIdiv(self,*args): +def MEDCouplingFieldDoubleIdiv(self,*args): import _MEDCouplingRemapper return _MEDCouplingRemapper.MEDCouplingFieldDouble____idiv___(self, self, *args) -def ParaMEDMEMMEDCouplingFieldDoubleIpow(self,*args): +def MEDCouplingFieldDoubleIpow(self,*args): import _MEDCouplingRemapper return _MEDCouplingRemapper.MEDCouplingFieldDouble____ipow___(self, self, *args) -def ParaMEDMEMDataArrayIntIadd(self,*args): +def MEDCouplingDataArrayIntnew(cls,*args): + import _MEDCouplingRemapper + return _MEDCouplingRemapper.DataArrayInt____new___(cls,args) +def MEDCouplingDataArrayIntnew(cls,*args): + import _MEDCoupling + return _MEDCoupling.DataArrayInt____new___(cls,args) +def MEDCouplingDataArrayIntIadd(self,*args): import _MEDCouplingRemapper return _MEDCouplingRemapper.DataArrayInt____iadd___(self, self, *args) -def ParaMEDMEMDataArrayIntIsub(self,*args): +def MEDCouplingDataArrayIntIsub(self,*args): import _MEDCouplingRemapper return _MEDCouplingRemapper.DataArrayInt____isub___(self, self, *args) -def ParaMEDMEMDataArrayIntImul(self,*args): +def MEDCouplingDataArrayIntImul(self,*args): import _MEDCouplingRemapper return _MEDCouplingRemapper.DataArrayInt____imul___(self, self, *args) -def ParaMEDMEMDataArrayIntIdiv(self,*args): +def MEDCouplingDataArrayIntIdiv(self,*args): import _MEDCouplingRemapper return _MEDCouplingRemapper.DataArrayInt____idiv___(self, self, *args) -def ParaMEDMEMDataArrayIntImod(self,*args): +def MEDCouplingDataArrayIntImod(self,*args): import _MEDCouplingRemapper return _MEDCouplingRemapper.DataArrayInt____imod___(self, self, *args) -def ParaMEDMEMDataArrayIntIpow(self,*args): +def MEDCouplingDataArrayIntIpow(self,*args): import _MEDCouplingRemapper return _MEDCouplingRemapper.DataArrayInt____ipow___(self, self, *args) -def ParaMEDMEMDataArrayDoubleTupleIadd(self,*args): +def MEDCouplingDataArrayDoubleTupleIadd(self,*args): import _MEDCouplingRemapper return _MEDCouplingRemapper.DataArrayDoubleTuple____iadd___(self, self, *args) -def ParaMEDMEMDataArrayDoubleTupleIsub(self,*args): +def MEDCouplingDataArrayDoubleTupleIsub(self,*args): import _MEDCouplingRemapper return _MEDCouplingRemapper.DataArrayDoubleTuple____isub___(self, self, *args) -def ParaMEDMEMDataArrayDoubleTupleImul(self,*args): +def MEDCouplingDataArrayDoubleTupleImul(self,*args): import _MEDCouplingRemapper return _MEDCouplingRemapper.DataArrayDoubleTuple____imul___(self, self, *args) -def ParaMEDMEMDataArrayDoubleTupleIdiv(self,*args): +def MEDCouplingDataArrayDoubleTupleIdiv(self,*args): import _MEDCouplingRemapper return _MEDCouplingRemapper.DataArrayDoubleTuple____idiv___(self, self, *args) -def ParaMEDMEMDataArrayIntTupleIadd(self,*args): +def MEDCouplingDataArrayIntTupleIadd(self,*args): import _MEDCouplingRemapper return _MEDCouplingRemapper.DataArrayIntTuple____iadd___(self, self, *args) -def ParaMEDMEMDataArrayIntTupleIsub(self,*args): +def MEDCouplingDataArrayIntTupleIsub(self,*args): import _MEDCouplingRemapper return _MEDCouplingRemapper.DataArrayIntTuple____isub___(self, self, *args) -def ParaMEDMEMDataArrayIntTupleImul(self,*args): +def MEDCouplingDataArrayIntTupleImul(self,*args): import _MEDCouplingRemapper return _MEDCouplingRemapper.DataArrayIntTuple____imul___(self, self, *args) -def ParaMEDMEMDataArrayIntTupleIdiv(self,*args): +def MEDCouplingDataArrayIntTupleIdiv(self,*args): import _MEDCouplingRemapper return _MEDCouplingRemapper.DataArrayIntTuple____idiv___(self, self, *args) -def ParaMEDMEMDataArrayIntTupleImod(self,*args): +def MEDCouplingDataArrayIntTupleImod(self,*args): import _MEDCouplingRemapper return _MEDCouplingRemapper.DataArrayIntTuple____imod___(self, self, *args) +def ParaMEDMEMDenseMatrixIadd(self,*args): + import _MEDCouplingRemapper + return _MEDCouplingRemapper.DenseMatrix____iadd___(self, 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"