From: ageay Date: Mon, 1 Mar 2010 08:27:05 +0000 (+0000) Subject: Addition of swigging of Remapper. X-Git-Tag: V5_1_main_FINAL~176 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=37d298782690ba11e89086b60e536e9c81cba0ff;p=tools%2Fmedcoupling.git Addition of swigging of Remapper. --- diff --git a/src/MEDCoupling_Swig/MEDCouplingRemapperTest.py b/src/MEDCoupling_Swig/MEDCouplingRemapperTest.py new file mode 100644 index 000000000..c657930dd --- /dev/null +++ b/src/MEDCoupling_Swig/MEDCouplingRemapperTest.py @@ -0,0 +1,68 @@ +# -*- coding: iso-8859-1 -*- + +from libMEDCouplingRemapper_Swig import * +from math import * +import unittest + +class MEDCouplingBasicsTest(unittest.TestCase): + def testRemapper1(self): + sourceMesh=self.build2DSourceMesh_1(); + targetMesh=self.build2DTargetMesh_1(); + remapper=MEDCouplingRemapper() + remapper.setPrecision(1e-12); + remapper.setIntersectionType(Triangulation); + self.failUnless(remapper.prepare(sourceMesh,targetMesh,"P0P0")==1); + srcField=MEDCouplingFieldDouble.New(ON_CELLS); + srcField.setNature(ConservativeVolumic); + srcField.setMesh(sourceMesh); + array=DataArrayDouble.New(); + ptr=sourceMesh.getNumberOfCells()*[None] + for i in xrange(sourceMesh.getNumberOfCells()): + ptr[i]=float(i+7) + pass + array.setValues(ptr,sourceMesh.getNumberOfCells(),1); + srcField.setArray(array); + trgfield=remapper.transferField(srcField,4.57); + values=trgfield.getArray().getValues(); + valuesExpected=[7.5 ,7. ,7.,8.,7.5]; + for i in xrange(targetMesh.getNumberOfCells()): + self.failUnless(abs(values[i]-valuesExpected[i])<1e-12); + pass + self.failUnless(1==trgfield.getArray().getNumberOfComponents()); + pass + + def build2DSourceMesh_1(self): + sourceCoords=[-0.3,-0.3, 0.7,-0.3, -0.3,0.7, 0.7,0.7] + sourceConn=[0,3,1,0,2,3] + sourceMesh=MEDCouplingUMesh.New("my name of mesh 2D",2) + sourceMesh.allocateCells(2); + sourceMesh.insertNextCell(NORM_TRI3,3,sourceConn[0:3]); + sourceMesh.insertNextCell(NORM_TRI3,3,sourceConn[3:6]); + sourceMesh.finishInsertingCells(); + myCoords=DataArrayDouble.New(); + myCoords.setValues(sourceCoords,4,2); + sourceMesh.setCoords(myCoords); + return sourceMesh; + + def build2DTargetMesh_1(self): + targetCoords=[-0.3,-0.3, 0.2,-0.3, 0.7,-0.3, -0.3,0.2, 0.2,0.2, 0.7,0.2, -0.3,0.7, 0.2,0.7, 0.7,0.7 ] + targetConn=[0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4] + targetMesh=MEDCouplingUMesh.New(); + targetMesh.setMeshDimension(2); + targetMesh.allocateCells(5); + targetMesh.insertNextCell(NORM_QUAD4,4,targetConn[0:4]); + targetMesh.insertNextCell(NORM_TRI3,3,targetConn[4:7]); + targetMesh.insertNextCell(NORM_TRI3,3,targetConn[7:10]); + targetMesh.insertNextCell(NORM_QUAD4,4,targetConn[10:14]); + targetMesh.insertNextCell(NORM_QUAD4,4,targetConn[14:18]); + targetMesh.finishInsertingCells(); + myCoords=DataArrayDouble.New(); + myCoords.setValues(targetCoords,9,2); + targetMesh.setCoords(myCoords); + return targetMesh; + + def setUp(self): + pass + pass + +unittest.main() diff --git a/src/MEDCoupling_Swig/Makefile.am b/src/MEDCoupling_Swig/Makefile.am index c1d31106d..beeff78e7 100644 --- a/src/MEDCoupling_Swig/Makefile.am +++ b/src/MEDCoupling_Swig/Makefile.am @@ -1,4 +1,4 @@ -# MED MEDMEM_SWIG : binding of C++ implementation and Python +# MED MEDCoupling_Swig : binding of C++ implementation and Python # # Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -22,14 +22,14 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am -lib_LTLIBRARIES = _libMEDCoupling_Swig.la +lib_LTLIBRARIES = _libMEDCoupling_Swig.la _libMEDCouplingRemapper_Swig.la salomeinclude_HEADERS = \ - libMEDCoupling_Swig.i MEDCouplingTypemaps.i + libMEDCoupling_Swig.i libMEDCouplingRemapper_Swig.i MEDCouplingTypemaps.i SWIG_DEF = libMEDCoupling_Swig.i MEDCouplingTypemaps.i -SWIG_FLAGS = @SWIG_FLAGS@ -I$(srcdir) -I$(srcdir)/../MEDCoupling -I$(srcdir)/../INTERP_KERNEL/Bases +SWIG_FLAGS = @SWIG_FLAGS@ -I$(srcdir) -I$(srcdir)/../MEDCoupling -I$(srcdir)/../INTERP_KERNEL/Bases -I$(srcdir)/../INTERP_KERNEL dist__libMEDCoupling_Swig_la_SOURCES = libMEDCoupling_Swig.i MEDCouplingTypemaps.i nodist__libMEDCoupling_Swig_la_SOURCES = libMEDCoupling_Swig_wrap.cxx @@ -38,12 +38,25 @@ libMEDCoupling_Swig.py: libMEDCoupling_Swig_wrap.cxx libMEDCoupling_Swig_wrap.cxx: $(SWIG_DEF) $(SWIG) $(SWIG_FLAGS) -o $@ $< -_libMEDCoupling_Swig_la_CPPFLAGS = $(CORBA_CXXFLAGS) $(CORBA_INCLUDES) $(PYTHON_INCLUDES) \ +_libMEDCoupling_Swig_la_CPPFLAGS = $(PYTHON_INCLUDES) \ @CXXTMPDPTHFLAGS@ -I$(srcdir)/../MEDCoupling -I$(srcdir)/../INTERP_KERNEL -I$(srcdir)/../INTERP_KERNEL/Bases _libMEDCoupling_Swig_la_LDFLAGS = -module $(PYTHON_LIBS) \ ../MEDCoupling/libmedcoupling.la ../INTERP_KERNEL/libinterpkernel.la -CLEANFILES = libMEDCoupling_Swig_wrap.cxx libMEDCoupling_Swig.py +dist__libMEDCouplingRemapper_Swig_la_SOURCES = libMEDCouplingRemapper_Swig.i +nodist__libMEDCouplingRemapper_Swig_la_SOURCES = libMEDCouplingRemapper_Swig_wrap.cxx +libMEDCouplingRemapper_Swig.py: libMEDCouplingRemapper_Swig_wrap.cxx -dist_salomescript_DATA= MEDCouplingBasicsTest.py libMEDCoupling_Swig.py +libMEDCouplingRemapper_Swig_wrap.cxx: libMEDCouplingRemapper_Swig.i + $(SWIG) $(SWIG_FLAGS) -o $@ $< + +_libMEDCouplingRemapper_Swig_la_CPPFLAGS = $(PYTHON_INCLUDES) \ + @CXXTMPDPTHFLAGS@ -I$(srcdir)/../MEDCoupling -I$(srcdir)/../INTERP_KERNEL -I$(srcdir)/../INTERP_KERNEL/Bases + +_libMEDCouplingRemapper_Swig_la_LDFLAGS = -module $(PYTHON_LIBS) \ + ../MEDCoupling/libmedcouplingremapper.la ../INTERP_KERNEL/libinterpkernel.la + +CLEANFILES = libMEDCoupling_Swig_wrap.cxx libMEDCoupling_Swig.py libMEDCouplingRemapper_Swig_wrap.cxx libMEDCouplingRemapper_Swig.py + +dist_salomescript_DATA= MEDCouplingBasicsTest.py MEDCouplingRemapperTest.py libMEDCoupling_Swig.py libMEDCouplingRemapper_Swig.py diff --git a/src/MEDCoupling_Swig/libMEDCouplingRemapper_Swig.i b/src/MEDCoupling_Swig/libMEDCouplingRemapper_Swig.i new file mode 100644 index 000000000..e962500ca --- /dev/null +++ b/src/MEDCoupling_Swig/libMEDCouplingRemapper_Swig.i @@ -0,0 +1,41 @@ +// Copyright (C) 2007-2008 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. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// +%module libMEDCouplingRemapper_Swig + +#define MEDCOUPLING_EXPORT +#define INTERPKERNEL_EXPORT +#define MEDCOUPLINGREMAPPER_EXPORT + +%{ +#include "MEDCouplingMemArray.hxx" +#include "MEDCouplingUMesh.hxx" +#include "MEDCouplingField.hxx" +#include "MEDCouplingFieldDouble.hxx" +#include "MEDCouplingRemapper.hxx" + +using namespace ParaMEDMEM; +using namespace INTERP_KERNEL; +%} + +%newobject ParaMEDMEM::MEDCouplingRemapper::transferField; +%newobject ParaMEDMEM::MEDCouplingRemapper::reverseTransferField; + +%include "libMEDCoupling_Swig.i" +%include "InterpolationOptions.hxx" +%include "MEDCouplingRemapper.hxx"